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

2016-02-01 18:30:30 +01:00
parent 782c1a388a ca8b7cbee8
commit c708f1582c
22 changed files with 273 additions and 126 deletions
@@ -59,10 +59,9 @@ void Renderer::InitializeWindow()
 		exit(EXIT_FAILURE);
 	}

-    int res[2];
-    glfwGetWindowSize(m_Window, &res[0], &res[1]);
-    SetViewPortSize(Rectangle::Rectangle(res[0], res[1]));
-
+    int windowSize[2];
+    glfwGetWindowSize(m_Window, &windowSize[0], &windowSize[1]);
+    m_ViewportSize = Rectangle(windowSize[0], windowSize[1]);
 }

 void Renderer::InitializeShaders()