History

Merge pull request #986 from PhilipRosedale/master

Faceshift rotates body, slow near others for easier positioning

ZappoMan committed 13 years ago

Commit fb85add2 parents 1bd67d3 f88a36311 files · +60 −74Browse files

Showing the changes to interface/src/Menu.cpp (1 of 11 files). Show all

Unified · Split

interface/src/Menu.cpp+0−7
@@ -488,7 +488,6 @@ void Menu::loadSettings(QSettings* settings) { · 487 unmodified lines
488 settings = Application::getInstance()->getSettings();488 settings = Application::getInstance()->getSettings();
489 }489 }
490 490
491 _gyroCameraSensitivity = loadSetting(settings, "gyroCameraSensitivity", 0.5f);
492 _audioJitterBufferSamples = loadSetting(settings, "audioJitterBufferSamples", 0);491 _audioJitterBufferSamples = loadSetting(settings, "audioJitterBufferSamples", 0);
493 _fieldOfView = loadSetting(settings, "fieldOfView", DEFAULT_FIELD_OF_VIEW_DEGREES);492 _fieldOfView = loadSetting(settings, "fieldOfView", DEFAULT_FIELD_OF_VIEW_DEGREES);
494 _maxVoxels = loadSetting(settings, "maxVoxels", DEFAULT_MAX_VOXELS_PER_SYSTEM);493 _maxVoxels = loadSetting(settings, "maxVoxels", DEFAULT_MAX_VOXELS_PER_SYSTEM);
@@ -512,7 +511,6 @@ void Menu::saveSettings(QSettings* settings) { · 17 unmodified lines
512 settings = Application::getInstance()->getSettings();511 settings = Application::getInstance()->getSettings();
513 }512 }
514 513
515 settings->setValue("gyroCameraSensitivity", _gyroCameraSensitivity);
516 settings->setValue("audioJitterBufferSamples", _audioJitterBufferSamples);514 settings->setValue("audioJitterBufferSamples", _audioJitterBufferSamples);
517 settings->setValue("fieldOfView", _fieldOfView);515 settings->setValue("fieldOfView", _fieldOfView);
518 settings->setValue("maxVoxels", _maxVoxels);516 settings->setValue("maxVoxels", _maxVoxels);
@@ -781,10 +779,6 @@ void Menu::editPreferences() { · 262 unmodified lines
781 fieldOfView->setValue(_fieldOfView);779 fieldOfView->setValue(_fieldOfView);
782 form->addRow("Vertical Field of View (Degrees):", fieldOfView);780 form->addRow("Vertical Field of View (Degrees):", fieldOfView);
783 781
784 QDoubleSpinBox* gyroCameraSensitivity = new QDoubleSpinBox();
785 gyroCameraSensitivity->setValue(_gyroCameraSensitivity);
786 form->addRow("Gyro Camera Sensitivity (0 - 1):", gyroCameraSensitivity);
787
788 QDoubleSpinBox* leanScale = new QDoubleSpinBox();782 QDoubleSpinBox* leanScale = new QDoubleSpinBox();
789 leanScale->setValue(applicationInstance->getAvatar()->getLeanScale());783 leanScale->setValue(applicationInstance->getAvatar()->getLeanScale());
790 form->addRow("Lean Scale:", leanScale);784 form->addRow("Lean Scale:", leanScale);
@@ -826,7 +820,6 @@ void Menu::editPreferences() { · 35 unmodified lines
826 820
827 applicationInstance->getAvatar()->getHead().setPupilDilation(pupilDilation->value() / (float)pupilDilation->maximum());821 applicationInstance->getAvatar()->getHead().setPupilDilation(pupilDilation->value() / (float)pupilDilation->maximum());
828 822
829 _gyroCameraSensitivity = gyroCameraSensitivity->value();
830 _maxVoxels = maxVoxels->value();823 _maxVoxels = maxVoxels->value();
831 applicationInstance->getVoxels()->setMaxVoxels(_maxVoxels);824 applicationInstance->getVoxels()->setMaxVoxels(_maxVoxels);
832 825