Skip to content
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

Add a CallbackModeDiscrete property to AnimationMixer to handle the case of blending Continuous and Discrete tracks #86629

Merged
merged 1 commit into from
Feb 17, 2024

Conversation

TokageItLab
Copy link
Member

@TokageItLab TokageItLab commented Dec 30, 2023

@TokageItLab
Copy link
Member Author

TokageItLab commented Feb 10, 2024

Fixed a bug where INTERPOLATION_NEAREST did not handle reverse playback correctly (the bug existed before this PR). This ensures consistency in playback when converting from Discrete.

However, the old Nearest interpolation is not unreasonable, so for now this is only used when converted from Discrete by Force Continuous option. If necessary, we can add it to Animation::InterpolationType can be added later (as like INTERPOLATION_NEAREST_BIDIRECTIONAL).

@TokageItLab TokageItLab force-pushed the callback-mode-discrete branch 2 times, most recently from 6c2e56c to 5c09425 Compare February 10, 2024 06:50
@TokageItLab TokageItLab requested a review from KoBeWi February 10, 2024 23:36
@TokageItLab TokageItLab force-pushed the callback-mode-discrete branch from 5c09425 to d075566 Compare February 13, 2024 08:33
@TokageItLab TokageItLab requested review from a team as code owners February 13, 2024 08:33
@TokageItLab TokageItLab force-pushed the callback-mode-discrete branch 2 times, most recently from 74cc871 to 489354c Compare February 13, 2024 10:43
@AThousandShips AThousandShips removed the request for review from a team February 13, 2024 10:47
@AThousandShips AThousandShips removed request for a team February 13, 2024 10:47
@TokageItLab TokageItLab requested review from fire and removed request for a team February 13, 2024 22:42
@TokageItLab TokageItLab force-pushed the callback-mode-discrete branch from 489354c to fee827b Compare February 17, 2024 06:00
Copy link
Contributor

@lyuma lyuma left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

After Tokage explained it to me, I understand what this is fixing and it makes sense.

I do think users are going to be confused, so I'm suggesting some documentation changes.

doc/classes/AnimationMixer.xml Outdated Show resolved Hide resolved
doc/classes/AnimationMixer.xml Outdated Show resolved Hide resolved
doc/classes/AnimationMixer.xml Outdated Show resolved Hide resolved
@TokageItLab TokageItLab force-pushed the callback-mode-discrete branch from fee827b to 4b84ddb Compare February 17, 2024 09:02
doc/classes/AnimationMixer.xml Outdated Show resolved Hide resolved
misc/extension_api_validation/4.2-stable.expected Outdated Show resolved Hide resolved
scene/resources/animation.h Outdated Show resolved Hide resolved
@TokageItLab TokageItLab force-pushed the callback-mode-discrete branch from 4b84ddb to bc20fdf Compare February 17, 2024 09:26
@akien-mga akien-mga merged commit e31b253 into godotengine:master Feb 17, 2024
16 checks passed
@akien-mga
Copy link
Member

Thanks!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
Status: Done
4 participants