implemented bloom lighting

themattinthehatt · Feb 9, 2017 · f4fe8dc · f4fe8dc
1 parent 521eb12
commit f4fe8dc
Show file tree

Hide file tree

Showing 12 changed files with 555 additions and 21 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -14,6 +14,7 @@ set(SOURCE_FILES
         src/core/FramebufferObject.cpp
         src/core/Skybox.cpp
         src/core/vboIndexer.cpp
+        src/core/lighting/bloom/FBOBloom.cpp
         src/core/loaders/loadShaders.cpp
         src/core/loaders/loadTextures.cpp
         src/core/loaders/loadCubemap.cpp

diff --git a/main.cpp b/main.cpp
@@ -101,7 +101,7 @@ int main() {
     // -------------------------------------------------------------------------
 
     // for printing FPS
-    bool printFPS = false;
+    bool printFPS = true;
     int counter = 0;
     GLfloat currentTime = glfwGetTime();
     GLfloat lastTime;

diff --git a/src/core/FramebufferObject.cpp b/src/core/FramebufferObject.cpp
@@ -289,7 +289,7 @@ void FramebufferObject::render() {
     // break vertex array object binding
     glBindVertexArray(0);
 
-};
+}
 
 
 void FramebufferObject::clean() {
@@ -306,4 +306,4 @@ void FramebufferObject::clean() {
     glDeleteBuffers(1, &screenVertexBufferID);
     glDeleteBuffers(1, &screenUVBufferID);
 
-};
+}