History

Merge branch 'fix_world_box' of github.com:Atlante45/hifi into lod

Atlante45 committed 11 years ago

Commit 41be3fe2 parents 96be60c 54b0a033 files · +29 −30Browse files

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

Unified · Split

interface/src/Application.cpp+4−7
@@ -3189,14 +3189,11 @@ namespace render { · 3188 unmodified lines
3189 template <> const ItemKey payloadGetKey(const WorldBoxRenderData::Pointer& stuff) { return ItemKey::Builder::opaqueShape(); }3189 template <> const ItemKey payloadGetKey(const WorldBoxRenderData::Pointer& stuff) { return ItemKey::Builder::opaqueShape(); }
3190 template <> const Item::Bound payloadGetBound(const WorldBoxRenderData::Pointer& stuff) { return Item::Bound(); }3190 template <> const Item::Bound payloadGetBound(const WorldBoxRenderData::Pointer& stuff) { return Item::Bound(); }
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 != RenderArgs::MIRROR_RENDER_MODE && Menu::getInstance()->isOptionChecked(MenuOption::Stats)) {
3193 PerformanceTimer perfTimer("worldBox");3193 PerformanceTimer perfTimer("worldBox");
3194 renderWorldBox(args);3194 auto& batch = *args->_batch;
3195 3195 DependencyManager::get<DeferredLightingEffect>()->bindSimpleProgram(batch);
3196 // FIXME: there's currently a bug in the new render engine, if this origin dot is rendered out of view it will3196 renderWorldBox(batch);
3197 // screw up the state of textures on models so they all end up rendering in the incorrect tint/color/texture
3198 float originSphereRadius = 0.05f;
3199 DependencyManager::get<GeometryCache>()->renderSphere(originSphereRadius, 15, 15, glm::vec4(1.0f, 0.0f, 0.0f, 1.0f));
3200 }3197 }
3201 }3198 }
3202}3199}