From b9360cee577a22962b867a56ba340d375be10002 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nicol=C3=A1s=20A=2E=20Ortega=20Froysa?=
 <nortega@themusicinnoise.net>
Date: Mon, 17 Dec 2018 17:47:13 +0100
Subject: [PATCH] Fixed the shader

Stupid matrices.
---
 assets/shaders/vertex_shader.glsl | 2 +-
 src/System.cpp                    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/assets/shaders/vertex_shader.glsl b/assets/shaders/vertex_shader.glsl
index 28f6cf3..08ba630 100644
--- a/assets/shaders/vertex_shader.glsl
+++ b/assets/shaders/vertex_shader.glsl
@@ -13,7 +13,7 @@ out vec3 frag_col;
 out vec3 normal;
 
 void main() {
-	gl_Position = model * view * proj * vec4(vert_pos, 1);
+	gl_Position = proj * view * model * vec4(vert_pos, 1);
 	frag_pos = vec3(model * vec4(vert_pos, 1.0));
 	frag_col = col * light_col;
 	normal = mat3(transpose(inverse(model))) * vert_norm;
diff --git a/src/System.cpp b/src/System.cpp
index 4aa63a4..360a08e 100644
--- a/src/System.cpp
+++ b/src/System.cpp
@@ -88,7 +88,7 @@ System::~System() {
 
 void System::run() {
 	unsigned int lastTime = SDL_GetTicks();
-	cam.setPosition(glm::vec3(4,4,4));
+	cam.setPosition(glm::vec3(8,8,8));
 	while(running)
 	{
 		syncInputs();