History

Merge branch 'master' of github.com:highfidelity/hifi into multi-hull-collisions

Seth Alves committed 11 years ago

Commit fd69a542 parents cfa3059 80ecbed25 files · +327 −389Browse files

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

Unified · Split

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