Skip to content

dampness rework #1709

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Areloch merged 2 commits into from
Apr 9, 2026
Merged

dampness rework #1709

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5690c64
dampness rework
Azaezel Apr 6, 2026
d85bbc0
account for translucencies
Azaezel Apr 9, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 11 additions & 14 deletions Templates/BaseGame/game/core/rendering/shaders/gl/lighting.glsl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -434,25 +434,22 @@ void dampen(inout Surface surface, sampler2D WetnessTexture, float accumTime, fl
{
if (degree<=0.0) return;
vec3 n = abs(surface.N);
float ang = clamp(n.z, 0.04, 0.96);
float ang = 1.1-(abs(surface.N.z)*sign(surface.N.z));

float speed = -accumTime*(1.0-surface.linearRoughnessSq)*clamp((2.0-ang), 0.04, 0.96);
if ((n.x > 0.0) || (n.y > 0.0))
speed *= -1.0;
vec2 wetoffset = vec2(speed,speed)*0.1;
float speed = accumTime * (1.0 - surface.linearRoughnessSq);
vec3 wetoffset = (surface.P+vec3(speed,speed,speed)) * 0.33;

vec3 wetNormal = texture(WetnessTexture, float2(surface.P.xy*0.1+wetoffset)).xyz;
wetNormal = lerp(wetNormal,texture(WetnessTexture,float2(surface.P.zx*0.1+wetoffset)).rgb ,n.y);
wetNormal = lerp(wetNormal,texture(WetnessTexture,float2(surface.P.zy*0.1+wetoffset)).rgb ,n.x);
surface.N = lerp(surface.N, wetNormal, degree);
vec3 wetNormal = texture(WetnessTexture, wetoffset.xy).xyz * (1.1-(n.z* n.z));
wetNormal = lerp(wetNormal, texture(WetnessTexture, wetoffset.zx).rgb, n.y);
wetNormal = lerp(wetNormal, texture(WetnessTexture, wetoffset.zy).rgb, n.x);
wetNormal = normalize(wetNormal);
float wetness = wetNormal.b* degree;

float wetness = texture(WetnessTexture, vec2(surface.P.xy*0.1+wetoffset)).b;
wetness = lerp(wetness,texture(WetnessTexture,vec2(surface.P.zx*0.1+wetoffset)).b,n.y);
wetness = lerp(wetness,texture(WetnessTexture,vec2(surface.P.zy*0.1+wetoffset)).b,n.x);
wetness = pow(wetness*ang*degree,3);
wetNormal = normalize(wetNormal * 2.0 - 1.0);
surface.N = normalize(vec3(surface.N.xy + wetNormal.xy * wetness, surface.N.z));

surface.roughness = lerp(surface.roughness, 0.04f, wetness);
surface.baseColor.rgb = lerp(surface.baseColor.rgb, surface.baseColor.rgb*0.6+float3(0.4,0.4,0.4)*wetness, wetness);
surface.baseColor = vec4(lerp(surface.baseColor.rgb, surface.baseColor.rgb*0.6+vec3(0.4,0.4,0.4)*wetness, wetness), max(surface.baseColor.a, 0.4* wetness));
surface.metalness = lerp(surface.metalness, 0.96, wetness);
updateSurface(surface);
}
Expand Down
27 changes: 12 additions & 15 deletions Templates/BaseGame/game/core/rendering/shaders/lighting.hlsl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -436,25 +436,22 @@ void dampen(inout Surface surface, TORQUE_SAMPLER2D(WetnessTexture), float accum
{
if (degree<=0.0) return;
float3 n = abs(surface.N);
float ang = clamp(n.z, 0.04, 0.96);
float ang = 1.1-(abs(surface.N.z)*sign(surface.N.z));

float speed = -accumTime*(1.0-surface.linearRoughnessSq)*clamp((2.0-ang), 0.04, 0.96);
if ((n.x > 0.0) || (n.y > 0.0))
speed *= -1.0;
float2 wetoffset = float2(speed,speed)*0.1;
float speed = accumTime * (1.0 - surface.linearRoughnessSq);
float3 wetoffset = (surface.P+float3(speed,speed,speed)) * 0.33;

float3 wetNormal = TORQUE_TEX2D(WetnessTexture, float2(surface.P.xy*0.1+wetoffset)).xyz;
wetNormal = lerp(wetNormal,TORQUE_TEX2D(WetnessTexture,float2(surface.P.zx*0.1+wetoffset)).rgb ,n.y);
wetNormal = lerp(wetNormal,TORQUE_TEX2D(WetnessTexture,float2(surface.P.zy*0.1+wetoffset)).rgb ,n.x);
surface.N = lerp(surface.N, wetNormal, degree);

float wetness = TORQUE_TEX2D(WetnessTexture, float2(surface.P.xy*0.1+wetoffset)).b;
wetness = lerp(wetness,TORQUE_TEX2D(WetnessTexture,float2(surface.P.zx*0.1+wetoffset)).b,n.y);
wetness = lerp(wetness,TORQUE_TEX2D(WetnessTexture,float2(surface.P.zy*0.1+wetoffset)).b,n.x);
wetness = pow(wetness*ang*degree,3);
float3 wetNormal = TORQUE_TEX2D(WetnessTexture, wetoffset.xy).xyz * (1.1-(n.z* n.z));
wetNormal = lerp(wetNormal, TORQUE_TEX2D(WetnessTexture, wetoffset.zx).rgb, n.y);
wetNormal = lerp(wetNormal, TORQUE_TEX2D(WetnessTexture, wetoffset.zy).rgb, n.x);
wetNormal = normalize(wetNormal);
float wetness = wetNormal.b* degree;

wetNormal = normalize(wetNormal * 2.0 - 1.0);
surface.N = normalize(float3(surface.N.xy + wetNormal.xy * wetness, surface.N.z));

surface.roughness = lerp(surface.roughness, 0.04f, wetness);
surface.baseColor.rgb = lerp(surface.baseColor.rgb, surface.baseColor.rgb*0.6+float3(0.4,0.4,0.4)*wetness, wetness);
surface.baseColor = float4(lerp(surface.baseColor.rgb, surface.baseColor.rgb * 0.6 + float3(0.4, 0.4, 0.4) * wetness, wetness), max(surface.baseColor.a, 0.4* wetness));
surface.metalness = lerp(surface.metalness, 0.96, wetness);
surface.Update();
}
Expand Down
Loading