lenn/LearnOpenGL
1
0
Fork 0
mirror of https://github.com/JoeyDeVries/LearnOpenGL.git synced 2026-01-02 04:37:54 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #85 from dotlive/master

Browse Source 
bug fixed & make run on macOS.
This commit is contained in:
Joey de Vries
2017-10-19 09:08:24 +02:00
committed by GitHub
parent 3a04c6f9f4 8fef6cdd3e
commit 65b30bd3ed
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@@ -202,7 +202,7 @@ foreach(CHAPTER ${CHAPTERS})
# configure_file(${SHADER} "test")
add_custom_command(TARGET ${NAME} PRE_BUILD COMMAND ${CMAKE_COMMAND} -E copy ${SHADER} $<TARGET_FILE_DIR:${NAME}>)
elseif(UNIX)
file(COPY ${SHADER} DESTINATION ${CMAKE_CURRENT_BINARY_DIR}/bin/${CHAPTER})
file(COPY ${SHADER} DESTINATION ${CMAKE_CURRENT_BINARY_DIR}/bin/${CHAPTER}/${CMAKE_BUILD_TYPE})
endif(WIN32)
endforeach(SHADER)

6
src/1.getting_started/6.3.coordinate_systems_multiple/6.3.coordinate_systems.fs
View File

@@ -3,10 +3,10 @@ out vec4 FragColor;
in vec2 TexCoord;
uniform sampler2D ourTexture1;
uniform sampler2D ourTexture2;
uniform sampler2D texture1;
uniform sampler2D texture2;
void main()
{
FragColor = mix(texture(ourTexture1, TexCoord), texture(ourTexture2, TexCoord), 0.2);
FragColor = mix(texture(texture1, TexCoord), texture(texture2, TexCoord), 0.2);
}