diff --git a/CMakeLists.txt b/CMakeLists.txt index b89b712..26c2da9 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -44,8 +44,9 @@ elseif(APPLE) FIND_LIBRARY(COCOA_LIBRARY Cocoa) FIND_LIBRARY(OpenGL_LIBRARY OpenGL) FIND_LIBRARY(IOKit_LIBRARY IOKit) + FIND_LIBRARY(CoreVideo_LIBRARY CoreVideo) MARK_AS_ADVANCED(COCOA_LIBRARY OpenGL_LIBRARY) - SET(APPLE_LIBS ${COCOA_LIBRARY} ${IOKit_LIBRARY} ${OpenGL_LIBRARY}) + SET(APPLE_LIBS ${COCOA_LIBRARY} ${IOKit_LIBRARY} ${OpenGL_LIBRARY} ${CoreVideo_LIBRARY}) SET(APPLE_LIBS ${APPLE_LIBS} ${GLFW3_LIBRARY} ${ASSIMP_LIBRARY}) set(LIBS ${LIBS} ${APPLE_LIBS}) else() diff --git a/src/5.advanced_lighting/7.bloom/7.bloom.fs b/src/5.advanced_lighting/7.bloom/7.bloom.fs index dcb9eb4..a687beb 100644 --- a/src/5.advanced_lighting/7.bloom/7.bloom.fs +++ b/src/5.advanced_lighting/7.bloom/7.bloom.fs @@ -43,7 +43,7 @@ void main() float brightness = dot(result, vec3(0.2126, 0.7152, 0.0722)); if(brightness > 1.0) BrightColor = vec4(result, 1.0); - // else - // BloomColor = vec4(0.0, 0.0, 0.0, 1.0); + else + BrightColor = vec4(0.0, 0.0, 0.0, 1.0); FragColor = vec4(result, 1.0); -} \ No newline at end of file +}