texture loading

This commit is contained in:
Ben
2019-01-13 21:50:28 +00:00
parent 9696044c32
commit c9f3951afb
5 changed files with 72 additions and 12 deletions

View File

@@ -0,0 +1,13 @@
#version 130
in vec3 Colour;
in vec2 TexCoord;
out vec4 outColour;
uniform vec3 triangleColour;
uniform sampler2D tex;
void main() {
outColour = texture(tex, TexCoord);// * vec4(Colour, 1.0);
}

View File

@@ -0,0 +1,15 @@
#version 130
in vec2 position;
in vec2 texcoord;
in vec3 colour;
out vec3 Colour;
out vec2 TexCoord;
void main() {
Colour = colour;
TexCoord = texcoord;
gl_Position = vec4(position, 0.0, 1.0);
// Equivilent to vec4(position.x, position.y, 0.0, 1.0)
}

Binary file not shown.

After

Width:  |  Height:  |  Size: 9.1 KiB