lenn/LearnOpenGL
1
0
Fork 0
mirror of https://github.com/JoeyDeVries/LearnOpenGL.git synced 2026-01-12 03:23:22 +08:00
Code Issues Packages Projects Releases Wiki Activity

Updated code changes to reflect content updates.

Browse Source
This commit is contained in:
Joey de Vries
2017-05-29 21:04:33 +02:00
parent 5846428705
commit 28eb2bbf62
25 changed files with 90 additions and 92 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/1.getting_started/5.1.transformations/5.1.transform.fs
View File

@@ -1,8 +1,7 @@
#version 330 core
out vec4 fragColor;
out vec4 FragColor;
in vec3 ourColor;
in vec2 texCoord;
in vec2 TexCoord;
// texture samplers
uniform sampler2D texture1;
@@ -11,5 +10,5 @@ uniform sampler2D texture2;
void main()
{
// linearly interpolate between both textures (80% container, 20% awesomeface)
fragColor = mix(texture(texture1, texCoord), texture(texture2, texCoord), 0.2);
FragColor = mix(texture(texture1, TexCoord), texture(texture2, TexCoord), 0.2);
}