Showing the changes to interface/src/ui/PreferencesDialog.cpp (1 of 158 files). Show all
Unified · Split
| @@ -9,6 +9,7 @@ · 8 unmodified lines | ||
| 9 | 9 | // 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 | 14 | #include "Application.h" |
| 14 | 15 | #include "Audio.h" |
| @@ -149,9 +150,7 @@ void PreferencesDialog::loadPreferences() { · 134 unmodified lines | ||
| 149 | 150 | |
| 150 | 151 | ui.avatarScaleSpin->setValue(myAvatar->getScale()); |
| 151 | 152 | |
| 152 | − ui.maxVoxelsSpin->setValue(menuInstance->getMaxVoxels()); | |
| 153 | − | |
| 154 | − ui.maxVoxelsPPSSpin->setValue(menuInstance->getMaxVoxelPacketsPerSecond()); | |
| 153 | + ui.maxVoxelsPPSSpin->setValue(menuInstance->getMaxOctreePacketsPerSecond()); | |
| 155 | 154 | |
| 156 | 155 | ui.oculusUIAngularSizeSpin->setValue(menuInstance->getOculusUIAngularSize()); |
| 157 | 156 | |
| @@ -220,7 +219,6 @@ void PreferencesDialog::savePreferences() { · 62 unmodified lines | ||
| 220 | 219 | myAvatar->setLeanScale(ui.leanScaleSpin->value()); |
| 221 | 220 | myAvatar->setClampedTargetScale(ui.avatarScaleSpin->value()); |
| 222 | 221 | |
| 223 | − Application::getInstance()->getVoxels()->setMaxVoxels(ui.maxVoxelsSpin->value()); | |
| 224 | 222 | GLCanvas::SharedPointer glCanvas = DependencyManager::get<GLCanvas>(); |
| 225 | 223 | Application::getInstance()->resizeGL(glCanvas->width(), glCanvas->height()); |
| 226 | 224 | |
| @@ -233,7 +231,7 @@ void PreferencesDialog::savePreferences() { · 6 unmodified lines | ||
| 233 | 231 | |
| 234 | 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 | 236 | Menu::getInstance()->setOculusUIAngularSize(ui.oculusUIAngularSizeSpin->value()); |
| 239 | 237 | |