History

Move Faceshift related member out of Menu

Moved it to Faceshift class

Atlante45 committed 11 years ago

Commit ef5cfdc1 parent 8f5f6346 files · +22 −19Browse files

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

Unified · Split

interface/src/ui/PreferencesDialog.cpp+10−6
@@ -11,6 +11,8 @@ · 10 unmodified lines
11 11
12#include <QFileDialog>12#include <QFileDialog>
13 13
14#include <devices/Faceshift.h>
15
14#include "Application.h"16#include "Application.h"
15#include "Audio.h"17#include "Audio.h"
16#include "MainWindow.h"18#include "MainWindow.h"
@@ -124,10 +126,11 @@ void PreferencesDialog::loadPreferences() { · 107 unmodified lines
124 ui.pupilDilationSlider->setValue(myAvatar->getHead()->getPupilDilation() *126 ui.pupilDilationSlider->setValue(myAvatar->getHead()->getPupilDilation() *
125 ui.pupilDilationSlider->maximum());127 ui.pupilDilationSlider->maximum());
126 128
127 ui.faceshiftEyeDeflectionSider->setValue(menuInstance->getFaceshiftEyeDeflection() *129 auto faceshift = DependencyManager::get<Faceshift>();
130 ui.faceshiftEyeDeflectionSider->setValue(faceshift->getEyeDeflection() *
128 ui.faceshiftEyeDeflectionSider->maximum());131 ui.faceshiftEyeDeflectionSider->maximum());
129 132
130 ui.faceshiftHostnameEdit->setText(menuInstance->getFaceshiftHostname());133 ui.faceshiftHostnameEdit->setText(faceshift->getHostname());
131 134
132 auto audio = DependencyManager::get<Audio>();135 auto audio = DependencyManager::get<Audio>();
133 MixedProcessedAudioStream& stream = audio->getReceivedAudioStream();136 MixedProcessedAudioStream& stream = audio->getReceivedAudioStream();
@@ -231,11 +234,12 @@ void PreferencesDialog::savePreferences() { · 97 unmodified lines
231 Menu::getInstance()->setRealWorldFieldOfView(ui.realWorldFieldOfViewSpin->value());234 Menu::getInstance()->setRealWorldFieldOfView(ui.realWorldFieldOfViewSpin->value());
232 235
233 Menu::getInstance()->setFieldOfView(ui.fieldOfViewSpin->value());236 Menu::getInstance()->setFieldOfView(ui.fieldOfViewSpin->value());
234
235 Menu::getInstance()->setFaceshiftEyeDeflection(ui.faceshiftEyeDeflectionSider->value() /
236 (float)ui.faceshiftEyeDeflectionSider->maximum());
237 237
238 Menu::getInstance()->setFaceshiftHostname(ui.faceshiftHostnameEdit->text()); 238 auto faceshift = DependencyManager::get<Faceshift>();
239 faceshift->setEyeDeflection(ui.faceshiftEyeDeflectionSider->value() /
240 (float)ui.faceshiftEyeDeflectionSider->maximum());
241
242 faceshift->setHostname(ui.faceshiftHostnameEdit->text());
239 243
240 Menu::getInstance()->setMaxOctreePacketsPerSecond(ui.maxOctreePPSSpin->value());244 Menu::getInstance()->setMaxOctreePacketsPerSecond(ui.maxOctreePPSSpin->value());
241 245