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/Menu.cpp (1 of 6 files). Show all

Unified · Split

interface/src/Menu.cpp+1−4
@@ -44,6 +44,7 @@ · 43 unmodified lines
4444 #include "Audio.h"
4545 #include "audio/AudioIOStatsRenderer.h"
4646 #include "audio/AudioScope.h"
47+#include "devices/Faceshift.h"
4748 #include "devices/RealSense.h"
4849 #include "devices/Visage.h"
4950 #include "Menu.h"
@@ -591,8 +592,6 @@ void Menu::loadSettings(QSettings* settings) { · 541 unmodified lines
591592
592593 _fieldOfView = loadSetting(settings, "fieldOfView", DEFAULT_FIELD_OF_VIEW_DEGREES);
593594 _realWorldFieldOfView = loadSetting(settings, "realWorldFieldOfView", DEFAULT_REAL_WORLD_FIELD_OF_VIEW_DEGREES);
594− _faceshiftEyeDeflection = loadSetting(settings, "faceshiftEyeDeflection", DEFAULT_FACESHIFT_EYE_DEFLECTION);
595− _faceshiftHostname = settings->value("faceshiftHostname", DEFAULT_FACESHIFT_HOSTNAME).toString();
596595 _maxOctreePacketsPerSecond = loadSetting(settings, "maxOctreePPS", DEFAULT_MAX_OCTREE_PPS);
597596 _snapshotsLocation = settings->value("snapshotsLocation",
598597 QStandardPaths::writableLocation(QStandardPaths::DesktopLocation)).toString();
@@ -638,8 +637,6 @@ void Menu::saveSettings(QSettings* settings) { · 39 unmodified lines
638637 settings->setValue("audioOutputBufferSize", audio->getOutputBufferSize());
639638
640639 settings->setValue("fieldOfView", _fieldOfView);
641− settings->setValue("faceshiftEyeDeflection", _faceshiftEyeDeflection);
642− settings->setValue("faceshiftHostname", _faceshiftHostname);
643640 settings->setValue("maxOctreePPS", _maxOctreePacketsPerSecond);
644641 settings->setValue("snapshotsLocation", _snapshotsLocation);
645642 settings->setValue("scriptsLocation", _scriptsLocation);