Merge branch 'render_queue'

Conflicts: src/GameWorld.cpp src/Renderer.cpp src/Shaders/Fragment.glsl src/Systems/PhysicsSystem.h vs11/Returngeance/Returngeance.vcxproj.filters
2014-05-27 09:35:52 +02:00
parent f775864ed2 7b622d530b
commit f31b2b7ddb
51 changed files with 1821 additions and 658 deletions
@@ -36,8 +36,9 @@ namespace Systems
 	class TankSteeringSystem : public System
 	{
 	public:
-		TankSteeringSystem(World* world, std::shared_ptr<::EventBroker> eventBroker)
-			: System(world, eventBroker) { }
+		TankSteeringSystem(World* world, std::shared_ptr<::EventBroker> eventBroker, std::shared_ptr<::ResourceManager> resourceManager)
+			: System(world, eventBroker, resourceManager)
+		{ }

 		void RegisterComponents(ComponentFactory* cf) override;
 		void Initialize() override;