Some merge fixes, needs more work

2015-12-18 15:28:44 +01:00
parent aeca1dec18
commit bd82f75dd0
9 changed files with 36 additions and 168 deletions
@@ -20,6 +20,15 @@ public:
 	void SetFullscreen(bool fullscreen) { m_Fullscreen = fullscreen; }
 	bool VSYNC() const { return m_VSYNC; }
 	void SetVSYNC(bool vsync) { m_VSYNC = vsync; }
+    ::Camera* Camera() const { return m_Camera; }
+    void SetCamera(::Camera* camera)
+    {
+        if (camera == nullptr) {
+            m_Camera = m_DefaultCamera;
+        } else {
+            m_Camera = camera;
+        }
+    }
 	virtual void Initialize() = 0;
 	virtual void Update(double dt) = 0;
 	virtual void Draw(RenderQueueCollection& rq) = 0;
@@ -31,6 +40,8 @@ protected:
 	int m_GLVersion[2];
 	std::string m_GLVendor;
 	GLFWwindow* m_Window = nullptr;
+    ::Camera* m_DefaultCamera;
+    ::Camera* m_Camera = nullptr;
 };

 #endif // Renderer_h__