From 986af50b7139e300b113846f380d08e219bc1f9d Mon Sep 17 00:00:00 2001 From: Zach Pomerantz Date: Fri, 15 Jan 2016 10:50:42 -0800 Subject: [PATCH] Remove unneccessary const --- libraries/octree/src/ViewFrustum.cpp | 4 ++-- libraries/render-utils/src/LightStage.cpp | 7 ++----- libraries/render-utils/src/RenderDeferredTask.cpp | 12 ++++++------ 3 files changed, 10 insertions(+), 13 deletions(-) diff --git a/libraries/octree/src/ViewFrustum.cpp b/libraries/octree/src/ViewFrustum.cpp index 0e7df1d9a4..85df5a0c93 100644 --- a/libraries/octree/src/ViewFrustum.cpp +++ b/libraries/octree/src/ViewFrustum.cpp @@ -740,8 +740,8 @@ const ViewFrustum::Corners ViewFrustum::getCorners(const float& depth) { glm::vec3 normal = glm::normalize(_direction); auto getCorner = [&](enum::BoxVertex nearCorner, enum::BoxVertex farCorner) { - const auto dir = glm::normalize(_cornersWorld[nearCorner] - _cornersWorld[farCorner]); - const auto factor = depth / glm::dot(dir, normal); + auto dir = glm::normalize(_cornersWorld[nearCorner] - _cornersWorld[farCorner]); + auto factor = depth / glm::dot(dir, normal); return _position + factor * dir; }; diff --git a/libraries/render-utils/src/LightStage.cpp b/libraries/render-utils/src/LightStage.cpp index 3b8eddd3b4..708c136eab 100644 --- a/libraries/render-utils/src/LightStage.cpp +++ b/libraries/render-utils/src/LightStage.cpp @@ -40,10 +40,8 @@ void LightStage::Shadow::setKeylightFrustum(ViewFrustum* viewFrustum, float near const Transform viewInverse{ _view.getInverseMatrix() }; viewFrustum->calculate(); - //const auto nearCorners = viewFrustum->getCorners(0); - const auto nearClip = viewFrustum->getNearClip(); - const auto nearCorners = viewFrustum->getCorners(nearDepth); - const auto farCorners = viewFrustum->getCorners(farDepth); + auto nearCorners = viewFrustum->getCorners(nearDepth); + auto farCorners = viewFrustum->getCorners(farDepth); vec3 min{ viewInverse.transform(nearCorners.bottomLeft) }; vec3 max{ min }; @@ -59,7 +57,6 @@ void LightStage::Shadow::setKeylightFrustum(ViewFrustum* viewFrustum, float near max.y = glm::max(max.y, corner.y); max.z = glm::max(max.z, corner.z); }; - fitFrustum(nearCorners.bottomLeft); fitFrustum(nearCorners.bottomRight); fitFrustum(nearCorners.topLeft); fitFrustum(nearCorners.topRight); diff --git a/libraries/render-utils/src/RenderDeferredTask.cpp b/libraries/render-utils/src/RenderDeferredTask.cpp index d0d0338742..c458a23812 100755 --- a/libraries/render-utils/src/RenderDeferredTask.cpp +++ b/libraries/render-utils/src/RenderDeferredTask.cpp @@ -78,21 +78,21 @@ RenderDeferredTask::RenderDeferredTask() : Task() { initDeferredPipelines(*shapePlumber); // CPU: Fetch the renderOpaques - const auto fetchedOpaques = addJob("FetchOpaque", FetchItems([](const RenderContextPointer& context, int count) { + auto fetchedOpaques = addJob("FetchOpaque", FetchItems([](const RenderContextPointer& context, int count) { context->getItemsConfig().opaque.numFeed = count; })); - const auto culledOpaques = addJob>("CullOpaque", fetchedOpaques); - const auto opaques = addJob("DepthSortOpaque", culledOpaques); + auto culledOpaques = addJob>("CullOpaque", fetchedOpaques); + auto opaques = addJob("DepthSortOpaque", culledOpaques); // CPU only, create the list of renderedTransparents items - const auto fetchedTransparents = addJob("FetchTransparent", FetchItems( + auto fetchedTransparents = addJob("FetchTransparent", FetchItems( ItemFilter::Builder::transparentShape().withoutLayered(), [](const RenderContextPointer& context, int count) { context->getItemsConfig().transparent.numFeed = count; } )); - const auto culledTransparents = addJob>("CullTransparent", fetchedTransparents); - const auto transparents = addJob("DepthSortTransparent", culledTransparents, DepthSortItems(false)); + auto culledTransparents = addJob>("CullTransparent", fetchedTransparents); + auto transparents = addJob("DepthSortTransparent", culledTransparents, DepthSortItems(false)); // GPU Jobs: Start preparing the deferred and lighting buffer addJob("PrepareDeferred");