X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fgame%2Fowned.h;h=620c6aab54e2114a7e3c718256fb794a92593d47;hb=f93a0f0afe8aff4d0bbc8ee393918881cfdd9db8;hp=19daa7efe12afbbffeb3676d635088daca4889ff;hpb=c7d0e1aff305778f97974b329826628966380158;p=libs%2Fgame.git

diff --git a/source/game/owned.h b/source/game/owned.h
index 19daa7e..620c6aa 100644
--- a/source/game/owned.h
+++ b/source/game/owned.h
@@ -2,6 +2,7 @@
 #define MSP_GAME_OWNED_H_
 
 #include <stdexcept>
+#include "events.h"
 #include "handle.h"
 #include "stage.h"
 
@@ -16,11 +17,11 @@ class Owned: public Handle<T>
 public:
 	Owned() = default;
 
-	template<typename... Args>
-	Owned(Handle<Entity>, Args &&...);
+	template<typename P, typename... Args>
+	Owned(Handle<P>, Args &&...);
 
-	template<typename... Args>
-	Owned(Entity &parent, Args &&... args): Owned(Handle<Entity>::from_object(&parent), std::forward<Args>(args)...) { }
+	template<typename P, typename... Args>
+	Owned(P &parent, Args &&... args): Owned(Handle<P>::from_object(&parent), std::forward<Args>(args)...) { }
 
 	Owned(Owned &&other): Handle<T>(other) { other.ptr = nullptr; }
 	Owned &operator=(Owned &&other);
@@ -35,21 +36,25 @@ private:
 
 
 template<typename T>
-template<typename... Args>
-Owned<T>::Owned(Handle<Entity> parent, Args &&... args)
+template<typename P, typename... Args>
+Owned<T>::Owned(Handle<P> parent, Args &&... args)
 {
 	if(!parent)
 		throw std::invalid_argument("Owned::Owned");
 
-	using DependentEntity = std::conditional_t<sizeof(T), Entity, Entity>;
-	Handle<DependentEntity> dparent = parent;
-
-	Pool<T> &pool = get_stage(*dparent).get_pools().template get_pool<T>();
+	Stage &stage = get_stage(*parent);
+	Pool<T> &pool = stage.get_pools().template get_pool<T>();
 	this->ptr = pool.create(parent, std::forward<Args>(args)...);
 	if constexpr(std::is_base_of_v<Component, T>)
-		dparent->add_component(*this);
+	{
+		parent->add_component(*this);
+		stage.get_event_source().emit<Events::ComponentCreated>(*this);
+	}
 	else
-		dparent->add_child(*this);
+	{
+		parent->add_child(*this);
+		stage.get_event_source().emit<Events::EntityCreated>(*this);
+	}
 }
 
 template<typename T>
@@ -80,13 +85,20 @@ void Owned<T>::destroy()
 	if(!obj)
 		return;
 
-	Pool<T> &pool = get_stage(*obj).get_pools().template get_pool<T>();
+	Stage &stage = get_stage(*obj);
 
 	if constexpr(std::is_base_of_v<Component, T>)
+	{
+		stage.get_event_source().emit<Events::ComponentDestroyed>(*this);
 		obj->get_entity()->remove_component(*this);
+	}
 	else if(auto parent = obj->get_parent().get())
+	{
+		stage.get_event_source().emit<Events::EntityDestroyed>(*this);
 		parent->remove_child(*this);
+	}
 
+	Pool<T> &pool = stage.get_pools().template get_pool<T>();
 	pool.destroy(this->ptr);
 }