onRemoveTrait() implementation

include/radix/Entity.hpp

@@ -5,6 +5,7 @@
 #include <memory>
 #include <stdexcept>
 #include <type_traits>
+#include <vector>
 
 #include <RadixEntity/Entity.hpp>
 
@@ -20,6 +21,10 @@ class World;
 
 using EntityId = uint32_t;
 
+namespace entities {
+class Trait;
+}
+
 /** \class Entity
  * It is created like this:
  * @snippet source/data/map/XmlMapLoader.cpp Creating an Entity
@@ -41,6 +46,11 @@ class Entity : public entity::Entity, protected Transform {
   std::string m_name;
 
 protected:
+  /**
+   * List of traits contained within this entity instance.
+   */
+  std::vector<entities::Trait*> m_traits;
+
   Entity() :
     world(util::NullReference<World>) {
     throw std::invalid_argument("You forgot to properly instantiate the Entity base");
@@ -135,7 +145,7 @@ class Entity : public entity::Entity, protected Transform {
   virtual void onRemove() {}
 
   virtual std::string fullClassName() const = 0;
-  virtual std::string className() const  = 0;
+  virtual std::string className() const = 0;
 
   virtual void tick(TDelta) {}
 };

include/radix/entities/traits/RigidBodyTrait.hpp

@@ -24,6 +24,7 @@ class RigidBodyTrait : public Trait {
   btDefaultMotionState motionState;
   btRigidBody *body;
 
+  virtual void onRemoveTrait() override;
   ~RigidBodyTrait();
 
   virtual int getCollisionFlags() const;

include/radix/entities/traits/Trait.hpp

@@ -4,11 +4,27 @@
 #include <radix/Entity.hpp>
 
 namespace radix {
+
+class EntityManager;
+
 namespace entities {
 
-class Trait : public virtual Entity {
+class Trait : protected virtual Entity {
 protected:
-  Trait() = default;
+  friend EntityManager;
+  friend Entity;
+
+  Trait();
+
+  virtual void onRemoveTrait() {}
+
+public:
+  inline Entity& entity() {
+    return *this;
+  }
+  inline const Entity& entity() const {
+    return *this;
+  }
 };
 
 } /* namespace entities */

source/CMakeLists.txt

@@ -30,9 +30,10 @@ set(RADIX_SOURCES
   ${D}/EntityManager.cpp
   ${D}/entities/Player.cpp
   ${D}/entities/StaticModel.cpp
+  ${D}/entities/traits/HealthTrait.cpp
   ${D}/entities/traits/RigidBodyTrait.cpp
   ${D}/entities/traits/SoundSourceTrait.cpp
-  ${D}/entities/traits/HealthTrait.cpp
+  ${D}/entities/traits/Trait.cpp
   ${D}/entities/Trigger.cpp
   ${D}/env/ArgumentsParser.cpp
   ${D}/env/GameConsole.cpp

source/Entity.cpp

@@ -39,6 +39,9 @@ void Entity::setName(const std::string &newName) {
 }
 
 void Entity::remove() {
+  for (auto trit = m_traits.rbegin(); trit != m_traits.rend(); ++trit) {
+    (*trit)->onRemoveTrait();
+  }
   onRemove();
   world.entityManager.queueDeleteEntity(this);
 }

source/entities/traits/RigidBodyTrait.cpp

@@ -42,15 +42,18 @@ void RigidBodyTrait::setRigidBody(float mass,
   phys.getPhysicsWorld().addRigidBody(body, getCollisionGroup(), getCollisionMask());
 }
 
-RigidBodyTrait::~RigidBodyTrait() {
+void RigidBodyTrait::onRemoveTrait() {
   if (body) {
     auto &phys = world.simulations.findFirstOfType<simulation::Physics>();
     Util::Log(Verbose, Tag) << "Removing body from phys world (" << id << ')';
     phys.getPhysicsWorld().removeRigidBody(body);
-    delete body;
   }
 }
 
+RigidBodyTrait::~RigidBodyTrait() {
+  delete body;
+}
+
 void RigidBodyTrait::setPosition(const Vector3f &val) {
   position = val;
   if (body) {

source/entities/traits/Trait.cpp

@@ -0,0 +1,11 @@
+#include <radix/entities/traits/Trait.hpp>
+
+namespace radix {
+namespace entities {
+
+Trait::Trait() {
+  m_traits.emplace_back(this);
+}
+
+} /* namespace entities */
+} /* namespace radix */

source/renderer/Renderer.cpp

@@ -59,7 +59,7 @@ void Renderer::updateLights(Shader& shader) {
     std::string distance = "lights[" + index + "].distance";
     std::string energy   = "lights[" + index + "].energy";
     std::string specular = "lights[" + index + "].specular";
-    const Vector3f &tposition = ls.getPosition();
+    const Vector3f &tposition = e.getPosition();
     glUniform3f(shader.uni(position.c_str()), tposition.x, tposition.y, tposition.z);
     glUniform3f(shader.uni(color.c_str()), ls.color.x, ls.color.y, ls.color.z);
     glUniform1f(shader.uni(distance.c_str()), ls.distance);