maxmustermann/godot
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge pull request #53687 from godotengine/revert-48332-implement-ping-pong

Browse source 
Revert "Implement reverse playback and ping-pong loop in AnimationPlayer and NodeAnimation"
This commit is contained in:
Juan Linietsky 2021-10-11 19:28:34 -03:00 committed by GitHub
parent 9ed4f8367b 610de0974d
commit f9aec342dc
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
29 changed files with 356 additions and 846 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
core/math/math_funcs.h
View file

@ -291,19 +291,6 @@ public:
return is_zero_approx(range) ? min : value - (range * Math::floor((value - min) / range)); return is_zero_approx(range) ? min : value - (range * Math::floor((value - min) / range));
} }
static _ALWAYS_INLINE_ float fract(float value) {
return value - floor(value);
}
static _ALWAYS_INLINE_ double fract(double value) {
return value - floor(value);
}
static _ALWAYS_INLINE_ float pingpong(float value, float length) {
return (length != 0.0f) ? abs(fract((value - length) / (length * 2.0f)) * length * 2.0f - length) : 0.0f;
}
static _ALWAYS_INLINE_ double pingpong(double value, double length) {
return (length != 0.0) ? abs(fract((value - length) / (length * 2.0)) * length * 2.0 - length) : 0.0;
}
// double only, as these functions are mainly used by the editor and not performance-critical, // double only, as these functions are mainly used by the editor and not performance-critical,
static double ease(double p_x, double p_c); static double ease(double p_x, double p_c);
static int step_decimals(double p_step); static int step_decimals(double p_step);

5
core/variant/variant_utility.cpp
View file

