From ae18928748047413db4d405a5d79a4bbfca05aca Mon Sep 17 00:00:00 2001 From: Hugo Locurcio Date: Sun, 24 Jul 2022 18:47:57 +0200 Subject: Rename Curve/Curve2D/Curve3D/Gradient `interpolate()` to `sample()` "sampling" is a more accurate term than "interpolating" for what's happening when using that function. --- scene/animation/animation_blend_tree.cpp | 2 +- scene/animation/animation_node_state_machine.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'scene/animation') diff --git a/scene/animation/animation_blend_tree.cpp b/scene/animation/animation_blend_tree.cpp index 61f068408c..308e14592c 100644 --- a/scene/animation/animation_blend_tree.cpp +++ b/scene/animation/animation_blend_tree.cpp @@ -750,7 +750,7 @@ double AnimationNodeTransition::process(double p_time, bool p_seek, bool p_seek_ float blend = xfade_time == 0 ? 0 : (prev_xfading / xfade_time); if (xfade_curve.is_valid()) { - blend = xfade_curve->interpolate(blend); + blend = xfade_curve->sample(blend); } if (from_start && !p_seek && switched) { //just switched, seek to start of current diff --git a/scene/animation/animation_node_state_machine.cpp b/scene/animation/animation_node_state_machine.cpp index afb52de307..4982afb59f 100644 --- a/scene/animation/animation_node_state_machine.cpp +++ b/scene/animation/animation_node_state_machine.cpp @@ -433,7 +433,7 @@ double AnimationNodeStateMachinePlayback::process(AnimationNodeStateMachine *p_s } if (current_curve.is_valid()) { - fade_blend = current_curve->interpolate(fade_blend); + fade_blend = current_curve->sample(fade_blend); } float rem = p_state_machine->blend_node(current, p_state_machine->states[current].node, p_time, p_seek, p_seek_root, fade_blend, AnimationNode::FILTER_IGNORE, true); -- cgit v1.2.3