From 730ad2da2f8cd26f8782cecfa3885d65d2710938 Mon Sep 17 00:00:00 2001 From: Sam Gateau Date: Tue, 4 Aug 2015 16:37:01 -0700 Subject: [PATCH] removing dead code --- libraries/render-utils/src/DeferredLightingEffect.cpp | 4 +--- libraries/render-utils/src/Model.cpp | 2 -- libraries/render/src/render/DrawStatus.cpp | 4 +--- libraries/render/src/render/DrawTask.cpp | 4 +--- 4 files changed, 3 insertions(+), 11 deletions(-) diff --git a/libraries/render-utils/src/DeferredLightingEffect.cpp b/libraries/render-utils/src/DeferredLightingEffect.cpp index 1c3be0496b..aaaa3b6d6a 100644 --- a/libraries/render-utils/src/DeferredLightingEffect.cpp +++ b/libraries/render-utils/src/DeferredLightingEffect.cpp @@ -406,9 +406,7 @@ void DeferredLightingEffect::render(RenderArgs* args) { Transform viewMat; args->_viewFrustum->evalProjectionMatrix(projMat); args->_viewFrustum->evalViewTransform(viewMat); - if (args->_renderMode == RenderArgs::MIRROR_RENDER_MODE) { - // viewMat.postScale(glm::vec3(-1.0f, 1.0f, 1.0f)); - } + batch.setProjectionTransform(projMat); batch.setViewTransform(viewMat); diff --git a/libraries/render-utils/src/Model.cpp b/libraries/render-utils/src/Model.cpp index 5190ff7641..9e06b8833e 100644 --- a/libraries/render-utils/src/Model.cpp +++ b/libraries/render-utils/src/Model.cpp @@ -156,8 +156,6 @@ void Model::RenderPipelineLib::addRenderPipeline(Model::RenderKey key, RenderKey mirrorKey(key.getRaw() | RenderKey::IS_MIRROR); auto mirrorState = std::make_shared(state->getValues()); - // mirrorState->setFrontFaceClockwise(true); - // create a new RenderPipeline with the same shader side and the mirrorState auto mirrorPipeline = gpu::PipelinePointer(gpu::Pipeline::create(program, mirrorState)); insert(value_type(mirrorKey.getRaw(), RenderPipeline(mirrorPipeline, locations))); diff --git a/libraries/render/src/render/DrawStatus.cpp b/libraries/render/src/render/DrawStatus.cpp index 3fda0fa84d..0c1b92b559 100644 --- a/libraries/render/src/render/DrawStatus.cpp +++ b/libraries/render/src/render/DrawStatus.cpp @@ -132,9 +132,7 @@ void DrawStatus::run(const SceneContextPointer& sceneContext, const RenderContex Transform viewMat; args->_viewFrustum->evalProjectionMatrix(projMat); args->_viewFrustum->evalViewTransform(viewMat); - if (args->_renderMode == RenderArgs::MIRROR_RENDER_MODE) { - // viewMat.postScale(glm::vec3(-1.0f, 1.0f, 1.0f)); - } + batch.setProjectionTransform(projMat); batch.setViewTransform(viewMat); batch.setModelTransform(Transform()); diff --git a/libraries/render/src/render/DrawTask.cpp b/libraries/render/src/render/DrawTask.cpp index 35dc71d580..ff2cf6ff41 100755 --- a/libraries/render/src/render/DrawTask.cpp +++ b/libraries/render/src/render/DrawTask.cpp @@ -264,9 +264,7 @@ void DrawBackground::run(const SceneContextPointer& sceneContext, const RenderCo Transform viewMat; args->_viewFrustum->evalProjectionMatrix(projMat); args->_viewFrustum->evalViewTransform(viewMat); - if (args->_renderMode == RenderArgs::MIRROR_RENDER_MODE) { - // viewMat.postScale(glm::vec3(-1.0f, 1.0f, 1.0f)); - } + batch.setProjectionTransform(projMat); batch.setViewTransform(viewMat);