@ -275,10 +275,6 @@ struct VariantUtilityFunctions {
return Math::wrapf(value, min, max); return Math::wrapf(value, min, max);
} }
static inline double pingpong(double value, double length) {
return Math::pingpong(value, length);
}
static inline Variant max(const Variant **p_args, int p_argcount, Callable::CallError &r_error) { static inline Variant max(const Variant **p_args, int p_argcount, Callable::CallError &r_error) {
if (p_argcount < 2) { if (p_argcount < 2) {
r_error.error = Callable::CallError::CALL_ERROR_TOO_FEW_ARGUMENTS; r_error.error = Callable::CallError::CALL_ERROR_TOO_FEW_ARGUMENTS;
@ -1230,7 +1226,6 @@ void Variant::_register_variant_utility_functions() {
FUNCBINDR(clampf, sarray("value", "min", "max"), Variant::UTILITY_FUNC_TYPE_MATH); FUNCBINDR(clampf, sarray("value", "min", "max"), Variant::UTILITY_FUNC_TYPE_MATH);
FUNCBINDR(nearest_po2, sarray("value"), Variant::UTILITY_FUNC_TYPE_MATH); FUNCBINDR(nearest_po2, sarray("value"), Variant::UTILITY_FUNC_TYPE_MATH);
FUNCBINDR(pingpong, sarray("value", "length"), Variant::UTILITY_FUNC_TYPE_MATH);
// Random // Random

20
doc/classes/@GlobalScope.xml
View file

@ -525,26 +525,6 @@
[b]Warning:[/b] Due to the way it is implemented, this function returns [code]0[/code] rather than [code]1[/code] for non-positive values of [code]value[/code] (in reality, 1 is the smallest integer power of 2). [b]Warning:[/b] Due to the way it is implemented, this function returns [code]0[/code] rather than [code]1[/code] for non-positive values of [code]value[/code] (in reality, 1 is the smallest integer power of 2).
</description> </description>
</method> </method>
<method name="pingpong">
<return type="float" />
<argument index="0" name="value" type="float" />
<argument index="1" name="length" type="float" />
<description>
Returns the [code]value[/code] wrapped between [code]0[/code] and the [code]length[/code]. If the limit is reached, the next value the function returned is decreased to the [code]0[/code] side or increased to the [code]length[/code] side (like a triangle wave). If [code]length[/code] is less than zero, it becomes positive.
[codeblock]
pingpong(-3.0, 3.0) # Returns 3
pingpong(-2.0, 3.0) # Returns 2
pingpong(-1.0, 3.0) # Returns 1
pingpong(0.0, 3.0) # Returns 0
pingpong(1.0, 3.0) # Returns 1
pingpong(2.0, 3.0) # Returns 2
pingpong(3.0, 3.0) # Returns 3
pingpong(4.0, 3.0) # Returns 2
pingpong(5.0, 3.0) # Returns 1
pingpong(6.0, 3.0) # Returns 0
[/codeblock]
</description>
</method>
<method name="posmod"> <method name="posmod">
<return type="int" /> <return type="int" />
<argument index="0" name="x" type="int" /> <argument index="0" name="x" type="int" />

14
doc/classes/Animation.xml
View file

@ -481,7 +481,6 @@
<return type="Array" /> <return type="Array" />
<argument index="0" name="track_idx" type="int" /> <argument index="0" name="track_idx" type="int" />
<argument index="1" name="time_sec" type="float" /> <argument index="1" name="time_sec" type="float" />
<argument index="2" name="is_backward" type="bool" default="false" />
<description> <description>
Returns the interpolated value of a transform track at a given time (in seconds). An array consisting of 3 elements: position ([Vector3]), rotation ([Quaternion]) and scale ([Vector3]). Returns the interpolated value of a transform track at a given time (in seconds). An array consisting of 3 elements: position ([Vector3]), rotation ([Quaternion]) and scale ([Vector3]).
</description> </description>
@ -524,8 +523,8 @@
The total length of the animation (in seconds). The total length of the animation (in seconds).
[b]Note:[/b] Length is not delimited by the last key, as this one may be before or after the end to ensure correct interpolation and looping. [b]Note:[/b] Length is not delimited by the last key, as this one may be before or after the end to ensure correct interpolation and looping.
</member> </member>
<member name="loop_mode" type="int" setter="set_loop_mode" getter="get_loop_mode" enum="Animation.LoopMode" default="0"> <member name="loop" type="bool" setter="set_loop" getter="has_loop" default="false">
Determines the behavior of both ends of the animation timeline during animation playback. This is used for correct interpolation of animation cycles, and for hinting the player that it must restart the animation. A flag indicating that the animation must loop. This is used for correct interpolation of animation cycles, and for hinting the player that it must restart the animation.
</member> </member>
<member name="step" type="float" setter="set_step" getter="get_step" default="0.1"> <member name="step" type="float" setter="set_step" getter="get_step" default="0.1">
The animation step value. The animation step value.
@ -578,14 +577,5 @@
<constant name="UPDATE_CAPTURE" value="3" enum="UpdateMode"> <constant name="UPDATE_CAPTURE" value="3" enum="UpdateMode">
Same as linear interpolation, but also interpolates from the current value (i.e. dynamically at runtime) if the first key isn't at 0 seconds. Same as linear interpolation, but also interpolates from the current value (i.e. dynamically at runtime) if the first key isn't at 0 seconds.
</constant> </constant>
<constant name="LOOP_NONE" value="0" enum="LoopMode">
At both ends of the animation, the animation will stop playing.
</constant>
<constant name="LOOP_LINEAR" value="1" enum="LoopMode">
At both ends of the animation, the animation will be repeated without changing the playback direction.
</constant>
<constant name="LOOP_PINGPONG" value="2" enum="LoopMode">
Repeats playback and reverse playback at both ends of the animation.
</constant>
</constants> </constants>
</class> </class>

1
doc/classes/AnimationNode.xml
View file

@ -73,7 +73,6 @@
<argument index="2" name="delta" type="float" /> <argument index="2" name="delta" type="float" />
<argument index="3" name="seeked" type="bool" /> <argument index="3" name="seeked" type="bool" />
<argument index="4" name="blend" type="float" /> <argument index="4" name="blend" type="float" />
<argument index="5" name="pingponged" type="int" default="0" />
<description> <description>
Blend an animation by [code]blend[/code] amount (name must be valid in the linked [AnimationPlayer]). A [code]time[/code] and [code]delta[/code] may be passed, as well as whether [code]seek[/code] happened. Blend an animation by [code]blend[/code] amount (name must be valid in the linked [AnimationPlayer]). A [code]time[/code] and [code]delta[/code] may be passed, as well as whether [code]seek[/code] happened.
</description> </description>

9
doc/classes/AnimationNodeAnimation.xml
View file

@ -15,14 +15,5 @@
<member name="animation" type="StringName" setter="set_animation" getter="get_animation" default="&amp;&quot;&quot;"> <member name="animation" type="StringName" setter="set_animation" getter="get_animation" default="&amp;&quot;&quot;">
Animation to use as an output. It is one of the animations provided by [member AnimationTree.anim_player]. Animation to use as an output. It is one of the animations provided by [member AnimationTree.anim_player].
</member> </member>
<member name="play_mode" type="int" setter="set_play_mode" getter="get_play_mode" enum="AnimationNodeAnimation.PlayMode" default="0">
Determines the playback direction of the animation.
</member>
</members> </members>
<constants>
<constant name="PLAY_MODE_FORWARD" value="0" enum="PlayMode">
</constant>
<constant name="PLAY_MODE_BACKWARD" value="1" enum="PlayMode">
</constant>
</constants>
</class> </class>

2
doc/classes/AudioStreamSample.xml
View file

@ -61,7 +61,7 @@
<constant name="LOOP_FORWARD" value="1" enum="LoopMode"> <constant name="LOOP_FORWARD" value="1" enum="LoopMode">
Audio loops the data between [member loop_begin] and [member loop_end], playing forward only. Audio loops the data between [member loop_begin] and [member loop_end], playing forward only.
</constant> </constant>
<constant name="LOOP_PINGPONG" value="2" enum="LoopMode"> <constant name="LOOP_PING_PONG" value="2" enum="LoopMode">
Audio loops the data between [member loop_begin] and [member loop_end], playing back and forth. Audio loops the data between [member loop_begin] and [member loop_end], playing back and forth.
</constant> </constant>
<constant name="LOOP_BACKWARD" value="3" enum="LoopMode"> <constant name="LOOP_BACKWARD" value="3" enum="LoopMode">

59
editor/animation_track_editor.cpp
View file

@ -1323,20 +1323,8 @@ void AnimationTimelineEdit::_anim_length_changed(double p_new_len) {
void AnimationTimelineEdit::_anim_loop_pressed() { void AnimationTimelineEdit::_anim_loop_pressed() {
undo_redo->create_action(TTR("Change Animation Loop")); undo_redo->create_action(TTR("Change Animation Loop"));
switch (animation->get_loop_mode()) { undo_redo->add_do_method(animation.ptr(), "set_loop", loop->is_pressed());
case Animation::LoopMode::LOOP_NONE: { undo_redo->add_undo_method(animation.ptr(), "set_loop", animation->has_loop());
undo_redo->add_do_method(animation.ptr(), "set_loop_mode", Animation::LoopMode::LOOP_LINEAR);
} break;
case Animation::LoopMode::LOOP_LINEAR: {
undo_redo->add_do_method(animation.ptr(), "set_loop_mode", Animation::LoopMode::LOOP_PINGPONG);
} break;
case Animation::LoopMode::LOOP_PINGPONG: {
undo_redo->add_do_method(animation.ptr(), "set_loop_mode", Animation::LoopMode::LOOP_NONE);
} break;
default:
break;
}
undo_redo->add_undo_method(animation.ptr(), "set_loop_mode", animation->get_loop_mode());
undo_redo->commit_action(); undo_redo->commit_action();
} }
@ -1619,24 +1607,7 @@ void AnimationTimelineEdit::update_values() {
length->set_tooltip(TTR("Animation length (seconds)")); length->set_tooltip(TTR("Animation length (seconds)"));
time_icon->set_tooltip(TTR("Animation length (seconds)")); time_icon->set_tooltip(TTR("Animation length (seconds)"));
} }
loop->set_pressed(animation->has_loop());
switch (animation->get_loop_mode()) {
case Animation::LoopMode::LOOP_NONE: {
loop->set_icon(get_theme_icon("Loop", "EditorIcons"));
loop->set_pressed(false);
} break;
case Animation::LoopMode::LOOP_LINEAR: {
loop->set_icon(get_theme_icon("Loop", "EditorIcons"));
loop->set_pressed(true);
} break;
case Animation::LoopMode::LOOP_PINGPONG: {
loop->set_icon(get_theme_icon("PingPongLoop", "EditorIcons"));
loop->set_pressed(true);
} break;
default:
break;
}
editing = false; editing = false;
} }
@ -2079,25 +2050,25 @@ void AnimationTrackEdit::_notification(int p_what) {
Ref<Texture2D> icon = wrap_icon[loop_wrap ? 1 : 0]; Ref<Texture2D> icon = wrap_icon[loop_wrap ? 1 : 0];
loop_wrap_rect.position.x = ofs; loop_mode_rect.position.x = ofs;
loop_wrap_rect.position.y = int(get_size().height - icon->get_height()) / 2; loop_mode_rect.position.y = int(get_size().height - icon->get_height()) / 2;
loop_wrap_rect.size = icon->get_size(); loop_mode_rect.size = icon->get_size();
if (animation->track_get_type(track) == Animation::TYPE_VALUE || animation->track_get_type(track) == Animation::TYPE_TRANSFORM3D) { if (animation->track_get_type(track) == Animation::TYPE_VALUE || animation->track_get_type(track) == Animation::TYPE_TRANSFORM3D) {
draw_texture(icon, loop_wrap_rect.position); draw_texture(icon, loop_mode_rect.position);
} }
loop_wrap_rect.position.y = 0; loop_mode_rect.position.y = 0;
loop_wrap_rect.size.y = get_size().height; loop_mode_rect.size.y = get_size().height;
ofs += icon->get_width() + hsep; ofs += icon->get_width() + hsep;
loop_wrap_rect.size.x += hsep; loop_mode_rect.size.x += hsep;
if (animation->track_get_type(track) == Animation::TYPE_VALUE || animation->track_get_type(track) == Animation::TYPE_TRANSFORM3D) { if (animation->track_get_type(track) == Animation::TYPE_VALUE || animation->track_get_type(track) == Animation::TYPE_TRANSFORM3D) {
draw_texture(down_icon, Vector2(ofs, int(get_size().height - down_icon->get_height()) / 2)); draw_texture(down_icon, Vector2(ofs, int(get_size().height - down_icon->get_height()) / 2));
loop_wrap_rect.size.x += down_icon->get_width(); loop_mode_rect.size.x += down_icon->get_width();
} else { } else {
loop_wrap_rect = Rect2(); loop_mode_rect = Rect2();
} }
ofs += down_icon->get_width(); ofs += down_icon->get_width();
@ -2444,7 +2415,7 @@ String AnimationTrackEdit::get_tooltip(const Point2 &p_pos) const {
return TTR("Interpolation Mode"); return TTR("Interpolation Mode");
} }
if (loop_wrap_rect.has_point(p_pos)) { if (loop_mode_rect.has_point(p_pos)) {
return TTR("Loop Wrap Mode (Interpolate end with beginning on loop)"); return TTR("Loop Wrap Mode (Interpolate end with beginning on loop)");
} }
@ -2643,7 +2614,7 @@ void AnimationTrackEdit::gui_input(const Ref<InputEvent> &p_event) {
accept_event(); accept_event();
} }
if (loop_wrap_rect.has_point(pos)) { if (loop_mode_rect.has_point(pos)) {
if (!menu) { if (!menu) {
menu = memnew(PopupMenu); menu = memnew(PopupMenu);
add_child(menu); add_child(menu);
@ -2654,7 +2625,7 @@ void AnimationTrackEdit::gui_input(const Ref<InputEvent> &p_event) {
menu->add_icon_item(get_theme_icon(SNAME("InterpWrapLoop"), SNAME("EditorIcons")), TTR("Wrap Loop Interp"), MENU_LOOP_WRAP); menu->add_icon_item(get_theme_icon(SNAME("InterpWrapLoop"), SNAME("EditorIcons")), TTR("Wrap Loop Interp"), MENU_LOOP_WRAP);
menu->set_as_minsize(); menu->set_as_minsize();
Vector2 popup_pos = get_screen_position() + loop_wrap_rect.position + Vector2(0, loop_wrap_rect.size.height); Vector2 popup_pos = get_screen_position() + loop_mode_rect.position + Vector2(0, loop_mode_rect.size.height);
menu->set_position(popup_pos); menu->set_position(popup_pos);
menu->popup(); menu->popup();
accept_event(); accept_event();

3
editor/animation_track_editor.h
View file

@ -159,7 +159,7 @@ class AnimationTrackEdit : public Control {
Rect2 update_mode_rect; Rect2 update_mode_rect;
Rect2 interp_mode_rect; Rect2 interp_mode_rect;
Rect2 loop_wrap_rect; Rect2 loop_mode_rect;
Rect2 remove_rect; Rect2 remove_rect;
Rect2 bezier_edit_rect; Rect2 bezier_edit_rect;
@ -466,7 +466,6 @@ class AnimationTrackEditor : public VBoxContainer {
Animation::TrackType track_type = Animation::TrackType::TYPE_ANIMATION; Animation::TrackType track_type = Animation::TrackType::TYPE_ANIMATION;
Animation::InterpolationType interp_type = Animation::InterpolationType::INTERPOLATION_CUBIC; Animation::InterpolationType interp_type = Animation::InterpolationType::INTERPOLATION_CUBIC;
Animation::UpdateMode update_mode = Animation::UpdateMode::UPDATE_CAPTURE; Animation::UpdateMode update_mode = Animation::UpdateMode::UPDATE_CAPTURE;
Animation::LoopMode loop_mode = Animation::LoopMode::LOOP_LINEAR;
bool loop_wrap = false; bool loop_wrap = false;
bool enabled = false; bool enabled = false;

1
editor/icons/PingPongLoop.svg
View file

@ -1 +0,0 @@
<svg enable-background="new 0 0 16 16" height="16" viewBox="0 0 16 16" width="16" xmlns="http://www.w3.org/2000/svg"><g fill="#e0e0e0" fill-opacity=".9961"><path d="m10 7h-4v-2l-4 3 4 3v-2h4v2l4-3-4-3z"/><path d="m0 1v14h2v-7-7z"/><path d="m14 1v7 7h2v-14z"/></g></svg>
Side by side

Before

Width:  |  Height:  |  Size: 270 B

20
editor/import/resource_importer_scene.cpp
View file

@ -317,10 +317,10 @@ Node *ResourceImporterScene::_pre_fix_node(Node *p_node, Node *p_root, Map<Ref<I
String animname = E; String animname = E;
const int loop_string_count = 3; const int loop_string_count = 3;
static const char *loop_strings[loop_string_count] = { "loop_mode", "loop", "cycle" }; static const char *loop_strings[loop_string_count] = { "loops", "loop", "cycle" };
for (int i = 0; i < loop_string_count; i++) { for (int i = 0; i < loop_string_count; i++) {
if (_teststr(animname, loop_strings[i])) { if (_teststr(animname, loop_strings[i])) {
anim->set_loop_mode(Animation::LoopMode::LOOP_LINEAR); anim->set_loop(true);
animname = _fixstr(animname, loop_strings[i]); animname = _fixstr(animname, loop_strings[i]);
ap->rename_animation(E, animname); ap->rename_animation(E, animname);
} }
@ -732,7 +732,7 @@ Node *ResourceImporterScene::_post_fix_node(Node *p_node, Node *p_root, Map<Ref<
String name = node_settings["clip_" + itos(i + 1) + "/name"]; String name = node_settings["clip_" + itos(i + 1) + "/name"];
int from_frame = node_settings["clip_" + itos(i + 1) + "/start_frame"]; int from_frame = node_settings["clip_" + itos(i + 1) + "/start_frame"];
int end_frame = node_settings["clip_" + itos(i + 1) + "/end_frame"]; int end_frame = node_settings["clip_" + itos(i + 1) + "/end_frame"];
Animation::LoopMode loop_mode = static_cast<Animation::LoopMode>((int)node_settings["clip_" + itos(i + 1) + "/loop_mode"]); bool loop = node_settings["clip_" + itos(i + 1) + "/loops"];
bool save_to_file = node_settings["clip_" + itos(i + 1) + "/save_to_file/enabled"]; bool save_to_file = node_settings["clip_" + itos(i + 1) + "/save_to_file/enabled"];
bool save_to_path = node_settings["clip_" + itos(i + 1) + "/save_to_file/path"]; bool save_to_path = node_settings["clip_" + itos(i + 1) + "/save_to_file/path"];
bool save_to_file_keep_custom = node_settings["clip_" + itos(i + 1) + "/save_to_file/keep_custom_tracks"]; bool save_to_file_keep_custom = node_settings["clip_" + itos(i + 1) + "/save_to_file/keep_custom_tracks"];
@ -740,7 +740,7 @@ Node *ResourceImporterScene::_post_fix_node(Node *p_node, Node *p_root, Map<Ref<
animation_clips.push_back(name); animation_clips.push_back(name);
animation_clips.push_back(from_frame / p_animation_fps); animation_clips.push_back(from_frame / p_animation_fps);
animation_clips.push_back(end_frame / p_animation_fps); animation_clips.push_back(end_frame / p_animation_fps);
animation_clips.push_back(loop_mode); animation_clips.push_back(loop);
animation_clips.push_back(save_to_file); animation_clips.push_back(save_to_file);
animation_clips.push_back(save_to_path); animation_clips.push_back(save_to_path);
animation_clips.push_back(save_to_file_keep_custom); animation_clips.push_back(save_to_file_keep_custom);
@ -767,7 +767,7 @@ Node *ResourceImporterScene::_post_fix_node(Node *p_node, Node *p_root, Map<Ref<
} }
} }
anim->set_loop_mode(static_cast<Animation::LoopMode>((int)anim_settings["settings/loop_mode"])); anim->set_loop(anim_settings["settings/loops"]);
bool save = anim_settings["save_to_file/enabled"]; bool save = anim_settings["save_to_file/enabled"];
String path = anim_settings["save_to_file/path"]; String path = anim_settings["save_to_file/path"];
bool keep_custom = anim_settings["save_to_file/keep_custom_tracks"]; bool keep_custom = anim_settings["save_to_file/keep_custom_tracks"];
@ -799,7 +799,7 @@ Ref<Animation> ResourceImporterScene::_save_animation_to_file(Ref<Animation> ani
old_anim->copy_track(i, anim); old_anim->copy_track(i, anim);
} }
} }
anim->set_loop_mode(old_anim->get_loop_mode()); anim->set_loop(old_anim->has_loop());
} }
} }
@ -827,7 +827,7 @@ void ResourceImporterScene::_create_clips(AnimationPlayer *anim, const Array &p_
String name = p_clips[i]; String name = p_clips[i];
float from = p_clips[i + 1]; float from = p_clips[i + 1];
float to = p_clips[i + 2]; float to = p_clips[i + 2];
Animation::LoopMode loop_mode = static_cast<Animation::LoopMode>((int)p_clips[i + 3]); bool loop = p_clips[i + 3];
bool save_to_file = p_clips[i + 4]; bool save_to_file = p_clips[i + 4];
String save_to_path = p_clips[i + 5]; String save_to_path = p_clips[i + 5];
bool keep_current = p_clips[i + 6]; bool keep_current = p_clips[i + 6];
@ -915,7 +915,7 @@ void ResourceImporterScene::_create_clips(AnimationPlayer *anim, const Array &p_
} }
} }
new_anim->set_loop_mode(loop_mode); new_anim->set_loop(loop);
new_anim->set_length(to - from); new_anim->set_length(to - from);
anim->add_animation(name, new_anim); anim->add_animation(name, new_anim);
@ -989,7 +989,7 @@ void ResourceImporterScene::get_internal_import_options(InternalImportCategory p
r_options->push_back(ImportOption(PropertyInfo(Variant::STRING, "use_external/path", PROPERTY_HINT_FILE, "*.material,*.res,*.tres"), "")); r_options->push_back(ImportOption(PropertyInfo(Variant::STRING, "use_external/path", PROPERTY_HINT_FILE, "*.material,*.res,*.tres"), ""));
} break; } break;
case INTERNAL_IMPORT_CATEGORY_ANIMATION: { case INTERNAL_IMPORT_CATEGORY_ANIMATION: {
r_options->push_back(ImportOption(PropertyInfo(Variant::INT, "settings/loop_mode"), 0)); r_options->push_back(ResourceImporter::ImportOption(PropertyInfo(Variant::BOOL, "settings/loops"), false));
r_options->push_back(ImportOption(PropertyInfo(Variant::BOOL, "save_to_file/enabled", PROPERTY_HINT_NONE, "", PROPERTY_USAGE_DEFAULT | PROPERTY_USAGE_UPDATE_ALL_IF_MODIFIED), false)); r_options->push_back(ImportOption(PropertyInfo(Variant::BOOL, "save_to_file/enabled", PROPERTY_HINT_NONE, "", PROPERTY_USAGE_DEFAULT | PROPERTY_USAGE_UPDATE_ALL_IF_MODIFIED), false));
r_options->push_back(ImportOption(PropertyInfo(Variant::STRING, "save_to_file/path", PROPERTY_HINT_SAVE_FILE, "*.res,*.tres"), "")); r_options->push_back(ImportOption(PropertyInfo(Variant::STRING, "save_to_file/path", PROPERTY_HINT_SAVE_FILE, "*.res,*.tres"), ""));
r_options->push_back(ImportOption(PropertyInfo(Variant::BOOL, "save_to_file/keep_custom_tracks"), "")); r_options->push_back(ImportOption(PropertyInfo(Variant::BOOL, "save_to_file/keep_custom_tracks"), ""));
@ -1006,7 +1006,7 @@ void ResourceImporterScene::get_internal_import_options(InternalImportCategory p
r_options->push_back(ImportOption(PropertyInfo(Variant::STRING, "slice_" + itos(i + 1) + "/name"), "")); r_options->push_back(ImportOption(PropertyInfo(Variant::STRING, "slice_" + itos(i + 1) + "/name"), ""));
r_options->push_back(ImportOption(PropertyInfo(Variant::INT, "slice_" + itos(i + 1) + "/start_frame"), 0)); r_options->push_back(ImportOption(PropertyInfo(Variant::INT, "slice_" + itos(i + 1) + "/start_frame"), 0));
r_options->push_back(ImportOption(PropertyInfo(Variant::INT, "slice_" + itos(i + 1) + "/end_frame"), 0)); r_options->push_back(ImportOption(PropertyInfo(Variant::INT, "slice_" + itos(i + 1) + "/end_frame"), 0));
r_options->push_back(ImportOption(PropertyInfo(Variant::INT, "slice_" + itos(i + 1) + "/loop_mode"), 0)); r_options->push_back(ImportOption(PropertyInfo(Variant::BOOL, "slice_" + itos(i + 1) + "/loops"), false));
r_options->push_back(ImportOption(PropertyInfo(Variant::BOOL, "slice_" + itos(i + 1) + "/save_to_file/enabled", PROPERTY_HINT_NONE, "", PROPERTY_USAGE_DEFAULT | PROPERTY_USAGE_UPDATE_ALL_IF_MODIFIED), false)); r_options->push_back(ImportOption(PropertyInfo(Variant::BOOL, "slice_" + itos(i + 1) + "/save_to_file/enabled", PROPERTY_HINT_NONE, "", PROPERTY_USAGE_DEFAULT | PROPERTY_USAGE_UPDATE_ALL_IF_MODIFIED), false));
r_options->push_back(ImportOption(PropertyInfo(Variant::STRING, "slice_" + itos(i + 1) + "/save_to_file/path", PROPERTY_HINT_SAVE_FILE, ".res,*.tres"), "")); r_options->push_back(ImportOption(PropertyInfo(Variant::STRING, "slice_" + itos(i + 1) + "/save_to_file/path", PROPERTY_HINT_SAVE_FILE, ".res,*.tres"), ""));
r_options->push_back(ImportOption(PropertyInfo(Variant::BOOL, "slice_" + itos(i + 1) + "/save_to_file/keep_custom_tracks"), false)); r_options->push_back(ImportOption(PropertyInfo(Variant::BOOL, "slice_" + itos(i + 1) + "/save_to_file/keep_custom_tracks"), false));

2
editor/import/resource_importer_wav.cpp
View file

@ -272,7 +272,7 @@ Error ResourceImporterWAV::import(const String &p_source_file, const String &p_s
if (loop_type == 0x00) { if (loop_type == 0x00) {
loop = AudioStreamSample::LOOP_FORWARD; loop = AudioStreamSample::LOOP_FORWARD;
} else if (loop_type == 0x01) { } else if (loop_type == 0x01) {
loop = AudioStreamSample::LOOP_PINGPONG; loop = AudioStreamSample::LOOP_PING_PONG;
} else if (loop_type == 0x02) { } else if (loop_type == 0x02) {
loop = AudioStreamSample::LOOP_BACKWARD; loop = AudioStreamSample::LOOP_BACKWARD;
} }

9
editor/plugins/animation_player_editor_plugin.cpp
View file

@ -41,7 +41,6 @@
#include "editor/plugins/canvas_item_editor_plugin.h" // For onion skinning. #include "editor/plugins/canvas_item_editor_plugin.h" // For onion skinning.
#include "editor/plugins/node_3d_editor_plugin.h" // For onion skinning. #include "editor/plugins/node_3d_editor_plugin.h" // For onion skinning.
#include "scene/main/window.h" #include "scene/main/window.h"
#include "scene/resources/animation.h"
#include "servers/rendering_server.h" #include "servers/rendering_server.h"
void AnimationPlayerEditor::_node_removed(Node *p_node) { void AnimationPlayerEditor::_node_removed(Node *p_node) {
@ -73,7 +72,7 @@ void AnimationPlayerEditor::_notification(int p_what) {
if (player->has_animation(animname)) { if (player->has_animation(animname)) {
Ref<Animation> anim = player->get_animation(animname); Ref<Animation> anim = player->get_animation(animname);
if (!anim.is_null()) { if (!anim.is_null()) {
frame->set_max((double)anim->get_length()); frame->set_max(anim->get_length());
} }
} }
} }
@ -290,7 +289,7 @@ void AnimationPlayerEditor::_animation_selected(int p_which) {
track_editor->set_root(root); track_editor->set_root(root);
} }
} }
frame->set_max((double)anim->get_length()); frame->set_max(anim->get_length());
} else { } else {
track_editor->set_animation(Ref<Animation>()); track_editor->set_animation(Ref<Animation>());
@ -1015,7 +1014,7 @@ void AnimationPlayerEditor::_seek_value_changed(float p_value, bool p_set, bool
Ref<Animation> anim; Ref<Animation> anim;
anim = player->get_animation(current); anim = player->get_animation(current);
float pos = CLAMP((double)anim->get_length() * (p_value / frame->get_max()), 0, (double)anim->get_length()); float pos = CLAMP(anim->get_length() * (p_value / frame->get_max()), 0, anim->get_length());
if (track_editor->is_snap_enabled()) { if (track_editor->is_snap_enabled()) {
pos = Math::snapped(pos, _get_editor_step()); pos = Math::snapped(pos, _get_editor_step());
} }
@ -1425,7 +1424,7 @@ void AnimationPlayerEditor::_prepare_onion_layers_2() {
float pos = cpos + step_off * anim->get_step(); float pos = cpos + step_off * anim->get_step();
bool valid = anim->get_loop_mode() != Animation::LoopMode::LOOP_NONE || (pos >= 0 && pos <= anim->get_length()); bool valid = anim->has_loop() || (pos >= 0 && pos <= anim->get_length());
onion.captures_valid.write[cidx] = valid; onion.captures_valid.write[cidx] = valid;
if (valid) { if (valid) {
player->seek(pos, true); player->seek(pos, true);

2
modules/gltf/gltf_document.cpp
View file

@ -5815,7 +5815,7 @@ void GLTFDocument::_import_animation(Ref<GLTFState> state, AnimationPlayer *ap,
animation->set_name(name); animation->set_name(name);
if (anim->get_loop()) { if (anim->get_loop()) {
animation->set_loop_mode(Animation::LOOP_LINEAR); animation->set_loop(true);
} }
float length = 0.0; float length = 0.0;

18
modules/mono/glue/GodotSharp/GodotSharp/Core/Mathf.cs
View file

@ -693,23 +693,5 @@ namespace Godot
} }
return min + ((((value - min) % range) + range) % range); return min + ((((value - min) % range) + range) % range);
} }
private static real_t Fract(real_t value)
{
return value - (real_t)Math.Floor(value);
}
/// <summary>
/// Returns the [code]value[/code] wrapped between [code]0[/code] and the [code]length[/code].
/// If the limit is reached, the next value the function returned is decreased to the [code]0[/code] side or increased to the [code]length[/code] side (like a triangle wave).
/// If [code]length[/code] is less than zero, it becomes positive.
/// </summary>
/// <param name="value">The value to pingpong.</param>
/// <param name="length">The maximum value of the function.</param>
/// <returns>The ping-ponged value.</returns>
public static real_t PingPong(real_t value, real_t length)
{
return (length != 0.0) ? Math.Abs(Mathf.Fract((value - length) / (length * 2.0)) * length * 2.0 - length) : 0.0;
}
} }
} }

