#6009: Move renderHighlights to base class

codereader · Oct 29, 2022 · 9beffa7 · 9beffa7
1 parent 485dbb1
commit 9beffa7
Show file tree

Hide file tree

Showing 6 changed files with 24 additions and 23 deletions.
diff --git a/radiantcore/model/ModelNodeBase.cpp b/radiantcore/model/ModelNodeBase.cpp
@@ -3,5 +3,14 @@
 namespace model
 {
 
+void ModelNodeBase::renderHighlights(IRenderableCollector& collector, const VolumeTest& volume)
+{
+    auto identity = Matrix4::getIdentity();
+
+    for (const auto& surface : _renderableSurfaces)
+    {
+        collector.addHighlightRenderable(*surface, identity);
+    }
+}
 
 }
diff --git a/radiantcore/model/ModelNodeBase.h b/radiantcore/model/ModelNodeBase.h
@@ -1,14 +1,28 @@
 #pragma once
 
+#include <vector>
 #include "scene/Node.h"
+#include "RenderableModelSurface.h"
 
 namespace model
 {
-
+/**
+ * Common ModelNode implementation used by various model types,
+ * e.g. StaticModelNode and MD5ModelNode
+ */
 class ModelNodeBase :
     public scene::Node
 {
+protected:
+    // The renderable surfaces attached to the shaders
+    std::vector<RenderableModelSurface::Ptr> _renderableSurfaces;
+
+protected:
+    ModelNodeBase()
+    {}
 
+public:
+    void renderHighlights(IRenderableCollector& collector, const VolumeTest& volume) override;
 };
 
 }
diff --git a/radiantcore/model/StaticModelNode.cpp b/radiantcore/model/StaticModelNode.cpp
@@ -112,16 +112,6 @@ void StaticModelNode::onPreRender(const VolumeTest& volume)
     attachToShaders();
 }
 
-void StaticModelNode::renderHighlights(IRenderableCollector& collector, const VolumeTest& volume)
-{
-    auto identity = Matrix4::getIdentity();
-
-    for (const auto& surface : _renderableSurfaces)
-    {
-        collector.addHighlightRenderable(*surface, identity);
-    }
-}
-
 void StaticModelNode::setRenderSystem(const RenderSystemPtr& renderSystem)
 {
     Node::setRenderSystem(renderSystem);

diff --git a/radiantcore/model/StaticModelNode.h b/radiantcore/model/StaticModelNode.h
@@ -79,7 +79,6 @@ class StaticModelNode final :
 
 	// Renderable implementation
   	void onPreRender(const VolumeTest& volume) override;
-	void renderHighlights(IRenderableCollector& collector, const VolumeTest& volume) override;
 	void setRenderSystem(const RenderSystemPtr& renderSystem) override;
 
 	std::size_t getHighlightFlags() override

diff --git a/radiantcore/model/md5/MD5ModelNode.cpp b/radiantcore/model/md5/MD5ModelNode.cpp
@@ -133,16 +133,6 @@ void MD5ModelNode::onPreRender(const VolumeTest& volume)
     }
 }
 
-void MD5ModelNode::renderHighlights(IRenderableCollector& collector, const VolumeTest& volume)
-{
-    auto identity = Matrix4::getIdentity();
-
-    for (const auto& surface : _renderableSurfaces)
-    {
-        collector.addHighlightRenderable(*surface, identity);
-    }
-}
-
 void MD5ModelNode::detachFromShaders()
 {
     // Detach any existing surfaces. In case we need them again,

diff --git a/radiantcore/model/md5/MD5ModelNode.h b/radiantcore/model/md5/MD5ModelNode.h
@@ -71,7 +71,6 @@ class MD5ModelNode :
 
 	// Renderable implementation
     void onPreRender(const VolumeTest& volume) override;
-	void renderHighlights(IRenderableCollector& collector, const VolumeTest& volume) override;
 
 	std::size_t getHighlightFlags() override
 	{