BTH/fishtanks
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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

Browse Source 
Conflicts:
	src/GUI/GameFrame.h
	src/GUI/TextureFrame.h
	vs11/Returngeance/Returngeance.vcxproj.filters
This commit is contained in:
Stiffly
2014-06-02 17:37:25 +02:00
parent 756107363e 94fc516a69
commit 349fab54a4
13 changed files with 262 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Renderer.cpp
+11 -7
View File
@@ -5,6 +5,9 @@ Renderer::Renderer(std::shared_ptr<::ResourceManager> resourceManager)
: ResourceManager(resourceManager)
{
m_VSync = false;
m_Fullscreen = false;
m_Width = 1280;
m_Height = 720;
#ifdef DEBUG
m_DrawNormals = false;
m_DrawWireframe = false;
@@ -38,11 +41,12 @@ void Renderer::Initialize()
}
// Create a window
m_Width = 1280;
m_Height = 720;
// Antialiasing
//glfwWindowHint(GLFW_SAMPLES, 16);
m_Window = glfwCreateWindow(m_Width, m_Height, "OpenGL", nullptr, nullptr);
GLFWmonitor* monitor = nullptr;
if (m_Fullscreen)
{
monitor = glfwGetPrimaryMonitor();
}
m_Window = glfwCreateWindow(m_Width, m_Height, "OpenGL", monitor, nullptr);
if (!m_Window)
{
LOG_ERROR("GLFW: Failed to create window");
@@ -267,7 +271,7 @@ void Renderer::DrawFrame(RenderQueuePair &rq)
{
glBindFramebuffer(GL_FRAMEBUFFER, 0);
glViewport(m_Viewport.X, m_Height - m_Viewport.Y - m_Viewport.Height, m_Viewport.Width, m_Viewport.Height);
glScissor(m_Viewport.X, m_Height - m_Viewport.Y - m_Viewport.Height, m_Viewport.Width, m_Viewport.Height);
glScissor(m_Scissor.X, m_Height - m_Scissor.Y - m_Scissor.Height, m_Scissor.Width, m_Scissor.Height);
//glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
//glClearColor(0.0f, 0.5f, 0.0f, 1.0f);
@@ -387,7 +391,7 @@ void Renderer::DrawWorld(RenderQueuePair &rq)
*/
glBindFramebuffer(GL_DRAW_FRAMEBUFFER, m_fbBasePass);
glViewport(m_Viewport.X, m_Height - m_Viewport.Y - m_Viewport.Height, m_Viewport.Width, m_Viewport.Height);
glScissor(m_Viewport.X, m_Height - m_Viewport.Y - m_Viewport.Height, m_Viewport.Width, m_Viewport.Height);
glScissor(m_Scissor.X, m_Height - m_Scissor.Y - m_Scissor.Height, m_Scissor.Width, m_Scissor.Height);
//glViewport(0, 0, m_Width, m_Height);
// Clear G-buffer