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

Merge branch 'master' into particles

Browse Source 
Conflicts:
	src/GameWorld.cpp
	vs11/Returngeance/Returngeance.vcxproj
	vs11/Returngeance/Returngeance.vcxproj.filters
This commit is contained in:
sippeangelo
2014-06-03 17:19:53 +02:00
parent 349fab54a4 0ad3d8ed76
commit 7f328332c4
112 changed files with 6526 additions and 7332 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Systems/TankSteeringSystem.h
+18 -1
View File
@@ -33,6 +33,18 @@
#include "Components/Vehicle.h"
#include "Components/Player.h"
#include "Events/SpawnVehicle.h"
#include "Components/SpawnPoint.h"
#include "Components/Wheel.h"
#include "Components/MeshShape.h"
#include "Components/Camera.h"
#include "Components/BoxShape.h"
#include "Components/WheelPair.h"
#include "Components/Input.h"
#include "Events/SetViewportCamera.h"
namespace Systems
{
@@ -50,13 +62,18 @@ namespace Systems
void UpdateEntity(double dt, EntityID entity, EntityID parent) override;
private:
std::map<EntityID, double> m_TimeSinceLastShot;
EventRelay<TankSteeringSystem, Events::Collision> m_ECollision;
bool OnCollision(const Events::Collision &e);
EventRelay<TankSteeringSystem, Events::SpawnVehicle> m_ESpawnVehicle;
bool OnSpawnVehicle(const Events::SpawnVehicle &e);
class TankSteeringInputController;
std::array<std::shared_ptr<TankSteeringInputController>, 4> m_TankInputControllers;
std::map<EntityID, double> m_TimeSinceLastShot;
EntityID CreateTank(int playerID);
void AddTankWheelPair(EntityID tankEntity, glm::vec3 position, int axleID, bool front);
};
class TankSteeringSystem::TankSteeringInputController : InputController<TankSteeringSystem>