Moved to SixenseManager
Showing the changes to interface/src/ui/PreferencesDialog.cpp (1 of 4 files). Show all
Unified · Split
| @@ -12,6 +12,7 @@ · 11 unmodified lines | |||
| 12 | #include <QFileDialog> | 12 | #include <QFileDialog> |
| 13 | 13 | ||
| 14 | #include <devices/Faceshift.h> | 14 | #include <devices/Faceshift.h> |
| 15 | #include <devices/SixenseManager.h> | ||
| 15 | 16 | ||
| 16 | #include "Application.h" | 17 | #include "Application.h" |
| 17 | #include "Audio.h" | 18 | #include "Audio.h" |
| @@ -163,9 +164,9 @@ void PreferencesDialog::loadPreferences() { · 145 unmodified lines | |||
| 163 | 164 | ||
| 164 | ui.oculusUIAngularSizeSpin->setValue(qApp->getApplicationOverlay().getOculusUIAngularSize()); | 165 | ui.oculusUIAngularSizeSpin->setValue(qApp->getApplicationOverlay().getOculusUIAngularSize()); |
| 165 | 166 | ||
| 166 | ui.sixenseReticleMoveSpeedSpin->setValue(menuInstance->getSixenseReticleMoveSpeed()); | 167 | SixenseManager& sixense = SixenseManager::getInstance(); |
| 167 | 168 | ui.sixenseReticleMoveSpeedSpin->setValue(sixense.getReticleMoveSpeed()); | |
| 168 | ui.invertSixenseButtonsCheckBox->setChecked(menuInstance->getInvertSixenseButtons()); | 169 | ui.invertSixenseButtonsCheckBox->setChecked(sixense.getInvertButtons()); |
| 169 | 170 | ||
| 170 | } | 171 | } |
| 171 | 172 | ||
| @@ -244,10 +245,10 @@ void PreferencesDialog::savePreferences() { · 72 unmodified lines | |||
| 244 | Menu::getInstance()->setMaxOctreePacketsPerSecond(ui.maxOctreePPSSpin->value()); | 245 | Menu::getInstance()->setMaxOctreePacketsPerSecond(ui.maxOctreePPSSpin->value()); |
| 245 | 246 | ||
| 246 | qApp->getApplicationOverlay().setOculusUIAngularSize(ui.oculusUIAngularSizeSpin->value()); | 247 | qApp->getApplicationOverlay().setOculusUIAngularSize(ui.oculusUIAngularSizeSpin->value()); |
| 247 | 248 | ||
| 248 | Menu::getInstance()->setSixenseReticleMoveSpeed(ui.sixenseReticleMoveSpeedSpin->value()); | 249 | SixenseManager& sixense = SixenseManager::getInstance(); |
| 249 | 250 | sixense.setReticleMoveSpeed(ui.sixenseReticleMoveSpeedSpin->value()); | |
| 250 | Menu::getInstance()->setInvertSixenseButtons(ui.invertSixenseButtonsCheckBox->isChecked()); | 251 | sixense.setInvertButtons(ui.invertSixenseButtonsCheckBox->isChecked()); |
| 251 | 252 | ||
| 252 | auto audio = DependencyManager::get<Audio>(); | 253 | auto audio = DependencyManager::get<Audio>(); |
| 253 | MixedProcessedAudioStream& stream = audio->getReceivedAudioStream(); | 254 | MixedProcessedAudioStream& stream = audio->getReceivedAudioStream(); |