-
-
Notifications
You must be signed in to change notification settings - Fork 2.9k
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.
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
fix: Don't combine Collada animations when channels are shared #2855
Merged
kimkulling
merged 4 commits into
assimp:master
from
felipeek:fix/collada-combining-animations
Jan 4, 2020
Merged
fix: Don't combine Collada animations when channels are shared #2855
kimkulling
merged 4 commits into
assimp:master
from
felipeek:fix/collada-combining-animations
Jan 4, 2020
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
Thanks a lot for the PR, looks fine for me. DO you have a simple example which can be used to check if your code is working as expected? And thanks for the help! |
Add missing include.
Merged, thanks a lot for the contribution. |
Thanks for merging. Below is an example of a collada file with two single-channel animations that have the same channel. Assimp is not combining them anymore.
|
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.
Hello,
We were experiencing problems with the Collada importer when dealing with files that had more than one single-channel animation. The problem was that Assimp was combining all single-channel animations, without checking if the channel was the same.
This PR adds a check to properly avoid combining the single-channel animations when they are animating the same channel. When they are animating different channels, they are still being combined as expected.