From 1d6f0052b3777a2ceb2c4cdb19bfc935b13dfd63 Mon Sep 17 00:00:00 2001
From: jiaguofeng <jiaguofeng@>
Date: Sat, 6 Jan 2024 14:04:00 +0800
Subject: [PATCH] =?UTF-8?q?[map-sdk]=E4=BF=AE=E6=94=B9=E5=A4=A9=E7=A9=BA?=
 =?UTF-8?q?=E7=9B=92=E9=9B=BE=E5=8C=96=E6=95=88=E6=9E=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mapmodule/src/main/assets/shaders/fMogo_Shader.glsl    | 7 +++----
 .../mapmodule/src/main/assets/shaders/fSkyBox_Shader.glsl  | 3 ++-
 .../main/assets/style/style/normal/vr/taxi_day/common.cfg  | 5 ++++-
 3 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/libraries/mapmodule/src/main/assets/shaders/fMogo_Shader.glsl b/libraries/mapmodule/src/main/assets/shaders/fMogo_Shader.glsl
index 944703bc6c..de74e89e78 100644
--- a/libraries/mapmodule/src/main/assets/shaders/fMogo_Shader.glsl
+++ b/libraries/mapmodule/src/main/assets/shaders/fMogo_Shader.glsl
@@ -241,8 +241,7 @@ void setLinearFog()
     float distanceFromCamera = length(posInEye-cameraPos);
     if(distanceFromCamera<fogStart)
         return;
-    float fogAlpha=(distanceFromCamera-fogStart)/(fogEnd-fogStart);
-    fogAlpha=clamp(fogAlpha,0.0,1.0)*fogDensity;
+    float fogAlpha = smoothstep(fogStart,fogEnd,distanceFromCamera)*fogDensity;
     fragColor.rgb = mix(fragColor.rgb,fogColor,fogAlpha);
 }
 void setGuideLine(){
@@ -301,8 +300,6 @@ void main()
         if (isShadow)
             setShadow();
     }
-    setLinearFog();
-    setBlur();
     float y = (ndc.y / ndc.w+1.0)*0.5;
     y = smoothstep(0.0,1.0,y);
     if(isDaytime || isMorning || isEvening || isRoadbed || isGreenBelt || isPlane){
@@ -321,4 +318,6 @@ void main()
         }
         fragColor.rgb = mix(fragColor.rgb,c.rgb,c.a);
     }
+    setLinearFog();
+    setBlur();
 }
\ No newline at end of file
diff --git a/libraries/mapmodule/src/main/assets/shaders/fSkyBox_Shader.glsl b/libraries/mapmodule/src/main/assets/shaders/fSkyBox_Shader.glsl
index 54c7ddfd46..2cda151d9f 100644
--- a/libraries/mapmodule/src/main/assets/shaders/fSkyBox_Shader.glsl
+++ b/libraries/mapmodule/src/main/assets/shaders/fSkyBox_Shader.glsl
@@ -16,7 +16,8 @@ void setLinearFog()
 {
     if(!isFogEnable)
     return;
-    float a = clamp(0.0,1.0,(1.0-gl_FragCoord.y/resolution.y)*3.0);
+    float f = gl_FragCoord.y/resolution.y;
+    float a = 1.0-smoothstep(0.75,1.0,f);
     fragColor.rgb = mix(fragColor.rgb,fogColor,fogDensity*a);
 }
 void main()
diff --git a/libraries/mapmodule/src/main/assets/style/style/normal/vr/taxi_day/common.cfg b/libraries/mapmodule/src/main/assets/style/style/normal/vr/taxi_day/common.cfg
index b17a7d9913..586c54c8bd 100644
--- a/libraries/mapmodule/src/main/assets/style/style/normal/vr/taxi_day/common.cfg
+++ b/libraries/mapmodule/src/main/assets/style/style/normal/vr/taxi_day/common.cfg
@@ -29,7 +29,6 @@ rsu.type.3=9FB6D6 //rsu颜色
 selfCar.light=0.8,0.8,0.8;0.2,0.2,0.2;0.1,0.1,0.1;100.0  //自车
 otherCar.light=0.7,0.7,0.7;0.02,0.02,0.02;0.15,0.15,0.15;11.0 //他车
 others.light=0.7,0.7,0.7;0.1,0.1,0.1;0.6,0.6,0.6;12.0 //除自车和他车外的其他3d锚点
-fog=d0e4ff;40;80;0.8 //雾颜色,起始距离，结束距离，密度
 skybox.lookat=0;-13;8.5;0;0;3; 0;1;0 //天空盒lookat参数
 skybox.proj=60;0.1;100 //天空盒fov,近平面，远平面
 grayscale=#A3C4EAFF
@@ -61,6 +60,10 @@ plane.gradientColor=66B5C8E6;00B5C8E6
 plane.gradientColor_morning=00f2c3b1;66f2c3b1
 plane.gradientColor_daytime=66B5C8E6;00B5C8E6
 plane.gradientColor_evening=00f2c3b1;66f2c3b1
+fog=C4E1FF;20;65;0.9 //雾颜色,起始距离，结束距离，密度
+fog_morning=D6CFDC;20;65;0.9 //雾颜色,起始距离，结束距离，密度
+fog_daytime=C4E1FF;20;65;0.9 //雾颜色,起始距离，结束距离，密度
+fog_evening=D6CFDC;20;65;0.9 //雾颜色,起始距离，结束距离，密度