From 8f4a10844195120cdaa19f9675f7fc9dac30a30d Mon Sep 17 00:00:00 2001 From: Sam Gateau Date: Thu, 9 Jul 2015 09:37:35 -0700 Subject: [PATCH] Dead code and disable debug info --- libraries/render-utils/src/DeferredLightingEffect.cpp | 4 ++-- libraries/render-utils/src/deferred_light_limited.slv | 4 ---- libraries/render-utils/src/spot_light.slf | 3 --- 3 files changed, 2 insertions(+), 9 deletions(-) diff --git a/libraries/render-utils/src/DeferredLightingEffect.cpp b/libraries/render-utils/src/DeferredLightingEffect.cpp index 7984c27da6..b86f628265 100644 --- a/libraries/render-utils/src/DeferredLightingEffect.cpp +++ b/libraries/render-utils/src/DeferredLightingEffect.cpp @@ -471,8 +471,8 @@ void DeferredLightingEffect::render(RenderArgs* args) { for (auto lightID : _spotLights) { auto light = _allocatedLights[lightID]; - // IN DEBUG: - light->setShowContour(true); + // IN DEBUG: light->setShowContour(true); + batch.setUniformBuffer(_spotLightLocations.lightBufferUnit, light->getSchemaBuffer()); auto eyeLightPos = eyePoint - light->getPosition(); diff --git a/libraries/render-utils/src/deferred_light_limited.slv b/libraries/render-utils/src/deferred_light_limited.slv index e657f36598..d57b987b68 100644 --- a/libraries/render-utils/src/deferred_light_limited.slv +++ b/libraries/render-utils/src/deferred_light_limited.slv @@ -19,16 +19,12 @@ uniform mat4 texcoordMat; void main(void) { - // gl_Position = ftransform(); - // standard transform TransformCamera cam = getTransformCamera(); TransformObject obj = getTransformObject(); <$transformModelToClipPos(cam, obj, gl_Vertex, gl_Position)$>; vec4 projected = gl_Position / gl_Position.w; - // gl_TexCoord[0] = vec4(dot(projected, gl_ObjectPlaneS[3]) * gl_Position.w, - // dot(projected, gl_ObjectPlaneT[3]) * gl_Position.w, 0.0, gl_Position.w); gl_TexCoord[0] = vec4(dot(projected, texcoordMat[0]) * gl_Position.w, dot(projected, texcoordMat[1]) * gl_Position.w, 0.0, gl_Position.w); } diff --git a/libraries/render-utils/src/spot_light.slf b/libraries/render-utils/src/spot_light.slf index 298a8e1502..cfb2a6da4b 100644 --- a/libraries/render-utils/src/spot_light.slf +++ b/libraries/render-utils/src/spot_light.slf @@ -35,9 +35,6 @@ void main(void) { discard; } - //gl_FragColor = vec4(1.0, 1.0, 1.0, 0.0); - //return; - // Need the light now Light light = getLight();