From aafc423a7298b0fc595c0209480474dc50c277f0 Mon Sep 17 00:00:00 2001
From: LaG1924 <lag1924@gmail.com>
Date: Sun, 21 Nov 2021 13:56:28 +0500
Subject: Added Gbuffer

---
 cwd/assets/altcraft/shaders/vert/light.vs | 11 +++++++++++
 1 file changed, 11 insertions(+)
 create mode 100644 cwd/assets/altcraft/shaders/vert/light.vs

(limited to 'cwd/assets/altcraft/shaders/vert')

diff --git a/cwd/assets/altcraft/shaders/vert/light.vs b/cwd/assets/altcraft/shaders/vert/light.vs
new file mode 100644
index 0000000..f837ebe
--- /dev/null
+++ b/cwd/assets/altcraft/shaders/vert/light.vs
@@ -0,0 +1,11 @@
+#version 330 core
+
+in vec2 pos;
+in vec2 uvPos;
+
+out vec2 uv;
+
+void main() {
+    gl_Position = vec4(pos.x, pos.y, 0.0, 1.0);
+    uv = uvPos;
+}
-- 
cgit v1.2.3


From f16c897522b6418c399b5699f8378a25c2e5de4f Mon Sep 17 00:00:00 2001
From: LaG1924 <lag1924@gmail.com>
Date: Sun, 21 Nov 2021 14:57:57 +0500
Subject: Added normals to faces

---
 cwd/assets/altcraft/shaders/vert/face.vs | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

(limited to 'cwd/assets/altcraft/shaders/vert')

diff --git a/cwd/assets/altcraft/shaders/vert/face.vs b/cwd/assets/altcraft/shaders/vert/face.vs
index 93e623d..21f7110 100644
--- a/cwd/assets/altcraft/shaders/vert/face.vs
+++ b/cwd/assets/altcraft/shaders/vert/face.vs
@@ -1,15 +1,17 @@
 #version 330 core
 
-layout (location = 0) in vec3 position[4];
-layout (location = 4) in vec2 uv[4];
-layout (location = 8) in float uvLayer;
-layout (location = 9) in float animation;
-layout (location = 10) in vec3 color;
-layout (location = 11) in vec2 light;
+in vec3 position[4];
+in vec3 normal;
+in vec2 uv[4];
+in float uvLayer;
+in float animation;
+in vec3 color;
+in vec2 light;
 
 out VS_OUT {
     vec3 Texture;
     vec3 Color;
+    vec3 faceNormal;
 } vs_out;
 
 uniform float GlobalTime;
@@ -24,4 +26,5 @@ void main() {
 
     float faceLight = clamp(light.x / 15.0 + (light.y / 15.0) * DayTime, MinLightLevel, 1.0);
     vs_out.Color = mix(color.rgb * faceLight, vec3(1,1,1) * faceLight, float(color == vec3(0,0,0)));
+    vs_out.faceNormal = normal;
 }
-- 
cgit v1.2.3


From 0ca11f9bee1cd918acf6ce8247a495442009fec9 Mon Sep 17 00:00:00 2001
From: LaG1924 <lag1924@gmail.com>
Date: Sun, 21 Nov 2021 17:49:23 +0500
Subject: Moved face lighting to lighting pass

---
 cwd/assets/altcraft/shaders/vert/face.vs | 24 +++++++++++-------------
 1 file changed, 11 insertions(+), 13 deletions(-)

(limited to 'cwd/assets/altcraft/shaders/vert')

diff --git a/cwd/assets/altcraft/shaders/vert/face.vs b/cwd/assets/altcraft/shaders/vert/face.vs
index 21f7110..ac92831 100644
--- a/cwd/assets/altcraft/shaders/vert/face.vs
+++ b/cwd/assets/altcraft/shaders/vert/face.vs
@@ -8,23 +8,21 @@ in float animation;
 in vec3 color;
 in vec2 light;
 
-out VS_OUT {
-    vec3 Texture;
-    vec3 Color;
-    vec3 faceNormal;
-} vs_out;
+out vec3 faceTexture;
+out vec3 faceNormal;
+out vec3 faceAddColor;
+out vec2 faceLight;
 
-uniform float GlobalTime;
 uniform mat4 projView;
