Merge remote-tracking branch 'origin/Animations'

# Conflicts:
#	src/Engine/Rendering/DrawFinalPass.cpp
#	src/Game/Systems/WeaponSystem.cpp
This commit is contained in:
2016-01-27 13:36:49 +01:00
10 changed files with 41 additions and 19 deletions
+5
View File
@@ -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()