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
44#include "Audio.h"44#include "Audio.h"
45#include "audio/AudioIOStatsRenderer.h"45#include "audio/AudioIOStatsRenderer.h"
46#include "audio/AudioScope.h"46#include "audio/AudioScope.h"
47#include "devices/Faceshift.h"
47#include "devices/RealSense.h"48#include "devices/RealSense.h"
48#include "devices/Visage.h"49#include "devices/Visage.h"
49#include "Menu.h"50#include "Menu.h"
@@ -591,8 +592,6 @@ void Menu::loadSettings(QSettings* settings) { · 541 unmodified lines
591 592
592 _fieldOfView = loadSetting(settings, "fieldOfView", DEFAULT_FIELD_OF_VIEW_DEGREES);593 _fieldOfView = loadSetting(settings, "fieldOfView", DEFAULT_FIELD_OF_VIEW_DEGREES);
593 _realWorldFieldOfView = loadSetting(settings, "realWorldFieldOfView", DEFAULT_REAL_WORLD_FIELD_OF_VIEW_DEGREES);594 _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();
596 _maxOctreePacketsPerSecond = loadSetting(settings, "maxOctreePPS", DEFAULT_MAX_OCTREE_PPS);595 _maxOctreePacketsPerSecond = loadSetting(settings, "maxOctreePPS", DEFAULT_MAX_OCTREE_PPS);
597 _snapshotsLocation = settings->value("snapshotsLocation",596 _snapshotsLocation = settings->value("snapshotsLocation",
598 QStandardPaths::writableLocation(QStandardPaths::DesktopLocation)).toString();597 QStandardPaths::writableLocation(QStandardPaths::DesktopLocation)).toString();
@@ -638,8 +637,6 @@ void Menu::saveSettings(QSettings* settings) { · 39 unmodified lines
638 settings->setValue("audioOutputBufferSize", audio->getOutputBufferSize());637 settings->setValue("audioOutputBufferSize", audio->getOutputBufferSize());
639 638
640 settings->setValue("fieldOfView", _fieldOfView);639 settings->setValue("fieldOfView", _fieldOfView);
641 settings->setValue("faceshiftEyeDeflection", _faceshiftEyeDeflection);
642 settings->setValue("faceshiftHostname", _faceshiftHostname);
643 settings->setValue("maxOctreePPS", _maxOctreePacketsPerSecond);640 settings->setValue("maxOctreePPS", _maxOctreePacketsPerSecond);
644 settings->setValue("snapshotsLocation", _snapshotsLocation);641 settings->setValue("snapshotsLocation", _snapshotsLocation);
645 settings->setValue("scriptsLocation", _scriptsLocation);642 settings->setValue("scriptsLocation", _scriptsLocation);