diff --git a/interface/interface_en.ts b/interface/interface_en.ts
index 7dc5a4c41d..b8534c1779 100644
--- a/interface/interface_en.ts
+++ b/interface/interface_en.ts
@@ -133,115 +133,111 @@
PreferencesDialog
-
+
Cancel
-
+
Save all changes
-
+
+
+
Avatar
-
+
<html><head/><body><p>Avatar display name <span style=" color:#909090;">(optional)</span></p></body></html>
-
+
Not showing a name
-
+
Head
-
+
Body
-
+
Advanced Tuning
-
+
It's not recomended that you play with these settings unless you've looked into exactly what they do.
-
-
- <p>Avatar</p>
-
-
-
-
-
+
+
Vertical field of view
-
-
+
+
Lean scale (applies to Faceshift users)
-
-
+
+
Avatar scale <span style=" color:#909090;">(default is 1.0)</span>
-
-
+
+
Pupil dillation
-
-
+
+
Audio Jitter Buffer Samples (0 for automatic)
-
-
+
+
Faceshift eye detection
-
-
+
+
<html><head/><body><p>Voxels</p></body></html>
-
-
+
+
Maximum voxels
-
-
+
+
Max voxels sent each second
diff --git a/interface/src/Menu.h b/interface/src/Menu.h
index 96d5267b9c..2c459a488a 100644
--- a/interface/src/Menu.h
+++ b/interface/src/Menu.h
@@ -75,6 +75,7 @@ public:
float getAudioJitterBufferSamples() const { return _audioJitterBufferSamples; }
void setAudioJitterBufferSamples(float audioJitterBufferSamples) { _audioJitterBufferSamples = audioJitterBufferSamples; }
float getFieldOfView() const { return _fieldOfView; }
+ void setFieldOfView(float fieldOfView) { _fieldOfView = fieldOfView; }
float getFaceshiftEyeDeflection() const { return _faceshiftEyeDeflection; }
void setFaceshiftEyeDeflection(float faceshiftEyeDeflection) { _faceshiftEyeDeflection = faceshiftEyeDeflection; }
BandwidthDialog* getBandwidthDialog() const { return _bandwidthDialog; }
diff --git a/interface/src/ui/PreferencesDialog.cpp b/interface/src/ui/PreferencesDialog.cpp
index 56dbf8470c..c7f5f19099 100644
--- a/interface/src/ui/PreferencesDialog.cpp
+++ b/interface/src/ui/PreferencesDialog.cpp
@@ -71,16 +71,16 @@ void PreferencesDialog::loadPreferences() {
MyAvatar* myAvatar = Application::getInstance()->getAvatar();
Menu* menuInstance = Menu::getInstance();
-
+
_displayNameString = myAvatar->getDisplayName();
ui.displayNameEdit->setText(_displayNameString);
-
+
_faceURLString = myAvatar->getHead()->getFaceModel().getURL().toString();
ui.faceURLEdit->setText(_faceURLString);
-
+
_skeletonURLString = myAvatar->getSkeletonModel().getURL().toString();
ui.skeletonURLEdit->setText(_skeletonURLString);
-
+
ui.pupilDilationSlider->setValue(myAvatar->getHead()->getPupilDilation() *
ui.pupilDilationSlider->maximum());
@@ -137,10 +137,14 @@ void PreferencesDialog::savePreferences() {
Application::getInstance()->resizeGL(Application::getInstance()->getGLWidget()->width(),
Application::getInstance()->getGLWidget()->height());
+ Menu::getInstance()->setFieldOfView(ui.fieldOfViewSpin->value());
+
Menu::getInstance()->setFaceshiftEyeDeflection(ui.faceshiftEyeDeflectionSider->value() /
(float)ui.faceshiftEyeDeflectionSider->maximum());
Menu::getInstance()->setMaxVoxelPacketsPerSecond(ui.maxVoxelsPPSSpin->value());
Menu::getInstance()->setAudioJitterBufferSamples(ui.audioJitterSpin->value());
-
+
+ Application::getInstance()->resizeGL(Application::getInstance()->getGLWidget()->width(),
+ Application::getInstance()->getGLWidget()->height());
}
diff --git a/interface/ui/preferencesDialog.ui b/interface/ui/preferencesDialog.ui
index 7692da2943..14db1b6d5e 100644
--- a/interface/ui/preferencesDialog.ui
+++ b/interface/ui/preferencesDialog.ui
@@ -573,7 +573,7 @@ padding: 0;
color: #0e7077
- <p>Avatar</p>
+ Avatar
Qt::AlignBottom|Qt::AlignLeading|Qt::AlignLeft
@@ -627,8 +627,8 @@ padding: 0;
- 40
- 20
+ 0
+ 0
@@ -649,8 +649,8 @@ padding: 0;
- 70
- 16777215
+ 95
+ 36
@@ -1100,7 +1100,7 @@ padding: 0;
-
-
+
0
@@ -1125,7 +1125,7 @@ padding: 0;
color: #0e7077
- <html><head/><body><p>Voxels</p></body></html>
+ Voxels
Qt::AlignBottom|Qt::AlignLeading|Qt::AlignLeft