#5893: Remove RendererLight parameter from OpenGLShaderPass::addRende…

…rable
codereader · Feb 19, 2022 · 95d16e3 · 95d16e3
1 parent b73af9b
commit 95d16e3
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 30 deletions.
diff --git a/radiantcore/rendersystem/backend/OpenGLShader.cpp b/radiantcore/rendersystem/backend/OpenGLShader.cpp
@@ -96,7 +96,7 @@ void OpenGLShader::addRenderable(const OpenGLRenderable& renderable,
     for (const OpenGLShaderPassPtr& pass : _shaderPasses)
     {
         // Submit the renderable to each pass
-		pass->addRenderable(renderable, modelview, nullptr);
+		pass->addRenderable(renderable, modelview);
     }
 }
 

diff --git a/radiantcore/rendersystem/backend/OpenGLShaderPass.cpp b/radiantcore/rendersystem/backend/OpenGLShaderPass.cpp
@@ -504,12 +504,9 @@ void OpenGLShaderPass::deactivateShaderProgram(OpenGLState& current)
 
 // Add a Renderable to this bucket
 void OpenGLShaderPass::addRenderable(const OpenGLRenderable& renderable,
-                                     const Matrix4& modelview,
-                                     const RendererLight* light)
+                                     const Matrix4& modelview)
 {
-    _renderablesWithoutEntity.push_back(
-        TransformedRenderable(renderable, modelview, light, nullptr)
-    );
+    _renderablesWithoutEntity.emplace_back(renderable, modelview);
 }
 
 // Render the bucket contents
@@ -629,7 +626,7 @@ void OpenGLShaderPass::renderAllContained(const Renderables& renderables,
     glPushMatrix();
 
     // Iterate over each transformed renderable in the vector
-    for (const TransformedRenderable& r : renderables)
+    for (const auto& r : renderables)
     {
         // If the current iteration's transform matrix was different from the
         // last, apply it and store for the next iteration
@@ -652,15 +649,6 @@ void OpenGLShaderPass::renderAllContained(const Renderables& renderables,
             }
         }
 
-        // If we are using a lighting program and this renderable is lit, set
-        // up the lighting calculation
-        const RendererLight* light = r.light;
-        if (current.glProgram && light)
-        {
-            setUpLightingCalculation(current, light, light->getLightTextureTransformation(),
-                viewer, *transform, time, _glState.isColourInverted());
-        }
-
         // Render the renderable
         RenderInfo info(current.getRenderFlags(), viewer, current.cubeMapMode);
         r.renderable->render(info);

diff --git a/radiantcore/rendersystem/backend/OpenGLShaderPass.h b/radiantcore/rendersystem/backend/OpenGLShaderPass.h
@@ -44,21 +44,11 @@ class OpenGLShaderPass
     	// The modelview transform for this renderable
     	const Matrix4 transform;
 
-		// The light falling on this obejct
-    	const RendererLight* light;
-
-		// The entity attached to this renderable
-		const IRenderEntity* entity;
-
 		// Constructor
 		TransformedRenderable(const OpenGLRenderable& r,
-							  const Matrix4& t,
-							  const RendererLight* l,
-							  const IRenderEntity* e)
+							  const Matrix4& t)
 		: renderable(&r),
-		  transform(t),
-		  light(l),
-		  entity(e)
+		  transform(t)
 		{}
 	};
 
@@ -116,8 +106,7 @@ class OpenGLShaderPass
      * renderable will be submitted once for each light).
 	 */
 	void addRenderable(const OpenGLRenderable& renderable,
-					   const Matrix4& modelview,
-					   const RendererLight* light = nullptr);
+					   const Matrix4& modelview);
 
 	/**
 	 * Return the OpenGL state associated with this bucket.