Merge pull request #84 from teamfisk/DamageIndicator

Damage indicator
2016-02-11 21:08:59 +01:00
parent c8c4879554 3a15550b57
commit 42d810b198
9 changed files with 554 additions and 1 deletions
@@ -11,6 +11,7 @@ struct PlayerDamage : Event
 {
    //NOTE: this struct is missing information on what the damageSource is
    EntityWrapper Player;
+    EntityWrapper PlayerShooter;
    double Damage;
 };

@@ -0,0 +1,33 @@
+#ifndef DamageIndicatorSystem_h__
+#define DamageIndicatorSystem_h__
+
+#include "Core/System.h"
+#include "Core/Transform.h"
+#include "Core/ResourceManager.h"
+#include "Core/EntityFileParser.h"
+#include "Core/EPlayerDamage.h"
+#include "Common.h"
+#include <tuple>
+
+#include "Rendering/ESetCamera.h"
+#include <glm/gtc/quaternion.hpp>
+#include <glm/gtx/vector_angle.hpp>
+
+#include "Rendering/Util/CommonFunctions.h"
+
+class DamageIndicatorSystem : public System
+{
+public:
+    DamageIndicatorSystem(SystemParams params);
+
+private:
+    EventRelay<DamageIndicatorSystem, Events::PlayerDamage> m_DamageTakenFromPlayer;
+    bool OnPlayerDamageTaken(Events::PlayerDamage& e);
+
+    EventRelay<DamageIndicatorSystem, Events::SetCamera> m_ESetCamera;
+    bool OnSetCamera(const Events::SetCamera& e);
+
+    EntityID m_CurrentCamera = -1;
+
+};
+#endif