#6009: Move getNodeType() to base

codereader · Oct 29, 2022 · ab8adcd · ab8adcd
1 parent 1ed747d
commit ab8adcd
Show file tree

Hide file tree

Showing 6 changed files with 7 additions and 12 deletions.
diff --git a/radiantcore/model/ModelNodeBase.cpp b/radiantcore/model/ModelNodeBase.cpp
@@ -7,6 +7,11 @@ ModelNodeBase::ModelNodeBase() :
     _attachedToShaders(false)
 {}
 
+scene::INode::Type ModelNodeBase::getNodeType() const
+{
+    return Type::Model;
+}
+
 void ModelNodeBase::renderHighlights(IRenderableCollector& collector, const VolumeTest& volume)
 {
     auto identity = Matrix4::getIdentity();

diff --git a/radiantcore/model/ModelNodeBase.h b/radiantcore/model/ModelNodeBase.h
@@ -23,6 +23,8 @@ class ModelNodeBase :
     ModelNodeBase();
 
 public:
+    scene::INode::Type getNodeType() const override;
+
     void renderHighlights(IRenderableCollector& collector, const VolumeTest& volume) override;
     std::size_t getHighlightFlags() override;
 

diff --git a/radiantcore/model/StaticModelNode.cpp b/radiantcore/model/StaticModelNode.cpp
@@ -85,11 +85,6 @@ std::string StaticModelNode::name() const {
     return _model->getFilename();
 }
 
-scene::INode::Type StaticModelNode::getNodeType() const
-{
-    return Type::Model;
-}
-
 const StaticModelPtr& StaticModelNode::getModel() const {
     return _model;
 }

diff --git a/radiantcore/model/StaticModelNode.h b/radiantcore/model/StaticModelNode.h
@@ -66,7 +66,6 @@ class StaticModelNode final :
 	void testSelect(Selector& selector, SelectionTest& test) override;
 
 	std::string name() const override;
-	Type getNodeType() const override;
 
 	const StaticModelPtr& getModel() const;
 	void setModel(const StaticModelPtr& model);

diff --git a/radiantcore/model/md5/MD5ModelNode.cpp b/radiantcore/model/md5/MD5ModelNode.cpp
@@ -67,11 +67,6 @@ std::string MD5ModelNode::name() const
     return _model->getFilename();
 }
 
-scene::INode::Type MD5ModelNode::getNodeType() const
-{
-    return Type::Model;
-}
-
 void MD5ModelNode::createRenderableSurfaces()
 {
     _model->foreachSurface([&](const MD5Surface& surface)

diff --git a/radiantcore/model/md5/MD5ModelNode.h b/radiantcore/model/md5/MD5ModelNode.h
@@ -55,7 +55,6 @@ class MD5ModelNode :
 	virtual const AABB& localAABB() const override;
 
 	virtual std::string name() const override;
-	Type getNodeType() const override;
 
 	// SelectionTestable implementation
 	void testSelect(Selector& selector, SelectionTest& test) override;