History

Removing access to the gl widget and display managers

Brad Davis committed 11 years ago

Commit 302aa9d1 parent 539063035 files · +401 −440Browse files

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

Unified · Split

interface/src/ui/PreferencesDialog.cpp+4−5
@@ -170,7 +170,7 @@ void PreferencesDialog::loadPreferences() { · 169 unmodified lines
170 170
171 ui.maxOctreePPSSpin->setValue(qApp->getOctreeQuery().getMaxOctreePacketsPerSecond());171 ui.maxOctreePPSSpin->setValue(qApp->getOctreeQuery().getMaxOctreePacketsPerSecond());
172 172
173 ui.oculusUIAngularSizeSpin->setValue(qApp->getApplicationOverlay().getOculusUIAngularSize());173 ui.oculusUIAngularSizeSpin->setValue(qApp->getApplicationOverlay().getHmdUIAngularSize());
174 174
175 SixenseManager& sixense = SixenseManager::getInstance();175 SixenseManager& sixense = SixenseManager::getInstance();
176 ui.sixenseReticleMoveSpeedSpin->setValue(sixense.getReticleMoveSpeed());176 ui.sixenseReticleMoveSpeedSpin->setValue(sixense.getReticleMoveSpeed());
@@ -216,8 +216,7 @@ void PreferencesDialog::savePreferences() { · 39 unmodified lines
216 myAvatar->setLeanScale(ui.leanScaleSpin->value());216 myAvatar->setLeanScale(ui.leanScaleSpin->value());
217 myAvatar->setClampedTargetScale(ui.avatarScaleSpin->value());217 myAvatar->setClampedTargetScale(ui.avatarScaleSpin->value());
218 218
219 auto glCanvas = Application::getInstance()->getGLWidget();219 Application::getInstance()->resizeGL();
220 Application::getInstance()->resizeGL(glCanvas->width(), glCanvas->height());
221 220
222 DependencyManager::get<AvatarManager>()->getMyAvatar()->setRealWorldFieldOfView(ui.realWorldFieldOfViewSpin->value());221 DependencyManager::get<AvatarManager>()->getMyAvatar()->setRealWorldFieldOfView(ui.realWorldFieldOfViewSpin->value());
223 222
@@ -231,7 +230,7 @@ void PreferencesDialog::savePreferences() { · 7 unmodified lines
231 230
232 qApp->getOctreeQuery().setMaxOctreePacketsPerSecond(ui.maxOctreePPSSpin->value());231 qApp->getOctreeQuery().setMaxOctreePacketsPerSecond(ui.maxOctreePPSSpin->value());
233 232
234 qApp->getApplicationOverlay().setOculusUIAngularSize(ui.oculusUIAngularSizeSpin->value());233 qApp->getApplicationOverlay().setHmdUIAngularSize(ui.oculusUIAngularSizeSpin->value());
235 234
236 SixenseManager& sixense = SixenseManager::getInstance();235 SixenseManager& sixense = SixenseManager::getInstance();
237 sixense.setReticleMoveSpeed(ui.sixenseReticleMoveSpeedSpin->value());236 sixense.setReticleMoveSpeed(ui.sixenseReticleMoveSpeedSpin->value());
@@ -255,7 +254,7 @@ void PreferencesDialog::savePreferences() { · 17 unmodified lines
255 audio->setOutputStarveDetectionThreshold(ui.outputStarveDetectionThresholdSpinner->value());254 audio->setOutputStarveDetectionThreshold(ui.outputStarveDetectionThresholdSpinner->value());
256 audio->setOutputStarveDetectionPeriod(ui.outputStarveDetectionPeriodSpinner->value());255 audio->setOutputStarveDetectionPeriod(ui.outputStarveDetectionPeriodSpinner->value());
257 256
258 Application::getInstance()->resizeGL(glCanvas->width(), glCanvas->height());257 Application::getInstance()->resizeGL();
259 258
260 // LOD items259 // LOD items
261 auto lodManager = DependencyManager::get<LODManager>();260 auto lodManager = DependencyManager::get<LODManager>();