#5893: Coarse implementation of the surface collection used by IRende…

…rEntities.
codereader · Jan 27, 2022 · 6bc219f · 6bc219f
1 parent 8f56350
commit 6bc219f
Show file tree

Hide file tree

Showing 6 changed files with 90 additions and 5 deletions.
diff --git a/radiantcore/entity/EntityNode.cpp b/radiantcore/entity/EntityNode.cpp
@@ -202,18 +202,18 @@ const Vector3& EntityNode::getDirection() const
 
 void EntityNode::addSurface(const render::IRenderableSurface::Ptr& surface)
 {
-    // TODO
+    _renderSurfaces.addSurface(surface);
 }
 
 void EntityNode::removeSurface(const render::IRenderableSurface::Ptr& surface)
 {
-    // TODO
+    _renderSurfaces.removeSurface(surface);
 }
 
 void EntityNode::foreachSurfaceTouchingBounds(const AABB& bounds,
     const std::function<void(const render::IRenderableSurface::Ptr&)>& functor)
 {
-    // TODO
+    _renderSurfaces.foreachSurfaceTouchingBounds(bounds, functor);
 }
 
 std::string EntityNode::getFingerprint()

diff --git a/radiantcore/entity/EntityNode.h b/radiantcore/entity/EntityNode.h
@@ -19,6 +19,7 @@
 
 #include "KeyObserverMap.h"
 #include "RenderableEntityName.h"
+#include "RenderableSurfaceCollection.h"
 
 namespace entity
 {
@@ -105,6 +106,10 @@ class EntityNode :
     // Whether this entity has registered itself to a render system
     bool _isAttachedToRenderSystem;
 
+    // The list of surfaces attached to this IRenderEntity
+    // Used in lighting render mode to enumerate surfaces by entity
+    RenderableSurfaceCollection _renderSurfaces;
+
   protected:
 	// The Constructor needs the eclass
 	EntityNode(const IEntityClassPtr& eclass);

diff --git a/radiantcore/entity/RenderableSurfaceCollection.h b/radiantcore/entity/RenderableSurfaceCollection.h
@@ -0,0 +1,74 @@
+#pragma once
+
+#include <set>
+#include "irender.h"
+
+namespace entity
+{
+
+class RenderableSurfaceCollection
+{
+private:
+    AABB _collectionBounds;
+    bool _collectionBoundsNeedUpdate;
+
+    std::set<render::IRenderableSurface::Ptr> _surfaces;
+
+public:
+    RenderableSurfaceCollection() :
+        _collectionBoundsNeedUpdate(true)
+    {}
+
+    void addSurface(const render::IRenderableSurface::Ptr& surface)
+    {
+        _surfaces.insert(surface);
+        _collectionBoundsNeedUpdate = true;
+    }
+
+    void removeSurface(const render::IRenderableSurface::Ptr& surface)
+    {
+        _surfaces.erase(surface);
+        _collectionBoundsNeedUpdate = true;
+    }
+
+    void foreachSurfaceTouchingBounds(const AABB& bounds,
+        const std::function<void(const render::IRenderableSurface::Ptr&)>& functor)
+    {
+        if (_surfaces.empty()) return;
+
+        ensureBoundsUpToDate();
+
+        // If the whole collection doesn't intersect, quit early
+        // TODO: bounds not updated when surface changes
+        //if (!_collectionBounds.intersects(bounds)) return;
+
+        for (const auto& surface : _surfaces)
+        {
+            auto orientedBounds = AABB::createFromOrientedAABBSafe(
+                surface->getSurfaceBounds(), surface->getSurfaceTransform());
+
+            if (bounds.intersects(orientedBounds))
+            {
+                functor(surface);
+            }
+        }
+    }
+
+private:
+    void ensureBoundsUpToDate()
+    {
+        if (!_collectionBoundsNeedUpdate) return;
+
+        _collectionBoundsNeedUpdate = false;
+
+        _collectionBounds = AABB();
+
+        for (const auto& surface : _surfaces)
+        {
+            _collectionBounds.includeAABB(AABB::createFromOrientedAABBSafe(
+                surface->getSurfaceBounds(), surface->getSurfaceTransform()));
+        }
+    }
+};
+
+}
diff --git a/radiantcore/rendersystem/OpenGLRenderSystem.cpp b/radiantcore/rendersystem/OpenGLRenderSystem.cpp
@@ -302,7 +302,9 @@ IRenderResult::Ptr OpenGLRenderSystem::renderLitScene(RenderStateFlags globalFla
     // Gather all visible lights and render the surfaces touched by them
     for (const auto& light : _lights)
     {
-        if (view.TestAABB(light->lightAABB()) == VOLUME_OUTSIDE)
+        auto lightBounds = light->lightAABB();
+
+        if (view.TestAABB(lightBounds) == VOLUME_OUTSIDE)
         {
             result->skippedLights++;
             continue;
@@ -315,7 +317,7 @@ IRenderResult::Ptr OpenGLRenderSystem::renderLitScene(RenderStateFlags globalFla
         {
             auto entitySurfaceCount = 0;
 
-            entity->foreachSurfaceTouchingBounds(light->lightAABB(),
+            entity->foreachSurfaceTouchingBounds(lightBounds,
                 [&](const render::IRenderableSurface::Ptr& surface)
             {
                 entitySurfaceCount++;

diff --git a/tools/msvc/DarkRadiantCore.vcxproj b/tools/msvc/DarkRadiantCore.vcxproj
@@ -790,6 +790,7 @@
     <ClInclude Include="..\..\radiantcore\entity\RenderableArrow.h" />
     <ClInclude Include="..\..\radiantcore\entity\RenderableEntityBox.h" />
     <ClInclude Include="..\..\radiantcore\entity\RenderableEntityName.h" />
+    <ClInclude Include="..\..\radiantcore\entity\RenderableSurfaceCollection.h" />
     <ClInclude Include="..\..\radiantcore\entity\RotationKey.h" />
     <ClInclude Include="..\..\radiantcore\entity\RotationMatrix.h" />
     <ClInclude Include="..\..\radiantcore\entity\ShaderParms.h" />

diff --git a/tools/msvc/DarkRadiantCore.vcxproj.filters b/tools/msvc/DarkRadiantCore.vcxproj.filters
@@ -2295,5 +2295,8 @@
     <ClInclude Include="..\..\radiantcore\rendersystem\LightingModeRenderResult.h">
       <Filter>src\rendersystem</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\radiantcore\entity\RenderableSurfaceCollection.h">
+      <Filter>src\entity</Filter>
+    </ClInclude>
   </ItemGroup>
 </Project>