The dragon renders yay

This commit is contained in:
Benjamin Kyd
2019-02-17 16:34:56 +00:00
parent d39f5a4884
commit a3207edee8
41 changed files with 134 additions and 3119 deletions

View File

@@ -1,13 +1,7 @@
#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);
outColour = vec4(0.58, 0.61, 0.627, 1.0);
}

View File

@@ -1,18 +1,11 @@
#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);
}