49
modules/visual_script/doc_classes/VisualScriptBuiltinFunc.xml
View file

@ -140,76 +140,73 @@
</constant> </constant>
<constant name="MATH_WRAPF" value="42" enum="BuiltinFunc"> <constant name="MATH_WRAPF" value="42" enum="BuiltinFunc">
</constant> </constant>
<constant name="MATH_PINGPONG" value="43" enum="BuiltinFunc"> <constant name="LOGIC_MAX" value="43" enum="BuiltinFunc">
Return the [code]value[/code] wrapped between [code]0[/code] and the [code]length[/code]. If the limit is reached, the next value the function returned is decreased to the [code]0[/code] side or increased to the [code]length[/code] side (like a triangle wave). If [code]length[/code] is less than zero, it becomes positive.
</constant>
<constant name="LOGIC_MAX" value="44" enum="BuiltinFunc">
Return the greater of the two numbers, also known as their maximum. Return the greater of the two numbers, also known as their maximum.
</constant> </constant>
<constant name="LOGIC_MIN" value="45" enum="BuiltinFunc"> <constant name="LOGIC_MIN" value="44" enum="BuiltinFunc">
Return the lesser of the two numbers, also known as their minimum. Return the lesser of the two numbers, also known as their minimum.
</constant> </constant>
<constant name="LOGIC_CLAMP" value="46" enum="BuiltinFunc"> <constant name="LOGIC_CLAMP" value="45" enum="BuiltinFunc">
Return the input clamped inside the given range, ensuring the result is never outside it. Equivalent to [code]min(max(input, range_low), range_high)[/code]. Return the input clamped inside the given range, ensuring the result is never outside it. Equivalent to [code]min(max(input, range_low), range_high)[/code].
</constant> </constant>
<constant name="LOGIC_NEAREST_PO2" value="47" enum="BuiltinFunc"> <constant name="LOGIC_NEAREST_PO2" value="46" enum="BuiltinFunc">
Return the nearest power of 2 to the input. Return the nearest power of 2 to the input.
</constant> </constant>
<constant name="OBJ_WEAKREF" value="48" enum="BuiltinFunc"> <constant name="OBJ_WEAKREF" value="47" enum="BuiltinFunc">
Create a [WeakRef] from the input. Create a [WeakRef] from the input.
</constant> </constant>
<constant name="TYPE_CONVERT" value="49" enum="BuiltinFunc"> <constant name="TYPE_CONVERT" value="48" enum="BuiltinFunc">
Convert between types. Convert between types.
</constant> </constant>
<constant name="TYPE_OF" value="50" enum="BuiltinFunc"> <constant name="TYPE_OF" value="49" enum="BuiltinFunc">
Return the type of the input as an integer. Check [enum Variant.Type] for the integers that might be returned. Return the type of the input as an integer. Check [enum Variant.Type] for the integers that might be returned.
</constant> </constant>
<constant name="TYPE_EXISTS" value="51" enum="BuiltinFunc"> <constant name="TYPE_EXISTS" value="50" enum="BuiltinFunc">
Checks if a type is registered in the [ClassDB]. Checks if a type is registered in the [ClassDB].
</constant> </constant>
<constant name="TEXT_CHAR" value="52" enum="BuiltinFunc"> <constant name="TEXT_CHAR" value="51" enum="BuiltinFunc">
Return a character with the given ascii value. Return a character with the given ascii value.
</constant> </constant>
<constant name="TEXT_STR" value="53" enum="BuiltinFunc"> <constant name="TEXT_STR" value="52" enum="BuiltinFunc">
Convert the input to a string. Convert the input to a string.
</constant> </constant>
<constant name="TEXT_PRINT" value="54" enum="BuiltinFunc"> <constant name="TEXT_PRINT" value="53" enum="BuiltinFunc">
Print the given string to the output window. Print the given string to the output window.
</constant> </constant>
<constant name="TEXT_PRINTERR" value="55" enum="BuiltinFunc"> <constant name="TEXT_PRINTERR" value="54" enum="BuiltinFunc">
Print the given string to the standard error output. Print the given string to the standard error output.
</constant> </constant>
<constant name="TEXT_PRINTRAW" value="56" enum="BuiltinFunc"> <constant name="TEXT_PRINTRAW" value="55" enum="BuiltinFunc">
Print the given string to the standard output, without adding a newline. Print the given string to the standard output, without adding a newline.
</constant> </constant>
<constant name="TEXT_PRINT_VERBOSE" value="57" enum="BuiltinFunc"> <constant name="TEXT_PRINT_VERBOSE" value="56" enum="BuiltinFunc">
</constant> </constant>
<constant name="VAR_TO_STR" value="58" enum="BuiltinFunc"> <constant name="VAR_TO_STR" value="57" enum="BuiltinFunc">
Serialize a [Variant] to a string. Serialize a [Variant] to a string.
</constant> </constant>
<constant name="STR_TO_VAR" value="59" enum="BuiltinFunc"> <constant name="STR_TO_VAR" value="58" enum="BuiltinFunc">
Deserialize a [Variant] from a string serialized using [constant VAR_TO_STR]. Deserialize a [Variant] from a string serialized using [constant VAR_TO_STR].
</constant> </constant>
<constant name="VAR_TO_BYTES" value="60" enum="BuiltinFunc"> <constant name="VAR_TO_BYTES" value="59" enum="BuiltinFunc">
Serialize a [Variant] to a [PackedByteArray]. Serialize a [Variant] to a [PackedByteArray].
</constant> </constant>
<constant name="BYTES_TO_VAR" value="61" enum="BuiltinFunc"> <constant name="BYTES_TO_VAR" value="60" enum="BuiltinFunc">
Deserialize a [Variant] from a [PackedByteArray] serialized using [constant VAR_TO_BYTES]. Deserialize a [Variant] from a [PackedByteArray] serialized using [constant VAR_TO_BYTES].
</constant> </constant>
<constant name="MATH_SMOOTHSTEP" value="62" enum="BuiltinFunc"> <constant name="MATH_SMOOTHSTEP" value="61" enum="BuiltinFunc">
Return a number smoothly interpolated between the first two inputs, based on the third input. Similar to [constant MATH_LERP], but interpolates faster at the beginning and slower at the end. Using Hermite interpolation formula: Return a number smoothly interpolated between the first two inputs, based on the third input. Similar to [constant MATH_LERP], but interpolates faster at the beginning and slower at the end. Using Hermite interpolation formula:
[codeblock] [codeblock]
var t = clamp((weight - from) / (to - from), 0.0, 1.0) var t = clamp((weight - from) / (to - from), 0.0, 1.0)
return t * t * (3.0 - 2.0 * t) return t * t * (3.0 - 2.0 * t)
[/codeblock] [/codeblock]
</constant> </constant>
<constant name="MATH_POSMOD" value="63" enum="BuiltinFunc"> <constant name="MATH_POSMOD" value="62" enum="BuiltinFunc">
</constant> </constant>
<constant name="MATH_LERP_ANGLE" value="64" enum="BuiltinFunc"> <constant name="MATH_LERP_ANGLE" value="63" enum="BuiltinFunc">
</constant> </constant>
<constant name="TEXT_ORD" value="65" enum="BuiltinFunc"> <constant name="TEXT_ORD" value="64" enum="BuiltinFunc">
</constant> </constant>
<constant name="FUNC_MAX" value="66" enum="BuiltinFunc"> <constant name="FUNC_MAX" value="65" enum="BuiltinFunc">
Represents the size of the [enum BuiltinFunc] enum. Represents the size of the [enum BuiltinFunc] enum.
</constant> </constant>
</constants> </constants>

17
modules/visual_script/visual_script_builtin_funcs.cpp
View file

