Archive/TombEngine
0
0
Fork 0
mirror of https://github.com/TombEngine/TombEngine.git synced 2025-04-28 15:57:59 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Debranch fog calculations

Browse source
This commit is contained in:
Lwmte 2024-12-06 21:53:45 +01:00
parent 15aee1c5b0
commit d96bf4ba8c
1 changed files with 16 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

33
TombEngine/Shaders/ShaderLight.hlsli
View file

@ -310,13 +310,12 @@ float DoFogBulbForSky(float3 pos, ShaderFogBulb bulb)
float DoDistanceFogForVertex(float3 pos) float DoDistanceFogForVertex(float3 pos)
{ {
float fog = 0.0f; float d = length(CamPositionWS.xyz - pos);
float fogRange = FogMaxDistance * 1024 - FogMinDistance * 1024;
if (FogMaxDistance > 0.0f) float fogEnabled = step(0.0f, FogMaxDistance);
{ float fogFactor = (d - FogMinDistance * 1024) / fogRange;
float d = length(CamPositionWS.xyz - pos); float fog = saturate(fogFactor) * fogEnabled;
fog = clamp((d - FogMinDistance * 1024) / (FogMaxDistance * 1024 - FogMinDistance * 1024), 0, 1);
}
return fog; return fog;
} }
@ -324,16 +323,16 @@ float DoDistanceFogForVertex(float3 pos)
float4 DoFogBulbsForVertex(float3 pos) float4 DoFogBulbsForVertex(float3 pos)
{ {
float4 fog = float4(0.0f, 0.0f, 0.0f, 0.0f); float4 fog = float4(0.0f, 0.0f, 0.0f, 0.0f);
for (int i = 0; i < NumFogBulbs; i++) for (int i = 0; i < NumFogBulbs; i++)
{ {
float fogFactor = DoFogBulb(pos, FogBulbs[i]); float fogFactor = DoFogBulb(pos, FogBulbs[i]);
fog.xyz += FogBulbs[i].Color.xyz * fogFactor; float3 fogColor = FogBulbs[i].Color.xyz * fogFactor;
fog.xyz += fogColor;
fog.w += fogFactor; fog.w += fogFactor;
if (fog.w >= 1.0f)
{ fog.w = saturate(fog.w);
break;
}
} }
return fog; return fog;
@ -346,12 +345,12 @@ float4 DoFogBulbsForSky(float3 pos)
for (int i = 0; i < NumFogBulbs; i++) for (int i = 0; i < NumFogBulbs; i++)
{ {
float fogFactor = DoFogBulbForSky(pos, FogBulbs[i]); float fogFactor = DoFogBulbForSky(pos, FogBulbs[i]);
fog.xyz += FogBulbs[i].Color.xyz * fogFactor; float3 fogColor = FogBulbs[i].Color.xyz * fogFactor;
fog.xyz += fogColor;
fog.w += fogFactor; fog.w += fogFactor;
if (fog.w >= 1.0f)
{ fog.w = saturate(fog.w);
break;
}
} }
return fog; return fog;