Skip to content

[Backport 8.x.x] Fix NaN cause when a 0-length normal is generated and then normalized #486

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 2 commits into from
May 17, 2020
Merged

[Backport 8.x.x] Fix NaN cause when a 0-length normal is generated and then normalized #486

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
bbc3a14
Backport changes
FrancescoC-unity May 14, 2020
fd06d84
changelog
FrancescoC-unity May 14, 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
3 changes: 3 additions & 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 @@ -9,6 +9,9 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
Version Updated
The version number for this package has increased due to a version update of a related graphics package.

### Fixed
- Fixed a cause of NaN when a normal of 0-length is generated (usually via shadergraph).

## [8.1.0] - 2020-04-21

### Added
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 @@ -91,7 +91,7 @@ public void GenerateNodeFunction(FunctionRegistry registry, GenerationMode gener
s.AppendLine("$precision3 inToNormal = ((((In + ddx(In)) - In) * crossY) + (((In + ddy(In)) - In) * crossX)) * sign(d);");
s.AppendLine("inToNormal.y *= -1.0;");
s.AppendNewLine();
s.AppendLine("Out = normalize((d * TangentMatrix[2].xyz) - inToNormal);");
s.AppendLine("Out = SafeNormalize((d * TangentMatrix[2].xyz) - inToNormal);");

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