Almost done with the fix for DamageIndicatorSystem

2016-02-23 15:54:44 +01:00
parent 25a7240962
commit 2c9c374f51
2 changed files with 102 additions and 22 deletions
@@ -15,10 +15,11 @@

 #include "Rendering/Util/CommonFunctions.h"

-class DamageIndicatorSystem : public System
+class DamageIndicatorSystem : public ImpureSystem
 {
 public:
    DamageIndicatorSystem(SystemParams params);
+    virtual void Update(double dt) override;

 private:
    EventRelay<DamageIndicatorSystem, Events::PlayerDamage> m_EPlayerDamage;
@@ -28,6 +29,17 @@ private:
    bool OnSetCamera(const Events::SetCamera& e);

    EntityID m_CurrentCamera = -1;
-
+    struct DamageIndicatorStruct {
+        EntityWrapper spriteEntity;
+        //double timeLeft;
+        glm::vec3 enemyPosition;
+        DamageIndicatorStruct(EntityWrapper entity, glm::vec3 pos)
+            : spriteEntity(entity)
+            //, timeLeft(time)
+            , enemyPosition(pos) {}
+    };
+    std::vector<DamageIndicatorStruct> updateDamageIndicatorVector;
+    float CalculateAngle(EntityWrapper player, glm::vec3 enemyPos);
+    int m_TestVar = 0;
 };
 #endif