Automatically transform Skeleton2D calculations so pivots are not needed #72214
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
reduz
approved these changes
Jan 28, 2023
| @@ -164,10 +174,13 @@ void main() { | |||
| m += GET_BONE_MATRIX(bones.z, bones_a.z, in_weight_attrib.z); | |||
| m += GET_BONE_MATRIX(bones.w, bones_a.w, in_weight_attrib.w); | |||
|
|
|||
| mat4 skeleton_matrix = mat4(vec4(skeleton_transform_x, 0.0, 0.0), vec4(skeleton_transform_y, 0.0, 0.0), vec4(0.0, 0.0, 1.0, 0.0), vec4(skeleton_transform_offset, 0.0, 1.0)); | |||
There was a problem hiding this comment.
Yep, that code is only included when calculating 2D skeletons
|
Thanks! |
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.
Fixes: #71108
In the rewrite for Godot 4.0 we moved to calculating skeletons outside of the main draw loop. This is more efficient, but it disconnects the skeleton from the object that draws it. As a result, we were deforming skeletons without regard to where the Skeleton2D node is compared to the Polygon2D resulting in rotations being calculated in the wrong space.
The fix is to transform the bone transforms into local space to perform the rotation. This requires sending the CanvasItem's transform to MeshStorage class and caching the transform in the MeshInstance so it is available at Skeleton update time.
With this change Skeleton2Ds finally are back to working the same as they do in the Skeleton2D tutorial