Add EntityNode::onEntityClassChanged() method to be overridden by chi…

…ld classes.

Redirect the connected signal to the virtual method which will call KeyObserverMap::refreshObservers() by default.

plugins/entity/EntityNode.cpp

@@ -49,9 +49,10 @@ EntityNode::~EntityNode()
 
 void EntityNode::construct()
 {
-    _eclass->changedSignal().connect(
-        sigc::mem_fun(_keyObservers, &KeyObserverMap::refreshObservers)
-    );
+	_eclassChangedConn = _eclass->changedSignal().connect([this]()
+	{
+		this->onEntityClassChanged();
+	});
 
 	TargetableNode::construct();
 
@@ -80,9 +81,17 @@ void EntityNode::destruct()
 	removeKeyObserver("_color", _colourKey);
 	removeKeyObserver("name", _nameKey);
 
+	_eclassChangedConn.disconnect();
+
 	TargetableNode::destruct();
 }
 
+void EntityNode::onEntityClassChanged()
+{
+	// By default, we notify the KeyObservers attached to this entity
+	_keyObservers.refreshObservers();
+}
+
 void EntityNode::addKeyObserver(const std::string& key, KeyObserver& observer)
 {
 	_keyObservers.insert(key, observer);

plugins/entity/EntityNode.h

@@ -1,5 +1,6 @@
 #pragma once
 
+#include <sigc++/connection.h>
 #include "ientity.h"
 #include "inamespace.h"
 #include "Bounded.h"
@@ -74,6 +75,8 @@ class EntityNode :
 	ShaderPtr _fillShader;
 	ShaderPtr _wireShader;
 
+	sigc::connection _eclassChangedConn;
+
 protected:
 	// The Constructor needs the eclass
 	EntityNode(const IEntityClassPtr& eclass);
@@ -151,6 +154,11 @@ class EntityNode :
 	 */
 	virtual void construct();
 
+	// Signal method to be overridden by subclasses.
+	// Don't forget to call the base class implementation as this will
+	// reload the entity key values and notify observers
+	virtual void onEntityClassChanged();
+
 private:
 	// Routine used by the destructor, should be non-virtual
 	void destruct();