This commit is contained in:
Ben
2019-02-17 02:06:47 +00:00
parent 06019cc13e
commit d39f5a4884
14 changed files with 262 additions and 58 deletions

View File

@@ -1 +1,13 @@
#version 330
// in vec3 Colour;
// in vec2 TexCoord;
out vec4 outColour;
uniform vec3 triangleColour;
uniform sampler2D tex;
void main() {
outColour = vec4(0.23, 0.58, 0.12, 1.0);
}

View File

@@ -1 +1,18 @@
#version 330
in vec3 position;
// in vec2 texcoord;
// in vec3 colour;
// out vec3 Colour;
// out vec2 TexCoord;
uniform mat4 model;
uniform mat4 view;
uniform mat4 proj;
void main() {
// Colour = colour;
// TexCoord = texcoord;
gl_Position = proj * view * model * vec4(position, 1.0);
}