Renamed lighting shader to default, shoehorned in glsl 3.30 support for Intel on Linux, removed duplicate handleGlError methods, added OpenGL and GLU to Object namespace, removed redundant includes for OpenGL and GLU, VBO and VAO now render (all be it incorrectly)

This commit is contained in:
2019-08-11 14:53:15 -05:00
parent 73478b7e37
commit f11b091fe0
17 changed files with 142 additions and 89 deletions

View File

@@ -0,0 +1,10 @@
# version 330
in vec3 outColor;
in vec4 outNormal;
in vec3 outUV;
in float outTextureID;
void main() {
gl_FragColor = vec4(outColor, 1.0);
}

View File

@@ -1,7 +0,0 @@
# version 150
out vec4 frag_colour;
void main() {
frag_colour = vec4(0.5, 0.0, 0.5, 1.0);
}