Increased fog end distance

Jonathan-Greve · Feb 24, 2024 · 722d168 · 722d168
1 parent 8f88cd7
commit 722d168
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 6 deletions.
diff --git a/SourceFiles/WaterPixelShader.h b/SourceFiles/WaterPixelShader.h
@@ -170,9 +170,10 @@ float4 main(PixelInputType input) : SV_TARGET
     if (should_render_fog)
     {
         float distance = length(cam_position - input.world_position.xyz);
-        float fogFactor = (fog_end - distance) / (fog_end - fog_start);
+        float fogFactor = (fog_end + 10000 - distance) / (fog_end + 10000 - fog_start);
         fogFactor = clamp(fogFactor, 0.0, 1.0);
-        final_color = lerp(float4(fog_color_rgb, 1.0), final_color, fogFactor);
+        float3 fog_color = lerp(fog_color_rgb, final_color.rgb, fogFactor);
+        final_color = lerp(float4(fog_color, 1.0), final_color, fogFactor);
     }
 
     float min_alpha = max(0.5 * (color0.a + color1.a), 0.7);

diff --git a/SourceFiles/WaterPixelShader.hlsl b/SourceFiles/WaterPixelShader.hlsl
@@ -165,9 +165,10 @@ float4 main(PixelInputType input) : SV_TARGET
     if (should_render_fog)
     {
         float distance = length(cam_position - input.world_position.xyz);
-        float fogFactor = (fog_end - distance) / (fog_end - fog_start);
+        float fogFactor = (fog_end + 10000 - distance) / (fog_end + 10000 - fog_start);
         fogFactor = clamp(fogFactor, 0.0, 1.0);
-        final_color = lerp(float4(fog_color_rgb, 1.0), final_color, fogFactor);
+        float3 fog_color = lerp(fog_color_rgb, final_color.rgb, fogFactor);
+        final_color = lerp(float4(fog_color, 1.0), final_color, fogFactor);
     }
 
     float min_alpha = max(0.5 * (color0.a + color1.a), 0.7);

diff --git a/SourceFiles/draw_dat_browser.cpp b/SourceFiles/draw_dat_browser.cpp
@@ -851,8 +851,8 @@ bool parse_file(DATManager* dat_manager, int index, MapRenderer* map_renderer,
 
 
                 map_renderer->SetFogStart(std::max((int)sub2_0.fog_distance_start, 3000));
-                map_renderer->SetFogEnd(std::max((float)sub2_0.fog_distance_end, map_renderer->GetFogStart()+10000));
-                map_renderer->SetFogStartY(-5000);
+                map_renderer->SetFogEnd(std::max((float)sub2_0.fog_distance_end, map_renderer->GetFogStart()+15000));
+                map_renderer->SetFogStartY(-10000);
                 map_renderer->SetFogEndY(1500);
 
                 map_renderer->SetClearColor(clear_and_fog_color);