ObjectGlTex & ObjectGlTexColor now working :o)
This commit is contained in:
@ -2,12 +2,11 @@
|
||||
|
||||
out vec4 FragColor;
|
||||
|
||||
in vec2 TexCoord;
|
||||
in vec2 texCoord;
|
||||
|
||||
uniform sampler2D texture1;
|
||||
uniform sampler2D texture2;
|
||||
|
||||
void main()
|
||||
{
|
||||
FragColor = mix(texture(texture1, TexCoord), texture(texture2, vec2(TexCoord)), 0.5);
|
||||
FragColor = texture(texture1, vec2(texCoord.y, -texCoord.x));
|
||||
}
|
@ -1,9 +1,9 @@
|
||||
#version 330 core
|
||||
|
||||
layout (location = 0) in vec3 aPos;
|
||||
layout (location = 2) in vec3 aTexCoord;
|
||||
layout (location = 2) in vec2 aTexCoord;
|
||||
|
||||
out vec3 texCoord;
|
||||
out vec2 texCoord;
|
||||
|
||||
uniform mat4 transform;
|
||||
|
||||
|
Reference in New Issue
Block a user