Some cleanup of the code

This commit is contained in:
verysecrethero
2016-02-09 16:15:19 +01:00
parent 971fee4a0c
commit 8bdf87da12
3 changed files with 5 additions and 80 deletions
+1 -13
View File
@@ -5,35 +5,23 @@
#include "Core/Transform.h"
#include "Core/ResourceManager.h"
#include "Core/EntityFileParser.h"
#include "Core/EPickupSpawned.h"
#include "Core/EPlayerDamage.h"
#include "Engine/Collision/ETrigger.h"
#include "Common.h"
#include <tuple>
//temp
#include "Input/EInputCommand.h"
#include "Rendering/ESetCamera.h"
#include <glm/gtc/quaternion.hpp>
#include <glm/gtx/vector_angle.hpp>
class DamageIndicatorSystem : public ImpureSystem
class DamageIndicatorSystem : public System
{
public:
DamageIndicatorSystem(World* world, EventBroker* eventBroker);
virtual void Update(double dt) override;
private:
EventRelay<DamageIndicatorSystem, Events::PlayerDamage> m_DamageTakenFromPlayer;
bool OnPlayerDamageTaken(Events::PlayerDamage& e);
//temp
EventRelay<DamageIndicatorSystem, Events::InputCommand> m_EInputCommand;
bool OnInputCommand(Events::InputCommand& e);
EventRelay<DamageIndicatorSystem, Events::SetCamera> m_ESetCamera;
bool OnSetCamera(const Events::SetCamera& e);