From 4fb9e9c7756d14894df76b1140355749d6b7a5aa Mon Sep 17 00:00:00 2001 From: Sam Gateau Date: Tue, 30 Dec 2014 17:55:49 -0800 Subject: [PATCH] cleaning the code --- libraries/render-utils/src/DeferredLightingEffect.cpp | 4 ---- libraries/render-utils/src/DeferredLightingEffect.h | 1 - 2 files changed, 5 deletions(-) diff --git a/libraries/render-utils/src/DeferredLightingEffect.cpp b/libraries/render-utils/src/DeferredLightingEffect.cpp index c59bc90035..fc84489a2f 100644 --- a/libraries/render-utils/src/DeferredLightingEffect.cpp +++ b/libraries/render-utils/src/DeferredLightingEffect.cpp @@ -414,10 +414,6 @@ void DeferredLightingEffect::render() { } void DeferredLightingEffect::loadLightProgram(const char* fragSource, bool limited, ProgramObject& program, LightLocations& locations) { - /* program.addShaderFromSourceFile(QGLShader::Vertex, PathUtils::resourcesPath() + - (limited ? "shaders/deferred_light_limited.vert" : "shaders/deferred_light.vert")); - program.addShaderFromSourceFile(QGLShader::Fragment, PathUtils::resourcesPath() + name); - */ program.addShaderFromSourceCode(QGLShader::Vertex, (limited ? deferred_light_limited_vert : deferred_light_vert)); program.addShaderFromSourceCode(QGLShader::Fragment, fragSource); program.link(); diff --git a/libraries/render-utils/src/DeferredLightingEffect.h b/libraries/render-utils/src/DeferredLightingEffect.h index 5b73a75461..bf8bb53c92 100644 --- a/libraries/render-utils/src/DeferredLightingEffect.h +++ b/libraries/render-utils/src/DeferredLightingEffect.h @@ -86,7 +86,6 @@ private: int radius; }; - //static void loadLightProgram(const char* name, bool limited, ProgramObject& program, LightLocations& locations); static void loadLightProgram(const char* fragSource, bool limited, ProgramObject& program, LightLocations& locations); ProgramObject _simpleProgram;