-uniform float DayTime;
-uniform float MinLightLevel;
+uniform float GlobalTime;
 
 void main() {
     gl_Position = projView * vec4(position[gl_VertexID], 1.0f);
-    vs_out.Texture = vec3(uv[gl_VertexID], uvLayer);
-    vs_out.Texture.y -= (uv[2].y - uv[0].y) * trunc(mod(GlobalTime * 4.0f, animation));
 
-    float faceLight = clamp(light.x / 15.0 + (light.y / 15.0) * DayTime, MinLightLevel, 1.0);
-    vs_out.Color = mix(color.rgb * faceLight, vec3(1,1,1) * faceLight, float(color == vec3(0,0,0)));
-    vs_out.faceNormal = normal;
+    faceTexture = vec3(uv[gl_VertexID], uvLayer);
+    faceTexture.y -= (uv[2].y - uv[0].y) * trunc(mod(GlobalTime * 4.0f, animation));
+
+    faceNormal = normal;
+    faceAddColor = color;
+    faceLight = light;
 }
-- 
cgit v1.2.3


From 0148fe0915c2c6f0357609c9b3e1c99d713fcd2b Mon Sep 17 00:00:00 2001
From: LaG1924 <lag1924@gmail.com>
Date: Sun, 21 Nov 2021 21:26:31 +0500
Subject: Added PostProcess class

---
 cwd/assets/altcraft/shaders/vert/pp.vs | 11 +++++++++++
 1 file changed, 11 insertions(+)
 create mode 100644 cwd/assets/altcraft/shaders/vert/pp.vs

(limited to 'cwd/assets/altcraft/shaders/vert')

diff --git a/cwd/assets/altcraft/shaders/vert/pp.vs b/cwd/assets/altcraft/shaders/vert/pp.vs
new file mode 100644
index 0000000..f837ebe
--- /dev/null
+++ b/cwd/assets/altcraft/shaders/vert/pp.vs
@@ -0,0 +1,11 @@
+#version 330 core
+
+in vec2 pos;
+in vec2 uvPos;
+
+out vec2 uv;
+
+void main() {
+    gl_Position = vec4(pos.x, pos.y, 0.0, 1.0);
+    uv = uvPos;
+}
-- 
cgit v1.2.3


From 7f3ed11618df0cce5c3d799e0b3f4c009714f2c3 Mon Sep 17 00:00:00 2001
From: LaG1924 <lag1924@gmail.com>
Date: Sat, 27 Nov 2021 19:03:36 +0500
Subject: Added ShaderParametersBuffer to GalOgl

---
 cwd/assets/altcraft/shaders/vert/face.vs | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'cwd/assets/altcraft/shaders/vert')

diff --git a/cwd/assets/altcraft/shaders/vert/face.vs b/cwd/assets/altcraft/shaders/vert/face.vs
index ac92831..d73e164 100644
--- a/cwd/assets/altcraft/shaders/vert/face.vs
+++ b/cwd/assets/altcraft/shaders/vert/face.vs
@@ -13,9 +13,12 @@ out vec3 faceNormal;
 out vec3 faceAddColor;
 out vec2 faceLight;
 
-uniform mat4 projView;
 uniform float GlobalTime;
 
+layout (std140) uniform Globals {
+    mat4 projView;
+};
+
 void main() {
     gl_Position = projView * vec4(position[gl_VertexID], 1.0f);
 
-- 
cgit v1.2.3


From c905ede556c892d39fd69d3945026ba244567ce9 Mon Sep 17 00:00:00 2001
From: LaG1924 <lag1924@gmail.com>
Date: Sat, 27 Nov 2021 21:08:58 +0500
Subject: Changed shaders to use SPB

---
 cwd/assets/altcraft/shaders/vert/entity.vs | 12 +++++++++---
 cwd/assets/altcraft/shaders/vert/face.vs   | 15 ++++++++-------
 cwd/assets/altcraft/shaders/vert/fbo.vs    | 23 +++++++++++++++--------
 cwd/assets/altcraft/shaders/vert/light.vs  |  7 +++++++
 cwd/assets/altcraft/shaders/vert/pp.vs     |  7 +++++++
 cwd/assets/altcraft/shaders/vert/rml.vs    | 27 +++++++++++++++------------
 cwd/assets/altcraft/shaders/vert/sky.vs    | 16 +++++++++++-----
 7 files changed, 72 insertions(+), 35 deletions(-)

(limited to 'cwd/assets/altcraft/shaders/vert')

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);
 }
