Terrain High shader: Use Blinn-Phong lighting

Co-Authored-By: MaNGusT- <bart2@bk.ru>
Warzone2100 · Sep 8, 2023 · 0d0350c · 0d0350c
1 parent a9d7606
commit 0d0350c
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 6 deletions.
diff --git a/data/base/shaders/terrain_combined_high.frag b/data/base/shaders/terrain_combined_high.frag
@@ -123,11 +123,12 @@ vec4 doBumpMapping(BumpData b, vec3 lightDir, vec3 halfVec) {
 	float lambertTerm = max(dot(b.N, L), 0.0); // diffuse lighting
 	// Gaussian specular term computation
 	vec3 H = normalize(halfVec);
-	float exponent = acos(dot(H, b.N)) / 0.33;
-	float gaussianTerm = exp(-(exponent * exponent));
+	float blinnTerm = clamp(dot(b.N, H), 0.f, 1.f);
+	blinnTerm = lambertTerm != 0.0 ? blinnTerm : 0.0;
+	blinnTerm = pow(blinnTerm, 16.f);
 	float visibility = getShadowVisibility();
 
-	vec4 res = b.color*(ambientLight + visibility*diffuseLight*lambertTerm) + visibility*b.gloss*b.gloss*specularLight*gaussianTerm*lambertTerm;
+	vec4 res = b.color*(ambientLight + visibility*diffuseLight*lambertTerm) + visibility*b.gloss*b.gloss*specularLight*blinnTerm*lambertTerm;
 
 	return vec4(res.rgb, b.color.a);
 }

diff --git a/data/base/shaders/vk/terrain_combined_high.frag b/data/base/shaders/vk/terrain_combined_high.frag
@@ -65,11 +65,12 @@ vec4 doBumpMapping(BumpData b, vec3 lightDir, vec3 halfVec) {
 	float lambertTerm = max(dot(b.N, L), 0.0); // diffuse lighting
 	// Gaussian specular term computation
 	vec3 H = normalize(halfVec);
-	float exponent = acos(dot(H, b.N)) / 0.33;
-	float gaussianTerm = exp(-(exponent * exponent));
+	float blinnTerm = clamp(dot(b.N, H), 0.f, 1.f);
+	blinnTerm = lambertTerm != 0.0 ? blinnTerm : 0.0;
+	blinnTerm = pow(blinnTerm, 16.f);
 	float visibility = getShadowVisibility();
 
-	vec4 res = b.color*(ambientLight + visibility*diffuseLight*lambertTerm) + visibility*b.gloss*b.gloss*specularLight*gaussianTerm*lambertTerm;
+	vec4 res = b.color*(ambientLight + visibility*diffuseLight*lambertTerm) + visibility*b.gloss*b.gloss*specularLight*blinnTerm*lambertTerm;
 
 	return vec4(res.rgb, b.color.a);
 }