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