@ -81,7 +81,6 @@ const char *VisualScriptBuiltinFunc::func_name[VisualScriptBuiltinFunc::FUNC_MAX
"db2linear", "db2linear",
"wrapi", "wrapi",
"wrapf", "wrapf",
"pingpong",
"max", "max",
"min", "min",
"clamp", "clamp",
@ -191,7 +190,6 @@ int VisualScriptBuiltinFunc::get_func_argument_count(BuiltinFunc p_func) {
case MATH_FMOD: case MATH_FMOD:
case MATH_FPOSMOD: case MATH_FPOSMOD:
case MATH_POSMOD: case MATH_POSMOD:
case MATH_PINGPONG:
case MATH_POW: case MATH_POW:
case MATH_EASE: case MATH_EASE:
case MATH_SNAPPED: case MATH_SNAPPED:
@ -383,13 +381,6 @@ PropertyInfo VisualScriptBuiltinFunc::get_input_value_port_info(int p_idx) const
case MATH_DB2LINEAR: { case MATH_DB2LINEAR: {
return PropertyInfo(Variant::FLOAT, "db"); return PropertyInfo(Variant::FLOAT, "db");
} break; } break;
case MATH_PINGPONG: {
if (p_idx == 0) {
return PropertyInfo(Variant::FLOAT, "value");
} else {
return PropertyInfo(Variant::FLOAT, "length");
}
} break;
case MATH_WRAP: { case MATH_WRAP: {
if (p_idx == 0) { if (p_idx == 0) {
return PropertyInfo(Variant::INT, "value"); return PropertyInfo(Variant::INT, "value");
@ -546,7 +537,6 @@ PropertyInfo VisualScriptBuiltinFunc::get_output_value_port_info(int p_idx) cons
case MATH_RAD2DEG: case MATH_RAD2DEG:
case MATH_LINEAR2DB: case MATH_LINEAR2DB:
case MATH_WRAPF: case MATH_WRAPF:
case MATH_PINGPONG:
case MATH_DB2LINEAR: { case MATH_DB2LINEAR: {
t = Variant::FLOAT; t = Variant::FLOAT;
} break; } break;
@ -869,11 +859,6 @@ void VisualScriptBuiltinFunc::exec_func(BuiltinFunc p_func, const Variant **p_in
VALIDATE_ARG_NUM(0); VALIDATE_ARG_NUM(0);
*r_return = Math::db2linear((double)*p_inputs[0]); *r_return = Math::db2linear((double)*p_inputs[0]);
} break; } break;
case VisualScriptBuiltinFunc::MATH_PINGPONG: {
VALIDATE_ARG_NUM(0);
VALIDATE_ARG_NUM(1);
*r_return = Math::pingpong((double)*p_inputs[0], (double)*p_inputs[1]);
} break;
case VisualScriptBuiltinFunc::MATH_WRAP: { case VisualScriptBuiltinFunc::MATH_WRAP: {
VALIDATE_ARG_NUM(0); VALIDATE_ARG_NUM(0);
VALIDATE_ARG_NUM(1); VALIDATE_ARG_NUM(1);
@ -1221,7 +1206,6 @@ void VisualScriptBuiltinFunc::_bind_methods() {
BIND_ENUM_CONSTANT(MATH_DB2LINEAR); BIND_ENUM_CONSTANT(MATH_DB2LINEAR);
BIND_ENUM_CONSTANT(MATH_WRAP); BIND_ENUM_CONSTANT(MATH_WRAP);
BIND_ENUM_CONSTANT(MATH_WRAPF); BIND_ENUM_CONSTANT(MATH_WRAPF);
BIND_ENUM_CONSTANT(MATH_PINGPONG);
BIND_ENUM_CONSTANT(LOGIC_MAX); BIND_ENUM_CONSTANT(LOGIC_MAX);
BIND_ENUM_CONSTANT(LOGIC_MIN); BIND_ENUM_CONSTANT(LOGIC_MIN);
BIND_ENUM_CONSTANT(LOGIC_CLAMP); BIND_ENUM_CONSTANT(LOGIC_CLAMP);
@ -1312,7 +1296,6 @@ void register_visual_script_builtin_func_node() {
VisualScriptLanguage::singleton->add_register_func("functions/built_in/db2linear", create_builtin_func_node<VisualScriptBuiltinFunc::MATH_DB2LINEAR>); VisualScriptLanguage::singleton->add_register_func("functions/built_in/db2linear", create_builtin_func_node<VisualScriptBuiltinFunc::MATH_DB2LINEAR>);
VisualScriptLanguage::singleton->add_register_func("functions/built_in/wrapi", create_builtin_func_node<VisualScriptBuiltinFunc::MATH_WRAP>); VisualScriptLanguage::singleton->add_register_func("functions/built_in/wrapi", create_builtin_func_node<VisualScriptBuiltinFunc::MATH_WRAP>);
VisualScriptLanguage::singleton->add_register_func("functions/built_in/wrapf", create_builtin_func_node<VisualScriptBuiltinFunc::MATH_WRAPF>); VisualScriptLanguage::singleton->add_register_func("functions/built_in/wrapf", create_builtin_func_node<VisualScriptBuiltinFunc::MATH_WRAPF>);
VisualScriptLanguage::singleton->add_register_func("functions/built_in/pingpong", create_builtin_func_node<VisualScriptBuiltinFunc::MATH_PINGPONG>);
VisualScriptLanguage::singleton->add_register_func("functions/built_in/max", create_builtin_func_node<VisualScriptBuiltinFunc::LOGIC_MAX>); VisualScriptLanguage::singleton->add_register_func("functions/built_in/max", create_builtin_func_node<VisualScriptBuiltinFunc::LOGIC_MAX>);
VisualScriptLanguage::singleton->add_register_func("functions/built_in/min", create_builtin_func_node<VisualScriptBuiltinFunc::LOGIC_MIN>); VisualScriptLanguage::singleton->add_register_func("functions/built_in/min", create_builtin_func_node<VisualScriptBuiltinFunc::LOGIC_MIN>);

1
modules/visual_script/visual_script_builtin_funcs.h
View file

@ -81,7 +81,6 @@ public:
MATH_DB2LINEAR, MATH_DB2LINEAR,
MATH_WRAP, MATH_WRAP,
MATH_WRAPF, MATH_WRAPF,
MATH_PINGPONG,
LOGIC_MAX, LOGIC_MAX,
LOGIC_MIN, LOGIC_MIN,
LOGIC_CLAMP, LOGIC_CLAMP,

7
scene/animation/animation_blend_space_2d.cpp
View file

@ -30,7 +30,6 @@
#include "animation_blend_space_2d.h" #include "animation_blend_space_2d.h"
#include "animation_blend_tree.h"
#include "core/math/geometry_2d.h" #include "core/math/geometry_2d.h"
void AnimationNodeBlendSpace2D::get_parameter_list(List<PropertyInfo> *r_list) const { void AnimationNodeBlendSpace2D::get_parameter_list(List<PropertyInfo> *r_list) const {
@ -532,12 +531,6 @@ double AnimationNodeBlendSpace2D::process(double p_time, bool p_seek) {
if (new_closest != closest && new_closest != -1) { if (new_closest != closest && new_closest != -1) {
float from = 0.0; float from = 0.0;
if (blend_mode == BLEND_MODE_DISCRETE_CARRY && closest != -1) { if (blend_mode == BLEND_MODE_DISCRETE_CARRY && closest != -1) {
//for ping-pong loop
Ref<AnimationNodeAnimation> na_c = static_cast<Ref<AnimationNodeAnimation>>(blend_points[closest].node);
Ref<AnimationNodeAnimation> na_n = static_cast<Ref<AnimationNodeAnimation>>(blend_points[new_closest].node);
if (!na_c.is_null() && !na_n.is_null()) {
na_n->set_backward(na_c->is_backward());
}
//see how much animation remains //see how much animation remains
from = length_internal - blend_node(blend_points[closest].name, blend_points[closest].node, p_time, false, 0.0, FILTER_IGNORE, false); from = length_internal - blend_node(blend_points[closest].name, blend_points[closest].node, p_time, false, 0.0, FILTER_IGNORE, false);
} }

79
scene/animation/animation_blend_tree.cpp
View file

@ -30,7 +30,6 @@
#include "animation_blend_tree.h" #include "animation_blend_tree.h"
#include "scene/resources/animation.h"
#include "scene/scene_string_names.h" #include "scene/scene_string_names.h"
void AnimationNodeAnimation::set_animation(const StringName &p_name) { void AnimationNodeAnimation::set_animation(const StringName &p_name) {
@ -84,55 +83,30 @@ double AnimationNodeAnimation::process(double p_time, bool p_seek) {
} }
Ref<Animation> anim = ap->get_animation(animation); Ref<Animation> anim = ap->get_animation(animation);
double anim_size = (double)anim->get_length();
double step = 0.0; double step;
double prev_time = time;
int pingponged = 0;
bool current_backward = signbit(p_time);
if (p_seek) { if (p_seek) {
step = p_time - time;
time = p_time; time = p_time;
step = 0;
} else { } else {
p_time *= backward ? -1.0 : 1.0; time = MAX(0, time + p_time);
if (!(time == anim_size && !current_backward) && !(time == 0 && current_backward)) { step = p_time;
time = time + p_time;
step = p_time;
}
} }
if (anim->get_loop_mode() == Animation::LoopMode::LOOP_PINGPONG) { double anim_size = anim->get_length();
if (anim->has_loop()) {
if (anim_size) { if (anim_size) {
if ((int)Math::floor(abs(time - prev_time) / anim_size) % 2 == 0) { time = Math::fposmod(time, anim_size);
if (prev_time > 0 && time <= 0) {
backward = !backward;
pingponged = -1;
}
if (prev_time < anim_size && time >= anim_size) {
backward = !backward;
pingponged = 1;
}
}
time = Math::pingpong(time, anim_size);
} }
} else {
if (anim->get_loop_mode() == Animation::LoopMode::LOOP_LINEAR) { } else if (time > anim_size) {
if (anim_size) { time = anim_size;
time = Math::fposmod(time, anim_size);
}
} else if (time < 0) {
time = 0;
} else if (time > anim_size) {
time = anim_size;
}
backward = false;
} }
if (play_mode == PLAY_MODE_FORWARD) { blend_animation(animation, time, step, p_seek, 1.0);
blend_animation(animation, time, step, p_seek, 1.0, pingponged);
} else {
blend_animation(animation, anim_size - time, -step, p_seek, 1.0, pingponged);
}
set_parameter(this->time, time); set_parameter(this->time, time);
return anim_size - time; return anim_size - time;
@ -142,34 +116,11 @@ String AnimationNodeAnimation::get_caption() const {
return "Animation"; return "Animation";
} }
void AnimationNodeAnimation::set_play_mode(PlayMode p_play_mode) {
play_mode = p_play_mode;
}
AnimationNodeAnimation::PlayMode AnimationNodeAnimation::get_play_mode() const {
return play_mode;
}
void AnimationNodeAnimation::set_backward(bool p_backward) {
backward = p_backward;
}
bool AnimationNodeAnimation::is_backward() const {
return backward;
}
void AnimationNodeAnimation::_bind_methods() { void AnimationNodeAnimation::_bind_methods() {
ClassDB::bind_method(D_METHOD("set_animation", "name"), &AnimationNodeAnimation::set_animation); ClassDB::bind_method(D_METHOD("set_animation", "name"), &AnimationNodeAnimation::set_animation);
ClassDB::bind_method(D_METHOD("get_animation"), &AnimationNodeAnimation::get_animation); ClassDB::bind_method(D_METHOD("get_animation"), &AnimationNodeAnimation::get_animation);
ClassDB::bind_method(D_METHOD("set_play_mode", "mode"), &AnimationNodeAnimation::set_play_mode);
ClassDB::bind_method(D_METHOD("get_play_mode"), &AnimationNodeAnimation::get_play_mode);
ADD_PROPERTY(PropertyInfo(Variant::STRING_NAME, "animation"), "set_animation", "get_animation"); ADD_PROPERTY(PropertyInfo(Variant::STRING_NAME, "animation"), "set_animation", "get_animation");
ADD_PROPERTY(PropertyInfo(Variant::INT, "play_mode", PROPERTY_HINT_ENUM, "Forward,Backward"), "set_play_mode", "get_play_mode");
BIND_ENUM_CONSTANT(PLAY_MODE_FORWARD);
BIND_ENUM_CONSTANT(PLAY_MODE_BACKWARD);
} }
AnimationNodeAnimation::AnimationNodeAnimation() { AnimationNodeAnimation::AnimationNodeAnimation() {
@ -582,7 +533,7 @@ AnimationNodeBlend3::AnimationNodeBlend3() {
///////////////////////////////// /////////////////////////////////
void AnimationNodeTimeScale::get_parameter_list(List<PropertyInfo> *r_list) const { void AnimationNodeTimeScale::get_parameter_list(List<PropertyInfo> *r_list) const {
r_list->push_back(PropertyInfo(Variant::FLOAT, scale, PROPERTY_HINT_RANGE, "-32,32,0.01,or_lesser,or_greater")); r_list->push_back(PropertyInfo(Variant::FLOAT, scale, PROPERTY_HINT_RANGE, "0,32,0.01,or_greater"));
} }
Variant AnimationNodeTimeScale::get_parameter_default_value(const StringName &p_parameter) const { Variant AnimationNodeTimeScale::get_parameter_default_value(const StringName &p_parameter) const {

26
scene/animation/animation_blend_tree.h
View file

@ -42,12 +42,12 @@ class AnimationNodeAnimation : public AnimationRootNode {
uint64_t last_version = 0; uint64_t last_version = 0;
bool skip = false; bool skip = false;
public: protected:
enum PlayMode { void _validate_property(PropertyInfo &property) const override;
PLAY_MODE_FORWARD,
PLAY_MODE_BACKWARD
};
static void _bind_methods();
public:
void get_parameter_list(List<PropertyInfo> *r_list) const override; void get_parameter_list(List<PropertyInfo> *r_list) const override;
static Vector<String> (*get_editable_animation_list)(); static Vector<String> (*get_editable_animation_list)();
@ -58,25 +58,9 @@ public:
void set_animation(const StringName &p_name); void set_animation(const StringName &p_name);
StringName get_animation() const; StringName get_animation() const;
void set_play_mode(PlayMode p_play_mode);
PlayMode get_play_mode() const;
void set_backward(bool p_backward);
bool is_backward() const;
AnimationNodeAnimation(); AnimationNodeAnimation();
protected:
void _validate_property(PropertyInfo &property) const override;
static void _bind_methods();
private:
PlayMode play_mode = PLAY_MODE_FORWARD;
bool backward = false;
}; };
VARIANT_ENUM_CAST(AnimationNodeAnimation::PlayMode)
class AnimationNodeOneShot : public AnimationNode { class AnimationNodeOneShot : public AnimationNode {
GDCLASS(AnimationNodeOneShot, AnimationNode); GDCLASS(AnimationNodeOneShot, AnimationNode);

139
scene/animation/animation_player.cpp
View file

@ -340,13 +340,12 @@ void AnimationPlayer::_ensure_node_caches(AnimationData *p_anim, Node *p_root_ov
} }
} }
void AnimationPlayer::_animation_process_animation(AnimationData *p_anim, double p_time, double p_delta, float p_interp, bool p_is_current, bool p_seeked, bool p_started, int p_pingponged) { void AnimationPlayer::_animation_process_animation(AnimationData *p_anim, double p_time, double p_delta, float p_interp, bool p_is_current, bool p_seeked, bool p_started) {
_ensure_node_caches(p_anim); _ensure_node_caches(p_anim);
ERR_FAIL_COND(p_anim->node_cache.size() != p_anim->animation->get_track_count()); ERR_FAIL_COND(p_anim->node_cache.size() != p_anim->animation->get_track_count());
Animation *a = p_anim->animation.operator->(); Animation *a = p_anim->animation.operator->();
bool can_call = is_inside_tree() && !Engine::get_singleton()->is_editor_hint(); bool can_call = is_inside_tree() && !Engine::get_singleton()->is_editor_hint();
bool backward = signbit(p_delta);
for (int i = 0; i < a->get_track_count(); i++) { for (int i = 0; i < a->get_track_count(); i++) {
// If an animation changes this animation (or it animates itself) // If an animation changes this animation (or it animates itself)
@ -426,8 +425,8 @@ void AnimationPlayer::_animation_process_animation(AnimationData *p_anim, double
continue; //eeh not worth it continue; //eeh not worth it
} }
double first_key_time = a->track_get_key_time(i, 0); float first_key_time = a->track_get_key_time(i, 0);
double transition = 1.0; float transition = 1.0;
int first_key = 0; int first_key = 0;
if (first_key_time == 0.0) { if (first_key_time == 0.0) {
@ -435,13 +434,13 @@ void AnimationPlayer::_animation_process_animation(AnimationData *p_anim, double
if (key_count == 1) { if (key_count == 1) {
continue; //with one key we can't do anything continue; //with one key we can't do anything
} }
transition = (double)a->track_get_key_transition(i, 0); transition = a->track_get_key_transition(i, 0);
first_key_time = a->track_get_key_time(i, 1); first_key_time = a->track_get_key_time(i, 1);
first_key = 1; first_key = 1;
} }
if (p_time < first_key_time) { if (p_time < first_key_time) {
double c = Math::ease(p_time / first_key_time, transition); float c = Math::ease(p_time / first_key_time, transition);
Variant first_value = a->track_get_key_value(i, first_key); Variant first_value = a->track_get_key_value(i, first_key);
Variant interp_value; Variant interp_value;
Variant::interpolate(pa->capture, first_value, c, interp_value); Variant::interpolate(pa->capture, first_value, c, interp_value);
@ -483,7 +482,7 @@ void AnimationPlayer::_animation_process_animation(AnimationData *p_anim, double
} else if (p_is_current && p_delta != 0) { } else if (p_is_current && p_delta != 0) {
List<int> indices; List<int> indices;
a->value_track_get_key_indices(i, p_time, p_delta, &indices, p_pingponged); a->value_track_get_key_indices(i, p_time, p_delta, &indices);
for (int &F : indices) { for (int &F : indices) {
Variant value = a->track_get_key_value(i, F); Variant value = a->track_get_key_value(i, F);
@ -542,7 +541,7 @@ void AnimationPlayer::_animation_process_animation(AnimationData *p_anim, double
List<int> indices; List<int> indices;
a->method_track_get_key_indices(i, p_time, p_delta, &indices, p_pingponged); a->method_track_get_key_indices(i, p_time, p_delta, &indices);
for (int &E : indices) { for (int &E : indices) {
StringName method = a->method_track_get_name(i, E); StringName method = a->method_track_get_name(i, E);
@ -597,7 +596,7 @@ void AnimationPlayer::_animation_process_animation(AnimationData *p_anim, double
TrackNodeCache::BezierAnim *ba = &E->get(); TrackNodeCache::BezierAnim *ba = &E->get();
real_t bezier = a->bezier_track_interpolate(i, p_time); float bezier = a->bezier_track_interpolate(i, p_time);
if (ba->accum_pass != accum_pass) { if (ba->accum_pass != accum_pass) {
ERR_CONTINUE(cache_update_bezier_size >= NODE_CACHE_UPDATE_MAX); ERR_CONTINUE(cache_update_bezier_size >= NODE_CACHE_UPDATE_MAX);
cache_update_bezier[cache_update_bezier_size++] = ba; cache_update_bezier[cache_update_bezier_size++] = ba;
@ -658,7 +657,7 @@ void AnimationPlayer::_animation_process_animation(AnimationData *p_anim, double
} else { } else {
//find stuff to play //find stuff to play
List<int> to_play; List<int> to_play;
a->track_get_key_indices_in_range(i, p_time, p_delta, &to_play, p_pingponged); a->track_get_key_indices_in_range(i, p_time, p_delta, &to_play);
if (to_play.size()) { if (to_play.size()) {
int idx = to_play.back()->get(); int idx = to_play.back()->get();
@ -686,14 +685,12 @@ void AnimationPlayer::_animation_process_animation(AnimationData *p_anim, double
nc->audio_start = p_time; nc->audio_start = p_time;
} }
} else if (nc->audio_playing) { } else if (nc->audio_playing) {
bool loop = a->get_loop_mode() != Animation::LoopMode::LOOP_NONE; bool loop = a->has_loop();
bool stop = false; bool stop = false;
if (!loop) { if (!loop && p_time < nc->audio_start) {
if ((p_time < nc->audio_start && !backward) || (p_time > nc->audio_start && backward)) { stop = true;
stop = true;
}
} else if (nc->audio_len > 0) { } else if (nc->audio_len > 0) {
float len = nc->audio_start > p_time ? (a->get_length() - nc->audio_start) + p_time : p_time - nc->audio_start; float len = nc->audio_start > p_time ? (a->get_length() - nc->audio_start) + p_time : p_time - nc->audio_start;
@ -734,23 +731,12 @@ void AnimationPlayer::_animation_process_animation(AnimationData *p_anim, double
Ref<Animation> anim = player->get_animation(anim_name); Ref<Animation> anim = player->get_animation(anim_name);
double at_anim_pos = 0.0; double at_anim_pos;
switch (anim->get_loop_mode()) { if (anim->has_loop()) {
case Animation::LoopMode::LOOP_NONE: { at_anim_pos = Math::fposmod(p_time - pos, (double)anim->get_length()); //seek to loop
at_anim_pos = MIN((double)anim->get_length(), p_time - pos); //seek to end } else {
} break; at_anim_pos = MIN((double)anim->get_length(), p_time - pos); //seek to end
case Animation::LoopMode::LOOP_LINEAR: {
at_anim_pos = Math::fposmod(p_time - pos, (double)anim->get_length()); //seek to loop
} break;
case Animation::LoopMode::LOOP_PINGPONG: {
at_anim_pos = Math::pingpong(p_time - pos, (double)anim->get_length());
} break;
default:
break;
} }
if (player->is_playing() || p_seeked) { if (player->is_playing() || p_seeked) {
@ -765,7 +751,7 @@ void AnimationPlayer::_animation_process_animation(AnimationData *p_anim, double
} else { } else {
//find stuff to play //find stuff to play
List<int> to_play; List<int> to_play;
a->track_get_key_indices_in_range(i, p_time, p_delta, &to_play, p_pingponged); a->track_get_key_indices_in_range(i, p_time, p_delta, &to_play);
if (to_play.size()) { if (to_play.size()) {
int idx = to_play.back()->get(); int idx = to_play.back()->get();
@ -795,73 +781,46 @@ void AnimationPlayer::_animation_process_data(PlaybackData &cd, double p_delta,
double next_pos = cd.pos + delta; double next_pos = cd.pos + delta;
real_t len = cd.from->animation->get_length(); real_t len = cd.from->animation->get_length();
int pingponged = 0; bool loop = cd.from->animation->has_loop();
switch (cd.from->animation->get_loop_mode()) { if (!loop) {
case Animation::LoopMode::LOOP_NONE: { if (next_pos < 0) {
if (next_pos < 0) { next_pos = 0;
next_pos = 0; } else if (next_pos > len) {
} else if (next_pos > len) { next_pos = len;
next_pos = len; }
bool backwards = signbit(delta); // Negative zero means playing backwards too
delta = next_pos - cd.pos; // Fix delta (after determination of backwards because negative zero is lost here)
if (&cd == &playback.current) {
if (!backwards && cd.pos <= len && next_pos == len) {
//playback finished
end_reached = true;
end_notify = cd.pos < len; // Notify only if not already at the end
} }
bool backwards = signbit(delta); // Negative zero means playing backwards too if (backwards && cd.pos >= 0 && next_pos == 0) {
delta = next_pos - cd.pos; // Fix delta (after determination of backwards because negative zero is lost here) //playback finished
end_reached = true;
if (&cd == &playback.current) { end_notify = cd.pos > 0; // Notify only if not already at the beginning
if (!backwards && cd.pos <= len && next_pos == len) {
//playback finished
end_reached = true;
end_notify = cd.pos < len; // Notify only if not already at the end
}
if (backwards && cd.pos >= 0 && next_pos == 0) {
//playback finished
end_reached = true;
end_notify = cd.pos > 0; // Notify only if not already at the beginning
}
} }
} break; }
case Animation::LoopMode::LOOP_LINEAR: { } else {
double looped_next_pos = Math::fposmod(next_pos, (double)len); double looped_next_pos = Math::fposmod(next_pos, (double)len);
if (looped_next_pos == 0 && next_pos != 0) { if (looped_next_pos == 0 && next_pos != 0) {
// Loop multiples of the length to it, rather than 0 // Loop multiples of the length to it, rather than 0
// so state at time=length is previewable in the editor // so state at time=length is previewable in the editor
next_pos = len; next_pos = len;
} else { } else {
next_pos = looped_next_pos; next_pos = looped_next_pos;
} }
} break;
case Animation::LoopMode::LOOP_PINGPONG: {
if ((int)Math::floor(abs(next_pos - cd.pos) / len) % 2 == 0) {
if (next_pos < 0 && cd.pos >= 0) {
cd.speed_scale *= -1.0;
pingponged = -1;
}
if (next_pos > len && cd.pos <= len) {
cd.speed_scale *= -1.0;
pingponged = 1;
}
}
double looped_next_pos = Math::pingpong(next_pos, (double)len);
if (looped_next_pos == 0 && next_pos != 0) {
// Loop multiples of the length to it, rather than 0
// so state at time=length is previewable in the editor
next_pos = len;
} else {
next_pos = looped_next_pos;
}
} break;
default:
break;
} }
cd.pos = next_pos; cd.pos = next_pos;
_animation_process_animation(cd.from, cd.pos, delta, p_blend, &cd == &playback.current, p_seeked, p_started, pingponged); _animation_process_animation(cd.from, cd.pos, delta, p_blend, &cd == &playback.current, p_seeked, p_started);
} }
void AnimationPlayer::_animation_process2(double p_delta, bool p_started) { void AnimationPlayer::_animation_process2(double p_delta, bool p_started) {

2
scene/animation/animation_player.h
View file

@ -215,7 +215,7 @@ private:
NodePath root; NodePath root;
void _animation_process_animation(AnimationData *p_anim, double p_time, double p_delta, float p_interp, bool p_is_current = true, bool p_seeked = false, bool p_started = false, int p_pingponged = 0); void _animation_process_animation(AnimationData *p_anim, double p_time, double p_delta, float p_interp, bool p_is_current = true, bool p_seeked = false, bool p_started = false);
void _ensure_node_caches(AnimationData *p_anim, Node *p_root_override = nullptr); void _ensure_node_caches(AnimationData *p_anim, Node *p_root_override = nullptr);
void _animation_process_data(PlaybackData &cd, double p_delta, float p_blend, bool p_seeked, bool p_started); void _animation_process_data(PlaybackData &cd, double p_delta, float p_blend, bool p_seeked, bool p_started);

129
scene/animation/animation_tree.cpp
View file

@ -32,7 +32,6 @@
#include "animation_blend_tree.h" #include "animation_blend_tree.h"
#include "core/config/engine.h" #include "core/config/engine.h"
#include "scene/resources/animation.h"
#include "scene/scene_string_names.h" #include "scene/scene_string_names.h"
#include "servers/audio/audio_stream.h" #include "servers/audio/audio_stream.h"
@ -88,7 +87,7 @@ void AnimationNode::get_child_nodes(List<ChildNode> *r_child_nodes) {
} }
} }
void AnimationNode::blend_animation(const StringName &p_animation, real_t p_time, real_t p_delta, bool p_seeked, real_t p_blend, int p_pingponged) { void AnimationNode::blend_animation(const StringName &p_animation, real_t p_time, real_t p_delta, bool p_seeked, real_t p_blend) {
ERR_FAIL_COND(!state); ERR_FAIL_COND(!state);
ERR_FAIL_COND(!state->player->has_animation(p_animation)); ERR_FAIL_COND(!state->player->has_animation(p_animation));
@ -114,7 +113,6 @@ void AnimationNode::blend_animation(const StringName &p_animation, real_t p_time
anim_state.time = p_time; anim_state.time = p_time;
anim_state.animation = animation; anim_state.animation = animation;
anim_state.seeked = p_seeked; anim_state.seeked = p_seeked;
anim_state.pingponged = p_pingponged;
state->animation_states.push_back(anim_state); state->animation_states.push_back(anim_state);
} }
@ -420,7 +418,7 @@ void AnimationNode::_bind_methods() {
ClassDB::bind_method(D_METHOD("_set_filters", "filters"), &AnimationNode::_set_filters); ClassDB::bind_method(D_METHOD("_set_filters", "filters"), &AnimationNode::_set_filters);
ClassDB::bind_method(D_METHOD("_get_filters"), &AnimationNode::_get_filters); ClassDB::bind_method(D_METHOD("_get_filters"), &AnimationNode::_get_filters);
ClassDB::bind_method(D_METHOD("blend_animation", "animation", "time", "delta", "seeked", "blend", "pingponged"), &AnimationNode::blend_animation, DEFVAL(0)); ClassDB::bind_method(D_METHOD("blend_animation", "animation", "time", "delta", "seeked", "blend"), &AnimationNode::blend_animation);
ClassDB::bind_method(D_METHOD("blend_node", "name", "node", "time", "seek", "blend", "filter", "optimize"), &AnimationNode::blend_node, DEFVAL(FILTER_IGNORE), DEFVAL(true)); ClassDB::bind_method(D_METHOD("blend_node", "name", "node", "time", "seek", "blend", "filter", "optimize"), &AnimationNode::blend_node, DEFVAL(FILTER_IGNORE), DEFVAL(true));
ClassDB::bind_method(D_METHOD("blend_input", "input_index", "time", "seek", "blend", "filter", "optimize"), &AnimationNode::blend_input, DEFVAL(FILTER_IGNORE), DEFVAL(true)); ClassDB::bind_method(D_METHOD("blend_input", "input_index", "time", "seek", "blend", "filter", "optimize"), &AnimationNode::blend_input, DEFVAL(FILTER_IGNORE), DEFVAL(true));
@ -826,8 +824,6 @@ void AnimationTree::_process_graph(real_t p_delta) {
double delta = as.delta; double delta = as.delta;
real_t weight = as.blend; real_t weight = as.blend;
bool seeked = as.seeked; bool seeked = as.seeked;
int pingponged = as.pingponged;
bool backward = signbit(delta);
for (int i = 0; i < a->get_track_count(); i++) { for (int i = 0; i < a->get_track_count(); i++) {
NodePath path = a->track_get_path(i); NodePath path = a->track_get_path(i);
@ -866,38 +862,12 @@ void AnimationTree::_process_graph(real_t p_delta) {
t->scale = Vector3(1, 1, 1); t->scale = Vector3(1, 1, 1);
} }
double prev_time = time - delta; real_t prev_time = time - delta;
if (!backward) { if (prev_time < 0) {
if (prev_time < 0) { if (!a->has_loop()) {
switch (a->get_loop_mode()) { prev_time = 0;
case Animation::LoopMode::LOOP_NONE: { } else {
prev_time = 0; prev_time = a->get_length() + prev_time;
} break;
case Animation::LoopMode::LOOP_LINEAR: {
prev_time = Math::fposmod(prev_time, (double)a->get_length());
} break;
case Animation::LoopMode::LOOP_PINGPONG: {
prev_time = Math::pingpong(prev_time, (double)a->get_length());
} break;
default:
break;
}
}
} else {
if (prev_time > a->get_length()) {
switch (a->get_loop_mode()) {
case Animation::LoopMode::LOOP_NONE: {
prev_time = (double)a->get_length();
} break;
case Animation::LoopMode::LOOP_LINEAR: {
prev_time = Math::fposmod(prev_time, (double)a->get_length());
} break;
case Animation::LoopMode::LOOP_PINGPONG: {
prev_time = Math::pingpong(prev_time, (double)a->get_length());
} break;
default:
break;
}
} }
} }
@ -905,38 +875,20 @@ void AnimationTree::_process_graph(real_t p_delta) {
Quaternion rot[2]; Quaternion rot[2];
Vector3 scale[2]; Vector3 scale[2];
if (!backward) { if (prev_time > time) {
if (prev_time > time) { Error err = a->transform_track_interpolate(i, prev_time, &loc[0], &rot[0], &scale[0]);
Error err = a->transform_track_interpolate(i, prev_time, &loc[0], &rot[0], &scale[0]); if (err != OK) {
if (err != OK) { continue;
continue;
}
a->transform_track_interpolate(i, (double)a->get_length(), &loc[1], &rot[1], &scale[1]);
t->loc += (loc[1] - loc[0]) * blend;
t->scale += (scale[1] - scale[0]) * blend;
Quaternion q = Quaternion().slerp(rot[0].normalized().inverse() * rot[1].normalized(), blend).normalized();
t->rot = (t->rot * q).normalized();
prev_time = 0;
} }
} else {
if (prev_time < time) {
Error err = a->transform_track_interpolate(i, prev_time, &loc[0], &rot[0], &scale[0]);
if (err != OK) {
continue;
}
a->transform_track_interpolate(i, 0, &loc[1], &rot[1], &scale[1]); a->transform_track_interpolate(i, a->get_length(), &loc[1], &rot[1], &scale[1]);
t->loc += (loc[1] - loc[0]) * blend; t->loc += (loc[1] - loc[0]) * blend;
t->scale += (scale[1] - scale[0]) * blend; t->scale += (scale[1] - scale[0]) * blend;
Quaternion q = Quaternion().slerp(rot[0].normalized().inverse() * rot[1].normalized(), blend).normalized(); Quaternion q = Quaternion().slerp(rot[0].normalized().inverse() * rot[1].normalized(), blend).normalized();
t->rot = (t->rot * q).normalized(); t->rot = (t->rot * q).normalized();
prev_time = 0; prev_time = 0;
}
} }
Error err = a->transform_track_interpolate(i, prev_time, &loc[0], &rot[0], &scale[0]); Error err = a->transform_track_interpolate(i, prev_time, &loc[0], &rot[0], &scale[0]);
@ -951,7 +903,8 @@ void AnimationTree::_process_graph(real_t p_delta) {
Quaternion q = Quaternion().slerp(rot[0].normalized().inverse() * rot[1].normalized(), blend).normalized(); Quaternion q = Quaternion().slerp(rot[0].normalized().inverse() * rot[1].normalized(), blend).normalized();
t->rot = (t->rot * q).normalized(); t->rot = (t->rot * q).normalized();
prev_time = !backward ? 0 : (double)a->get_length(); prev_time = 0;
} else { } else {
Vector3 loc; Vector3 loc;
Quaternion rot; Quaternion rot;
@ -1007,7 +960,7 @@ void AnimationTree::_process_graph(real_t p_delta) {
} else { } else {
List<int> indices; List<int> indices;
a->value_track_get_key_indices(i, time, delta, &indices, pingponged); a->value_track_get_key_indices(i, time, delta, &indices);
for (int &F : indices) { for (int &F : indices) {
Variant value = a->track_get_key_value(i, F); Variant value = a->track_get_key_value(i, F);
@ -1024,7 +977,7 @@ void AnimationTree::_process_graph(real_t p_delta) {
List<int> indices; List<int> indices;
a->method_track_get_key_indices(i, time, delta, &indices, pingponged); a->method_track_get_key_indices(i, time, delta, &indices);
for (int &F : indices) { for (int &F : indices) {
StringName method = a->method_track_get_name(i, F); StringName method = a->method_track_get_name(i, F);
@ -1107,7 +1060,7 @@ void AnimationTree::_process_graph(real_t p_delta) {
} else { } else {
//find stuff to play //find stuff to play
List<int> to_play; List<int> to_play;
a->track_get_key_indices_in_range(i, time, delta, &to_play, pingponged); a->track_get_key_indices_in_range(i, time, delta, &to_play);
if (to_play.size()) { if (to_play.size()) {
int idx = to_play.back()->get(); int idx = to_play.back()->get();
@ -1135,20 +1088,12 @@ void AnimationTree::_process_graph(real_t p_delta) {
t->start = time; t->start = time;
} }
} else if (t->playing) { } else if (t->playing) {
bool loop = a->get_loop_mode() != Animation::LoopMode::LOOP_NONE; bool loop = a->has_loop();
bool stop = false; bool stop = false;
if (!loop) { if (!loop && time < t->start) {
if (delta > 0) { stop = true;
if (time < t->start) {
stop = true;
}
} else if (delta < 0) {
if (time > t->start) {
stop = true;
}
}
} else if (t->len > 0) { } else if (t->len > 0) {
real_t len = t->start > time ? (a->get_length() - t->start) + time : time - t->start; real_t len = t->start > time ? (a->get_length() - t->start) + time : time - t->start;
@ -1182,7 +1127,7 @@ void AnimationTree::_process_graph(real_t p_delta) {
continue; continue;
} }
if (seeked) { if (delta == 0 || seeked) {
//seek //seek
int idx = a->track_find_key(i, time); int idx = a->track_find_key(i, time);
if (idx < 0) { if (idx < 0) {
@ -1198,20 +1143,12 @@ void AnimationTree::_process_graph(real_t p_delta) {
Ref<Animation> anim = player2->get_animation(anim_name); Ref<Animation> anim = player2->get_animation(anim_name);
real_t at_anim_pos = 0.0; real_t at_anim_pos;
switch (anim->get_loop_mode()) { if (anim->has_loop()) {
case Animation::LoopMode::LOOP_NONE: { at_anim_pos = Math::fposmod(time - pos, (double)anim->get_length()); //seek to loop
at_anim_pos = MAX((double)anim->get_length(), time - pos); //seek to end } else {
} break; at_anim_pos = MAX(anim->get_length(), time - pos); //seek to end
case Animation::LoopMode::LOOP_LINEAR: {
at_anim_pos = Math::fposmod(time - pos, (double)anim->get_length()); //seek to loop
} break;
case Animation::LoopMode::LOOP_PINGPONG: {
at_anim_pos = Math::pingpong(time - pos, (double)a->get_length());
} break;
default:
break;
} }
if (player2->is_playing() || seeked) { if (player2->is_playing() || seeked) {
@ -1226,7 +1163,7 @@ void AnimationTree::_process_graph(real_t p_delta) {
} else { } else {
//find stuff to play //find stuff to play
List<int> to_play; List<int> to_play;
a->track_get_key_indices_in_range(i, time, delta, &to_play, pingponged); a->track_get_key_indices_in_range(i, time, delta, &to_play);
if (to_play.size()) { if (to_play.size()) {
int idx = to_play.back()->get(); int idx = to_play.back()->get();

4
scene/animation/animation_tree.h
View file

@ -68,7 +68,6 @@ public:
const Vector<real_t> *track_blends = nullptr; const Vector<real_t> *track_blends = nullptr;
real_t blend = 0.0; real_t blend = 0.0;
bool seeked = false; bool seeked = false;
int pingponged = 0;
}; };
struct State { struct State {
@ -102,10 +101,9 @@ public:
real_t _blend_node(const StringName &p_subpath, const Vector<StringName> &p_connections, AnimationNode *p_new_parent, Ref<AnimationNode> p_node, real_t p_time, bool p_seek, real_t p_blend, FilterAction p_filter = FILTER_IGNORE, bool p_optimize = true, real_t *r_max = nullptr); real_t _blend_node(const StringName &p_subpath, const Vector<StringName> &p_connections, AnimationNode *p_new_parent, Ref<AnimationNode> p_node, real_t p_time, bool p_seek, real_t p_blend, FilterAction p_filter = FILTER_IGNORE, bool p_optimize = true, real_t *r_max = nullptr);
protected: protected:
void blend_animation(const StringName &p_animation, real_t p_time, real_t p_delta, bool p_seeked, real_t p_blend, int p_pingponged = 0); void blend_animation(const StringName &p_animation, real_t p_time, real_t p_delta, bool p_seeked, real_t p_blend);
real_t blend_node(const StringName &p_sub_path, Ref<AnimationNode> p_node, real_t p_time, bool p_seek, real_t p_blend, FilterAction p_filter = FILTER_IGNORE, bool p_optimize = true); real_t blend_node(const StringName &p_sub_path, Ref<AnimationNode> p_node, real_t p_time, bool p_seek, real_t p_blend, FilterAction p_filter = FILTER_IGNORE, bool p_optimize = true);
real_t blend_input(int p_input, real_t p_time, bool p_seek, real_t p_blend, FilterAction p_filter = FILTER_IGNORE, bool p_optimize = true); real_t blend_input(int p_input, real_t p_time, bool p_seek, real_t p_blend, FilterAction p_filter = FILTER_IGNORE, bool p_optimize = true);
void make_invalid(const String &p_reason); void make_invalid(const String &p_reason);
static void _bind_methods(); static void _bind_methods();

533
scene/resources/animation.cpp
View file

@ -309,8 +309,8 @@ bool Animation::_get(const StringName &p_name, Variant &r_ret) const {
if (name == "length") { if (name == "length") {
r_ret = length; r_ret = length;
} else if (name == "loop_mode") { } else if (name == "loop") {
r_ret = loop_mode; r_ret = loop;
} else if (name == "step") { } else if (name == "step") {
r_ret = step; r_ret = step;
} else if (name.begins_with("tracks/")) { } else if (name.begins_with("tracks/")) {
@ -1413,7 +1413,7 @@ void Animation::track_set_key_transition(int p_track, int p_key_idx, real_t p_tr
} }
template <class K> template <class K>
int Animation::_find(const Vector<K> &p_keys, double p_time, bool p_backward) const { int Animation::_find(const Vector<K> &p_keys, double p_time) const {
int len = p_keys.size(); int len = p_keys.size();
if (len == 0) { if (len == 0) {
return -2; return -2;
@ -1443,14 +1443,8 @@ int Animation::_find(const Vector<K> &p_keys, double p_time, bool p_backward) co
} }
} }
if (!p_backward) { if (keys[middle].time > p_time) {
if (keys[middle].time > p_time) { middle--;
middle--;
}
} else {
if (keys[middle].time < p_time) {
middle++;
}
} }
return middle; return middle;
@ -1591,7 +1585,7 @@ real_t Animation::_cubic_interpolate(const real_t &p_pre_a, const real_t &p_a, c
} }
template <class T> template <class T>
T Animation::_interpolate(const Vector<TKey<T>> &p_keys, double p_time, InterpolationType p_interp, bool p_loop_wrap, bool *p_ok, bool p_backward) const { T Animation::_interpolate(const Vector<TKey<T>> &p_keys, double p_time, InterpolationType p_interp, bool p_loop_wrap, bool *p_ok) const {
int len = _find(p_keys, length) + 1; // try to find last key (there may be more past the end) int len = _find(p_keys, length) + 1; // try to find last key (there may be more past the end)
if (len <= 0) { if (len <= 0) {
@ -1609,7 +1603,7 @@ T Animation::_interpolate(const Vector<TKey<T>> &p_keys, double p_time, Interpol
return p_keys[0].value; return p_keys[0].value;
} }
int idx = _find(p_keys, p_time, p_backward); int idx = _find(p_keys, p_time);
ERR_FAIL_COND_V(idx == -2, T()); ERR_FAIL_COND_V(idx == -2, T());
@ -1618,42 +1612,24 @@ T Animation::_interpolate(const Vector<TKey<T>> &p_keys, double p_time, Interpol
real_t c = 0.0; real_t c = 0.0;
// prepare for all cases of interpolation // prepare for all cases of interpolation
if ((loop_mode == LOOP_LINEAR || loop_mode == LOOP_PINGPONG) && p_loop_wrap) { if (loop && p_loop_wrap) {
// loop // loop
if (!p_backward) { if (idx >= 0) {
// no backward if ((idx + 1) < len) {
if (idx >= 0) { next = idx + 1;
if (idx < len - 1) { real_t delta = p_keys[next].time - p_keys[idx].time;
next = idx + 1; real_t from = p_time - p_keys[idx].time;
real_t delta = p_keys[next].time - p_keys[idx].time;
real_t from = p_time - p_keys[idx].time;
if (Math::is_zero_approx(delta)) { if (Math::is_zero_approx(delta)) {
c = 0; c = 0;
} else {
c = from / delta;
}
} else { } else {
next = 0; c = from / delta;
real_t delta = (length - p_keys[idx].time) + p_keys[next].time; }
real_t from = p_time - p_keys[idx].time;
if (Math::is_zero_approx(delta)) {
c = 0;
} else {
c = from / delta;
}
}
} else { } else {
// on loop, behind first key
idx = len - 1;
next = 0; next = 0;
real_t endtime = (length - p_keys[idx].time); real_t delta = (length - p_keys[idx].time) + p_keys[next].time;
if (endtime < 0) { // may be keys past the end real_t from = p_time - p_keys[idx].time;
endtime = 0;
}
real_t delta = endtime + p_keys[next].time;
real_t from = endtime + p_time;
if (Math::is_zero_approx(delta)) { if (Math::is_zero_approx(delta)) {
c = 0; c = 0;
@ -1661,81 +1637,49 @@ T Animation::_interpolate(const Vector<TKey<T>> &p_keys, double p_time, Interpol
c = from / delta; c = from / delta;
} }
} }
} else { } else {
// backward // on loop, behind first key
if (idx <= len - 1) { idx = len - 1;
if (idx > 0) { next = 0;
next = idx - 1; real_t endtime = (length - p_keys[idx].time);
real_t delta = (length - p_keys[next].time) - (length - p_keys[idx].time); if (endtime < 0) { // may be keys past the end
real_t from = (length - p_time) - (length - p_keys[idx].time); endtime = 0;
}
real_t delta = endtime + p_keys[next].time;
real_t from = endtime + p_time;
if (Math::is_zero_approx(delta)) if (Math::is_zero_approx(delta)) {
c = 0; c = 0;
else
c = from / delta;
} else {
next = len - 1;
real_t delta = p_keys[idx].time + (length - p_keys[next].time);
real_t from = (length - p_time) - (length - p_keys[idx].time);
if (Math::is_zero_approx(delta))
c = 0;
else
c = from / delta;
}
} else { } else {
// on loop, in front of last key c = from / delta;
idx = 0;
next = len - 1;
real_t endtime = p_keys[idx].time;
if (endtime > length) // may be keys past the end
endtime = length;
real_t delta = p_keys[next].time - endtime;
real_t from = p_time - endtime;
if (Math::is_zero_approx(delta))
c = 0;
else
c = from / delta;
} }
} }
} else { // no loop } else { // no loop
if (!p_backward) {
if (idx >= 0) {
if (idx < len - 1) {
next = idx + 1;
real_t delta = p_keys[next].time - p_keys[idx].time;
real_t from = p_time - p_keys[idx].time;
if (Math::is_zero_approx(delta)) { if (idx >= 0) {
c = 0; if ((idx + 1) < len) {
} else { next = idx + 1;
c = from / delta; real_t delta = p_keys[next].time - p_keys[idx].time;
} real_t from = p_time - p_keys[idx].time;
if (Math::is_zero_approx(delta)) {
c = 0;
} else { } else {
next = idx; c = from / delta;
} }
} else { } else {
idx = next = 0; next = idx;
} }
} else { } else {
if (idx <= len - 1) { // only allow extending first key to anim start if looping
if (idx > 0) { if (loop) {
next = idx - 1; idx = next = 0;
real_t delta = (length - p_keys[next].time) - (length - p_keys[idx].time);
real_t from = (length - p_time) - (length - p_keys[idx].time);
if (Math::is_zero_approx(delta)) {
c = 0;
} else {
c = from / delta;
}
} else {
next = idx;
}
} else { } else {
idx = next = len - 1; result = false;
} }
} }
} }
@ -1785,7 +1729,7 @@ T Animation::_interpolate(const Vector<TKey<T>> &p_keys, double p_time, Interpol
// do a barrel roll // do a barrel roll
} }
Error Animation::transform_track_interpolate(int p_track, double p_time, Vector3 *r_loc, Quaternion *r_rot, Vector3 *r_scale, bool p_backward) const { Error Animation::transform_track_interpolate(int p_track, double p_time, Vector3 *r_loc, Quaternion *r_rot, Vector3 *r_scale) const {
ERR_FAIL_INDEX_V(p_track, tracks.size(), ERR_INVALID_PARAMETER); ERR_FAIL_INDEX_V(p_track, tracks.size(), ERR_INVALID_PARAMETER);
Track *t = tracks[p_track]; Track *t = tracks[p_track];
ERR_FAIL_COND_V(t->type != TYPE_TRANSFORM3D, ERR_INVALID_PARAMETER); ERR_FAIL_COND_V(t->type != TYPE_TRANSFORM3D, ERR_INVALID_PARAMETER);
@ -1794,7 +1738,7 @@ Error Animation::transform_track_interpolate(int p_track, double p_time, Vector3
bool ok = false; bool ok = false;
TransformKey tk = _interpolate(tt->transforms, p_time, tt->interpolation, tt->loop_wrap, &ok, p_backward); TransformKey tk = _interpolate(tt->transforms, p_time, tt->interpolation, tt->loop_wrap, &ok);
if (!ok) { if (!ok) {
return ERR_UNAVAILABLE; return ERR_UNAVAILABLE;
@ -1869,7 +1813,7 @@ void Animation::_value_track_get_key_indices_in_range(const ValueTrack *vt, doub
} }
} }
void Animation::value_track_get_key_indices(int p_track, double p_time, double p_delta, List<int> *p_indices, int p_pingponged) const { void Animation::value_track_get_key_indices(int p_track, double p_time, double p_delta, List<int> *p_indices) const {
ERR_FAIL_INDEX(p_track, tracks.size()); ERR_FAIL_INDEX(p_track, tracks.size());
Track *t = tracks[p_track]; Track *t = tracks[p_track];
ERR_FAIL_COND(t->type != TYPE_VALUE); ERR_FAIL_COND(t->type != TYPE_VALUE);
@ -1883,50 +1827,30 @@ void Animation::value_track_get_key_indices(int p_track, double p_time, double p
SWAP(from_time, to_time); SWAP(from_time, to_time);
} }
switch (loop_mode) { if (loop) {
case LOOP_NONE: { from_time = Math::fposmod(from_time, length);
if (from_time < 0) { to_time = Math::fposmod(to_time, length);
from_time = 0;
}
if (from_time > length) {
from_time = length;
}
if (to_time < 0) { if (from_time > to_time) {
to_time = 0; // handle loop by splitting
} _value_track_get_key_indices_in_range(vt, from_time, length, p_indices);
if (to_time > length) { _value_track_get_key_indices_in_range(vt, 0, to_time, p_indices);
to_time = length; return;
} }
} break; } else {
case LOOP_LINEAR: { if (from_time < 0) {
from_time = Math::fposmod(from_time, length); from_time = 0;
to_time = Math::fposmod(to_time, length); }
if (from_time > length) {
from_time = length;
}
if (from_time > to_time) { if (to_time < 0) {
// handle loop by splitting to_time = 0;
_value_track_get_key_indices_in_range(vt, from_time, length, p_indices); }
_value_track_get_key_indices_in_range(vt, 0, to_time, p_indices); if (to_time > length) {
return; to_time = length;
} }
} break;
case LOOP_PINGPONG: {
from_time = Math::pingpong(from_time, length);
to_time = Math::pingpong(to_time, length);
if (p_pingponged == -1) {
// handle loop by splitting
_value_track_get_key_indices_in_range(vt, 0, from_time, p_indices);
_value_track_get_key_indices_in_range(vt, 0, to_time, p_indices);
return;
}
if (p_pingponged == 1) {
// handle loop by splitting
_value_track_get_key_indices_in_range(vt, from_time, length, p_indices);
_value_track_get_key_indices_in_range(vt, to_time, length, p_indices);
return;
}
} break;
} }
_value_track_get_key_indices_in_range(vt, from_time, to_time, p_indices); _value_track_get_key_indices_in_range(vt, from_time, to_time, p_indices);
@ -1985,7 +1909,7 @@ void Animation::_track_get_key_indices_in_range(const Vector<T> &p_array, double
} }
} }
void Animation::track_get_key_indices_in_range(int p_track, double p_time, double p_delta, List<int> *p_indices, int p_pingponged) const { void Animation::track_get_key_indices_in_range(int p_track, double p_time, double p_delta, List<int> *p_indices) const {
ERR_FAIL_INDEX(p_track, tracks.size()); ERR_FAIL_INDEX(p_track, tracks.size());
const Track *t = tracks[p_track]; const Track *t = tracks[p_track];
@ -1996,176 +1920,104 @@ void Animation::track_get_key_indices_in_range(int p_track, double p_time, doubl
SWAP(from_time, to_time); SWAP(from_time, to_time);
} }
switch (loop_mode) { if (loop) {
case LOOP_NONE: { if (from_time > length || from_time < 0) {
if (from_time < 0) { from_time = Math::fposmod(from_time, length);
from_time = 0; }
}
if (from_time > length) {
from_time = length;
}
if (to_time < 0) { if (to_time > length || to_time < 0) {
to_time = 0; to_time = Math::fposmod(to_time, length);
} }
if (to_time > length) {
to_time = length;
}
} break;
case LOOP_LINEAR: {
if (from_time > length || from_time < 0) {
from_time = Math::fposmod(from_time, length);
}
if (to_time > length || to_time < 0) {
to_time = Math::fposmod(to_time, length);
}
if (from_time > to_time) { if (from_time > to_time) {
// handle loop by splitting // handle loop by splitting
switch (t->type) {
case TYPE_TRANSFORM3D: {
const TransformTrack *tt = static_cast<const TransformTrack *>(t);
_track_get_key_indices_in_range(tt->transforms, from_time, length, p_indices);
_track_get_key_indices_in_range(tt->transforms, 0, to_time, p_indices);
} break;
case TYPE_VALUE: {
const ValueTrack *vt = static_cast<const ValueTrack *>(t);
_track_get_key_indices_in_range(vt->values, from_time, length, p_indices);
_track_get_key_indices_in_range(vt->values, 0, to_time, p_indices);
} break;
case TYPE_METHOD: {
const MethodTrack *mt = static_cast<const MethodTrack *>(t);
_track_get_key_indices_in_range(mt->methods, from_time, length, p_indices);
_track_get_key_indices_in_range(mt->methods, 0, to_time, p_indices);
} break;
case TYPE_BEZIER: {
const BezierTrack *bz = static_cast<const BezierTrack *>(t);
_track_get_key_indices_in_range(bz->values, from_time, length, p_indices);
_track_get_key_indices_in_range(bz->values, 0, to_time, p_indices);
} break;
case TYPE_AUDIO: {
const AudioTrack *ad = static_cast<const AudioTrack *>(t);
_track_get_key_indices_in_range(ad->values, from_time, length, p_indices);
_track_get_key_indices_in_range(ad->values, 0, to_time, p_indices);
} break;
case TYPE_ANIMATION: {
const AnimationTrack *an = static_cast<const AnimationTrack *>(t);
_track_get_key_indices_in_range(an->values, from_time, length, p_indices);
_track_get_key_indices_in_range(an->values, 0, to_time, p_indices);
} break;
}
return;
}
} break;
case LOOP_PINGPONG: {
if (from_time > length || from_time < 0) {
from_time = Math::pingpong(from_time, length);
}
if (to_time > length || to_time < 0) {
to_time = Math::pingpong(to_time, length);
}
if ((int)Math::floor(abs(p_delta) / length) % 2 == 0) { switch (t->type) {
if (p_pingponged == -1) { case TYPE_TRANSFORM3D: {
// handle loop by splitting const TransformTrack *tt = static_cast<const TransformTrack *>(t);
switch (t->type) { _track_get_key_indices_in_range(tt->transforms, from_time, length, p_indices);
case TYPE_TRANSFORM3D: { _track_get_key_indices_in_range(tt->transforms, 0, to_time, p_indices);
const TransformTrack *tt = static_cast<const TransformTrack *>(t);
_track_get_key_indices_in_range(tt->transforms, 0, from_time, p_indices); } break;
_track_get_key_indices_in_range(tt->transforms, 0, to_time, p_indices); case TYPE_VALUE: {
} break; const ValueTrack *vt = static_cast<const ValueTrack *>(t);
case TYPE_VALUE: { _track_get_key_indices_in_range(vt->values, from_time, length, p_indices);
const ValueTrack *vt = static_cast<const ValueTrack *>(t); _track_get_key_indices_in_range(vt->values, 0, to_time, p_indices);
_track_get_key_indices_in_range(vt->values, 0, from_time, p_indices);
_track_get_key_indices_in_range(vt->values, 0, to_time, p_indices); } break;
} break; case TYPE_METHOD: {
case TYPE_METHOD: { const MethodTrack *mt = static_cast<const MethodTrack *>(t);
const MethodTrack *mt = static_cast<const MethodTrack *>(t); _track_get_key_indices_in_range(mt->methods, from_time, length, p_indices);
_track_get_key_indices_in_range(mt->methods, 0, from_time, p_indices); _track_get_key_indices_in_range(mt->methods, 0, to_time, p_indices);
_track_get_key_indices_in_range(mt->methods, 0, to_time, p_indices);
} break; } break;
case TYPE_BEZIER: { case TYPE_BEZIER: {
const BezierTrack *bz = static_cast<const BezierTrack *>(t); const BezierTrack *bz = static_cast<const BezierTrack *>(t);
_track_get_key_indices_in_range(bz->values, 0, from_time, p_indices); _track_get_key_indices_in_range(bz->values, from_time, length, p_indices);
_track_get_key_indices_in_range(bz->values, 0, to_time, p_indices); _track_get_key_indices_in_range(bz->values, 0, to_time, p_indices);
} break;
case TYPE_AUDIO: { } break;
const AudioTrack *ad = static_cast<const AudioTrack *>(t); case TYPE_AUDIO: {
_track_get_key_indices_in_range(ad->values, 0, from_time, p_indices); const AudioTrack *ad = static_cast<const AudioTrack *>(t);
_track_get_key_indices_in_range(ad->values, 0, to_time, p_indices); _track_get_key_indices_in_range(ad->values, from_time, length, p_indices);
} break; _track_get_key_indices_in_range(ad->values, 0, to_time, p_indices);
case TYPE_ANIMATION: {
const AnimationTrack *an = static_cast<const AnimationTrack *>(t); } break;
_track_get_key_indices_in_range(an->values, 0, from_time, p_indices); case TYPE_ANIMATION: {
_track_get_key_indices_in_range(an->values, 0, to_time, p_indices); const AnimationTrack *an = static_cast<const AnimationTrack *>(t);
} break; _track_get_key_indices_in_range(an->values, from_time, length, p_indices);
} _track_get_key_indices_in_range(an->values, 0, to_time, p_indices);
return;
} } break;
if (p_pingponged == 1) {
// handle loop by splitting
switch (t->type) {
case TYPE_TRANSFORM3D: {
const TransformTrack *tt = static_cast<const TransformTrack *>(t);
_track_get_key_indices_in_range(tt->transforms, from_time, length, p_indices);
_track_get_key_indices_in_range(tt->transforms, to_time, length, p_indices);
} break;
case TYPE_VALUE: {
const ValueTrack *vt = static_cast<const ValueTrack *>(t);
_track_get_key_indices_in_range(vt->values, from_time, length, p_indices);
_track_get_key_indices_in_range(vt->values, to_time, length, p_indices);
} break;
case TYPE_METHOD: {
const MethodTrack *mt = static_cast<const MethodTrack *>(t);
_track_get_key_indices_in_range(mt->methods, from_time, length, p_indices);
_track_get_key_indices_in_range(mt->methods, to_time, length, p_indices);
} break;
case TYPE_BEZIER: {
const BezierTrack *bz = static_cast<const BezierTrack *>(t);
_track_get_key_indices_in_range(bz->values, from_time, length, p_indices);
_track_get_key_indices_in_range(bz->values, to_time, length, p_indices);
} break;
case TYPE_AUDIO: {
const AudioTrack *ad = static_cast<const AudioTrack *>(t);
_track_get_key_indices_in_range(ad->values, from_time, length, p_indices);
_track_get_key_indices_in_range(ad->values, to_time, length, p_indices);
} break;
case TYPE_ANIMATION: {
const AnimationTrack *an = static_cast<const AnimationTrack *>(t);
_track_get_key_indices_in_range(an->values, from_time, length, p_indices);
_track_get_key_indices_in_range(an->values, to_time, length, p_indices);
} break;
}
return;
}
} }
} break; return;
}
} else {
if (from_time < 0) {
from_time = 0;
}
if (from_time > length) {
from_time = length;
}
if (to_time < 0) {
to_time = 0;
}
if (to_time > length) {
to_time = length;
}
} }
switch (t->type) { switch (t->type) {
case TYPE_TRANSFORM3D: { case TYPE_TRANSFORM3D: {
const TransformTrack *tt = static_cast<const TransformTrack *>(t); const TransformTrack *tt = static_cast<const TransformTrack *>(t);
_track_get_key_indices_in_range(tt->transforms, from_time, to_time, p_indices); _track_get_key_indices_in_range(tt->transforms, from_time, to_time, p_indices);
} break; } break;
case TYPE_VALUE: { case TYPE_VALUE: {
const ValueTrack *vt = static_cast<const ValueTrack *>(t); const ValueTrack *vt = static_cast<const ValueTrack *>(t);
_track_get_key_indices_in_range(vt->values, from_time, to_time, p_indices); _track_get_key_indices_in_range(vt->values, from_time, to_time, p_indices);
} break; } break;
case TYPE_METHOD: { case TYPE_METHOD: {
const MethodTrack *mt = static_cast<const MethodTrack *>(t); const MethodTrack *mt = static_cast<const MethodTrack *>(t);
_track_get_key_indices_in_range(mt->methods, from_time, to_time, p_indices); _track_get_key_indices_in_range(mt->methods, from_time, to_time, p_indices);
} break; } break;
case TYPE_BEZIER: { case TYPE_BEZIER: {
const BezierTrack *bz = static_cast<const BezierTrack *>(t); const BezierTrack *bz = static_cast<const BezierTrack *>(t);
_track_get_key_indices_in_range(bz->values, from_time, to_time, p_indices); _track_get_key_indices_in_range(bz->values, from_time, to_time, p_indices);
} break; } break;
case TYPE_AUDIO: { case TYPE_AUDIO: {
const AudioTrack *ad = static_cast<const AudioTrack *>(t); const AudioTrack *ad = static_cast<const AudioTrack *>(t);
_track_get_key_indices_in_range(ad->values, from_time, to_time, p_indices); _track_get_key_indices_in_range(ad->values, from_time, to_time, p_indices);
} break; } break;
case TYPE_ANIMATION: { case TYPE_ANIMATION: {
const AnimationTrack *an = static_cast<const AnimationTrack *>(t); const AnimationTrack *an = static_cast<const AnimationTrack *>(t);
_track_get_key_indices_in_range(an->values, from_time, to_time, p_indices); _track_get_key_indices_in_range(an->values, from_time, to_time, p_indices);
} break; } break;
} }
} }
@ -2203,7 +2055,7 @@ void Animation::_method_track_get_key_indices_in_range(const MethodTrack *mt, do
} }
} }
void Animation::method_track_get_key_indices(int p_track, double p_time, double p_delta, List<int> *p_indices, int p_pingponged) const { void Animation::method_track_get_key_indices(int p_track, double p_time, double p_delta, List<int> *p_indices) const {
ERR_FAIL_INDEX(p_track, tracks.size()); ERR_FAIL_INDEX(p_track, tracks.size());
Track *t = tracks[p_track]; Track *t = tracks[p_track];
ERR_FAIL_COND(t->type != TYPE_METHOD); ERR_FAIL_COND(t->type != TYPE_METHOD);
@ -2217,58 +2069,35 @@ void Animation::method_track_get_key_indices(int p_track, double p_time, double
SWAP(from_time, to_time); SWAP(from_time, to_time);
} }
switch (loop_mode) { if (loop) {
case LOOP_NONE: { if (from_time > length || from_time < 0) {
if (from_time < 0) { from_time = Math::fposmod(from_time, length);
from_time = 0; }
}
if (from_time > length) {
from_time = length;
}
if (to_time < 0) { if (to_time > length || to_time < 0) {
to_time = 0; to_time = Math::fposmod(to_time, length);
} }
if (to_time > length) {
to_time = length;
}
} break;
case LOOP_LINEAR: {
if (from_time > length || from_time < 0) {
from_time = Math::fposmod(from_time, length);
}
if (to_time > length || to_time < 0) {
to_time = Math::fposmod(to_time, length);
}
if (from_time > to_time) { if (from_time > to_time) {
// handle loop by splitting // handle loop by splitting
_method_track_get_key_indices_in_range(mt, from_time, length, p_indices); _method_track_get_key_indices_in_range(mt, from_time, length, p_indices);
_method_track_get_key_indices_in_range(mt, 0, to_time, p_indices); _method_track_get_key_indices_in_range(mt, 0, to_time, p_indices);
return; return;
} }
} break; } else {
case LOOP_PINGPONG: { if (from_time < 0) {
if (from_time > length || from_time < 0) { from_time = 0;
from_time = Math::pingpong(from_time, length); }
} if (from_time > length) {
if (to_time > length || to_time < 0) { from_time = length;
to_time = Math::pingpong(to_time, length); }
}
if (p_pingponged == -1) { if (to_time < 0) {
_method_track_get_key_indices_in_range(mt, 0, from_time, p_indices); to_time = 0;
_method_track_get_key_indices_in_range(mt, 0, to_time, p_indices); }
return; if (to_time > length) {
} to_time = length;
if (p_pingponged == 1) { }
_method_track_get_key_indices_in_range(mt, from_time, length, p_indices);
_method_track_get_key_indices_in_range(mt, to_time, length, p_indices);
return;
}
} break;
default:
break;
} }
_method_track_get_key_indices_in_range(mt, from_time, to_time, p_indices); _method_track_get_key_indices_in_range(mt, from_time, to_time, p_indices);
@ -2654,13 +2483,13 @@ real_t Animation::get_length() const {
return length; return length;
} }
void Animation::set_loop_mode(Animation::LoopMode p_loop_mode) { void Animation::set_loop(bool p_enabled) {
loop_mode = p_loop_mode; loop = p_enabled;
emit_changed(); emit_changed();
} }
Animation::LoopMode Animation::get_loop_mode() const { bool Animation::has_loop() const {
return loop_mode; return loop;
} }
void Animation::track_set_imported(int p_track, bool p_imported) { void Animation::track_set_imported(int p_track, bool p_imported) {
@ -2799,7 +2628,7 @@ void Animation::_bind_methods() {
ClassDB::bind_method(D_METHOD("track_set_interpolation_loop_wrap", "track_idx", "interpolation"), &Animation::track_set_interpolation_loop_wrap); ClassDB::bind_method(D_METHOD("track_set_interpolation_loop_wrap", "track_idx", "interpolation"), &Animation::track_set_interpolation_loop_wrap);
ClassDB::bind_method(D_METHOD("track_get_interpolation_loop_wrap", "track_idx"), &Animation::track_get_interpolation_loop_wrap); ClassDB::bind_method(D_METHOD("track_get_interpolation_loop_wrap", "track_idx"), &Animation::track_get_interpolation_loop_wrap);
ClassDB::bind_method(D_METHOD("transform_track_interpolate", "track_idx", "time_sec", "is_backward"), &Animation::_transform_track_interpolate, DEFVAL(false)); ClassDB::bind_method(D_METHOD("transform_track_interpolate", "track_idx", "time_sec"), &Animation::_transform_track_interpolate);
ClassDB::bind_method(D_METHOD("value_track_set_update_mode", "track_idx", "mode"), &Animation::value_track_set_update_mode); ClassDB::bind_method(D_METHOD("value_track_set_update_mode", "track_idx", "mode"), &Animation::value_track_set_update_mode);
ClassDB::bind_method(D_METHOD("value_track_get_update_mode", "track_idx"), &Animation::value_track_get_update_mode); ClassDB::bind_method(D_METHOD("value_track_get_update_mode", "track_idx"), &Animation::value_track_get_update_mode);
@ -2837,8 +2666,8 @@ void Animation::_bind_methods() {
ClassDB::bind_method(D_METHOD("set_length", "time_sec"), &Animation::set_length); ClassDB::bind_method(D_METHOD("set_length", "time_sec"), &Animation::set_length);
ClassDB::bind_method(D_METHOD("get_length"), &Animation::get_length); ClassDB::bind_method(D_METHOD("get_length"), &Animation::get_length);
ClassDB::bind_method(D_METHOD("set_loop_mode", "loop_mode"), &Animation::set_loop_mode); ClassDB::bind_method(D_METHOD("set_loop", "enabled"), &Animation::set_loop);
ClassDB::bind_method(D_METHOD("get_loop_mode"), &Animation::get_loop_mode); ClassDB::bind_method(D_METHOD("has_loop"), &Animation::has_loop);
ClassDB::bind_method(D_METHOD("set_step", "size_sec"), &Animation::set_step); ClassDB::bind_method(D_METHOD("set_step", "size_sec"), &Animation::set_step);
ClassDB::bind_method(D_METHOD("get_step"), &Animation::get_step); ClassDB::bind_method(D_METHOD("get_step"), &Animation::get_step);
@ -2847,7 +2676,7 @@ void Animation::_bind_methods() {
ClassDB::bind_method(D_METHOD("copy_track", "track_idx", "to_animation"), &Animation::copy_track); ClassDB::bind_method(D_METHOD("copy_track", "track_idx", "to_animation"), &Animation::copy_track);
ADD_PROPERTY(PropertyInfo(Variant::FLOAT, "length", PROPERTY_HINT_RANGE, "0.001,99999,0.001"), "set_length", "get_length"); ADD_PROPERTY(PropertyInfo(Variant::FLOAT, "length", PROPERTY_HINT_RANGE, "0.001,99999,0.001"), "set_length", "get_length");
ADD_PROPERTY(PropertyInfo(Variant::INT, "loop_mode"), "set_loop_mode", "get_loop_mode"); ADD_PROPERTY(PropertyInfo(Variant::BOOL, "loop"), "set_loop", "has_loop");
ADD_PROPERTY(PropertyInfo(Variant::FLOAT, "step", PROPERTY_HINT_RANGE, "0,4096,0.001"), "set_step", "get_step"); ADD_PROPERTY(PropertyInfo(Variant::FLOAT, "step", PROPERTY_HINT_RANGE, "0,4096,0.001"), "set_step", "get_step");
ADD_SIGNAL(MethodInfo("tracks_changed")); ADD_SIGNAL(MethodInfo("tracks_changed"));
@ -2867,10 +2696,6 @@ void Animation::_bind_methods() {
BIND_ENUM_CONSTANT(UPDATE_DISCRETE); BIND_ENUM_CONSTANT(UPDATE_DISCRETE);
BIND_ENUM_CONSTANT(UPDATE_TRIGGER); BIND_ENUM_CONSTANT(UPDATE_TRIGGER);
BIND_ENUM_CONSTANT(UPDATE_CAPTURE); BIND_ENUM_CONSTANT(UPDATE_CAPTURE);
BIND_ENUM_CONSTANT(LOOP_NONE);
BIND_ENUM_CONSTANT(LOOP_LINEAR);
BIND_ENUM_CONSTANT(LOOP_PINGPONG);
} }
void Animation::clear() { void Animation::clear() {
@ -2878,7 +2703,7 @@ void Animation::clear() {
memdelete(tracks[i]); memdelete(tracks[i]);
} }
tracks.clear(); tracks.clear();
loop_mode = LOOP_NONE; loop = false;
length = 1; length = 1;
emit_changed(); emit_changed();
emit_signal(SceneStringNames::get_singleton()->tracks_changed); emit_signal(SceneStringNames::get_singleton()->tracks_changed);

30
scene/resources/animation.h
View file

@ -60,12 +60,7 @@ public:
UPDATE_DISCRETE, UPDATE_DISCRETE,
UPDATE_TRIGGER, UPDATE_TRIGGER,
UPDATE_CAPTURE, UPDATE_CAPTURE,
};
enum LoopMode {
LOOP_NONE,
LOOP_LINEAR,
LOOP_PINGPONG,
}; };
private: private:
@ -189,8 +184,7 @@ private:
int _insert(double p_time, T &p_keys, const V &p_value); int _insert(double p_time, T &p_keys, const V &p_value);
template <class K> template <class K>
inline int _find(const Vector<K> &p_keys, double p_time) const;
inline int _find(const Vector<K> &p_keys, double p_time, bool p_backward = false) const;
_FORCE_INLINE_ Animation::TransformKey _interpolate(const Animation::TransformKey &p_a, const Animation::TransformKey &p_b, real_t p_c) const; _FORCE_INLINE_ Animation::TransformKey _interpolate(const Animation::TransformKey &p_a, const Animation::TransformKey &p_b, real_t p_c) const;
@ -206,7 +200,7 @@ private:
_FORCE_INLINE_ real_t _cubic_interpolate(const real_t &p_pre_a, const real_t &p_a, const real_t &p_b, const real_t &p_post_b, real_t p_c) const; _FORCE_INLINE_ real_t _cubic_interpolate(const real_t &p_pre_a, const real_t &p_a, const real_t &p_b, const real_t &p_post_b, real_t p_c) const;
template <class T> template <class T>
_FORCE_INLINE_ T _interpolate(const Vector<TKey<T>> &p_keys, double p_time, InterpolationType p_interp, bool p_loop_wrap, bool *p_ok, bool p_backward = false) const; _FORCE_INLINE_ T _interpolate(const Vector<TKey<T>> &p_keys, double p_time, InterpolationType p_interp, bool p_loop_wrap, bool *p_ok) const;
template <class T> template <class T>
_FORCE_INLINE_ void _track_get_key_indices_in_range(const Vector<T> &p_array, double from_time, double to_time, List<int> *p_indices) const; _FORCE_INLINE_ void _track_get_key_indices_in_range(const Vector<T> &p_array, double from_time, double to_time, List<int> *p_indices) const;
@ -216,16 +210,15 @@ private:
double length = 1.0; double length = 1.0;
real_t step = 0.1; real_t step = 0.1;
LoopMode loop_mode = LOOP_NONE; bool loop = false;
int pingponged = 0;
// bind helpers // bind helpers
private: private:
Array _transform_track_interpolate(int p_track, double p_time, bool p_backward = false) const { Array _transform_track_interpolate(int p_track, double p_time) const {
Vector3 loc; Vector3 loc;
Quaternion rot; Quaternion rot;
Vector3 scale; Vector3 scale;
transform_track_interpolate(p_track, p_time, &loc, &rot, &scale, p_backward); transform_track_interpolate(p_track, p_time, &loc, &rot, &scale);
Array ret; Array ret;
ret.push_back(loc); ret.push_back(loc);
ret.push_back(rot); ret.push_back(rot);
@ -331,26 +324,26 @@ public:
void track_set_interpolation_loop_wrap(int p_track, bool p_enable); void track_set_interpolation_loop_wrap(int p_track, bool p_enable);
bool track_get_interpolation_loop_wrap(int p_track) const; bool track_get_interpolation_loop_wrap(int p_track) const;
Error transform_track_interpolate(int p_track, double p_time, Vector3 *r_loc, Quaternion *r_rot, Vector3 *r_scale, bool p_backward = false) const; Error transform_track_interpolate(int p_track, double p_time, Vector3 *r_loc, Quaternion *r_rot, Vector3 *r_scale) const;
Variant value_track_interpolate(int p_track, double p_time) const; Variant value_track_interpolate(int p_track, double p_time) const;
void value_track_get_key_indices(int p_track, double p_time, double p_delta, List<int> *p_indices, int p_pingponged = 0) const; void value_track_get_key_indices(int p_track, double p_time, double p_delta, List<int> *p_indices) const;
void value_track_set_update_mode(int p_track, UpdateMode p_mode); void value_track_set_update_mode(int p_track, UpdateMode p_mode);
UpdateMode value_track_get_update_mode(int p_track) const; UpdateMode value_track_get_update_mode(int p_track) const;
void method_track_get_key_indices(int p_track, double p_time, double p_delta, List<int> *p_indices, int p_pingponged = 0) const; void method_track_get_key_indices(int p_track, double p_time, double p_delta, List<int> *p_indices) const;
Vector<Variant> method_track_get_params(int p_track, int p_key_idx) const; Vector<Variant> method_track_get_params(int p_track, int p_key_idx) const;
StringName method_track_get_name(int p_track, int p_key_idx) const; StringName method_track_get_name(int p_track, int p_key_idx) const;
void copy_track(int p_track, Ref<Animation> p_to_animation); void copy_track(int p_track, Ref<Animation> p_to_animation);
void track_get_key_indices_in_range(int p_track, double p_time, double p_delta, List<int> *p_indices, int p_pingponged = 0) const; void track_get_key_indices_in_range(int p_track, double p_time, double p_delta, List<int> *p_indices) const;
void set_length(real_t p_length); void set_length(real_t p_length);
real_t get_length() const; real_t get_length() const;
void set_loop_mode(LoopMode p_loop_mode); void set_loop(bool p_enabled);
LoopMode get_loop_mode() const; bool has_loop() const;
void set_step(real_t p_step); void set_step(real_t p_step);
real_t get_step() const; real_t get_step() const;
@ -366,6 +359,5 @@ public:
VARIANT_ENUM_CAST(Animation::TrackType); VARIANT_ENUM_CAST(Animation::TrackType);
VARIANT_ENUM_CAST(Animation::InterpolationType); VARIANT_ENUM_CAST(Animation::InterpolationType);
VARIANT_ENUM_CAST(Animation::UpdateMode); VARIANT_ENUM_CAST(Animation::UpdateMode);
VARIANT_ENUM_CAST(Animation::LoopMode);
#endif #endif

6
scene/resources/audio_stream_sample.cpp
View file

@ -299,7 +299,7 @@ int AudioStreamPlaybackSample::mix(AudioFrame *p_buffer, float p_rate_scale, int
if (loop_format != AudioStreamSample::LOOP_DISABLED && offset < loop_begin_fp) { if (loop_format != AudioStreamSample::LOOP_DISABLED && offset < loop_begin_fp) {
/* loopstart reached */ /* loopstart reached */
if (loop_format == AudioStreamSample::LOOP_PINGPONG) { if (loop_format == AudioStreamSample::LOOP_PING_PONG) {
/* bounce ping pong */ /* bounce ping pong */
offset = loop_begin_fp + (loop_begin_fp - offset); offset = loop_begin_fp + (loop_begin_fp - offset);
increment = -increment; increment = -increment;
@ -320,7 +320,7 @@ int AudioStreamPlaybackSample::mix(AudioFrame *p_buffer, float p_rate_scale, int
if (loop_format != AudioStreamSample::LOOP_DISABLED && offset >= loop_end_fp) { if (loop_format != AudioStreamSample::LOOP_DISABLED && offset >= loop_end_fp) {
/* loopend reached */ /* loopend reached */
if (loop_format == AudioStreamSample::LOOP_PINGPONG) { if (loop_format == AudioStreamSample::LOOP_PING_PONG) {
/* bounce ping pong */ /* bounce ping pong */
offset = loop_end_fp - (offset - loop_end_fp); offset = loop_end_fp - (offset - loop_end_fp);
increment = -increment; increment = -increment;
@ -650,7 +650,7 @@ void AudioStreamSample::_bind_methods() {
BIND_ENUM_CONSTANT(LOOP_DISABLED); BIND_ENUM_CONSTANT(LOOP_DISABLED);
BIND_ENUM_CONSTANT(LOOP_FORWARD); BIND_ENUM_CONSTANT(LOOP_FORWARD);
BIND_ENUM_CONSTANT(LOOP_PINGPONG); BIND_ENUM_CONSTANT(LOOP_PING_PONG);
BIND_ENUM_CONSTANT(LOOP_BACKWARD); BIND_ENUM_CONSTANT(LOOP_BACKWARD);
} }

2
scene/resources/audio_stream_sample.h
View file

@ -92,7 +92,7 @@ public:
enum LoopMode { enum LoopMode {
LOOP_DISABLED, LOOP_DISABLED,
LOOP_FORWARD, LOOP_FORWARD,
LOOP_PINGPONG, LOOP_PING_PONG,
LOOP_BACKWARD LOOP_BACKWARD
}; };