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

Merge remote-tracking branch 'origin/vehicle-helicopter' into havok

Browse Source 
Conflicts:
	src/GameWorld.cpp
	vs11/Returngeance/Returngeance.vcxproj
This commit is contained in:
ViktorLjung
2014-05-18 21:09:08 +02:00
parent fd0bb18bd3 16d51c64c5
commit 85e5d7461c
10 changed files with 208 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Systems/PhysicsSystem.h
+3 -1
View File
@@ -15,6 +15,7 @@
#include "Components/TowerSteering.h"
#include "Events/TankSteer.h"
#include "Events/SetVelocity.h"
#include "Events/ApplyForce.h"
#include "OBJ.h"
// Math and base include
@@ -103,9 +104,10 @@ private:
// Events
EventRelay<Events::TankSteer> m_ETankSteer;
bool OnTankSteer(const Events::TankSteer &event);
EventRelay<Events::SetVelocity> m_ESetVelocity;
bool OnSetVelocity(const Events::SetVelocity &event);
EventRelay<Events::ApplyForce> m_EApplyForce;
bool OnApplyForce(const Events::ApplyForce &event);
void SetUpPhysicsState(EntityID entity, EntityID parent);
void TearDownPhysicsState(EntityID entity, EntityID parent);