Skip to content

Fix NaN cause when a 0-length normal is generated and then normalized #437

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
merged 3 commits into from
May 15, 2020
Merged

Fix NaN cause when a 0-length normal is generated and then normalized #437

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b30a959
Avoid to normalize 0-length normals
FrancescoC-unity May 13, 2020
cc8fc91
changelog
FrancescoC-unity May 13, 2020
32d4d9e
Merge branch 'master' into HDRP/fix-0-length-normal
sebastienlagarde May 15, 2020
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
1 change: 1 addition & 0 deletions com.unity.render-pipelines.high-definition/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -573,6 +573,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
- Fixed SceneView Draw Modes not being properly updated after opening new scene view panels or changing the editor layout.
- VFX: Removed irrelevant queues in render queue selection from HDRP outputs
- VFX: Motion Vector are correctly renderered with MSAA [Case 1240754](https://issuetracker.unity3d.com/product/unity/issues/guid/1240754/)
- Fixed a cause of NaN when a normal of 0-length is generated (usually via shadergraph).

### Changed
- Improve MIP selection for decals on Transparents
Expand Down
4 changes: 2 additions & 2 deletions com.unity.render-pipelines.high-definition/Runtime/Material/MaterialUtilities.hlsl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,8 @@ void GetNormalWS(FragInputs input, float3 normalTS, out float3 normalWS, float3
normalTS.xy *= flipSign;
#endif // _DOUBLESIDED_ON

// We need to normalize as we use mikkt tangent space and this is expected (tangent space is not normalize)
normalWS = normalize(TransformTangentToWorld(normalTS, input.tangentToWorld));
// We need to normalize as we use mikkt tangent space and this is expected (tangent space is not normalized)
normalWS = SafeNormalize(TransformTangentToWorld(normalTS, input.tangentToWorld));

#endif // SURFACE_GRADIENT
}
2 changes: 1 addition & 1 deletion com.unity.shadergraph/Editor/Data/Nodes/Artistic/Normal/NormalBlendNode.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ static string Unity_NormalBlend(

return @"
{
Out = normalize($precision3(A.rg + B.rg, A.b * B.b));
Out = SafeNormalize($precision3(A.rg + B.rg, A.b * B.b));
}
";
}
Expand Down
2 changes: 1 addition & 1 deletion com.unity.shadergraph/Editor/Data/Nodes/Artistic/Normal/NormalFromHeightNode.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ public void GenerateNodeFunction(FunctionRegistry registry, GenerationMode gener
s.AppendLine("$precision dHdx = ddx(In);");
s.AppendLine("$precision dHdy = ddy(In);");
s.AppendLine("$precision3 surfGrad = surface * (dHdx*crossY + dHdy*crossX);");
s.AppendLine("Out = normalize(TangentMatrix[2].xyz - (Strength * surfGrad));");
s.AppendLine("Out = SafeNormalize(TangentMatrix[2].xyz - (Strength * surfGrad));");

if(outputSpace == OutputSpace.Tangent)
s.AppendLine("Out = TransformWorldToTangent(Out, TangentMatrix);");
Expand Down