From 04ad0ef50d7eb362fd13272fd1d610740b3ede5e Mon Sep 17 00:00:00 2001
From: LaG1924 <lag1924@gmail.com>
Date: Mon, 28 Jun 2021 20:20:49 +0500
Subject: Embed UV to vertex data

---
 cwd/assets/altcraft/shaders/frag/face.fs | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'cwd/assets/altcraft/shaders/frag/face.fs')

diff --git a/cwd/assets/altcraft/shaders/frag/face.fs b/cwd/assets/altcraft/shaders/frag/face.fs
index bd2a2d7..314e47b 100644
--- a/cwd/assets/altcraft/shaders/frag/face.fs
+++ b/cwd/assets/altcraft/shaders/frag/face.fs
@@ -1,7 +1,6 @@
 #version 330 core
 
 in VS_OUT {
-    vec2 UvPosition;
     vec3 Texture;
     vec3 Color;
     vec2 Light;
@@ -47,4 +46,4 @@ void main() {
 
     color = vec4(color.rgb * faceLight, color.a);
 	fragColor = color;
-}
\ No newline at end of file
+}
-- 
cgit v1.2.3


From 2db3f2a415f20f1224e277cef93e6d9bb2a1244b Mon Sep 17 00:00:00 2001
From: LaG1924 <lag1924@gmail.com>
Date: Tue, 29 Jun 2021 07:53:04 +0500
Subject: Tint calculation moved to vertex shader

---
 cwd/assets/altcraft/shaders/frag/face.fs | 35 ++------------------------------
 1 file changed, 2 insertions(+), 33 deletions(-)

(limited to 'cwd/assets/altcraft/shaders/frag/face.fs')

diff --git a/cwd/assets/altcraft/shaders/frag/face.fs b/cwd/assets/altcraft/shaders/frag/face.fs
index 314e47b..30d44d2 100644
--- a/cwd/assets/altcraft/shaders/frag/face.fs
+++ b/cwd/assets/altcraft/shaders/frag/face.fs
@@ -3,47 +3,16 @@
 in VS_OUT {
     vec3 Texture;
     vec3 Color;
-    vec2 Light;
 } fs_in;
 
 out vec4 fragColor;
 
 uniform sampler2DArray textureAtlas;
-uniform float DayTime;
-uniform float MinLightLevel;
-
-vec3 rgb2hsv(vec3 c)
-{
-    vec4 K = vec4(0.0, -1.0 / 3.0, 2.0 / 3.0, -1.0);
-    vec4 p = mix(vec4(c.bg, K.wz), vec4(c.gb, K.xy), step(c.b, c.g));
-    vec4 q = mix(vec4(p.xyw, c.r), vec4(c.r, p.yzx), step(p.x, c.r));
-
-    float d = q.x - min(q.w, q.y);
-    float e = 1.0e-10;
-    return vec3(abs(q.z + (q.w - q.y) / (6.0 * d + e)), d / (q.x + e), q.x);
-}
-
-vec3 hsv2rgb(vec3 c)
-{
-    vec4 K = vec4(1.0, 2.0 / 3.0, 1.0 / 3.0, 3.0);
-    vec3 p = abs(fract(c.xxx + K.xyz) * 6.0 - K.www);
-    return c.z * mix(K.xxx, clamp(p - K.xxx, 0.0, 1.0), c.y);
-}
 
 void main() {
-	vec4 color = texture(textureAtlas,fs_in.Texture);
+    vec4 color = texture(textureAtlas,fs_in.Texture);
     if (color.a < 0.3)
         discard;
 
-    vec3 hsvColor = rgb2hsv(color.xyz);
-    hsvColor+=fs_in.Color;
-	color = vec4(hsv2rgb(hsvColor),1);
-
-	float light = fs_in.Light.x / 15.0;
-	float skyLight = (fs_in.Light.y / 15.0) * DayTime;
-
-    float faceLight = clamp(light + skyLight,MinLightLevel,1.0);
-
-    color = vec4(color.rgb * faceLight, color.a);
-	fragColor = color;
+    fragColor = vec4(color.rgb * fs_in.Color, 1.0);
 }
-- 
cgit v1.2.3