Showing the changes to interface/src/Application.cpp (1 of 25 files). Show all
Unified · Split
| @@ -796,7 +796,7 @@ void Application::paintGL() { · 795 unmodified lines | ||
| 796 | 796 | |
| 797 | 797 | DependencyManager::get<GlowEffect>()->render(); |
| 798 | 798 | |
| 799 | − if (Menu::getInstance()->isOptionChecked(MenuOption::UserInterface)) { | |
| 799 | + { | |
| 800 | 800 | PerformanceTimer perfTimer("renderOverlay"); |
| 801 | 801 | _applicationOverlay.renderOverlay(true); |
| 802 | 802 | _applicationOverlay.displayOverlayTexture(); |
| @@ -994,12 +994,6 @@ void Application::keyPressEvent(QKeyEvent* event) { · 191 unmodified lines | ||
| 994 | 994 | resetSensors(); |
| 995 | 995 | break; |
| 996 | 996 | |
| 997 | − case Qt::Key_G: | |
| 998 | − if (isShifted) { | |
| 999 | − Menu::getInstance()->triggerOption(MenuOption::ObeyEnvironmentalGravity); | |
| 1000 | − } | |
| 1001 | − break; | |
| 1002 | − | |
| 1003 | 997 | case Qt::Key_A: |
| 1004 | 998 | if (isShifted) { |
| 1005 | 999 | Menu::getInstance()->triggerOption(MenuOption::Atmosphere); |
| @@ -1134,13 +1128,10 @@ void Application::keyPressEvent(QKeyEvent* event) { · 128 unmodified lines | ||
| 1134 | 1128 | Menu::getInstance()->triggerOption(MenuOption::FullscreenMirror); |
| 1135 | 1129 | } |
| 1136 | 1130 | break; |
| 1137 | − case Qt::Key_Slash: | |
| 1138 | − Menu::getInstance()->triggerOption(MenuOption::UserInterface); | |
| 1139 | − break; | |
| 1140 | 1131 | case Qt::Key_P: |
| 1141 | 1132 | Menu::getInstance()->triggerOption(MenuOption::FirstPerson); |
| 1142 | 1133 | break; |
| 1143 | − case Qt::Key_Percent: | |
| 1134 | + case Qt::Key_Slash: | |
| 1144 | 1135 | Menu::getInstance()->triggerOption(MenuOption::Stats); |
| 1145 | 1136 | break; |
| 1146 | 1137 | case Qt::Key_Plus: |
| @@ -1175,10 +1166,6 @@ void Application::keyPressEvent(QKeyEvent* event) { · 28 unmodified lines | ||
| 1175 | 1166 | break; |
| 1176 | 1167 | } |
| 1177 | 1168 | |
| 1178 | − case Qt::Key_Comma: { | |
| 1179 | − _myAvatar->togglePhysicsEnabled(); | |
| 1180 | − } | |
| 1181 | − | |
| 1182 | 1169 | default: |
| 1183 | 1170 | event->ignore(); |
| 1184 | 1171 | break; |
| @@ -2205,7 +2192,6 @@ void Application::update(float deltaTime) { · 1020 unmodified lines | ||
| 2205 | 2192 | |
| 2206 | 2193 | { |
| 2207 | 2194 | PerformanceTimer perfTimer("physics"); |
| 2208 | − _myAvatar->preSimulation(); | |
| 2209 | 2195 | _physicsEngine.stepSimulation(); |
| 2210 | 2196 | } |
| 2211 | 2197 | |
| @@ -3029,8 +3015,7 @@ void Application::displaySide(Camera& theCamera, bool selfAvatarOnly, RenderArgs · 817 unmodified lines | ||
| 3029 | 3015 | _nodeBoundsDisplay.draw(); |
| 3030 | 3016 | |
| 3031 | 3017 | // Render the world box |
| 3032 | − if (theCamera.getMode() != CAMERA_MODE_MIRROR && Menu::getInstance()->isOptionChecked(MenuOption::Stats) && | |
| 3033 | − Menu::getInstance()->isOptionChecked(MenuOption::UserInterface)) { | |
| 3018 | + if (theCamera.getMode() != CAMERA_MODE_MIRROR && Menu::getInstance()->isOptionChecked(MenuOption::Stats)) { | |
| 3034 | 3019 | PerformanceTimer perfTimer("worldBox"); |
| 3035 | 3020 | renderWorldBox(); |
| 3036 | 3021 | } |