History

Merge branch 'master' into tony/remove-joint-states

Anthony J. Thibault committed 10 years ago

Commit 55adedc2 parents e698d3c 8dcf245128 files · +5083 −1241Browse files

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

Unified · Split

interface/src/Application.cpp+3−4
@@ -3493,10 +3493,6 @@ void Application::displaySide(RenderArgs* renderArgs, Camera& theCamera, bool se · 3492 unmodified lines
34933493 if (Menu::getInstance()->isOptionChecked(MenuOption::PhysicsShowHulls)) {
34943494 renderDebugFlags = (RenderArgs::DebugFlags) (renderDebugFlags | (int)RenderArgs::RENDER_DEBUG_HULLS);
34953495 }
3496− if (Menu::getInstance()->isOptionChecked(MenuOption::PhysicsShowOwned)) {
3497− renderDebugFlags =
3498− (RenderArgs::DebugFlags) (renderDebugFlags | (int)RenderArgs::RENDER_DEBUG_SIMULATION_OWNERSHIP);
3499− }
35003496 renderArgs->_debugFlags = renderDebugFlags;
35013497 //ViveControllerManager::getInstance().updateRendering(renderArgs, _main3DScene, pendingChanges);
35023498 }
@@ -3556,6 +3552,9 @@ void Application::displaySide(RenderArgs* renderArgs, Camera& theCamera, bool se · 53 unmodified lines
35563552 renderContext._maxDrawnOverlay3DItems = sceneInterface->getEngineMaxDrawnOverlay3DItems();
35573553
35583554 renderContext._drawItemStatus = sceneInterface->doEngineDisplayItemStatus();
3555+ if (Menu::getInstance()->isOptionChecked(MenuOption::PhysicsShowOwned)) {
3556+ renderContext._drawItemStatus |= render::showNetworkStatusFlag;
3557+ }
35593558 renderContext._drawHitEffect = sceneInterface->doEngineDisplayHitEffect();
35603559
35613560 renderContext._occlusionStatus = Menu::getInstance()->isOptionChecked(MenuOption::DebugAmbientOcclusion);