Merge remote-tracking branch 'origin/master' into NormalSpecularMapping

# Conflicts: # include/Engine/Rendering/RenderSystem.h # src/Engine/Rendering/DrawFinalPass.cpp # src/Engine/Rendering/RenderSystem.cpp
2016-01-27 15:41:31 +01:00
parent 44302bb0f3 181017313d
commit 0e70dc6fa3
50 changed files with 345 additions and 251 deletions
@@ -58,6 +58,11 @@ void Renderer::InitializeWindow()
 		LOG_ERROR("GLEW: Initialization failed");
 		exit(EXIT_FAILURE);
 	}
+
+    int res[2];
+    glfwGetWindowSize(m_Window, &res[0], &res[1]);
+    SetViewPortSize(Rectangle::Rectangle(res[0], res[1]));
+
 }

 void Renderer::InitializeShaders()