History

almost finished plugin architecture, general plugin improvements. menu actions don't work all the time, joint controllers need to be handled better, and activate/deactive aren't always called correctly

Anthony J. Thibault committed 11 years ago

Commit 060f6c11 parent 108353420 files · +367 −204Browse files

Showing the changes to interface/src/ui/PreferencesDialog.cpp (1 of 20 files). Show all

Unified · Split

interface/src/ui/PreferencesDialog.cpp+2−2
@@ -182,7 +182,7 @@ void PreferencesDialog::loadPreferences() { · 181 unmodified lines
182#endif182#endif
183 183
184 SixenseManager& sixense = SixenseManager::getInstance();184 SixenseManager& sixense = SixenseManager::getInstance();
185 ui.sixenseReticleMoveSpeedSpin->setValue(sixense.getReticleMoveSpeed());185 ui.sixenseReticleMoveSpeedSpin->setValue(InputDevice::getReticleMoveSpeed());
186 ui.invertSixenseButtonsCheckBox->setChecked(sixense.getInvertButtons());186 ui.invertSixenseButtonsCheckBox->setChecked(sixense.getInvertButtons());
187 187
188 // LOD items188 // LOD items
@@ -246,7 +246,7 @@ void PreferencesDialog::savePreferences() { · 57 unmodified lines
246 qApp->getApplicationCompositor().setHmdUIAngularSize(ui.oculusUIAngularSizeSpin->value());246 qApp->getApplicationCompositor().setHmdUIAngularSize(ui.oculusUIAngularSizeSpin->value());
247 247
248 SixenseManager& sixense = SixenseManager::getInstance();248 SixenseManager& sixense = SixenseManager::getInstance();
249 sixense.setReticleMoveSpeed(ui.sixenseReticleMoveSpeedSpin->value());249 InputDevice::setReticleMoveSpeed(ui.sixenseReticleMoveSpeedSpin->value());
250 sixense.setInvertButtons(ui.invertSixenseButtonsCheckBox->isChecked());250 sixense.setInvertButtons(ui.invertSixenseButtonsCheckBox->isChecked());
251 251
252 auto audio = DependencyManager::get<AudioClient>();252 auto audio = DependencyManager::get<AudioClient>();