#5584: Pass the volume test reference to the backend renderer, it sho…

…uld be used to cull surfaces.

include/irender.h

@@ -1,6 +1,7 @@
 #pragma once
 
 #include "imodule.h"
+#include "ivolumetest.h"
 #include "iwindingrenderer.h"
 #include "igeometryrenderer.h"
 #include "isurfacerenderer.h"
@@ -546,12 +547,16 @@ class RenderSystem
      *
      * \param viewer
      * Location of the viewer in world space.
+     * 
+     * * \param volume
+     * The volume structure that can be used for culling.
      */
     virtual void render(RenderViewType renderViewType,
                         RenderStateFlags globalFlagsMask,
                         const Matrix4& modelview,
                         const Matrix4& projection,
-                        const Vector3& viewer) = 0;
+                        const Vector3& viewer,
+                        const VolumeTest& volume) = 0;
 
     virtual void realise() = 0;
     virtual void unrealise() = 0;

libs/wxutil/preview/RenderPreview.cpp

@@ -500,7 +500,7 @@ bool RenderPreview::drawPreview()
 
     // Launch the back end rendering
     renderer.submitToShaders();
-    _renderSystem->render(RenderViewType::Camera, flags, _volumeTest.GetModelview(), projection, _viewOrigin);
+    _renderSystem->render(RenderViewType::Camera, flags, _volumeTest.GetModelview(), projection, _viewOrigin, _volumeTest);
 
     // Give subclasses an opportunity to render their own on-screen stuff
     onPostRender();
@@ -525,7 +525,7 @@ void RenderPreview::renderWireFrame()
 
     // Launch the back end rendering
     renderer.submitToShaders();
-    _renderSystem->render(RenderViewType::Camera, flags, _volumeTest.GetModelview(), projection, _viewOrigin);
+    _renderSystem->render(RenderViewType::Camera, flags, _volumeTest.GetModelview(), projection, _viewOrigin, _volumeTest);
 }
 
 void RenderPreview::onGLMouseClick(wxMouseEvent& ev)

radiant/camera/CamWnd.cpp

@@ -807,7 +807,7 @@ void CamWnd::Cam_Draw()
             getCameraSettings()->getRenderMode() == RENDER_MODE_LIGHTING
         );
         GlobalRenderSystem().render(RenderViewType::Camera, allowedRenderFlags, 
-            _camera->getModelView(), _camera->getProjection(), _view.getViewer());
+            _camera->getModelView(), _camera->getProjection(), _view.getViewer(), _view);
 
         _renderer->cleanup();
     }

radiant/xyview/XYRenderer.h

@@ -122,8 +122,8 @@ class XYRenderer :
         }
     }
 
-    void render(const Matrix4& modelview, const Matrix4& projection)
+    void render(const Matrix4& modelview, const Matrix4& projection, const VolumeTest& view)
     {
-        GlobalRenderSystem().render(RenderViewType::OrthoView, _globalstate, modelview, projection, Vector3(0,0,0));
+        GlobalRenderSystem().render(RenderViewType::OrthoView, _globalstate, modelview, projection, Vector3(0,0,0), view);
     }
 }; // class XYRenderer

radiant/xyview/XYWnd.cpp

@@ -1389,7 +1389,7 @@ void XYWnd::draw()
 		}
 
         // Second pass (GL calls)
-        renderer.render(_modelView, _projection);
+        renderer.render(_modelView, _projection, _view);
     }
 
     glDepthMask(GL_FALSE);

radiantcore/rendersystem/OpenGLRenderSystem.cpp

