#5584: Infrastructure to render the generic entity boxes (with and wi…

…thout arrows)

radiantcore/entity/RenderableEntityBox.cpp

@@ -0,0 +1,32 @@
+#include "RenderableEntityBox.h"
+
+#include "EntityNode.h"
+
+namespace entity
+{
+
+RenderableEntityBox::RenderableEntityBox(EntityNode& node) :
+    _needsUpdate(true),
+    _filledBox(true)
+{}
+
+void RenderableEntityBox::queueUpdate()
+{
+    _needsUpdate = true;
+}
+
+void RenderableEntityBox::setFillMode(bool fill)
+{
+    _filledBox = fill;
+}
+
+void RenderableEntityBox::updateGeometry()
+{
+    if (!_needsUpdate) return;
+
+    _needsUpdate = false;
+
+
+}
+
+}

radiantcore/entity/RenderableEntityBox.h

@@ -0,0 +1,26 @@
+#pragma once
+
+#include "render/RenderableGeometry.h"
+
+namespace entity
+{
+
+class EntityNode;
+
+class RenderableEntityBox :
+    public render::RenderableGeometry
+{
+private:
+    bool _needsUpdate;
+    bool _filledBox;
+
+public:
+    RenderableEntityBox(EntityNode& node);
+
+    void queueUpdate();
+    void setFillMode(bool fill);
+
+    virtual void updateGeometry() override;
+};
+
+}

radiantcore/entity/generic/GenericEntityNode.cpp

@@ -16,6 +16,7 @@ GenericEntityNode::GenericEntityNode(const IEntityClassPtr& eclass) :
 	m_arrow(m_ray),
 	m_aabb_solid(m_aabb_local),
 	m_aabb_wire(m_aabb_local),
+    _renderableBox(*this),
 	_allow3Drotations(_spawnArgs.getKeyValue("editor_rotatable") == "1"),
     _solidAABBRenderMode(SolidBoxes)
 {}
@@ -31,6 +32,7 @@ GenericEntityNode::GenericEntityNode(const GenericEntityNode& other) :
 	m_arrow(m_ray),
 	m_aabb_solid(m_aabb_local),
 	m_aabb_wire(m_aabb_local),
+    _renderableBox(*this),
 	_allow3Drotations(_spawnArgs.getKeyValue("editor_rotatable") == "1"),
     _solidAABBRenderMode(other._solidAABBRenderMode)
 {}
@@ -127,6 +129,13 @@ GenericEntityNode::SolidAAABBRenderMode GenericEntityNode::getSolidAABBRenderMod
     return _solidAABBRenderMode;
 }
 
+void GenericEntityNode::onPreRender(const VolumeTest& volume)
+{
+    EntityNode::onPreRender(volume);
+
+    _renderableBox.update(getColourShader());
+}
+
 void GenericEntityNode::renderArrow(const ShaderPtr& shader, IRenderableCollector& collector,
 	const VolumeTest& volume, const Matrix4& localToWorld) const
 {
@@ -139,20 +148,30 @@ void GenericEntityNode::renderArrow(const ShaderPtr& shader, IRenderableCollecto
 void GenericEntityNode::renderSolid(IRenderableCollector& collector, const VolumeTest& volume) const
 {
 	EntityNode::renderSolid(collector, volume);
-
+#if 0
 	const ShaderPtr& shader = getSolidAABBRenderMode() == GenericEntityNode::WireFrameOnly ?
 		getWireShader() : getFillShader();
 
 	collector.addRenderable(*shader, m_aabb_solid, localToWorld());
 	renderArrow(shader, collector, volume, localToWorld());
+#endif
 }
 
 void GenericEntityNode::renderWireframe(IRenderableCollector& collector, const VolumeTest& volume) const
 {
 	EntityNode::renderWireframe(collector, volume);
-
+#if 0
 	collector.addRenderable(*getWireShader(), m_aabb_wire, localToWorld());
 	renderArrow(getWireShader(), collector, volume, localToWorld());
+#endif
+}
+
+void GenericEntityNode::setRenderSystem(const RenderSystemPtr& renderSystem)
+{
+    EntityNode::setRenderSystem(renderSystem);
+
+    // Clear the geometry from any previous shader
+    _renderableBox.clear();
 }
 
 const Vector3& GenericEntityNode::getDirection() const
@@ -231,6 +250,7 @@ void GenericEntityNode::_onTransformationChanged()
 		rotate(getRotation());
 
 		updateTransform();
+        _renderableBox.queueUpdate();
 	}
 }
 
@@ -293,6 +313,36 @@ void GenericEntityNode::onChildRemoved(const scene::INodePtr& child)
     });
 }
 
