Merge pull request #106567 from TokageItLab/fix-fadeout-dur

akien-mga · akien-mga · commit 0129180c72e6 · 2025-06-22T11:59:01.000+02:00
Fix fade out duration to extend a bit take into account current delta in NodeOneShot
diff --git a/scene/animation/animation_blend_tree.cpp b/scene/animation/animation_blend_tree.cpp
@@ -678,7 +678,7 @@ AnimationNode::NodeTimeInfo AnimationNodeOneShot::_process(const AnimationMixer:
 		double os_rem = os_nti.get_remain(break_loop_at_end) * tscl;
 		if (Animation::is_less_or_equal_approx(os_rem, fade_out)) {
 			is_fading_out = true;
-			cur_fade_out_remaining = os_rem;
+			cur_fade_out_remaining = os_rem + abs_delta;
 			cur_fade_in_remaining = 0;
 			set_parameter(internal_active, false);
 		}

Original file line number	Diff line number	Diff line change
`@@ -678,7 +678,7 @@ AnimationNode::NodeTimeInfo AnimationNodeOneShot::_process(const AnimationMixer:`
`678`	`678`	`double os_rem = os_nti.get_remain(break_loop_at_end) * tscl;`
`679`	`679`	`if (Animation::is_less_or_equal_approx(os_rem, fade_out)) {`
`680`	`680`	`is_fading_out = true;`
`681`		`- cur_fade_out_remaining = os_rem;`
	`681`	`+ cur_fade_out_remaining = os_rem + abs_delta;`
`682`	`682`	`cur_fade_in_remaining = 0;`
`683`	`683`	`set_parameter(internal_active, false);`
`684`	`684`	`}`