@@ -121,7 +121,8 @@ void OpenGLRenderSystem::render(RenderViewType renderViewType,
                                 RenderStateFlags globalstate,
                                 const Matrix4& modelview,
                                 const Matrix4& projection,
-                                const Vector3& viewer)
+                                const Vector3& viewer,
+                                const VolumeTest& view)
 {
     glPushAttrib(GL_ALL_ATTRIB_BITS);
 
@@ -214,7 +215,7 @@ void OpenGLRenderSystem::render(RenderViewType renderViewType,
 
         if (pair.second->isApplicableTo(renderViewType))
         {
-            pair.second->render(current, globalstate, viewer, _time);
+            pair.second->render(current, globalstate, viewer, view, _time);
         }
 
         pair.second->clearRenderables();

radiantcore/rendersystem/OpenGLRenderSystem.h

@@ -63,9 +63,10 @@ class OpenGLRenderSystem
 
 	ShaderPtr capture(const std::string& name) override;
 	void render(RenderViewType renderViewType, RenderStateFlags globalstate,
-				const Matrix4& modelview,
-				const Matrix4& projection,
-				const Vector3& viewer) override;
+                const Matrix4& modelview,
+                const Matrix4& projection,
+                const Vector3& viewer,
+                const VolumeTest& view) override;
 	void realise() override;
 	void unrealise() override;
 

radiantcore/rendersystem/backend/OpenGLShader.cpp

@@ -131,7 +131,7 @@ void OpenGLShader::addSurface(const std::vector<ArbitraryMeshVertex>& vertices,
     _vertexBuffer->addIndicesToLastBatch(indices.begin(), indices.size(), indexOffset);
 }
 #endif
-void OpenGLShader::drawSurfaces()
+void OpenGLShader::drawSurfaces(const VolumeTest& view)
 {
     glEnableClientState(GL_VERTEX_ARRAY);
     glEnableClientState(GL_TEXTURE_COORD_ARRAY);
@@ -146,7 +146,7 @@ void OpenGLShader::drawSurfaces()
         //_vertexBuffer->renderAllBatches(GL_TRIANGLES, false);
 
         _geometryRenderer.render();
-        _surfaceRenderer.render();
+        _surfaceRenderer.render(view);
 #if 0
         // Render all triangles
 

radiantcore/rendersystem/backend/OpenGLShader.h

@@ -113,7 +113,7 @@ class OpenGLShader final :
 
     //void addSurface(const std::vector<ArbitraryMeshVertex>& vertices, const std::vector<unsigned int>& indices) override;
     bool hasSurfaces() const;
-    void drawSurfaces();
+    void drawSurfaces(const VolumeTest& view);
 
     IGeometryRenderer::Slot addGeometry(GeometryType indexType,
         const std::vector<ArbitraryMeshVertex>& vertices, const std::vector<unsigned int>& indices) override;

radiantcore/rendersystem/backend/OpenGLShaderPass.cpp

@@ -565,6 +565,7 @@ void OpenGLShaderPass::addRenderable(const OpenGLRenderable& renderable,
 void OpenGLShaderPass::render(OpenGLState& current,
                               unsigned int flagsMask,
                               const Vector3& viewer,
+                              const VolumeTest& view,
                               std::size_t time)
 {
     if (!_owner.isVisible()) return;
@@ -578,7 +579,7 @@ void OpenGLShaderPass::render(OpenGLState& current,
     // Apply our state to the current state object
     applyState(current, flagsMask, viewer, time, NULL);
 
-    _owner.drawSurfaces();
+    _owner.drawSurfaces(view);
 
     if (!_renderablesWithoutEntity.empty())
     {

radiantcore/rendersystem/backend/OpenGLShaderPass.h

@@ -97,9 +97,9 @@ class OpenGLShaderPass
 
 	// Render all of the given TransformedRenderables
 	void renderAllContained(const Renderables& renderables,
-							OpenGLState& current,
-						    const Vector3& viewer,
-							std::size_t time);
+                            OpenGLState& current,
+                            const Vector3& viewer,
+                            std::size_t time);
 
     /* Helper functions to enable/disable particular GL states */
 
@@ -187,9 +187,10 @@ class OpenGLShaderPass
      *
      */
 	void render(OpenGLState& current,
-				unsigned int flagsMask,
-				const Vector3& viewer,
-				std::size_t time);
+                unsigned int flagsMask,
+                const Vector3& viewer,
+                const VolumeTest& view,
+                std::size_t time);
 
 	/**
 	 * Returns true if this shaderpass doesn't have anything to render.

radiantcore/rendersystem/backend/SurfaceRenderer.h

@@ -163,7 +163,7 @@ class SurfaceRenderer :
         _surfaces.at(slot).surfaceDataChanged = true;
     }
 
-    void render()
+    void render(const VolumeTest& view)
     {
         glEnableClientState(GL_VERTEX_ARRAY);
         glEnableClientState(GL_TEXTURE_COORD_ARRAY);
@@ -176,7 +176,7 @@ class SurfaceRenderer :
 
         for (auto& surface : _surfaces)
         {
-            renderSlot(surface.second);
+            renderSlot(surface.second, &view);
         }
 
         glDisableClientState(GL_NORMAL_ARRAY);
@@ -201,7 +201,7 @@ class SurfaceRenderer :
     }
 
 private:
-    void renderSlot(SurfaceInfo& slot)
+    void renderSlot(SurfaceInfo& slot, const VolumeTest* view = nullptr)
     {
         auto& surface = slot.surface.get();