progress

build/shaders/shader.fs

@@ -5,10 +5,9 @@ out vec4 FragColor;
 in vec3 ourColor;
 in vec2 TexCoord;
 
-uniform sampler2D texture1;
-uniform sampler2D texture2;
+uniform sampler2D tex;
 
 void main()
 {
-	FragColor = texture(texture2, TexCoord);
+	FragColor = texture(tex, TexCoord);
 }