Removed the skeleton property from the .animationset resource.
#7990
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
JCash
commented
Sep 15, 2023
| @@ -180,7 +175,7 @@ static void loadModelAnimations(ArrayList<ModelImporter.Bone> bones, AnimationSe | |||
|
|
|||
| // Currently, by design choice, each file must only contain one animation. | |||
| // Our current approach is to choose the longest animation (to eliminate target poses etc) | |||
| ModelUtil.loadAnimations(scene, bones, animBuilder, animId, localAnimationIds); | |||
| ModelUtil.loadAnimations(scene, animBuilder, animId, localAnimationIds); | |||
There was a problem hiding this comment.
We no longer require the bones when loading an animation.
we load it as-is, and instead do animation track/bone matching at runtime.
Comment on lines
+426
to
+431
| String boneName = bone.getSourceId(); | ||
| if (bi == 0 || refIndex == 0) | ||
| { | ||
| boneName = "root"; | ||
| } | ||
|
|
There was a problem hiding this comment.
Another change after a design discussion with @matgis : Since the root bone is such a unique bone, we wanted to make sure it's always named the same, making it easier for users to import content from various sources.
matgis
previously approved these changes
Sep 15, 2023
JCash
commented
Sep 20, 2023
| (defn register-resource-types [workspace] | ||
| (resource-node/register-ddf-resource-type workspace | ||
| :ext "animationset" | ||
| :icon animation-set-icon | ||
| :label "Animation Set" | ||
| :load-fn load-animation-set | ||
| :sanitize-fn sanitize-animation-set |
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.
We've removed the
skeletonproperty from the.animationsetresource.This allows us to better match animation names with bone names at runtime.
The root bone of a skeleton is now also always renamed to
root, making it easier to use similar code in engine/scripting.Fixes #7712
PR checklist