Add a special case for 0-time interpolations #53003
Merged
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
KoBeWi
added
bug
cherrypick:3.x
akien-mga
reviewed
Sep 24, 2021
scene/animation/tween.cpp
Outdated
| @@ -318,6 +318,11 @@ bool Tween::should_pause() { | |||
| } | |||
|
|
|||
| Variant Tween::interpolate_variant(Variant p_initial_val, Variant p_delta_val, float p_time, float p_duration, TransitionType p_trans, EaseType p_ease) { | |||
| if (p_duration == 0) { | |||
| // Special case to avoid dividing by 0 in equations. | |||
| return p_initial_val + p_delta_val; | |||
There was a problem hiding this comment.
Doesn't work sadly:
scene/animation/tween.cpp:323:24: error: use of overloaded operator '+' is ambiguous (with operand types 'Variant' and 'Variant')
return p_initial_val + p_delta_val;
~~~~~~~~~~~~~ ^ ~~~~~~~~~~~
There was a problem hiding this comment.
Ah right, this should've gone into easing equations .-.
There was a problem hiding this comment.
So I guess this is why I originally wanted to PR it after merging #50165 🤔
akien-mga
approved these changes
Sep 24, 2021
|
Thanks! |
|
Cherry-picked for 3.4. |
akien-mga
removed
the
cherrypick:3.x
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.
Most of interpolation equations divide by duration, which results in infinite final value if it's 0. I added a special case for 0 duration, so now it ends instantly without computing anything.
Fixes #40843
Could be probably cherry-picked, because the interpolation method is the same (except it's not exposed).