mirror of
https://github.com/JoeyDeVries/LearnOpenGL.git
synced 2026-01-30 20:13:22 +08:00
Merge branch 'JoeyDeVries:master' into master
This commit is contained in:
@@ -30,8 +30,10 @@ message(STATUS "Found ASSIMP in ${ASSIMP_INCLUDE_DIR}")
|
|||||||
# message(STATUS "Found SOIL in ${SOIL_INCLUDE_DIR}")
|
# message(STATUS "Found SOIL in ${SOIL_INCLUDE_DIR}")
|
||||||
# find_package(GLEW REQUIRED)
|
# find_package(GLEW REQUIRED)
|
||||||
# message(STATUS "Found GLEW in ${GLEW_INCLUDE_DIR}")
|
# message(STATUS "Found GLEW in ${GLEW_INCLUDE_DIR}")
|
||||||
|
if(APPLE)
|
||||||
find_package(Freetype REQUIRED)
|
find_package(Freetype REQUIRED)
|
||||||
message(STATUS "Found Freetype in ${FREETYPE_INCLUDE_DIRS}")
|
message(STATUS "Found Freetype in ${FREETYPE_INCLUDE_DIRS}")
|
||||||
|
endif(APPLE)
|
||||||
|
|
||||||
if(WIN32)
|
if(WIN32)
|
||||||
set(LIBS glfw3 opengl32 assimp freetype irrKlang)
|
set(LIBS glfw3 opengl32 assimp freetype irrKlang)
|
||||||
|
|||||||
@@ -231,7 +231,6 @@ int main()
|
|||||||
simpleDepthShader.use();
|
simpleDepthShader.use();
|
||||||
|
|
||||||
glBindFramebuffer(GL_FRAMEBUFFER, lightFBO);
|
glBindFramebuffer(GL_FRAMEBUFFER, lightFBO);
|
||||||
glFramebufferTexture(GL_FRAMEBUFFER, GL_TEXTURE_2D_ARRAY, lightDepthMaps, 0);
|
|
||||||
glViewport(0, 0, depthMapResolution, depthMapResolution);
|
glViewport(0, 0, depthMapResolution, depthMapResolution);
|
||||||
glClear(GL_DEPTH_BUFFER_BIT);
|
glClear(GL_DEPTH_BUFFER_BIT);
|
||||||
glCullFace(GL_FRONT); // peter panning
|
glCullFace(GL_FRONT); // peter panning
|
||||||
|
|||||||
Reference in New Issue
Block a user