Skybox working, flag for averaging normals working.

2014-06-05 05:19:34 +02:00
parent a6941c0fb6
commit fd92f37902
11 changed files with 235 additions and 34 deletions
@@ -8,8 +8,13 @@
 #include "Components/Tower.h"
 #include "Components/Turret.h"
 #include "Components/TurretShot.h"
+#include "Components/Health.h"
 #include "Events/SetVelocity.h"
 #include "Events/CreateExplosion.h"
+#include "Events/Collision.h"
+#include "Events/Damage.h"
+
+



@@ -29,8 +34,10 @@ namespace Systems
 		virtual void Update(double dt);
 		virtual void UpdateEntity(double dt, EntityID entity, EntityID parent);

-		//EventRelay<TowerSystem, Events::Damage> m_eDamage;
-		//bool Damage(const Events::Damage &event);
+
+		EventRelay<TowerSystem, Events::Collision> m_ECollision;
+		bool OnCollision(const Events::Collision &e);
+

 	private:
 		std::map<EntityID, double> m_TimeSinceLastShot;