Add support for textures

This commit is contained in:
2021-01-30 17:41:59 +01:00
parent c4fb7ff1d8
commit fab70ddc86
18 changed files with 226 additions and 21 deletions

View File

@@ -1,10 +1,21 @@
#version 330
uniform vec4 objectColor;
uniform int hasTexture;
uniform sampler2D sampler;
in vec2 fragmentTexCoord;
out vec4 fragColor;
void main()
{
fragColor = objectColor;
if(hasTexture == 1)
{
fragColor = objectColor * texture(sampler, fragmentTexCoord);
}
else
{
fragColor = objectColor;
}
}

View File

@@ -4,9 +4,13 @@ uniform mat4 modelMatrix;
uniform mat4 viewMatrix;
uniform mat4 projectionMatrix;
layout(location=0) in vec3 position;
layout(location=0) in vec2 position;
layout(location=1) in vec2 texCoord;
out vec2 fragmentTexCoord;
void main()
{
gl_Position = projectionMatrix * viewMatrix * modelMatrix * vec4(position, 1.0);
gl_Position = projectionMatrix * viewMatrix * modelMatrix * vec4(position, 0.0, 1.0);
fragmentTexCoord = texCoord;
}