Merge branch 'JoeyDeVries:master' into master

This commit is contained in:
Jonas Sorgenfrei
2022-03-19 11:36:54 +01:00
committed by GitHub
2 changed files with 4 additions and 3 deletions

View File

@@ -30,8 +30,10 @@ message(STATUS "Found ASSIMP in ${ASSIMP_INCLUDE_DIR}")
# message(STATUS "Found SOIL in ${SOIL_INCLUDE_DIR}")
# find_package(GLEW REQUIRED)
# message(STATUS "Found GLEW in ${GLEW_INCLUDE_DIR}")
find_package(Freetype REQUIRED)
message(STATUS "Found Freetype in ${FREETYPE_INCLUDE_DIRS}")
if(APPLE)
find_package(Freetype REQUIRED)
message(STATUS "Found Freetype in ${FREETYPE_INCLUDE_DIRS}")
endif(APPLE)
if(WIN32)
set(LIBS glfw3 opengl32 assimp freetype irrKlang)

View File

@@ -231,7 +231,6 @@ int main()
simpleDepthShader.use();
glBindFramebuffer(GL_FRAMEBUFFER, lightFBO);
glFramebufferTexture(GL_FRAMEBUFFER, GL_TEXTURE_2D_ARRAY, lightDepthMaps, 0);
glViewport(0, 0, depthMapResolution, depthMapResolution);
glClear(GL_DEPTH_BUFFER_BIT);
glCullFace(GL_FRONT); // peter panning