EclassModelNode using observeKey() with auto-disconnection

codereader · Dec 12, 2021 · b39db31 · b39db31
1 parent e0013ab
commit b39db31
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 14 deletions.
diff --git a/radiantcore/entity/eclassmodel/EclassModelNode.cpp b/radiantcore/entity/eclassmodel/EclassModelNode.cpp
@@ -29,9 +29,6 @@ EclassModelNode::EclassModelNode(const EclassModelNode& other) :
 
 EclassModelNode::~EclassModelNode()
 {
-    removeKeyObserver("origin", _originKey);
-    removeKeyObserver("rotation", _rotationObserver);
-    removeKeyObserver("angle", _angleObserver);
 }
 
 EclassModelNodePtr EclassModelNode::Create(const IEntityClassPtr& eclass)
@@ -46,14 +43,14 @@ void EclassModelNode::construct()
 {
 	EntityNode::construct();
 
-    _rotationObserver.setCallback(std::bind(&RotationKey::rotationChanged, &_rotationKey, std::placeholders::_1));
-	_angleObserver.setCallback(std::bind(&RotationKey::angleChanged, &_rotationKey, std::placeholders::_1));
-
     _rotation.setIdentity();
 
-    addKeyObserver("angle", _angleObserver);
-	addKeyObserver("rotation", _rotationObserver);
-    addKeyObserver("origin", _originKey);
+    // Observe position and orientation spawnargs
+    static_assert(std::is_base_of<sigc::trackable, OriginKey>::value);
+    static_assert(std::is_base_of<sigc::trackable, RotationKey>::value);
+    observeKey("angle", sigc::mem_fun(_rotationKey, &RotationKey::angleChanged));
+	observeKey("rotation", sigc::mem_fun(_rotationKey, &RotationKey::rotationChanged));
+    observeKey("origin", sigc::mem_fun(_originKey, &OriginKey::onKeyValueChanged));
 }
 
 // Snappable implementation
@@ -109,7 +106,7 @@ void EclassModelNode::translate(const Vector3& translation)
 	_origin += translation;
 }
 
-void EclassModelNode::rotate(const Quaternion& rotation) 
+void EclassModelNode::rotate(const Quaternion& rotation)
 {
 	_rotation.rotate(rotation);
 }

diff --git a/radiantcore/entity/eclassmodel/EclassModelNode.h b/radiantcore/entity/eclassmodel/EclassModelNode.h
@@ -22,6 +22,12 @@ namespace entity
 class EclassModelNode;
 typedef std::shared_ptr<EclassModelNode> EclassModelNodePtr;
 
+/**
+ * @brief Entity node displaying a model defined in an entityDef.
+ *
+ * This is used for entities whose model is defined in the entity class, e.g.
+ * guards, interactable objects etc.
+ */
 class EclassModelNode :
 	public EntityNode,
 	public Snappable
@@ -40,9 +46,6 @@ class EclassModelNode :
 
 	AABB _localAABB;
 
-    KeyObserverDelegate _rotationObserver;
-	KeyObserverDelegate _angleObserver;
-
 private:
 	// Constructor
 	EclassModelNode(const IEntityClassPtr& eclass);
@@ -66,7 +69,7 @@ class EclassModelNode :
 	void renderSolid(RenderableCollector& collector, const VolumeTest& volume) const override;
 	void renderWireframe(RenderableCollector& collector, const VolumeTest& volume) const override;
 	void setRenderSystem(const RenderSystemPtr& renderSystem) override;
-    
+
     // Returns the original "origin" value
     const Vector3& getUntransformedOrigin() override;