#6106: Don't render hidden light scene nodes

codereader · Sep 23, 2022 · f468198 · f468198
1 parent 07f593a
commit f468198
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 4 deletions.
diff --git a/include/irender.h b/include/irender.h
@@ -1,19 +1,16 @@
 #pragma once
 
 #include "imodule.h"
-#include "ivolumetest.h"
 #include "irenderview.h"
 #include "iwindingrenderer.h"
 #include "igeometryrenderer.h"
 #include "isurfacerenderer.h"
 #include <functional>
-#include <vector>
 
 #include "math/Vector3.h"
 #include "math/Vector4.h"
 #include "render/Colour4.h"
 #include "math/AABB.h"
-#include "render/MeshVertex.h"
 
 #include "ishaderlayer.h"
 #include <sigc++/signal.h>
@@ -115,7 +112,6 @@ const unsigned RENDER_OVERRIDE = 1 << 21;
 typedef unsigned RenderStateFlags;
 ///@}
 
-class AABB;
 class Matrix4;
 
 template<typename Element> class BasicVector3;
@@ -208,6 +204,9 @@ class RendererLight
 public:
     virtual ~RendererLight() {}
 
+    // Returns true when this light is visible in the scene, false otherwise
+    virtual bool isVisible() = 0;
+
     /**
      * \brief Return the render entity associated with this light
      *

diff --git a/radiantcore/entity/light/LightNode.cpp b/radiantcore/entity/light/LightNode.cpp
@@ -1235,6 +1235,11 @@ const ShaderPtr& LightNode::getShader() const
     return m_shader.get();
 }
 
+bool LightNode::isVisible()
+{
+    return visible();
+}
+
 const IRenderEntity& LightNode::getLightEntity() const
 {
 	return *this;

diff --git a/radiantcore/entity/light/LightNode.h b/radiantcore/entity/light/LightNode.h
@@ -263,6 +263,7 @@ class LightNode :
 
 public:
     // RendererLight implementation
+    bool isVisible() override;
     const IRenderEntity& getLightEntity() const override;
     Matrix4 getLightTextureTransformation() const override;
     Vector3 getLightOrigin() const override;

diff --git a/radiantcore/rendersystem/backend/LightingModeRenderer.cpp b/radiantcore/rendersystem/backend/LightingModeRenderer.cpp
@@ -122,6 +122,8 @@ void LightingModeRenderer::collectLights(const IRenderView& view)
     // Categorise all visible lights
     for (const auto& light : _lights)
     {
+        if (!light->isVisible()) continue;
+
         if (light->isBlendLight())
         {
             collectBlendLight(*light, view);