7 files changed, 72 insertions, 35 deletions

diff --git a/cwd/assets/altcraft/shaders/vert/entity.vs b/cwd/assets/altcraft/shaders/vert/entity.vs
index e38c54c..b2f1db6 100644
--- a/cwd/assets/altcraft/shaders/vert/entity.vs
+++ b/cwd/assets/altcraft/shaders/vert/entity.vs
@@ -1,10 +1,16 @@
 #version 330 core
 
-in vec3 position;
+in vec3 pos;
 
-uniform mat4 projView;
 uniform mat4 model;
 
+layout (std140) uniform Globals {
+    mat4 projView;
+    uvec2 viewportSize;
+    float globalTime;
+    float dayTime;
+};
+
 void main() {
-    gl_Position = projView * model * vec4(position, 1);
+    gl_Position = projView * model * vec4(pos, 1);
 }
diff --git a/cwd/assets/altcraft/shaders/vert/face.vs b/cwd/assets/altcraft/shaders/vert/face.vs
index d73e164..5fb9357 100644
--- a/cwd/assets/altcraft/shaders/vert/face.vs
+++ b/cwd/assets/altcraft/shaders/vert/face.vs
@@ -1,6 +1,6 @@
 #version 330 core
 
-in vec3 position[4];
+in vec3 pos[4];
 in vec3 normal;
 in vec2 uv[4];
 in float uvLayer;
@@ -8,22 +8,23 @@ in float animation;
 in vec3 color;
 in vec2 light;
 
-out vec3 faceTexture;
+out vec3 faceTextureUv;
 out vec3 faceNormal;
 out vec3 faceAddColor;
 out vec2 faceLight;
 
-uniform float GlobalTime;
-
 layout (std140) uniform Globals {
     mat4 projView;
+    uvec2 viewportSize;
+    float globalTime;
+    float dayTime;
 };
 
 void main() {
-    gl_Position = projView * vec4(position[gl_VertexID], 1.0f);
+    gl_Position = projView * vec4(pos[gl_VertexID], 1.0f);
 
-    faceTexture = vec3(uv[gl_VertexID], uvLayer);
-    faceTexture.y -= (uv[2].y - uv[0].y) * trunc(mod(GlobalTime * 4.0f, animation));
+    faceTextureUv = vec3(uv[gl_VertexID], uvLayer);
+    faceTextureUv.y -= (uv[2].y - uv[0].y) * trunc(mod(globalTime * 4.0f, animation));
 
     faceNormal = normal;
     faceAddColor = color;
diff --git a/cwd/assets/altcraft/shaders/vert/fbo.vs b/cwd/assets/altcraft/shaders/vert/fbo.vs
index e1e8966..e490da5 100644
--- a/cwd/assets/altcraft/shaders/vert/fbo.vs
+++ b/cwd/assets/altcraft/shaders/vert/fbo.vs
@@ -1,11 +1,18 @@
 #version 330 core
-layout (location = 0) in vec2 Pos;
-layout (location = 1) in vec2 TextureCoords;
 
-out vec2 TexCoords;
+in vec2 pos;
+in vec2 uvPos;
 
-void main()
-{
-    gl_Position = vec4(Pos.x, Pos.y, 0.0, 1.0); 
-    TexCoords = TextureCoords;
-}  
\ No newline at end of file
+out vec2 uv;
+
+layout (std140) uniform Globals {
+    mat4 projView;
+    uvec2 viewportSize;
+    float globalTime;
+    float dayTime;
+};
+
+void main() {
+    gl_Position = vec4(pos.x, pos.y, 0.0, 1.0); 
+    uv = uvPos;
+}
diff --git a/cwd/assets/altcraft/shaders/vert/light.vs b/cwd/assets/altcraft/shaders/vert/light.vs
index f837ebe..0033107 100644
--- a/cwd/assets/altcraft/shaders/vert/light.vs
+++ b/cwd/assets/altcraft/shaders/vert/light.vs
@@ -5,6 +5,13 @@ in vec2 uvPos;
 
 out vec2 uv;
 
+layout (std140) uniform Globals {
+    mat4 projView;
+    uvec2 viewportSize;
+    float globalTime;
+    float dayTime;
+};
+
 void main() {
     gl_Position = vec4(pos.x, pos.y, 0.0, 1.0);
     uv = uvPos;
diff --git a/cwd/assets/altcraft/shaders/vert/pp.vs b/cwd/assets/altcraft/shaders/vert/pp.vs
index f837ebe..0033107 100644
--- a/cwd/assets/altcraft/shaders/vert/pp.vs
+++ b/cwd/assets/altcraft/shaders/vert/pp.vs
@@ -5,6 +5,13 @@ in vec2 uvPos;
 
 out vec2 uv;
 
+layout (std140) uniform Globals {
+    mat4 projView;
+    uvec2 viewportSize;
+    float globalTime;
+    float dayTime;
+};
+
 void main() {
     gl_Position = vec4(pos.x, pos.y, 0.0, 1.0);
     uv = uvPos;
diff --git a/cwd/assets/altcraft/shaders/vert/rml.vs b/cwd/assets/altcraft/shaders/vert/rml.vs
index bdd3b71..d82308e 100644
--- a/cwd/assets/altcraft/shaders/vert/rml.vs
+++ b/cwd/assets/altcraft/shaders/vert/rml.vs
@@ -1,22 +1,25 @@
 #version 330 core
 
-uniform uvec2 viewportSize;
-uniform vec2 translation;
-uniform mat4 rotationMat;
+in vec2 pos;
+in uvec4 col;
+in vec2 uvPos;
+
+out vec4 color;
+out vec2 uv;
 
-layout (location = 0) in vec2 pos;
-layout (location = 1) in uvec4 color;
-layout (location = 2) in vec2 tex_coord;
+uniform vec2 translation;
 
-out VS_OUT {
-    vec4 color;
-    vec2 tex_coord;
-} vs_out;
+layout (std140) uniform Globals {
+    mat4 projView;
+    uvec2 viewportSize;
+    float globalTime;
+    float dayTime;
+};
 
 void main() {
     float x = ((pos.x + translation.x) / viewportSize.x) * 2.0f - 1.0f;
     float y = ((pos.y + translation.y) / viewportSize.y) * 2.0f - 1.0f;
     gl_Position = vec4(x, -y, -1.0f, 1.0f);
-    vs_out.color = vec4(float(color.x) / 255.0f, float(color.y) / 255.0f, float(color.z) / 255.0f, float(color.w) / 255.0f);
-    vs_out.tex_coord = tex_coord;
+    color = vec4(float(col.x) / 255.0f, float(col.y) / 255.0f, float(col.z) / 255.0f, float(col.w) / 255.0f);
+    uv = uvPos;
 }
diff --git a/cwd/assets/altcraft/shaders/vert/sky.vs b/cwd/assets/altcraft/shaders/vert/sky.vs
index 0ab261c..e580843 100644
--- a/cwd/assets/altcraft/shaders/vert/sky.vs
+++ b/cwd/assets/altcraft/shaders/vert/sky.vs
@@ -1,13 +1,19 @@
 #version 330 core
 
-in vec3 position;
+in vec3 pos;
 
-out vec3 pos;
+out vec3 facePos;
 
-uniform mat4 projView;
 uniform mat4 model;
 
+layout (std140) uniform Globals {
+    mat4 projView;
+    uvec2 viewportSize;
+    float globalTime;
+    float dayTime;
+};
+
 void main() {
-    pos = position;
-    gl_Position = projView * model * vec4(position, 1);
+    facePos = pos;
+    gl_Position = projView * model * vec4(pos, 1);
 }