fog density is now controlled by fog color alpha

mgsx-dev · Mar 19, 2021 · 98077ea · 98077ea
1 parent 6decc94
commit 98077ea
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 2 deletions.
diff --git a/CHANGES.md b/CHANGES.md
@@ -4,6 +4,7 @@
 
 * upgrade to libGDX 1.9.11, you can't use older libGDX with this version.
 * MeshPlus class has been removed since libGDX now supports 64k vertices meshes. If you directly used MeshPlus in your code, you can now use Mesh class instead.
+* Fog density is now controlled by fog color alpha. Make sure to have fog color alpha at 1.0 in your code to keep previous behavior.
 
 ### 1.0.0
 

diff --git a/gltf/src/net/mgsx/gltf/shaders/default.fs.glsl b/gltf/src/net/mgsx/gltf/shaders/default.fs.glsl
@@ -172,7 +172,7 @@ void main() {
 	#endif //lightingFlag
 
 	#ifdef fogFlag
-		gl_FragColor.rgb = mix(gl_FragColor.rgb, u_fogColor.rgb, v_fog);
+		gl_FragColor.rgb = mix(gl_FragColor.rgb, u_fogColor.rgb, v_fog * u_fogColor.a);
 	#endif // end fogFlag
 
 	#ifdef blendedFlag

diff --git a/gltf/src/net/mgsx/gltf/shaders/gdx-pbr.fs.glsl b/gltf/src/net/mgsx/gltf/shaders/gdx-pbr.fs.glsl
@@ -644,7 +644,7 @@ void main() {
 #else
 	float fog = min(1.0, eyeDistance * eyeDistance * u_cameraPosition.w);
 #endif
-	out_FragColor.rgb = mix(out_FragColor.rgb, u_fogColor.rgb, fog);
+	out_FragColor.rgb = mix(out_FragColor.rgb, u_fogColor.rgb, fog * u_fogColor.a);
 #endif
 
     // Blending and Alpha Test