+void GenericEntityNode::onInsertIntoScene(scene::IMapRootNode& root)
+{
+    // Call the base class first
+    EntityNode::onInsertIntoScene(root);
+
+    _renderableBox.queueUpdate();
+}
+
+void GenericEntityNode::onRemoveFromScene(scene::IMapRootNode& root)
+{
+    // Call the base class first
+    EntityNode::onRemoveFromScene(root);
+
+    _renderableBox.clear();
+}
+
+void GenericEntityNode::onVisibilityChanged(bool isVisibleNow)
+{
+    EntityNode::onVisibilityChanged(isVisibleNow);
+
+    if (isVisibleNow)
+    {
+        _renderableBox.queueUpdate();
+    }
+    else
+    {
+        _renderableBox.clear();
+    }
+}
+
 void GenericEntityNode::originChanged()
 {
 	m_origin = m_originKey.get();

radiantcore/entity/generic/GenericEntityNode.h

@@ -17,6 +17,7 @@
 #include "../KeyObserverDelegate.h"
 
 #include "RenderableArrow.h"
+#include "../RenderableEntityBox.h"
 
 namespace entity
 {
@@ -48,6 +49,7 @@ class GenericEntityNode: public EntityNode, public Snappable
 	RenderableArrow m_arrow;
 	RenderableSolidAABB m_aabb_solid;
 	RenderableWireframeAABB m_aabb_wire;
+    RenderableEntityBox _renderableBox;
 
 	// TRUE if this entity's arrow can be rotated in all directions,
 	// FALSE if the arrow is caught in the xy plane
@@ -99,10 +101,12 @@ class GenericEntityNode: public EntityNode, public Snappable
 	scene::INodePtr clone() const override;
 
 	// Renderable implementation
+    void onPreRender(const VolumeTest& volume) override;
 	void renderArrow(const ShaderPtr& shader, IRenderableCollector& collector,
                      const VolumeTest& volume, const Matrix4& localToWorld) const;
 	void renderSolid(IRenderableCollector& collector, const VolumeTest& volume) const override;
 	void renderWireframe(IRenderableCollector& collector, const VolumeTest& volume) const override;
+	void setRenderSystem(const RenderSystemPtr& renderSystem) override;
 
     SolidAAABBRenderMode getSolidAABBRenderMode() const;
 
@@ -115,6 +119,9 @@ class GenericEntityNode: public EntityNode, public Snappable
     void onChildAdded(const scene::INodePtr& child) override;
 	void onChildRemoved(const scene::INodePtr& child) override;
 
+    void onInsertIntoScene(scene::IMapRootNode& root) override;
+    void onRemoveFromScene(scene::IMapRootNode& root) override;
+
 protected:
 	// Gets called by the Transformable implementation whenever
 	// scale, rotation or translation is changed.
@@ -126,6 +133,8 @@ class GenericEntityNode: public EntityNode, public Snappable
 
 	// Override EntityNode::construct()
 	void construct() override;
+
+    void onVisibilityChanged(bool isVisibleNow) override;
 };
 
 } // namespace entity

tools/msvc/DarkRadiantCore.vcxproj

@@ -61,6 +61,7 @@
     <ClCompile Include="..\..\radiantcore\entity\ModelKey.cpp" />
     <ClCompile Include="..\..\radiantcore\entity\NameKeyObserver.cpp" />
     <ClCompile Include="..\..\radiantcore\entity\NamespaceManager.cpp" />
+    <ClCompile Include="..\..\radiantcore\entity\RenderableEntityBox.cpp" />
     <ClCompile Include="..\..\radiantcore\entity\RotationKey.cpp" />
     <ClCompile Include="..\..\radiantcore\entity\RotationMatrix.cpp" />
     <ClCompile Include="..\..\radiantcore\entity\ShaderParms.cpp" />
@@ -782,6 +783,7 @@
     <ClInclude Include="..\..\radiantcore\entity\NameKeyObserver.h" />
     <ClInclude Include="..\..\radiantcore\entity\NamespaceManager.h" />
     <ClInclude Include="..\..\radiantcore\entity\OriginKey.h" />
+    <ClInclude Include="..\..\radiantcore\entity\RenderableEntityBox.h" />
     <ClInclude Include="..\..\radiantcore\entity\RotationKey.h" />
     <ClInclude Include="..\..\radiantcore\entity\RotationMatrix.h" />
     <ClInclude Include="..\..\radiantcore\entity\ShaderParms.h" />

tools/msvc/DarkRadiantCore.vcxproj.filters

@@ -1108,6 +1108,9 @@
     <ClCompile Include="..\..\radiantcore\undo\UndoSystemFactory.cpp">
       <Filter>src\undo</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\radiantcore\entity\RenderableEntityBox.cpp">
+      <Filter>src\entity</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\..\radiantcore\modulesystem\ModuleLoader.h">
@@ -2256,5 +2259,8 @@
     <ClInclude Include="..\..\radiantcore\rendersystem\backend\GeometryRenderer.h">
       <Filter>src\rendersystem\backend</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\radiantcore\entity\RenderableEntityBox.h">
+      <Filter>src\entity</Filter>
+    </ClInclude>
   </ItemGroup>
 </Project>