#5893: Extend IRenderEntity interface to enumerate renderables withou…

…t bounds check
codereader · Feb 19, 2022 · fe94f37 · fe94f37
1 parent 6a2149a
commit fe94f37
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 0 deletions.
diff --git a/include/irender.h b/include/irender.h
@@ -185,6 +185,11 @@ class IRenderEntity
 
     using ObjectVisitFunction = std::function<void(const render::IRenderableObject::Ptr&, Shader*)>;
 
+    /**
+     * Enumerate all entity object, unconditionally.
+     */
+    virtual void foreachRenderable(const ObjectVisitFunction& functor) = 0;
+
     /**
      * Enumerate all entity object (partially) intersecting with the given bounds.
      * The bounds are specified in world coordinates.

diff --git a/radiantcore/entity/EntityNode.cpp b/radiantcore/entity/EntityNode.cpp
@@ -223,6 +223,11 @@ void EntityNode::removeRenderable(const render::IRenderableObject::Ptr& object)
     _renderObjects.removeRenderable(object);
 }
 
+void EntityNode::foreachRenderable(const IRenderEntity::ObjectVisitFunction& functor)
+{
+    _renderObjects.foreachRenderable(functor);
+}
+
 void EntityNode::foreachRenderableTouchingBounds(const AABB& bounds,
     const IRenderEntity::ObjectVisitFunction& functor)
 {

diff --git a/radiantcore/entity/EntityNode.h b/radiantcore/entity/EntityNode.h
@@ -133,6 +133,7 @@ class EntityNode :
 
     virtual void addRenderable(const render::IRenderableObject::Ptr& object, Shader* shader) override;
     virtual void removeRenderable(const render::IRenderableObject::Ptr& object) override;
+    virtual void foreachRenderable(const ObjectVisitFunction& functor) override;
     virtual void foreachRenderableTouchingBounds(const AABB& bounds,
         const ObjectVisitFunction& functor) override;
 

diff --git a/radiantcore/entity/RenderableObjectCollection.h b/radiantcore/entity/RenderableObjectCollection.h
@@ -64,6 +64,16 @@ class RenderableObjectCollection :
         _collectionBoundsNeedUpdate = true;
     }
 
+    void foreachRenderable(const IRenderEntity::ObjectVisitFunction& functor)
+    {
+        ensureBoundsUpToDate();
+
+        for (const auto& [object, objectData] : _objects)
+        {
+            functor(object, objectData.shader);
+        }
+    }
+
     void foreachRenderableTouchingBounds(const AABB& bounds,
         const IRenderEntity::ObjectVisitFunction& functor)
     {