Showing the changes to interface/src/Menu.cpp (1 of 4 files). Show all
Unified · Split
| @@ -87,44 +87,9 @@ Menu* Menu::getInstance() { · 86 unmodified lines | |||
| 87 | return _instance; | 87 | return _instance; |
| 88 | } | 88 | } |
| 89 | 89 | ||
| 90 | const float DEFAULT_FACESHIFT_EYE_DEFLECTION = 0.25f; | ||
| 91 | const QString DEFAULT_FACESHIFT_HOSTNAME = "localhost"; | ||
| 92 | const float DEFAULT_AVATAR_LOD_DISTANCE_MULTIPLIER = 1.0f; | ||
| 93 | const int ONE_SECOND_OF_FRAMES = 60; | ||
| 94 | const int FIVE_SECONDS_OF_FRAMES = 5 * ONE_SECOND_OF_FRAMES; | ||
| 95 | |||
| 96 | const QString CONSOLE_TITLE = "Scripting Console"; | ||
| 97 | const float CONSOLE_WINDOW_OPACITY = 0.95f; | ||
| 98 | const int CONSOLE_WIDTH = 800; | ||
| 99 | const int CONSOLE_HEIGHT = 200; | ||
| 100 | |||
| 101 | Menu::Menu() : | 90 | Menu::Menu() : |
| 102 | _actionHash(), | ||
| 103 | _receivedAudioStreamSettings(), | ||
| 104 | _fieldOfView(DEFAULT_FIELD_OF_VIEW_DEGREES), | ||
| 105 | _realWorldFieldOfView(DEFAULT_REAL_WORLD_FIELD_OF_VIEW_DEGREES), | ||
| 106 | _faceshiftEyeDeflection(DEFAULT_FACESHIFT_EYE_DEFLECTION), | ||
| 107 | _faceshiftHostname(DEFAULT_FACESHIFT_HOSTNAME), | ||
| 108 | _jsConsole(NULL), | ||
| 109 | #if defined(Q_OS_MAC) || defined(Q_OS_WIN) | ||
| 110 | _speechRecognizer(), | ||
| 111 | #endif | ||
| 112 | _octreeSizeScale(DEFAULT_OCTREE_SIZE_SCALE), | ||
| 113 | _oculusUIAngularSize(DEFAULT_OCULUS_UI_ANGULAR_SIZE), | ||
| 114 | _sixenseReticleMoveSpeed(DEFAULT_SIXENSE_RETICLE_MOVE_SPEED), | ||
| 115 | _invertSixenseButtons(DEFAULT_INVERT_SIXENSE_MOUSE_BUTTONS), | ||
| 116 | _automaticAvatarLOD(true), | ||
| 117 | _avatarLODDecreaseFPS(DEFAULT_ADJUST_AVATAR_LOD_DOWN_FPS), | ||
| 118 | _avatarLODIncreaseFPS(ADJUST_LOD_UP_FPS), | ||
| 119 | _avatarLODDistanceMultiplier(DEFAULT_AVATAR_LOD_DISTANCE_MULTIPLIER), | ||
| 120 | _boundaryLevelAdjust(0), | ||
| 121 | _maxOctreePacketsPerSecond(DEFAULT_MAX_OCTREE_PPS), | ||
| 122 | _lastAdjust(usecTimestampNow()), | 91 | _lastAdjust(usecTimestampNow()), |
| 123 | _lastAvatarDetailDrop(usecTimestampNow()), | 92 | _lastAvatarDetailDrop(usecTimestampNow()) |
| 124 | _fpsAverage(FIVE_SECONDS_OF_FRAMES), | ||
| 125 | _fastFPSAverage(ONE_SECOND_OF_FRAMES), | ||
| 126 | _hasLoginDialogDisplayed(false), | ||
| 127 | _shouldRenderTableNeedsRebuilding(true) | ||
| 128 | { | 93 | { |
| 129 | Application *appInstance = Application::getInstance(); | 94 | Application *appInstance = Application::getInstance(); |
| 130 | 95 | ||