History

resolve conflicts on merge with upstream master

Stephen Birarda committed 12 years ago

Commit 348bcdb2 parents 1084483 8428b1a44 files · +745 −231Browse files

Showing the changes to interface/src/Menu.cpp (1 of 44 files). Show all

Unified · Split

interface/src/Menu.cpp+4−0
@@ -71,6 +71,7 @@ Menu* Menu::getInstance() { · 70 unmodified lines
71 71
72const ViewFrustumOffset DEFAULT_FRUSTUM_OFFSET = {-135.0f, 0.0f, 0.0f, 25.0f, 0.0f};72const ViewFrustumOffset DEFAULT_FRUSTUM_OFFSET = {-135.0f, 0.0f, 0.0f, 25.0f, 0.0f};
73const float DEFAULT_FACESHIFT_EYE_DEFLECTION = 0.25f;73const float DEFAULT_FACESHIFT_EYE_DEFLECTION = 0.25f;
74const QString DEFAULT_FACESHIFT_HOSTNAME = "localhost";
74const float DEFAULT_AVATAR_LOD_DISTANCE_MULTIPLIER = 1.0f;75const float DEFAULT_AVATAR_LOD_DISTANCE_MULTIPLIER = 1.0f;
75const int ONE_SECOND_OF_FRAMES = 60;76const int ONE_SECOND_OF_FRAMES = 60;
76const int FIVE_SECONDS_OF_FRAMES = 5 * ONE_SECOND_OF_FRAMES;77const int FIVE_SECONDS_OF_FRAMES = 5 * ONE_SECOND_OF_FRAMES;
@@ -88,6 +89,7 @@ Menu::Menu() : · 11 unmodified lines
88 _fieldOfView(DEFAULT_FIELD_OF_VIEW_DEGREES),89 _fieldOfView(DEFAULT_FIELD_OF_VIEW_DEGREES),
89 _realWorldFieldOfView(DEFAULT_REAL_WORLD_FIELD_OF_VIEW_DEGREES),90 _realWorldFieldOfView(DEFAULT_REAL_WORLD_FIELD_OF_VIEW_DEGREES),
90 _faceshiftEyeDeflection(DEFAULT_FACESHIFT_EYE_DEFLECTION),91 _faceshiftEyeDeflection(DEFAULT_FACESHIFT_EYE_DEFLECTION),
92 _faceshiftHostname(DEFAULT_FACESHIFT_HOSTNAME),
91 _frustumDrawMode(FRUSTUM_DRAW_MODE_ALL),93 _frustumDrawMode(FRUSTUM_DRAW_MODE_ALL),
92 _viewFrustumOffset(DEFAULT_FRUSTUM_OFFSET),94 _viewFrustumOffset(DEFAULT_FRUSTUM_OFFSET),
93 _jsConsole(NULL),95 _jsConsole(NULL),
@@ -697,6 +699,7 @@ void Menu::loadSettings(QSettings* settings) { · 603 unmodified lines
697 _fieldOfView = loadSetting(settings, "fieldOfView", DEFAULT_FIELD_OF_VIEW_DEGREES);699 _fieldOfView = loadSetting(settings, "fieldOfView", DEFAULT_FIELD_OF_VIEW_DEGREES);
698 _realWorldFieldOfView = loadSetting(settings, "realWorldFieldOfView", DEFAULT_REAL_WORLD_FIELD_OF_VIEW_DEGREES);700 _realWorldFieldOfView = loadSetting(settings, "realWorldFieldOfView", DEFAULT_REAL_WORLD_FIELD_OF_VIEW_DEGREES);
699 _faceshiftEyeDeflection = loadSetting(settings, "faceshiftEyeDeflection", DEFAULT_FACESHIFT_EYE_DEFLECTION);701 _faceshiftEyeDeflection = loadSetting(settings, "faceshiftEyeDeflection", DEFAULT_FACESHIFT_EYE_DEFLECTION);
702 _faceshiftHostname = settings->value("faceshiftHostname", DEFAULT_FACESHIFT_HOSTNAME).toString();
700 _maxVoxels = loadSetting(settings, "maxVoxels", DEFAULT_MAX_VOXELS_PER_SYSTEM);703 _maxVoxels = loadSetting(settings, "maxVoxels", DEFAULT_MAX_VOXELS_PER_SYSTEM);
701 _maxVoxelPacketsPerSecond = loadSetting(settings, "maxVoxelsPPS", DEFAULT_MAX_VOXEL_PPS);704 _maxVoxelPacketsPerSecond = loadSetting(settings, "maxVoxelsPPS", DEFAULT_MAX_VOXEL_PPS);
702 _voxelSizeScale = loadSetting(settings, "voxelSizeScale", DEFAULT_OCTREE_SIZE_SCALE);705 _voxelSizeScale = loadSetting(settings, "voxelSizeScale", DEFAULT_OCTREE_SIZE_SCALE);
@@ -761,6 +764,7 @@ void Menu::saveSettings(QSettings* settings) { · 58 unmodified lines
761 764
762 settings->setValue("fieldOfView", _fieldOfView);765 settings->setValue("fieldOfView", _fieldOfView);
763 settings->setValue("faceshiftEyeDeflection", _faceshiftEyeDeflection);766 settings->setValue("faceshiftEyeDeflection", _faceshiftEyeDeflection);
767 settings->setValue("faceshiftHostname", _faceshiftHostname);
764 settings->setValue("maxVoxels", _maxVoxels);768 settings->setValue("maxVoxels", _maxVoxels);
765 settings->setValue("maxVoxelsPPS", _maxVoxelPacketsPerSecond);769 settings->setValue("maxVoxelsPPS", _maxVoxelPacketsPerSecond);
766 settings->setValue("voxelSizeScale", _voxelSizeScale);770 settings->setValue("voxelSizeScale", _voxelSizeScale);