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

Merge branch 'render_queue'

Browse Source 
Conflicts:
	src/GameWorld.cpp
	src/Renderer.cpp
	src/Shaders/Fragment.glsl
	src/Systems/PhysicsSystem.h
	vs11/Returngeance/Returngeance.vcxproj.filters
This commit is contained in:
sippeangelo
2014-05-27 09:35:52 +02:00
parent f775864ed2 7b622d530b
commit f31b2b7ddb
51 changed files with 1821 additions and 658 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/GameWorld.h
+3 -4
View File
@@ -51,8 +51,9 @@
class GameWorld : public World
{
public:
GameWorld(std::shared_ptr<::EventBroker> eventBroker, std::shared_ptr<Renderer> renderer)
: World(eventBroker), m_Renderer(renderer) { }
GameWorld(std::shared_ptr<::EventBroker> eventBroker, std::shared_ptr<::ResourceManager> resourceManager)
: World(eventBroker, resourceManager)
{ }
void Initialize();
@@ -63,8 +64,6 @@ public:
void Update(double dt);
private:
std::shared_ptr<Renderer> m_Renderer;
void BindKey(int keyCode, std::string command, float value);
void BindMouseButton(int button, std::string command, float value);
void BindGamepadAxis(Gamepad::Axis axis, std::string command, float value);