Showing the changes to interface/src/Application.cpp (1 of 11 files). Show all
Unified · Split
| @@ -164,8 +164,6 @@ const QString SKIP_FILENAME = QStandardPaths::writableLocation(QStandardPaths::D · 163 unmodified lines | ||
| 164 | 164 | |
| 165 | 165 | const QString DEFAULT_SCRIPTS_JS_URL = "http://s3.amazonaws.com/hifi-public/scripts/defaultScripts.js"; |
| 166 | 166 | |
| 167 | −bool renderCollisionHulls = false; | |
| 168 | − | |
| 169 | 167 | #ifdef Q_OS_WIN |
| 170 | 168 | class MyNativeEventFilter : public QAbstractNativeEventFilter { |
| 171 | 169 | public: |
| @@ -1280,11 +1278,6 @@ void Application::keyPressEvent(QKeyEvent* event) { · 1108 unmodified lines | ||
| 1280 | 1278 | break; |
| 1281 | 1279 | } |
| 1282 | 1280 | |
| 1283 | − case Qt::Key_Comma: { | |
| 1284 | − renderCollisionHulls = !renderCollisionHulls; | |
| 1285 | − break; | |
| 1286 | − } | |
| 1287 | − | |
| 1288 | 1281 | default: |
| 1289 | 1282 | event->ignore(); |
| 1290 | 1283 | break; |
| @@ -3110,13 +3103,20 @@ void Application::displaySide(Camera& theCamera, bool selfAvatarOnly, RenderArgs · 1819 unmodified lines | ||
| 3110 | 3103 | PerformanceTimer perfTimer("entities"); |
| 3111 | 3104 | PerformanceWarning warn(Menu::getInstance()->isOptionChecked(MenuOption::PipelineWarnings), |
| 3112 | 3105 | "Application::displaySide() ... entities..."); |
| 3113 | − if (renderCollisionHulls) { | |
| 3114 | − _entities.render(RenderArgs::DEBUG_RENDER_MODE, renderSide); | |
| 3115 | − } else if (theCamera.getMode() == CAMERA_MODE_MIRROR) { | |
| 3116 | − _entities.render(RenderArgs::MIRROR_RENDER_MODE, renderSide); | |
| 3117 | − } else { | |
| 3118 | − _entities.render(RenderArgs::DEFAULT_RENDER_MODE, renderSide); | |
| 3106 | + | |
| 3107 | + RenderArgs::DebugFlags renderDebugFlags = 0; | |
| 3108 | + RenderArgs::RenderMode renderMode = RenderArgs::DEFAULT_RENDER_MODE; | |
| 3109 | + | |
| 3110 | + if (Menu::getInstance()->isOptionChecked(MenuOption::PhysicsShowHulls)) { | |
| 3111 | + renderDebugFlags |= RenderArgs::RENDER_DEBUG_HULLS; | |
| 3112 | + } | |
| 3113 | + if (Menu::getInstance()->isOptionChecked(MenuOption::PhysicsShowOwned)) { | |
| 3114 | + renderDebugFlags |= RenderArgs::RENDER_DEBUG_SIMULATION_OWNERSHIP; | |
| 3115 | + } | |
| 3116 | + if (theCamera.getMode() == CAMERA_MODE_MIRROR) { | |
| 3117 | + renderMode = RenderArgs::MIRROR_RENDER_MODE; | |
| 3119 | 3118 | } |
| 3119 | + _entities.render(renderMode, renderSide, renderDebugFlags); | |
| 3120 | 3120 | } |
| 3121 | 3121 | |
| 3122 | 3122 | // render JS/scriptable overlays |