Ajout d'un canal texture dans le vertexArray
This commit is contained in:
@ -1,10 +1,12 @@
|
||||
#version 330 core
|
||||
|
||||
out vec4 FragColor;
|
||||
|
||||
in vec3 Color;
|
||||
in vec3 ourColor;
|
||||
in vec2 TexCoord;
|
||||
|
||||
uniform sampler2D ourTexture;
|
||||
|
||||
void main()
|
||||
{
|
||||
FragColor = vec4(Color, 1.0);
|
||||
FragColor = texture(ourTexture, TexCoord) * vec4(ourColor, 1.0f);
|
||||
}
|
@ -1,12 +1,14 @@
|
||||
#version 330 core
|
||||
|
||||
layout (location = 0) in vec3 aPos; // la variable aPos a l'attribut de position 0
|
||||
layout (location = 0) in vec3 aPos;
|
||||
layout (location = 1) in vec3 aColor;
|
||||
layout (location = 2) in vec2 aTexCoord;
|
||||
|
||||
out vec3 Color;
|
||||
out vec3 ourColor;
|
||||
out vec2 TexCoord;
|
||||
|
||||
void main()
|
||||
{
|
||||
gl_Position = vec4(aPos, 1.0);
|
||||
Color = aColor;
|
||||
ourColor = aColor;
|
||||
TexCoord = aTexCoord;
|
||||
}
|
Reference in New Issue
Block a user