Started on CollisionSystem and TriggerSystem. Moved collision code to Collision folder.

This commit is contained in:
William Moberg
2015-12-14 17:08:00 +01:00
parent 8d87841691
commit 59095c2ce5
13 changed files with 162 additions and 2 deletions
@@ -0,0 +1,30 @@
#ifndef CollisionSystem_h__
#define CollisionSystem_h__
#include <GLFW/glfw3.h>
#include <glm/common.hpp>
#include "Common.h"
#include "Core/System.h"
#include "Core/EventBroker.h"
#include "Core/EKeyUp.h"
class CollisionSystem : public System
{
public:
CollisionSystem(EventBroker* eventBroker)
: System(eventBroker, "AABB")
{
//TODO: Debug stuff, remove later.
EVENT_SUBSCRIBE_MEMBER(m_EKeyUp, &CollisionSystem::OnKeyUp);
}
virtual void Update(World* world, ComponentWrapper& collision, double dt) override;
private:
EventRelay<CollisionSystem, Events::KeyUp> m_EKeyUp;
bool OnKeyUp(const Events::KeyUp &event);
};
#endif
+39
View File
@@ -0,0 +1,39 @@
#ifndef Events_TriggerEnter_h__
#define Events_TriggerEnter_h__
#include "../Core/EventBroker.h"
#include "../Core/Entity.h"
namespace Events
{
/** Thrown once, when an entity is completely inside a trigger. */
struct TriggerTouch : Event
{
/** The id of the entity that touches the trigger. */
EntityID Entity;
/** The id of the trigger entity. */
EntityID Trigger;
};
/** Thrown once, when an entity has completely left a trigger. */
struct TriggerLeave : Event
{
/** The id of the entity that left the trigger. */
EntityID Entity;
/** The id of the trigger entity. */
EntityID Trigger;
};
/** Thrown when an entity is completely inside a trigger. */
struct TriggerEnter : Event
{
/** The id of the entity that entered the trigger. */
EntityID Entity;
/** The id of the trigger entity. */
EntityID Trigger;
};
}
#endif
+23
View File
@@ -0,0 +1,23 @@
#ifndef PlayerSystem_h__
#define PlayerSystem_h__
#include <glm/common.hpp>
#include "Core/System.h"
#include "Core/EventBroker.h"
#include "ETrigger.h"
class TriggerSystem : public System
{
public:
TriggerSystem(EventBroker* eventBroker)
: System(eventBroker, "Trigger")
{}
virtual void Update(World* world, ComponentWrapper& collision, double dt) override;
private:
};
#endif