less ssao in fog, fix lens aspect

stuntrally · Dec 6, 2024 · db858a2 · db858a2
1 parent 0abf242
commit db858a2
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 6 deletions.
diff --git a/data/Hlms/Pbs/Any/SR3_Fog_piece_ps.any b/data/Hlms/Pbs/Any/SR3_Fog_piece_ps.any
@@ -4,7 +4,6 @@
         //**  fog fade for ssao
         @property( hlms_fog && !sky )
             outPs_fog = fogWeight * heightMul;
-            // outPs_fog *= fluidHeight;  //bad
             outPs_fog = lerp(
                             lerp ( 0.0, outPs_fog,  fluidDist ),
                             outPs_fog,  fluidHeight );  // in fluid

diff --git a/data/materials/Common/GLSL/SSAO_Apply_ps.glsl b/data/materials/Common/GLSL/SSAO_Apply_ps.glsl
@@ -31,5 +31,5 @@ void main()
 	// fragColour = vec4( ssao, ssao, ssao, 1.0 );  // test ssao only
 	// fragColour = vec4( ssao, ssao, fog, 1.0 );  // test fog, ssao  yellow-blue
 
-	fragColour = vec4( mix(col.xyz, col.xyz * ssao, fog), col.a );
+	fragColour = vec4( mix(col.xyz, col.xyz * ssao, fog * fog), col.a );
 }
diff --git a/docs/Roadmap.md b/docs/Roadmap.md
@@ -12,18 +12,19 @@ Marked: `crucial`, **Next or Big**, _Important_.
 *editor videos* all new  
 
 redo all track views, with ssao, effects  
+ed rtt less ssao size?  
 
 `ed` apply shadows crash  
 ed fix *brushes* png load
 
 add **sounds**, WIP from [Changelog.md](Changelog.md)  
 
 fix tracks:  
-AnomalyFun invisible boxes  
+|AnomalyFun invisible boxes  rqg  
+|FrozenGarden invisible icicles  
+|CrystalIslands no flowers  
 MogFoss waterfals  
-FrozenGarden invisible icicles  
 Mudflats gravel alpha bridge  
-CrystalIslands no flowers  
 
 ----
 ### 🪄 Effects

diff --git a/src/common/AppGui_SSAO.cpp b/src/common/AppGui_SSAO.cpp
@@ -193,7 +193,7 @@ void AppGui::UpdSunPos(Camera *camera)
 	v.x =  p2.x * 0.5f;
 	v.y = -p2.y * 0.5f;
 	v.z = max(0.f, min(1.f, -scn->fx.sunDir.dotProduct(camera->getDirection()) ));  // sun dot cam
-	v.w = float(mWindow->getWidth()) / float(mWindow->getHeight());  // wnd x/y aspect
+	v.w = camera->getAspectRatio();
 
 	efxClrSun = scn->fx.sunClr;
 	efxClrRays = scn->fx.raysClr;  // or own par-