Skip to content

fix: grass consistency when using mods #939

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
doodlum merged 1 commit into from
Feb 2, 2025
Merged

fix: grass consistency when using mods #939

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion features/Grass Collision/Shaders/GrassCollision/GrassCollision.hlsli
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ namespace GrassCollision
displacement += shift;
}

ClampDisplacement(displacement, 20);
ClampDisplacement(displacement, 10);
return displacement * saturate(alpha * 10);
}

Expand Down
20 changes: 6 additions & 14 deletions package/Shaders/RunGrass.hlsl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -233,7 +233,7 @@ VS_OUTPUT main(VS_INPUT input)

// Vertex normal needs to be transformed to world-space for lighting calculations.
vsout.VertexNormal.xyz = mul(world3x3, input.Normal.xyz * 2.0 - 1.0);
vsout.VertexNormal.w = saturate(sqrt(input.Color.w));
vsout.VertexNormal.w = input.Color.w;

return vsout;
}
Expand Down Expand Up @@ -581,18 +581,13 @@ PS_OUTPUT main(PS_INPUT input, bool frontFace
dirLightColor *= dirLightColorMultiplier;
dirLightColor *= dirShadow;

float wrapAmount = saturate(input.VertexNormal.w);
float wrapMultiplier = rcp((1.0 + wrapAmount) * (1.0 + wrapAmount));

float dirDiffuse = (dirLightAngle + wrapAmount) * wrapMultiplier;
lightsDiffuseColor += dirLightColor * saturate(dirDiffuse) * dirDetailShadow;
lightsDiffuseColor += dirLightColor * saturate(dirLightAngle) * dirDetailShadow;

float3 albedo = max(0, baseColor.xyz * input.VertexColor.xyz);

float3 subsurfaceColor = lerp(Color::RGBToLuminance(albedo.xyz), albedo.xyz, 2.0) * input.VertexNormal.w;
float3 subsurfaceColor = lerp(Color::RGBToLuminance(albedo.xyz), albedo.xyz, 2.0) * saturate(input.VertexNormal.w * 10.0);

float dirLightBacklighting = 1.0 + saturate(dot(viewDirection, -SharedData::DirLightDirection.xyz));
float3 sss = dirLightColor * saturate(-dirLightAngle) * dirLightBacklighting;
float3 sss = dirLightColor * saturate(-dirLightAngle);

if (complex)
lightsSpecularColor += GrassLighting::GetLightSpecularInput(DirLightDirection, viewDirection, normal, dirLightColor, SharedData::grassLightingSettings.Glossiness);
Expand Down Expand Up @@ -645,11 +640,8 @@ PS_OUTPUT main(PS_INPUT input, bool frontFace
# else
lightColor *= lightShadow;

float lightDiffuse = (lightAngle + wrapAmount) * wrapMultiplier;
float3 lightDiffuseColor = lightColor * saturate(lightDiffuse);

float lightBacklighting = 1.0 + saturate(dot(viewDirection, -normalizedLightDirection.xyz));
sss += lightColor * saturate(-lightAngle) * lightBacklighting;
float3 lightDiffuseColor = lightColor * saturate(dirLightAngle);
sss += lightColor * saturate(-lightAngle);

lightsDiffuseColor += lightDiffuseColor;

Expand Down