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

Very simple CollisionSystem made, 'Z','Y' to toggle on/off.

Browse Source
This commit is contained in:
William Moberg
2015-12-15 15:36:28 +01:00
parent 170610bcb1
commit e2417be8c7
5 changed files with 46 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Game/Game.cpp
+2
View File
@@ -1,5 +1,6 @@
#include "Game.h"
#include "Collision/TriggerSystem.h"
#include "Collision/CollisionSystem.h"
Game::Game(int argc, char* argv[])
{
@@ -47,6 +48,7 @@ Game::Game(int argc, char* argv[])
m_SystemPipeline = new SystemPipeline(m_EventBroker);
m_SystemPipeline->AddSystem<RaptorCopterSystem>();
m_SystemPipeline->AddSystem<PlayerSystem>();
m_SystemPipeline->AddSystem<CollisionSystem>();
m_SystemPipeline->AddSystem<TriggerSystem>();
m_LastTime = glfwGetTime();
src/Game/PlayerSystem.cpp
+3 -3
View File
@@ -59,18 +59,18 @@ bool PlayerSystem::OnKeyUp(const Events::KeyUp & event)
bool PlayerSystem::OnTouch(const Events::TriggerTouch &event)
{
LOG_INFO("Player %i touched widget (entity %i).", event.Entity, event.Trigger);
LOG_INFO("Player entity %i touched widget (entity %i).", event.Entity, event.Trigger);
return false;
}
bool PlayerSystem::OnEnter(const Events::TriggerEnter &event)
{
LOG_INFO("Player %i entered widget (entity %i).", event.Entity, event.Trigger);
LOG_INFO("Player entity %i entered widget (entity %i).", event.Entity, event.Trigger);
return false;
}
bool PlayerSystem::OnLeave(const Events::TriggerLeave &event)
{
LOG_INFO("Player %i left widget (entity %i).", event.Entity, event.Trigger);
LOG_INFO("Player entity %i left widget (entity %i).", event.Entity, event.Trigger);
return false;
}