CapturePointSystem fix, DamageIndicatorSystem fix

This commit is contained in:
verysecrethero
2016-02-23 17:29:33 +01:00
parent 2c18068059
commit e2831c5593
5 changed files with 144 additions and 64 deletions
+15 -1
View File
@@ -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,19 @@ private:
bool OnSetCamera(const Events::SetCamera& e);
EntityID m_CurrentCamera = -1;
struct DamageIndicatorStruct {
EntityWrapper spriteEntity;
glm::vec3 enemyPosition;
DamageIndicatorStruct(EntityWrapper sprite, glm::vec3 pos)
: spriteEntity(sprite)
, enemyPosition(pos) {}
};
std::vector<DamageIndicatorStruct> updateDamageIndicatorVector;
float CalculateAngle(EntityWrapper player, glm::vec3 enemyPos);
//for tests
int m_TestVar = 0;
bool m_Testing = false;
glm::vec3 DamageIndicatorTest(EntityWrapper player);
};
#endif