faerbit/Saxum
1
0
Fork 0
Code Issues 1 Pull Requests Projects Releases 2 Wiki Activity

Reenabling multisampling.

Browse Source
This commit is contained in:
Faerbit 2015-03-09 08:21:44 +01:00
parent 4a7c552508
commit 5599a39eff
2 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
graphics.cc
View File

@ -41,7 +41,7 @@ void Graphics::init(Level* level) {
glBlendEquation(GL_FUNC_ADD); glBlendEquation(GL_FUNC_ADD);
glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
glEnable(GL_TEXTURE_CUBE_MAP_SEAMLESS); glEnable(GL_TEXTURE_CUBE_MAP_SEAMLESS);
//glEnable(GL_MULTISAMPLE); glEnable(GL_MULTISAMPLE);
// update lights on creation // update lights on creation
@ -288,7 +288,7 @@ void Graphics::render(double time)
} }
// lighting render pass // lighting render pass
framebuffer_light->bind(); glBindFramebuffer(GL_FRAMEBUFFER, 0);
glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT); glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
//wind //wind
@ -360,6 +360,13 @@ void Graphics::render(double time)
} }
glDisable(GL_CULL_FACE); glDisable(GL_CULL_FACE);
framebuffer_light->bind();
glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
glBindFramebuffer(GL_READ_FRAMEBUFFER, 0);
glBindFramebuffer(GL_DRAW_FRAMEBUFFER, framebuffer_light->getObjectName());
glBlitFramebuffer(0, 0, windowSize.x, windowSize.y, 0, 0, windowSize.x, windowSize.y,
GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT, GL_NEAREST);
// draw slightly larger only for stencil buffer to blur edges // draw slightly larger only for stencil buffer to blur edges
glEnable(GL_STENCIL_TEST); glEnable(GL_STENCIL_TEST);
glStencilFunc(GL_ALWAYS, 1, 0xFF); //Set any stencil to 1 glStencilFunc(GL_ALWAYS, 1, 0xFF); //Set any stencil to 1

2
main.cc
View File

@ -87,7 +87,7 @@ bool createWindow()
setGLFWHintsForOpenGLVersion( ACGL_OPENGL_VERSION ); setGLFWHintsForOpenGLVersion( ACGL_OPENGL_VERSION );
// activate multisampling (second parameter is the number of samples): // activate multisampling (second parameter is the number of samples):
//glfwWindowHint( GLFW_SAMPLES, 4); glfwWindowHint( GLFW_SAMPLES, 4);
// request an OpenGL debug context: // request an OpenGL debug context:
glfwWindowHint( GLFW_OPENGL_DEBUG_CONTEXT, true ); glfwWindowHint( GLFW_OPENGL_DEBUG_CONTEXT, true );