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
170170
171171 ui.maxOctreePPSSpin->setValue(qApp->getOctreeQuery().getMaxOctreePacketsPerSecond());
172172
173− ui.oculusUIAngularSizeSpin->setValue(qApp->getApplicationOverlay().getOculusUIAngularSize());
173+ ui.oculusUIAngularSizeSpin->setValue(qApp->getApplicationOverlay().getHmdUIAngularSize());
174174
175175 SixenseManager& sixense = SixenseManager::getInstance();
176176 ui.sixenseReticleMoveSpeedSpin->setValue(sixense.getReticleMoveSpeed());
@@ -216,8 +216,7 @@ void PreferencesDialog::savePreferences() { · 39 unmodified lines
216216 myAvatar->setLeanScale(ui.leanScaleSpin->value());
217217 myAvatar->setClampedTargetScale(ui.avatarScaleSpin->value());
218218
219− auto glCanvas = Application::getInstance()->getGLWidget();
220− Application::getInstance()->resizeGL(glCanvas->width(), glCanvas->height());
219+ Application::getInstance()->resizeGL();
221220
222221 DependencyManager::get<AvatarManager>()->getMyAvatar()->setRealWorldFieldOfView(ui.realWorldFieldOfViewSpin->value());
223222
@@ -231,7 +230,7 @@ void PreferencesDialog::savePreferences() { · 7 unmodified lines
231230
232231 qApp->getOctreeQuery().setMaxOctreePacketsPerSecond(ui.maxOctreePPSSpin->value());
233232
234− qApp->getApplicationOverlay().setOculusUIAngularSize(ui.oculusUIAngularSizeSpin->value());
233+ qApp->getApplicationOverlay().setHmdUIAngularSize(ui.oculusUIAngularSizeSpin->value());
235234
236235 SixenseManager& sixense = SixenseManager::getInstance();
237236 sixense.setReticleMoveSpeed(ui.sixenseReticleMoveSpeedSpin->value());
@@ -255,7 +254,7 @@ void PreferencesDialog::savePreferences() { · 17 unmodified lines
255254 audio->setOutputStarveDetectionThreshold(ui.outputStarveDetectionThresholdSpinner->value());
256255 audio->setOutputStarveDetectionPeriod(ui.outputStarveDetectionPeriodSpinner->value());
257256
258− Application::getInstance()->resizeGL(glCanvas->width(), glCanvas->height());
257+ Application::getInstance()->resizeGL();
259258
260259 // LOD items
261260 auto lodManager = DependencyManager::get<LODManager>();