Merge pull request #16 from omnisci3nce/port-opengl-ral

Bring back OpenGL (part 1)

1 files changed, 9 insertions, 5 deletions

diff --git a/assets/shaders/cube.vert b/assets/shaders/cube.vert
index dc625ec..e7d6a79 100644
--- a/assets/shaders/cube.vert
+++ b/assets/shaders/cube.vert
@@ -1,11 +1,13 @@
-#version 450
+#version 430
 
-layout(binding = 0) uniform UniformBufferObject {
+layout( binding = 0) uniform Matrices {
   mat4 model;
   mat4 view;
   mat4 proj;
-}
-ubo;
+} ubo;
+uniform mat4 model;
+uniform mat4 view;
+uniform mat4 projection;
 
 layout(location = 0) in vec3 inPosition;
 layout(location = 1) in vec3 inNormal;
@@ -15,7 +17,9 @@ layout(location = 0) out vec3 fragColor;
 layout(location = 1) out vec2 fragTexCoord;
 
 void main() {
-  gl_Position = ubo.proj * ubo.view * ubo.model * vec4(inPosition, 1.0);
+  // gl_Position = ubo.proj * ubo.view * ubo.model * vec4(inPosition, 1.0);
+  gl_Position = projection * view * model * vec4(inPosition, 1.0);
+  // gl_Position = vec4(inPosition, 1.0);
   fragColor = abs(inNormal);
   fragTexCoord = inTexCoords;
 }