[Merged by Bors] - bevy_pbr: Fix tangent and normal normalization#5666
Closed
superdump wants to merge 3 commits intobevyengine:mainfrom
Closed
[Merged by Bors] - bevy_pbr: Fix tangent and normal normalization#5666superdump wants to merge 3 commits intobevyengine:mainfrom
superdump wants to merge 3 commits intobevyengine:mainfrom
Conversation
Morten Mikkelsen clarified that the world normal and tangent must be normalized in the vertex stage and the interpolated values must not be normalized in the fragment stage.
superdump
added
C-Bug
Contributor
Author
Contributor
Author
|
Before merging this I want to add comments about why things are done this way. |
Contributor
Author
|
I hacked the Kapture.2022-08-13.at.12.41.38.mp4On this PR it looks like this: Kapture.2022-08-13.at.12.39.15.mp4 |
Contributor
Author
Done. |
Contributor
Author
|
bors try |
Contributor
mockersf
approved these changes
Aug 13, 2022
Contributor
Author
|
It seems there is possibly one more detail. Morten Mikkelsen says that if the determinant of the local to world matrix can be negative (I think it definitely can be) then something needs scaling by the sign of the determinant. Just finding out exactly what, then I’ll update the PR. |
If the sign of the determinant of the 3x3 model matrix is negative, this must be applied when calculating the bitangent from the cross-product of the interpolated world space normal and interpolated world space tangent. This information came from Morten Mikkelsen and can be understood from section 2 of the following paper, though I do not understand it well enough to be able to explain it: https://jcgt.org/published/0009/03/04/
IceSentry
approved these changes
Aug 18, 2022
cart
approved these changes
Aug 18, 2022
Member
cart
left a comment
cart
left a comment
There was a problem hiding this comment.
Seems to work with both uniform and non-uniform scales!
Member
|
bors r+ |
bors bot
pushed a commit
that referenced
this pull request
Aug 18, 2022
# Objective - Morten Mikkelsen clarified that the world normal and tangent must be normalized in the vertex stage and the interpolated values must not be normalized in the fragment stage. This is in order to match the mikktspace approach exactly. - Fixes #5514 by ensuring the tangent basis matrix (TBN) is orthonormal ## Solution - Normalize the world normal in the vertex stage and not the fragment stage - Normalize the world tangent xyz in the vertex stage - Take into account the sign of the determinant of the local to world matrix when calculating the bitangent --- ## Changelog - Fixed - scaling a model that uses normal mapping now has correct lighting again
Contributor
|
Pull request successfully merged into main. Build succeeded: |
bors
bot
changed the title
cart
pushed a commit
that referenced
this pull request
Aug 19, 2022
# Objective - Morten Mikkelsen clarified that the world normal and tangent must be normalized in the vertex stage and the interpolated values must not be normalized in the fragment stage. This is in order to match the mikktspace approach exactly. - Fixes #5514 by ensuring the tangent basis matrix (TBN) is orthonormal ## Solution - Normalize the world normal in the vertex stage and not the fragment stage - Normalize the world tangent xyz in the vertex stage - Take into account the sign of the determinant of the local to world matrix when calculating the bitangent --- ## Changelog - Fixed - scaling a model that uses normal mapping now has correct lighting again
mockersf
added a commit
to mockersf/bevy
that referenced
this pull request
Aug 26, 2022
…)" This reverts commit a7ece4c.
HackerFoo
added a commit
to HackerFoo/bevy
that referenced
this pull request
Sep 6, 2022
…)" This reverts commit 681c9c6.
HackerFoo
added a commit
to HackerFoo/bevy
that referenced
this pull request
Sep 8, 2022
…)" This reverts commit 681c9c6.
maccesch
pushed a commit
to Synphonyte/bevy
that referenced
this pull request
Sep 28, 2022
# Objective - Morten Mikkelsen clarified that the world normal and tangent must be normalized in the vertex stage and the interpolated values must not be normalized in the fragment stage. This is in order to match the mikktspace approach exactly. - Fixes bevyengine#5514 by ensuring the tangent basis matrix (TBN) is orthonormal ## Solution - Normalize the world normal in the vertex stage and not the fragment stage - Normalize the world tangent xyz in the vertex stage - Take into account the sign of the determinant of the local to world matrix when calculating the bitangent --- ## Changelog - Fixed - scaling a model that uses normal mapping now has correct lighting again
james7132
pushed a commit
to james7132/bevy
that referenced
this pull request
Oct 28, 2022
# Objective - Morten Mikkelsen clarified that the world normal and tangent must be normalized in the vertex stage and the interpolated values must not be normalized in the fragment stage. This is in order to match the mikktspace approach exactly. - Fixes bevyengine#5514 by ensuring the tangent basis matrix (TBN) is orthonormal ## Solution - Normalize the world normal in the vertex stage and not the fragment stage - Normalize the world tangent xyz in the vertex stage - Take into account the sign of the determinant of the local to world matrix when calculating the bitangent --- ## Changelog - Fixed - scaling a model that uses normal mapping now has correct lighting again
superdump
added a commit
to superdump/bevy
that referenced
this pull request
Nov 10, 2022
This was forgotten in bevyengine#5666 when normalization of normals was moved from the fragment to vertex stage.
This was referenced Nov 10, 2022
bors bot
pushed a commit
that referenced
this pull request
Nov 11, 2022
# Objective - Make the many foxes not unnecessarily bright. Broken since #5666. - Fixes #6528 ## Solution - In #5666 normalisation of normals was moved from the fragment stage to the vertex stage. However, it was not added to the vertex stage for skinned normals. The many foxes are skinned and their skinned normals were not unit normals. which made them brighter. Normalising the skinned normals fixes this. --- ## Changelog - Fixed: Non-unit length skinned normals are now normalized.
HackerFoo
added a commit
to HackerFoo/bevy
that referenced
this pull request
Dec 21, 2022
…)" This reverts commit 681c9c6.
HackerFoo
added a commit
to HackerFoo/bevy
that referenced
this pull request
Dec 21, 2022
…)" This reverts commit 681c9c6.
HackerFoo
added a commit
to HackerFoo/bevy
that referenced
this pull request
Dec 21, 2022
…)" This reverts commit 681c9c6.
HackerFoo
added a commit
to HackerFoo/bevy
that referenced
this pull request
Jan 6, 2023
…)" This reverts commit 681c9c6.
HackerFoo
added a commit
to HackerFoo/bevy
that referenced
this pull request
Jan 22, 2023
…)" This reverts commit 681c9c6.
ItsDoot
pushed a commit
to ItsDoot/bevy
that referenced
this pull request
Feb 1, 2023
# Objective - Morten Mikkelsen clarified that the world normal and tangent must be normalized in the vertex stage and the interpolated values must not be normalized in the fragment stage. This is in order to match the mikktspace approach exactly. - Fixes bevyengine#5514 by ensuring the tangent basis matrix (TBN) is orthonormal ## Solution - Normalize the world normal in the vertex stage and not the fragment stage - Normalize the world tangent xyz in the vertex stage - Take into account the sign of the determinant of the local to world matrix when calculating the bitangent --- ## Changelog - Fixed - scaling a model that uses normal mapping now has correct lighting again
ItsDoot
pushed a commit
to ItsDoot/bevy
that referenced
this pull request
Feb 1, 2023
# Objective - Make the many foxes not unnecessarily bright. Broken since bevyengine#5666. - Fixes bevyengine#6528 ## Solution - In bevyengine#5666 normalisation of normals was moved from the fragment stage to the vertex stage. However, it was not added to the vertex stage for skinned normals. The many foxes are skinned and their skinned normals were not unit normals. which made them brighter. Normalising the skinned normals fixes this. --- ## Changelog - Fixed: Non-unit length skinned normals are now normalized.
HackerFoo
added a commit
to HackerFoo/bevy
that referenced
this pull request
Mar 4, 2023
…)" This reverts commit 681c9c6.
HackerFoo
added a commit
to HackerFoo/bevy
that referenced
this pull request
Mar 5, 2023
…)" This reverts commit 681c9c6.
HackerFoo
added a commit
to HackerFoo/bevy
that referenced
this pull request
Apr 10, 2023
…)" This reverts commit 681c9c6.
Merged
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Objective
Solution
Changelog