BTH/axyz
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

New Event: EShoot. New Components: PrimaryItem,SecondaryItem. New Test: ShootEventTest. Added LeftMouseRelease->Shoot in PlayerSystem

Browse Source 
TODO: generalize the test
This commit is contained in:
verysecrethero
2016-01-08 16:19:18 +01:00
parent 704e8825c4
commit 184af95507
13 changed files with 266 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/Game/PlayerSystem.h
+7
View File
@@ -7,6 +7,8 @@
#include "Common.h"
#include "Core/System.h"
#include "Collision/ETrigger.h"
#include "Core\EMouseRelease.h"
#include "Core\EShoot.h"
class PlayerSystem : public PureSystem
{
@@ -17,17 +19,22 @@ public:
EVENT_SUBSCRIBE_MEMBER(m_ETouch, &PlayerSystem::OnTouch);
EVENT_SUBSCRIBE_MEMBER(m_EEnter, &PlayerSystem::OnEnter);
EVENT_SUBSCRIBE_MEMBER(m_ELeave, &PlayerSystem::OnLeave);
EVENT_SUBSCRIBE_MEMBER(m_MouseRelease, &PlayerSystem::OnMouseRelease);
}
virtual void UpdateComponent(World* world, ComponentWrapper& player, double dt) override;
private:
float m_Speed = 5;
bool leftMouseWasReleased = false;
glm::vec2 aimingCoordinates;
EventRelay<PlayerSystem, Events::TriggerEnter> m_EEnter;
bool OnEnter(const Events::TriggerEnter &event);
EventRelay<PlayerSystem, Events::TriggerTouch> m_ETouch;
bool PlayerSystem::OnTouch(const Events::TriggerTouch &event);
EventRelay<PlayerSystem, Events::TriggerLeave> m_ELeave;
bool PlayerSystem::OnLeave(const Events::TriggerLeave &event);
EventRelay<PlayerSystem, Events::MouseRelease> m_MouseRelease;
bool PlayerSystem::OnMouseRelease(const Events::MouseRelease& e);
};
#endif