History

Merge branch 'team-teaching' of https://github.com/highfidelity/hifi into lod

Atlante45 committed 11 years ago

Commit 96be60c2 parents 7654533 f70ff2216 files · +89 −52Browse files

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

Unified · Split

interface/src/Application.cpp+4−1
@@ -3191,7 +3191,7 @@ namespace render { · 3190 unmodified lines
3191 template <> void payloadRender(const WorldBoxRenderData::Pointer& stuff, RenderArgs* args) {3191 template <> void payloadRender(const WorldBoxRenderData::Pointer& stuff, RenderArgs* args) {
3192 if (args->_renderMode != CAMERA_MODE_MIRROR && Menu::getInstance()->isOptionChecked(MenuOption::Stats)) {3192 if (args->_renderMode != CAMERA_MODE_MIRROR && Menu::getInstance()->isOptionChecked(MenuOption::Stats)) {
3193 PerformanceTimer perfTimer("worldBox");3193 PerformanceTimer perfTimer("worldBox");
3194 renderWorldBox();3194 renderWorldBox(args);
3195 3195
3196 // FIXME: there's currently a bug in the new render engine, if this origin dot is rendered out of view it will3196 // FIXME: there's currently a bug in the new render engine, if this origin dot is rendered out of view it will
3197 // screw up the state of textures on models so they all end up rendering in the incorrect tint/color/texture3197 // screw up the state of textures on models so they all end up rendering in the incorrect tint/color/texture
@@ -3506,6 +3506,9 @@ void Application::displaySide(RenderArgs* renderArgs, Camera& theCamera, bool se · 308 unmodified lines
3506 renderContext._sortTransparent = sceneInterface->doEngineSortTransparent();3506 renderContext._sortTransparent = sceneInterface->doEngineSortTransparent();
3507 renderContext._renderTransparent = sceneInterface->doEngineRenderTransparent();3507 renderContext._renderTransparent = sceneInterface->doEngineRenderTransparent();
3508 3508
3509 renderContext._maxDrawnOpaqueItems = sceneInterface->getEngineMaxDrawnOpaqueItems();
3510 renderContext._maxDrawnTransparentItems = sceneInterface->getEngineMaxDrawnTransparentItems();
3511
3509 renderArgs->_shouldRender = LODManager::shouldRender;3512 renderArgs->_shouldRender = LODManager::shouldRender;
3510 3513
3511 renderContext.args = renderArgs;3514 renderContext.args = renderArgs;