Merge remote-tracking branch 'origin/master' into Forward+

# Conflicts: # include/Engine/Rendering/Renderer.h # resources/Schema/Components.xsd # resources/Schema/Entities/Test.xml # src/Engine/Rendering/Renderer.cpp
2016-01-06 11:35:55 +01:00
parent e510f2b88c 34cbbb3eb1
commit e7bb8954bf
62 changed files with 4186 additions and 156 deletions
@@ -35,7 +35,7 @@ public:
 	virtual void Draw(RenderQueueCollection& rq) = 0;

 protected:
-	Rectangle m_Resolution = Rectangle(1280, 720);
+	Rectangle m_Resolution = Rectangle::Rectangle(1280, 720);
 	bool m_Fullscreen = false;
 	bool m_VSYNC = false;
 	int m_GLVersion[2];
@@ -12,6 +12,7 @@
 #include "../Core/World.h"
 #include "PickingPass.h"
 #include "DrawScenePass.h"
+#include "DebugCameraInputController.h"
 #include "LightCullingPass.h"
 #include "DrawFinalPass.h"

@@ -34,6 +35,8 @@ private:
    //----------------------Variables----------------------//
    EventBroker* m_EventBroker;

+    std::shared_ptr<DebugCameraInputController<Renderer>> m_DebugCameraInputController;
+
    Texture* m_ErrorTexture;
    Texture* m_WhiteTexture;
    float m_CameraMoveSpeed;