#5893: Add IRenderEntity::foreachSurfaceTouchingBounds to enumerate t…

…he ones intersecting with a given light.
codereader · Jan 27, 2022 · 8f56350 · 8f56350
1 parent da0a46f
commit 8f56350
Show file tree

Hide file tree

Showing 5 changed files with 36 additions and 2 deletions.
diff --git a/include/irender.h b/include/irender.h
@@ -180,6 +180,13 @@ class IRenderEntity
      * Removes the surface from this entity.
      */
     virtual void removeSurface(const render::IRenderableSurface::Ptr& surface) = 0;
+
+    /**
+     * Enumerate all entity surfaces (partially) intersecting with the given bounds.
+     * The bounds are specified in world coordinates.
+     */
+    virtual void foreachSurfaceTouchingBounds(const AABB& bounds,
+        const std::function<void(const render::IRenderableSurface::Ptr&)>& functor) = 0;
 };
 typedef std::shared_ptr<IRenderEntity> IRenderEntityPtr;
 typedef std::weak_ptr<IRenderEntity> IRenderEntityWeakPtr;

diff --git a/radiantcore/entity/EntityNode.cpp b/radiantcore/entity/EntityNode.cpp
@@ -210,6 +210,12 @@ void EntityNode::removeSurface(const render::IRenderableSurface::Ptr& surface)
     // TODO
 }
 
+void EntityNode::foreachSurfaceTouchingBounds(const AABB& bounds,
+    const std::function<void(const render::IRenderableSurface::Ptr&)>& functor)
+{
+    // TODO
+}
+
 std::string EntityNode::getFingerprint()
 {
     std::map<std::string, std::string> sortedKeyValues;

diff --git a/radiantcore/entity/EntityNode.h b/radiantcore/entity/EntityNode.h
@@ -126,6 +126,8 @@ class EntityNode :
 
     virtual void addSurface(const render::IRenderableSurface::Ptr& surface) override;
     virtual void removeSurface(const render::IRenderableSurface::Ptr& surface) override;
+    virtual void foreachSurfaceTouchingBounds(const AABB& bounds,
+        const std::function<void(const render::IRenderableSurface::Ptr&)>& functor) override;
 
     // IMatrixTransform implementation
     Matrix4 localToParent() const override { return _localToParent; }

diff --git a/radiantcore/rendersystem/LightingModeRenderResult.h b/radiantcore/rendersystem/LightingModeRenderResult.h
@@ -13,9 +13,12 @@ class LightingModeRenderResult :
     std::size_t visibleLights = 0;
     std::size_t skippedLights = 0;
 
+    std::size_t entities = 0;
+    std::size_t surfaces = 0;
+
     std::string toString() override
     {
-        return fmt::format("Lights: {0} of {1}", visibleLights, skippedLights);
+        return fmt::format("Lights: {0} of {1} | Entities: {2} | Surfaces: {3}", visibleLights, skippedLights, entities, surfaces);
     }
 };
 

diff --git a/radiantcore/rendersystem/OpenGLRenderSystem.cpp b/radiantcore/rendersystem/OpenGLRenderSystem.cpp
@@ -310,7 +310,23 @@ IRenderResult::Ptr OpenGLRenderSystem::renderLitScene(RenderStateFlags globalFla
 
         result->visibleLights++;
 
-        // TODO: Insert rendering code here
+        // Now check all the entities intersecting with this light
+        for (const auto& entity : _entities)
+        {
+            auto entitySurfaceCount = 0;
+
+            entity->foreachSurfaceTouchingBounds(light->lightAABB(),
+                [&](const render::IRenderableSurface::Ptr& surface)
+            {
+                entitySurfaceCount++;
+            });
+
+            if (entitySurfaceCount > 0)
+            {
+                result->surfaces += entitySurfaceCount;
+                result->entities++;
+            }
+        }
     }
 
     finishRendering();