#5893: Refactoring

codereader · Feb 25, 2022 · c57316d · c57316d
1 parent b4e641e
commit c57316d
Show file tree

Hide file tree

Showing 7 changed files with 23 additions and 23 deletions.
diff --git a/radiantcore/rendersystem/OpenGLRenderSystem.cpp b/radiantcore/rendersystem/OpenGLRenderSystem.cpp
@@ -145,12 +145,12 @@ ShaderPtr OpenGLRenderSystem::capture(ColourShaderType type, const Colour4& colo
 }
 
 void OpenGLRenderSystem::render(RenderViewType renderViewType, 
-                                RenderStateFlags globalstate,
+                                RenderStateFlags globalFlagsMask,
                                 const IRenderView& view)
 {
-    FullBrightRenderer renderer(_state_sorted);
+    FullBrightRenderer renderer(renderViewType, _state_sorted);
 
-    renderer.render(renderViewType, globalstate, view, _time);
+    renderer.render(globalFlagsMask, view, _time);
 
     renderText();
 }

diff --git a/radiantcore/rendersystem/backend/FullBrightRenderer.cpp b/radiantcore/rendersystem/backend/FullBrightRenderer.cpp
@@ -5,12 +5,11 @@
 namespace render
 {
 
-void FullBrightRenderer::render(RenderViewType renderViewType, RenderStateFlags globalstate, 
-    const IRenderView& view, std::size_t time)
+void FullBrightRenderer::render(RenderStateFlags globalstate, const IRenderView& view, std::size_t time)
 {
     // Construct default OpenGL state
     OpenGLState current;
-    beginRendering(current);
+    setupState(current);
 
     setupViewMatrices(view);
 
@@ -23,15 +22,15 @@ void FullBrightRenderer::render(RenderViewType renderViewType, RenderStateFlags
         // Render the OpenGLShaderPass
         if (pair.second->empty()) continue;
 
-        if (pair.second->isApplicableTo(renderViewType))
+        if (pair.second->isApplicableTo(_renderViewType))
         {
             pair.second->render(current, globalstate, view.getViewer(), view, time);
         }
 
         pair.second->clearRenderables();
     }
 
-    finishRendering();
+    cleanupState();
 }
 
 }
diff --git a/radiantcore/rendersystem/backend/FullBrightRenderer.h b/radiantcore/rendersystem/backend/FullBrightRenderer.h
@@ -10,15 +10,16 @@ class FullBrightRenderer :
     public SceneRenderer
 {
 private:
+    RenderViewType _renderViewType;
     const OpenGLStates& _sortedStates;
 
 public:
-    FullBrightRenderer(const OpenGLStates& sortedStates) :
+    FullBrightRenderer(RenderViewType renderViewType, const OpenGLStates& sortedStates) :
+        _renderViewType(renderViewType),
         _sortedStates(sortedStates)
     {}
 
-    void render(RenderViewType renderViewType, RenderStateFlags globalstate, 
-        const IRenderView& view, std::size_t time);
+    void render(RenderStateFlags globalstate, const IRenderView& view, std::size_t time);
 };
 
 }
diff --git a/radiantcore/rendersystem/backend/LightingModeRenderer.cpp b/radiantcore/rendersystem/backend/LightingModeRenderer.cpp
@@ -16,7 +16,7 @@ IRenderResult::Ptr LightingModeRenderer::render(RenderStateFlags globalFlagsMask
 
     // Construct default OpenGL state
     OpenGLState current;
-    beginRendering(current);
+    setupState(current);
     setupViewMatrices(view);
 
     std::size_t visibleLights = 0;
@@ -122,7 +122,7 @@ IRenderResult::Ptr LightingModeRenderer::render(RenderStateFlags globalFlagsMask
         });
     }
 
-    finishRendering();
+    cleanupState();
 
     return result;
 }

diff --git a/radiantcore/rendersystem/backend/LightingModeRenderer.h b/radiantcore/rendersystem/backend/LightingModeRenderer.h
@@ -21,15 +21,15 @@ class LightingModeRenderer :
     const std::set<IRenderEntityPtr>& _entities;
 
 public:
-    LightingModeRenderer(IGeometryStore& store, const std::set<RendererLightPtr>& lights,
-        const std::set<IRenderEntityPtr>& entities) :
+    LightingModeRenderer(IGeometryStore& store, 
+                         const std::set<RendererLightPtr>& lights,
+                         const std::set<IRenderEntityPtr>& entities) :
+        _geometryStore(store),
         _lights(lights),
-        _entities(entities),
-        _geometryStore(store)
+        _entities(entities)
     {}
 
-    IRenderResult::Ptr render(RenderStateFlags globalFlagsMask, const IRenderView& view,
-        std::size_t time);
+    IRenderResult::Ptr render(RenderStateFlags globalFlagsMask, const IRenderView& view, std::size_t time);
 };
 
 }
diff --git a/radiantcore/rendersystem/backend/SceneRenderer.cpp b/radiantcore/rendersystem/backend/SceneRenderer.cpp
@@ -39,7 +39,7 @@ void SceneRenderer::setupViewMatrices(const IRenderView& view)
     glLoadMatrixd(view.GetModelview());
 }
 
-void SceneRenderer::beginRendering(OpenGLState& state)
+void SceneRenderer::setupState(OpenGLState& state)
 {
     glPushAttrib(GL_ALL_ATTRIB_BITS);
 
@@ -116,7 +116,7 @@ void SceneRenderer::beginRendering(OpenGLState& state)
     glDisable(GL_FOG);
 }
 
-void SceneRenderer::finishRendering()
+void SceneRenderer::cleanupState()
 {
     if (GLEW_ARB_shader_objects)
     {

diff --git a/radiantcore/rendersystem/backend/SceneRenderer.h b/radiantcore/rendersystem/backend/SceneRenderer.h
@@ -27,8 +27,8 @@ class SceneRenderer
     // Set the projection and modelview matrices
     void setupViewMatrices(const IRenderView& view);
 
-    void beginRendering(OpenGLState& state);
-    void finishRendering();
+    void setupState(OpenGLState& state);
+    void cleanupState();
 };
 
 }