Merge branch 'master' of github.com:sippeangelo/Escape-the-Dawn

Conflicts: Escape-the-Dawn/Renderer.cpp
2014-03-09 20:43:04 +01:00
parent a9e3e91203 fcbf802cc2
commit 0b67d7cc7b
6 changed files with 140 additions and 47 deletions
@@ -19,6 +19,7 @@
 #include <glm/gtc/type_ptr.hpp>

 #include "glerror.h"
+#include "Camera.h"
 #include "ShaderProgram.h"
 #include "Model.h"

@@ -41,7 +42,6 @@ public:

 	std::vector<ModelData*> ModelsToRender;

-
 	Renderer();

 	void Initialize();
@@ -54,11 +54,14 @@ public:
 	void LoadContent();

 	GLFWwindow* GetWindow() const { return m_Window; }
+	std::shared_ptr<Camera> GetCamera() const { return m_Camera; }

 private:
 	GLFWwindow* m_Window;
 	GLint m_glVersion[2];
 	GLchar* m_glVendor;
+
+	std::shared_ptr<Camera> m_Camera;
 };

 #endif // Renderer_h__