History

Merge branch 'master' of git://github.com/highfidelity/hifi into audio-buffer-size

Ryan Huffman committed 11 years ago

Commit defb2cb2 parents bbfe2ff 162854c158 files · +501 −11918Browse files

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

Unified · Split

interface/src/ui/PreferencesDialog.cpp+3−5
@@ -9,6 +9,7 @@ · 8 unmodified lines
9// See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html9// See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
10//10//
11 11
12#include <QFileDialog>
12 13
13#include "Application.h"14#include "Application.h"
14#include "Audio.h"15#include "Audio.h"
@@ -149,9 +150,7 @@ void PreferencesDialog::loadPreferences() { · 134 unmodified lines
149 150
150 ui.avatarScaleSpin->setValue(myAvatar->getScale());151 ui.avatarScaleSpin->setValue(myAvatar->getScale());
151 152
152 ui.maxVoxelsSpin->setValue(menuInstance->getMaxVoxels());153 ui.maxVoxelsPPSSpin->setValue(menuInstance->getMaxOctreePacketsPerSecond());
153
154 ui.maxVoxelsPPSSpin->setValue(menuInstance->getMaxVoxelPacketsPerSecond());
155 154
156 ui.oculusUIAngularSizeSpin->setValue(menuInstance->getOculusUIAngularSize());155 ui.oculusUIAngularSizeSpin->setValue(menuInstance->getOculusUIAngularSize());
157 156
@@ -220,7 +219,6 @@ void PreferencesDialog::savePreferences() { · 62 unmodified lines
220 myAvatar->setLeanScale(ui.leanScaleSpin->value());219 myAvatar->setLeanScale(ui.leanScaleSpin->value());
221 myAvatar->setClampedTargetScale(ui.avatarScaleSpin->value());220 myAvatar->setClampedTargetScale(ui.avatarScaleSpin->value());
222 221
223 Application::getInstance()->getVoxels()->setMaxVoxels(ui.maxVoxelsSpin->value());
224 GLCanvas::SharedPointer glCanvas = DependencyManager::get<GLCanvas>();222 GLCanvas::SharedPointer glCanvas = DependencyManager::get<GLCanvas>();
225 Application::getInstance()->resizeGL(glCanvas->width(), glCanvas->height());223 Application::getInstance()->resizeGL(glCanvas->width(), glCanvas->height());
226 224
@@ -233,7 +231,7 @@ void PreferencesDialog::savePreferences() { · 6 unmodified lines
233 231
234 Menu::getInstance()->setFaceshiftHostname(ui.faceshiftHostnameEdit->text()); 232 Menu::getInstance()->setFaceshiftHostname(ui.faceshiftHostnameEdit->text());
235 233
236 Menu::getInstance()->setMaxVoxelPacketsPerSecond(ui.maxVoxelsPPSSpin->value());234 Menu::getInstance()->setMaxOctreePacketsPerSecond(ui.maxVoxelsPPSSpin->value());
237 235
238 Menu::getInstance()->setOculusUIAngularSize(ui.oculusUIAngularSizeSpin->value());236 Menu::getInstance()->setOculusUIAngularSize(ui.oculusUIAngularSizeSpin->value());
239 237