daily update on 20240506 by nitload youmu

This commit is contained in:
YoumuLiu
2024-05-07 05:12:28 +08:00
parent 66efce19fc
commit fc19ab3298
83 changed files with 1161 additions and 741 deletions
+2 -2
View File
@@ -1,10 +1,10 @@
#version 330 core
in vec4 TexColor;
in vec2 TexCoord;
out vec4 FragColor;
uniform vec4 color;
uniform sampler2D ourTexture;
uniform sampler2D ourTexture2;
@@ -12,6 +12,6 @@ void main()
{
vec4 tex1 = texture(ourTexture, TexCoord);
vec4 tex2 = texture(ourTexture2,TexCoord);
FragColor = mix(tex1 * vec4( TexColor.xyz, 1.0), tex2, 0.2) /* *vec4( TexColor,1.0) /**/;
FragColor = mix(tex1 * vec4( color.xyz, 1.0), tex2, 0.2) /* *vec4( TexColor,1.0) /**/;
}