From 9ffe5b9c171e01a4319e6329bb21e6c05ac3e2b4 Mon Sep 17 00:00:00 2001
From: LaG1924 <lag1924@gmail.com>
Date: Sun, 5 Dec 2021 06:44:37 +0500
Subject: Minor shader optimization

---
 cwd/assets/altcraft/shaders/frag/entity.fs | 2 +-
 cwd/assets/altcraft/shaders/frag/light.fs  | 3 +--
 cwd/assets/altcraft/shaders/frag/sky.fs    | 2 +-
 src/AssetManager.cpp                       | 2 +-
 src/RenderConfigs.cpp                      | 2 +-
 5 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/cwd/assets/altcraft/shaders/frag/entity.fs b/cwd/assets/altcraft/shaders/frag/entity.fs
index 6e77a29..31e1a7c 100644
--- a/cwd/assets/altcraft/shaders/frag/entity.fs
+++ b/cwd/assets/altcraft/shaders/frag/entity.fs
@@ -14,6 +14,6 @@ void main() {
     color = vec4(entityColor, 1.0f);
     normal = vec4(0.0f, 0.0f, 0.0f, 1.0f);
     worldPos = entityWorldPos;
-    addColor = vec4(0.0f, 0.0f, 0.0f, 1.0f);
+    addColor = vec4(1.0f);
     light = vec4(1.0f, 1.0f, 0.0f, 1.0f);
 }
diff --git a/cwd/assets/altcraft/shaders/frag/light.fs b/cwd/assets/altcraft/shaders/frag/light.fs
index 5b2de5d..d1763f9 100644
--- a/cwd/assets/altcraft/shaders/frag/light.fs
+++ b/cwd/assets/altcraft/shaders/frag/light.fs
@@ -46,9 +46,8 @@ void main() {
         lightLevel *= (1.0f - s.r);
     }
     lightLevel = clamp(lightLevel, 0.005f, 1.0f);
-    vec3 faceColor = mix(ac.rgb * lightLevel, vec3(1,1,1) * lightLevel, float(ac.rgb == vec3(0,0,0)));
 
-    vec4 finalColor = vec4(c.rgb * faceColor, 1.0f);
+    vec4 finalColor = vec4(c.rgb * ac.rgb * lightLevel, 1.0f);
 
     finalColor.rgb = pow(finalColor.rgb, vec3(1.0f / gamma));
 
diff --git a/cwd/assets/altcraft/shaders/frag/sky.fs b/cwd/assets/altcraft/shaders/frag/sky.fs
index 65a56ad..dc97440 100644
--- a/cwd/assets/altcraft/shaders/frag/sky.fs
+++ b/cwd/assets/altcraft/shaders/frag/sky.fs
@@ -66,6 +66,6 @@ void main() {
     color += vec4(Moon().rgb, 1.0f);
     normal = vec4(0.0f, 0.0f, 0.0f, 1.0f);
     worldPos = vec4(0.0f, 0.0f, 0.0f, 1.0f);
-    addColor = vec4(0.0f, 0.0f, 0.0f, 1.0f);
+    addColor = vec4(1.0f);
     light = vec4(1.0f, 1.0f, 0.0f, 1.0f);
 }
diff --git a/src/AssetManager.cpp b/src/AssetManager.cpp
index 0976e30..ca68304 100644
--- a/src/AssetManager.cpp
+++ b/src/AssetManager.cpp
@@ -557,7 +557,7 @@ void ParseBlockModels() {
 				if (face.second.tintIndex)
 					parsedFace.color = glm::vec3(0.486, 0.745, 0.423);
 				else
-					parsedFace.color = glm::vec3(0, 0, 0);
+					parsedFace.color = glm::vec3(1.0f);
 
 				model.parsedFaces.push_back(parsedFace);
 			}
diff --git a/src/RenderConfigs.cpp b/src/RenderConfigs.cpp
index 0a5450b..3d91a1d 100644
--- a/src/RenderConfigs.cpp
+++ b/src/RenderConfigs.cpp
@@ -200,5 +200,5 @@ Gbuffer::Gbuffer(size_t geomW, size_t geomH, size_t lightW, size_t lightH, bool
         Gal::Format::R8G8B8A8,
         Gal::Filtering::Bilinear);
 
-    lightingPass->SetShaderParameter("applySsao", true);
+    lightingPass->SetShaderParameter("applySsao", applySsao);
 }
-- 
cgit v1.2.3