-- 
cgit v1.2.3


From 8286ddda96a5f2925d342d0ce115aa00ae5d94ec Mon Sep 17 00:00:00 2001
From: LaG1924 <lag1924@gmail.com>
Date: Sun, 28 Nov 2021 16:16:29 +0500
Subject: Added gamma correction

---
 cwd/assets/altcraft/shaders/vert/entity.vs | 1 +
 cwd/assets/altcraft/shaders/vert/face.vs   | 1 +
 cwd/assets/altcraft/shaders/vert/fbo.vs    | 1 +
 cwd/assets/altcraft/shaders/vert/light.vs  | 1 +
 cwd/assets/altcraft/shaders/vert/pp.vs     | 1 +
 cwd/assets/altcraft/shaders/vert/rml.vs    | 1 +
 cwd/assets/altcraft/shaders/vert/sky.vs    | 1 +
 7 files changed, 7 insertions(+)

(limited to 'cwd/assets/altcraft/shaders/vert')

diff --git a/cwd/assets/altcraft/shaders/vert/entity.vs b/cwd/assets/altcraft/shaders/vert/entity.vs
index b2f1db6..4acaa93 100644
--- a/cwd/assets/altcraft/shaders/vert/entity.vs
+++ b/cwd/assets/altcraft/shaders/vert/entity.vs
@@ -9,6 +9,7 @@ layout (std140) uniform Globals {
     uvec2 viewportSize;
     float globalTime;
     float dayTime;
+    float gamma;
 };
 
 void main() {
diff --git a/cwd/assets/altcraft/shaders/vert/face.vs b/cwd/assets/altcraft/shaders/vert/face.vs
index 5fb9357..70c24c8 100644
--- a/cwd/assets/altcraft/shaders/vert/face.vs
+++ b/cwd/assets/altcraft/shaders/vert/face.vs
@@ -18,6 +18,7 @@ layout (std140) uniform Globals {
     uvec2 viewportSize;
     float globalTime;
     float dayTime;
+    float gamma;
 };
 
 void main() {
diff --git a/cwd/assets/altcraft/shaders/vert/fbo.vs b/cwd/assets/altcraft/shaders/vert/fbo.vs
index e490da5..cfde14e 100644
--- a/cwd/assets/altcraft/shaders/vert/fbo.vs
+++ b/cwd/assets/altcraft/shaders/vert/fbo.vs
@@ -10,6 +10,7 @@ layout (std140) uniform Globals {
     uvec2 viewportSize;
     float globalTime;
     float dayTime;
+    float gamma;
 };
 
 void main() {
diff --git a/cwd/assets/altcraft/shaders/vert/light.vs b/cwd/assets/altcraft/shaders/vert/light.vs
index 0033107..4e551f8 100644
--- a/cwd/assets/altcraft/shaders/vert/light.vs
+++ b/cwd/assets/altcraft/shaders/vert/light.vs
@@ -10,6 +10,7 @@ layout (std140) uniform Globals {
     uvec2 viewportSize;
     float globalTime;
     float dayTime;
+    float gamma;
 };
 
 void main() {
diff --git a/cwd/assets/altcraft/shaders/vert/pp.vs b/cwd/assets/altcraft/shaders/vert/pp.vs
index 0033107..4e551f8 100644
--- a/cwd/assets/altcraft/shaders/vert/pp.vs
+++ b/cwd/assets/altcraft/shaders/vert/pp.vs
@@ -10,6 +10,7 @@ layout (std140) uniform Globals {
     uvec2 viewportSize;
     float globalTime;
     float dayTime;
+    float gamma;
 };
 
 void main() {
diff --git a/cwd/assets/altcraft/shaders/vert/rml.vs b/cwd/assets/altcraft/shaders/vert/rml.vs
index d82308e..ea78825 100644
--- a/cwd/assets/altcraft/shaders/vert/rml.vs
+++ b/cwd/assets/altcraft/shaders/vert/rml.vs
@@ -14,6 +14,7 @@ layout (std140) uniform Globals {
     uvec2 viewportSize;
     float globalTime;
     float dayTime;
+    float gamma;
 };
 
 void main() {
diff --git a/cwd/assets/altcraft/shaders/vert/sky.vs b/cwd/assets/altcraft/shaders/vert/sky.vs
index e580843..617caed 100644
--- a/cwd/assets/altcraft/shaders/vert/sky.vs
+++ b/cwd/assets/altcraft/shaders/vert/sky.vs
@@ -11,6 +11,7 @@ layout (std140) uniform Globals {
     uvec2 viewportSize;
     float globalTime;
     float dayTime;
+    float gamma;
 };
 
 void main() {
-- 
cgit v1.2.3


From 3f122e57f118db1229a4bad2c54be624f2f8f19c Mon Sep 17 00:00:00 2001
From: LaG1924 <lag1924@gmail.com>
Date: Sun, 5 Dec 2021 00:51:39 +0500
Subject: Added SSAO

---
 cwd/assets/altcraft/shaders/vert/entity.vs | 6 ++++++
 cwd/assets/altcraft/shaders/vert/face.vs   | 6 ++++++
 cwd/assets/altcraft/shaders/vert/fbo.vs    | 3 +++
 cwd/assets/altcraft/shaders/vert/light.vs  | 3 +++
 cwd/assets/altcraft/shaders/vert/pp.vs     | 3 +++
 cwd/assets/altcraft/shaders/vert/rml.vs    | 3 +++
 cwd/assets/altcraft/shaders/vert/sky.vs    | 3 +++
 7 files changed, 27 insertions(+)

(limited to 'cwd/assets/altcraft/shaders/vert')

diff --git a/cwd/assets/altcraft/shaders/vert/entity.vs b/cwd/assets/altcraft/shaders/vert/entity.vs
index 4acaa93..f90fbc1 100644
--- a/cwd/assets/altcraft/shaders/vert/entity.vs
+++ b/cwd/assets/altcraft/shaders/vert/entity.vs
@@ -2,11 +2,16 @@
 
 in vec3 pos;
 
+out vec4 entityWorldPos;
+
 uniform mat4 model;
 
 layout (std140) uniform Globals {
     mat4 projView;
+    mat4 proj;
+    mat4 view;
     uvec2 viewportSize;
+    vec4 ssaoKernels[64];
     float globalTime;
     float dayTime;
     float gamma;
@@ -14,4 +19,5 @@ layout (std140) uniform Globals {
 
 void main() {
     gl_Position = projView * model * vec4(pos, 1);
+    entityWorldPos = view * model * vec4(pos, 1.0f);
 }
diff --git a/cwd/assets/altcraft/shaders/vert/face.vs b/cwd/assets/altcraft/shaders/vert/face.vs
index 70c24c8..e50e503 100644
--- a/cwd/assets/altcraft/shaders/vert/face.vs
+++ b/cwd/assets/altcraft/shaders/vert/face.vs
@@ -8,6 +8,7 @@ in float animation;
 in vec3 color;
 in vec2 light;
 
+out vec4 faceWorldPos;
 out vec3 faceTextureUv;
 out vec3 faceNormal;
 out vec3 faceAddColor;
@@ -15,7 +16,10 @@ out vec2 faceLight;
 
 layout (std140) uniform Globals {
     mat4 projView;
+    mat4 proj;
+    mat4 view;
     uvec2 viewportSize;
+    vec4 ssaoKernels[64];
     float globalTime;
     float dayTime;
     float gamma;
@@ -24,6 +28,8 @@ layout (std140) uniform Globals {
 void main() {
     gl_Position = projView * vec4(pos[gl_VertexID], 1.0f);
 
+    faceWorldPos = view * vec4(pos[gl_VertexID], 1.0f);
+
     faceTextureUv = vec3(uv[gl_VertexID], uvLayer);
     faceTextureUv.y -= (uv[2].y - uv[0].y) * trunc(mod(globalTime * 4.0f, animation));
 
diff --git a/cwd/assets/altcraft/shaders/vert/fbo.vs b/cwd/assets/altcraft/shaders/vert/fbo.vs
index cfde14e..0e05eaf 100644
--- a/cwd/assets/altcraft/shaders/vert/fbo.vs
+++ b/cwd/assets/altcraft/shaders/vert/fbo.vs
@@ -7,7 +7,10 @@ out vec2 uv;
 
 layout (std140) uniform Globals {
     mat4 projView;
+    mat4 proj;
+    mat4 view;
     uvec2 viewportSize;
+    vec4 ssaoKernels[64];
     float globalTime;
     float dayTime;
     float gamma;
diff --git a/cwd/assets/altcraft/shaders/vert/light.vs b/cwd/assets/altcraft/shaders/vert/light.vs
index 4e551f8..118ea5b 100644
--- a/cwd/assets/altcraft/shaders/vert/light.vs
+++ b/cwd/assets/altcraft/shaders/vert/light.vs
@@ -7,7 +7,10 @@ out vec2 uv;
 
 layout (std140) uniform Globals {
     mat4 projView;
+    mat4 proj;
+    mat4 view;
     uvec2 viewportSize;
+    vec4 ssaoKernels[64];
     float globalTime;
     float dayTime;
     float gamma;
diff --git a/cwd/assets/altcraft/shaders/vert/pp.vs b/cwd/assets/altcraft/shaders/vert/pp.vs
index 4e551f8..118ea5b 100644
--- a/cwd/assets/altcraft/shaders/vert/pp.vs
+++ b/cwd/assets/altcraft/shaders/vert/pp.vs
@@ -7,7 +7,10 @@ out vec2 uv;
 
 layout (std140) uniform Globals {
     mat4 projView;
+    mat4 proj;
+    mat4 view;
     uvec2 viewportSize;
+    vec4 ssaoKernels[64];
     float globalTime;
     float dayTime;
     float gamma;
diff --git a/cwd/assets/altcraft/shaders/vert/rml.vs b/cwd/assets/altcraft/shaders/vert/rml.vs
index ea78825..c61a4a0 100644
--- a/cwd/assets/altcraft/shaders/vert/rml.vs
+++ b/cwd/assets/altcraft/shaders/vert/rml.vs
@@ -11,7 +11,10 @@ uniform vec2 translation;
 
 layout (std140) uniform Globals {
     mat4 projView;
+    mat4 proj;
+    mat4 view;
     uvec2 viewportSize;
+    vec4 ssaoKernels[64];
     float globalTime;
     float dayTime;
     float gamma;
diff --git a/cwd/assets/altcraft/shaders/vert/sky.vs b/cwd/assets/altcraft/shaders/vert/sky.vs
index 617caed..7043584 100644
--- a/cwd/assets/altcraft/shaders/vert/sky.vs
+++ b/cwd/assets/altcraft/shaders/vert/sky.vs
@@ -8,7 +8,10 @@ uniform mat4 model;
 
 layout (std140) uniform Globals {
     mat4 projView;
+    mat4 proj;
+    mat4 view;
     uvec2 viewportSize;
+    vec4 ssaoKernels[64];
     float globalTime;
     float dayTime;
     float gamma;
-- 
cgit v1.2.3


From 91afb55a58c4b27d0c746e64305dd1d9ad816d94 Mon Sep 17 00:00:00 2001
From: LaG1924 <lag1924@gmail.com>
Date: Tue, 7 Dec 2021 21:53:02 +0500
Subject: Fixed SSAO normals

---
 cwd/assets/altcraft/shaders/vert/face.vs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'cwd/assets/altcraft/shaders/vert')

diff --git a/cwd/assets/altcraft/shaders/vert/face.vs b/cwd/assets/altcraft/shaders/vert/face.vs
index e50e503..a85b2c6 100644
--- a/cwd/assets/altcraft/shaders/vert/face.vs
+++ b/cwd/assets/altcraft/shaders/vert/face.vs
@@ -33,7 +33,7 @@ void main() {
     faceTextureUv = vec3(uv[gl_VertexID], uvLayer);
     faceTextureUv.y -= (uv[2].y - uv[0].y) * trunc(mod(globalTime * 4.0f, animation));
 
-    faceNormal = normal;
+    faceNormal = (view * vec4(normal, 0.0f)).xyz;
     faceAddColor = color;
     faceLight = light;
 }
-- 
cgit v1.2.3


From a12779bc153425407b131bce541c0bb97cccca39 Mon Sep 17 00:00:00 2001
From: LaG1924 <lag1924@gmail.com>
Date: Wed, 8 Dec 2021 20:33:09 +0500
Subject: Removed unnecessary framebuffers copying

---
 cwd/assets/altcraft/shaders/vert/fbo.vs  | 22 ----------------------
 cwd/assets/altcraft/shaders/vert/pp.vs   | 22 ----------------------
 cwd/assets/altcraft/shaders/vert/quad.vs | 22 ++++++++++++++++++++++
 3 files changed, 22 insertions(+), 44 deletions(-)
 delete mode 100644 cwd/assets/altcraft/shaders/vert/fbo.vs
 delete mode 100644 cwd/assets/altcraft/shaders/vert/pp.vs
 create mode 100644 cwd/assets/altcraft/shaders/vert/quad.vs

(limited to 'cwd/assets/altcraft/shaders/vert')

diff --git a/cwd/assets/altcraft/shaders/vert/fbo.vs b/cwd/assets/altcraft/shaders/vert/fbo.vs
deleted file mode 100644
index 0e05eaf..0000000
--- a/cwd/assets/altcraft/shaders/vert/fbo.vs
+++ /dev/null
@@ -1,22 +0,0 @@
-#version 330 core
-
-in vec2 pos;
-in vec2 uvPos;
-
-out vec2 uv;
-
-layout (std140) uniform Globals {
-    mat4 projView;
-    mat4 proj;
-    mat4 view;
-    uvec2 viewportSize;
-    vec4 ssaoKernels[64];
-    float globalTime;
-    float dayTime;
-    float gamma;
-};
-
-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
deleted file mode 100644
index 118ea5b..0000000
--- a/cwd/assets/altcraft/shaders/vert/pp.vs
+++ /dev/null
@@ -1,22 +0,0 @@
-#version 330 core
-
-in vec2 pos;
-in vec2 uvPos;
-
-out vec2 uv;
-
-layout (std140) uniform Globals {
-    mat4 projView;
-    mat4 proj;
-    mat4 view;
-    uvec2 viewportSize;
-    vec4 ssaoKernels[64];
-    float globalTime;
-    float dayTime;
-    float gamma;
-};
-
-void main() {
-    gl_Position = vec4(pos.x, pos.y, 0.0, 1.0);
-    uv = uvPos;
-}
diff --git a/cwd/assets/altcraft/shaders/vert/quad.vs b/cwd/assets/altcraft/shaders/vert/quad.vs
new file mode 100644
index 0000000..118ea5b
--- /dev/null
+++ b/cwd/assets/altcraft/shaders/vert/quad.vs
@@ -0,0 +1,22 @@
+#version 330 core
+
+in vec2 pos;
+in vec2 uvPos;
+
+out vec2 uv;
+
+layout (std140) uniform Globals {
+    mat4 projView;
+    mat4 proj;
+    mat4 view;
+    uvec2 viewportSize;
+    vec4 ssaoKernels[64];
+    float globalTime;
+    float dayTime;
+    float gamma;
+};
+
+void main() {
+    gl_Position = vec4(pos.x, pos.y, 0.0, 1.0);
+    uv = uvPos;
+}
-- 
cgit v1.2.3


From be808181b2c84358b232e4a32d1a6dd9dd6659ed Mon Sep 17 00:00:00 2001
From: LaG1924 <lag1924@gmail.com>
Date: Sat, 11 Dec 2021 20:44:40 +0500
Subject: Optimized GBuffer size

---
 cwd/assets/altcraft/shaders/vert/entity.vs |  4 +---
 cwd/assets/altcraft/shaders/vert/face.vs   |  4 +---
 cwd/assets/altcraft/shaders/vert/light.vs  | 22 ----------------------
 cwd/assets/altcraft/shaders/vert/quad.vs   |  1 +
 cwd/assets/altcraft/shaders/vert/rml.vs    |  1 +
 cwd/assets/altcraft/shaders/vert/sky.vs    |  1 +
 6 files changed, 5 insertions(+), 28 deletions(-)
 delete mode 100644 cwd/assets/altcraft/shaders/vert/light.vs

(limited to 'cwd/assets/altcraft/shaders/vert')

diff --git a/cwd/assets/altcraft/shaders/vert/entity.vs b/cwd/assets/altcraft/shaders/vert/entity.vs
index f90fbc1..8cc7f69 100644
--- a/cwd/assets/altcraft/shaders/vert/entity.vs
+++ b/cwd/assets/altcraft/shaders/vert/entity.vs
@@ -2,13 +2,12 @@
 
 in vec3 pos;
 
-out vec4 entityWorldPos;
-
 uniform mat4 model;
 
 layout (std140) uniform Globals {
     mat4 projView;
     mat4 proj;
+    mat4 invProj;
     mat4 view;
     uvec2 viewportSize;
     vec4 ssaoKernels[64];
@@ -19,5 +18,4 @@ layout (std140) uniform Globals {
 
 void main() {
     gl_Position = projView * model * vec4(pos, 1);
-    entityWorldPos = view * model * vec4(pos, 1.0f);
 }
diff --git a/cwd/assets/altcraft/shaders/vert/face.vs b/cwd/assets/altcraft/shaders/vert/face.vs
index a85b2c6..3e6adf7 100644
--- a/cwd/assets/altcraft/shaders/vert/face.vs
+++ b/cwd/assets/altcraft/shaders/vert/face.vs
@@ -8,7 +8,6 @@ in float animation;
 in vec3 color;
 in vec2 light;
 
-out vec4 faceWorldPos;
 out vec3 faceTextureUv;
 out vec3 faceNormal;
 out vec3 faceAddColor;
@@ -17,6 +16,7 @@ out vec2 faceLight;
 layout (std140) uniform Globals {
     mat4 projView;
     mat4 proj;
+    mat4 invProj;
     mat4 view;
     uvec2 viewportSize;
     vec4 ssaoKernels[64];
@@ -28,8 +28,6 @@ layout (std140) uniform Globals {
 void main() {
     gl_Position = projView * vec4(pos[gl_VertexID], 1.0f);
 
-    faceWorldPos = view * vec4(pos[gl_VertexID], 1.0f);
-
     faceTextureUv = vec3(uv[gl_VertexID], uvLayer);
     faceTextureUv.y -= (uv[2].y - uv[0].y) * trunc(mod(globalTime * 4.0f, animation));
 
diff --git a/cwd/assets/altcraft/shaders/vert/light.vs b/cwd/assets/altcraft/shaders/vert/light.vs
deleted file mode 100644
index 118ea5b..0000000
--- a/cwd/assets/altcraft/shaders/vert/light.vs
+++ /dev/null
@@ -1,22 +0,0 @@
-#version 330 core
-
-in vec2 pos;
-in vec2 uvPos;
-
-out vec2 uv;
-
-layout (std140) uniform Globals {
-    mat4 projView;
-    mat4 proj;
-    mat4 view;
-    uvec2 viewportSize;
-    vec4 ssaoKernels[64];
-    float globalTime;
-    float dayTime;
-    float gamma;
-};
-
-void main() {
-    gl_Position = vec4(pos.x, pos.y, 0.0, 1.0);
-    uv = uvPos;
-}
diff --git a/cwd/assets/altcraft/shaders/vert/quad.vs b/cwd/assets/altcraft/shaders/vert/quad.vs
index 118ea5b..9add76d 100644
--- a/cwd/assets/altcraft/shaders/vert/quad.vs
+++ b/cwd/assets/altcraft/shaders/vert/quad.vs
@@ -8,6 +8,7 @@ out vec2 uv;
 layout (std140) uniform Globals {
     mat4 projView;
     mat4 proj;
+    mat4 invProj;
     mat4 view;
     uvec2 viewportSize;
     vec4 ssaoKernels[64];
diff --git a/cwd/assets/altcraft/shaders/vert/rml.vs b/cwd/assets/altcraft/shaders/vert/rml.vs
index c61a4a0..897f49d 100644
--- a/cwd/assets/altcraft/shaders/vert/rml.vs
+++ b/cwd/assets/altcraft/shaders/vert/rml.vs
@@ -12,6 +12,7 @@ uniform vec2 translation;
 layout (std140) uniform Globals {
     mat4 projView;
     mat4 proj;
+    mat4 invProj;
     mat4 view;
     uvec2 viewportSize;
     vec4 ssaoKernels[64];
diff --git a/cwd/assets/altcraft/shaders/vert/sky.vs b/cwd/assets/altcraft/shaders/vert/sky.vs
index 7043584..c618852 100644
--- a/cwd/assets/altcraft/shaders/vert/sky.vs
+++ b/cwd/assets/altcraft/shaders/vert/sky.vs
@@ -9,6 +9,7 @@ uniform mat4 model;
 layout (std140) uniform Globals {
     mat4 projView;
     mat4 proj;
+    mat4 invProj;
     mat4 view;
     uvec2 viewportSize;
     vec4 ssaoKernels[64];
-- 
cgit v1.2.3


From 3dc7e8aba4a07cc3c0d897b82af5a5951bde9991 Mon Sep 17 00:00:00 2001
From: LaG1924 <lag1924@gmail.com>
Date: Sat, 18 Dec 2021 10:59:06 +0500
Subject: Added AO mask

---
 cwd/assets/altcraft/shaders/vert/face.vs | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'cwd/assets/altcraft/shaders/vert')

diff --git a/cwd/assets/altcraft/shaders/vert/face.vs b/cwd/assets/altcraft/shaders/vert/face.vs
index 3e6adf7..d3caf32 100644
--- a/cwd/assets/altcraft/shaders/vert/face.vs
+++ b/cwd/assets/altcraft/shaders/vert/face.vs
@@ -7,11 +7,13 @@ in float uvLayer;
 in float animation;
 in vec3 color;
 in vec2 light;
+in float ambientOcclusion;
 
 out vec3 faceTextureUv;
 out vec3 faceNormal;
 out vec3 faceAddColor;
 out vec2 faceLight;
+out float faceAmbientOcclusion;
 
 layout (std140) uniform Globals {
     mat4 projView;
@@ -34,4 +36,5 @@ void main() {
     faceNormal = (view * vec4(normal, 0.0f)).xyz;
     faceAddColor = color;
     faceLight = light;
+    faceAmbientOcclusion = ambientOcclusion;
 }
-- 
cgit v1.2.3


From bac80e3514f93055daa4e743fa4f8ba177f77311 Mon Sep 17 00:00:00 2001
From: LaG1924 <lag1924@gmail.com>
Date: Sun, 19 Dec 2021 17:00:13 +0500
Subject: Added per vertex lighting

---
 cwd/assets/altcraft/shaders/vert/face.vs | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

(limited to 'cwd/assets/altcraft/shaders/vert')

diff --git a/cwd/assets/altcraft/shaders/vert/face.vs b/cwd/assets/altcraft/shaders/vert/face.vs
index d3caf32..101e4d0 100644
--- a/cwd/assets/altcraft/shaders/vert/face.vs
+++ b/cwd/assets/altcraft/shaders/vert/face.vs
@@ -1,13 +1,11 @@
 #version 330 core
 
 in vec3 pos[4];
-in vec3 normal;
 in vec2 uv[4];
-in float uvLayer;
-in float animation;
+in vec2 light[4];
+in vec3 normal;
 in vec3 color;
-in vec2 light;
-in float ambientOcclusion;
+in vec3 layerAnimationAo;
 
 out vec3 faceTextureUv;
 out vec3 faceNormal;
@@ -30,11 +28,11 @@ layout (std140) uniform Globals {
 void main() {
     gl_Position = projView * vec4(pos[gl_VertexID], 1.0f);
 
-    faceTextureUv = vec3(uv[gl_VertexID], uvLayer);
-    faceTextureUv.y -= (uv[2].y - uv[0].y) * trunc(mod(globalTime * 4.0f, animation));
+    faceTextureUv = vec3(uv[gl_VertexID], layerAnimationAo.r);
+    faceTextureUv.y -= (uv[2].y - uv[0].y) * trunc(mod(globalTime * 4.0f, layerAnimationAo.g));
 
     faceNormal = (view * vec4(normal, 0.0f)).xyz;
     faceAddColor = color;
-    faceLight = light;
-    faceAmbientOcclusion = ambientOcclusion;
+    faceLight = light[gl_VertexID];
+    faceAmbientOcclusion = layerAnimationAo.b;
 }
-- 
cgit v1.2.3