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
488488 settings = Application::getInstance()->getSettings();
489489 }
490490
491− _gyroCameraSensitivity = loadSetting(settings, "gyroCameraSensitivity", 0.5f);
492491 _audioJitterBufferSamples = loadSetting(settings, "audioJitterBufferSamples", 0);
493492 _fieldOfView = loadSetting(settings, "fieldOfView", DEFAULT_FIELD_OF_VIEW_DEGREES);
494493 _maxVoxels = loadSetting(settings, "maxVoxels", DEFAULT_MAX_VOXELS_PER_SYSTEM);
@@ -512,7 +511,6 @@ void Menu::saveSettings(QSettings* settings) { · 17 unmodified lines
512511 settings = Application::getInstance()->getSettings();
513512 }
514513
515− settings->setValue("gyroCameraSensitivity", _gyroCameraSensitivity);
516514 settings->setValue("audioJitterBufferSamples", _audioJitterBufferSamples);
517515 settings->setValue("fieldOfView", _fieldOfView);
518516 settings->setValue("maxVoxels", _maxVoxels);
@@ -781,10 +779,6 @@ void Menu::editPreferences() { · 262 unmodified lines
781779 fieldOfView->setValue(_fieldOfView);
782780 form->addRow("Vertical Field of View (Degrees):", fieldOfView);
783781
784− QDoubleSpinBox* gyroCameraSensitivity = new QDoubleSpinBox();
785− gyroCameraSensitivity->setValue(_gyroCameraSensitivity);
786− form->addRow("Gyro Camera Sensitivity (0 - 1):", gyroCameraSensitivity);
787−
788782 QDoubleSpinBox* leanScale = new QDoubleSpinBox();
789783 leanScale->setValue(applicationInstance->getAvatar()->getLeanScale());
790784 form->addRow("Lean Scale:", leanScale);
@@ -826,7 +820,6 @@ void Menu::editPreferences() { · 35 unmodified lines
826820
827821 applicationInstance->getAvatar()->getHead().setPupilDilation(pupilDilation->value() / (float)pupilDilation->maximum());
828822
829− _gyroCameraSensitivity = gyroCameraSensitivity->value();
830823 _maxVoxels = maxVoxels->value();
831824 applicationInstance->getVoxels()->setMaxVoxels(_maxVoxels);
832825