not sure if i added anything

This commit is contained in:
2026-02-26 21:40:59 -05:00
parent 328f839da8
commit 8f416364c3
131 changed files with 21 additions and 50 deletions

View File

@@ -4,11 +4,10 @@ out vec4 Colour;
in vec3 ourColor;
in vec2 TexCoord;
uniform sampler2D texture1;
uniform sampler2D texture2;
uniform sampler2D textureimg;
void main()
{
// Colour = texture(texture1, TexCoord) * vec4(ourColor, 1.0f);
Colour = mix(texture(texture1, TexCoord), texture(texture2, TexCoord), .5);
Colour = texture(textureimg, TexCoord) ;
// Colour = mix(texture(texture1, TexCoord), texture(texture2, TexCoord), 1.0f);
}