Fix refraction offset by manually unpacking normal mappings #48478
Conversation
This file contains 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
clayjohn
reviewed
May 6, 2021
scene/resources/material.cpp
Outdated
| @@ -1032,6 +1032,8 @@ void BaseMaterial3D::_update_shader() { | |||
|
|
|||
| if (features[FEATURE_REFRACTION]) { | |||
| if (features[FEATURE_NORMAL_MAPPING]) { | |||
| code += "\tNORMAL_MAP.xy = NORMAL_MAP.xy * 2.0 - 1.0;\n"; | |||
There was a problem hiding this comment.
You should be using a local variable such as normal_unpacked like what Arnklit suggested in the issue. If you override the NORMAL_MAP variable then the unpack will happen twice for actually calculating the normals of the object.
There was a problem hiding this comment.
Got it! Yea that actually makes sense... copy the normal mapping, unpack it, and feed it to the shader for when it needs to consider refraction. Leave the original normal mapping unedited for the remainder of the shader.
Something like
normal_unpacked = NORMAL_MAP;
normal_unpacked = ...;
...
code += "\tvec3 ref_normal = normalize( mix(NORMAL,TANGENT * normal_unpacked.x + BINORMAL * normal_unpacked.y + NORMAL * normal_unpacked.z,NORMAL_MAP_DEPTH) );\n";
If so I'll get that fixed and ammended to the commit/pr as soon as I get back home! Thanks!
…ffset rather than distorted.
brennengreen
force-pushed
the
normal-mapping-unpacked-fix
branch
from
264cd2c
to
31f2d94
Compare
akien-mga
approved these changes
May 14, 2021
akien-mga
changed the title
akien-mga
added
the
cherrypick:3.x
|
Thanks! And congrats on your first merged Godot contribution 🎉 |
|
Cherry-picked for 3.4. |
akien-mga
removed
the
cherrypick:3.x
|
Cherry-picked for 3.3.1. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Implemented the suggested changes from @clayjohn in issue #44571. Changes were implemented to manually unpack the normal maps to enable refraction rather than just an offset when a normal mapping is provided.
Fixes: #44571