Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add back AnimationPlayer.get_argument_options #99277

Merged
merged 1 commit into from
Nov 15, 2024
Merged

Add back AnimationPlayer.get_argument_options #99277

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 13 additions & 0 deletions modules/gdscript/tests/scripts/completion/argument_options/argument_options.tscn
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,16 @@
[gd_scene load_steps=1 format=3 uid="uid://dl28pdkxcjvym"]

[sub_resource type="Animation" id="Animation_d1pub"]
resource_name = "bounce"

[sub_resource type="AnimationLibrary" id="AnimationLibrary_gs7mj"]
_data = {
"bounce": SubResource("Animation_d1pub")
}

[node name="GetNode" type="Node"]

[node name="AnimationPlayer" type="AnimationPlayer" parent="."]
libraries = {
"": SubResource("AnimationLibrary_gs7mj")
}
6 changes: 6 additions & 0 deletions modules/gdscript/tests/scripts/completion/argument_options/play_inferred.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
[input]
scene="res://completion/argument_options/argument_options.tscn"
[output]
include=[
{"display": "\"bounce\""},
]
5 changes: 5 additions & 0 deletions modules/gdscript/tests/scripts/completion/argument_options/play_inferred.gd
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
@onready var anim := $AnimationPlayer

func test():
anim.play(➡)
pass
6 changes: 6 additions & 0 deletions modules/gdscript/tests/scripts/completion/argument_options/play_typed.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
[input]
scene="res://completion/argument_options/argument_options.tscn"
[output]
include=[
{"display": "\"bounce\""},
]
5 changes: 5 additions & 0 deletions modules/gdscript/tests/scripts/completion/argument_options/play_typed.gd
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
@onready var anim: AnimationPlayer = $AnimationPlayer

func test():
anim.play(➡)
pass
6 changes: 6 additions & 0 deletions modules/gdscript/tests/scripts/completion/argument_options/play_untyped.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
[input]
scene="res://completion/argument_options/argument_options.tscn"
[output]
include=[
{"display": "\"bounce\""},
]
5 changes: 5 additions & 0 deletions modules/gdscript/tests/scripts/completion/argument_options/play_untyped.gd
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
@onready var anim = $AnimationPlayer

func test():
anim.play(➡)
pass
14 changes: 14 additions & 0 deletions scene/animation/animation_player.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -876,6 +876,20 @@ Tween::EaseType AnimationPlayer::get_auto_capture_ease_type() const {
return auto_capture_ease_type;
}

#ifdef TOOLS_ENABLED
void AnimationPlayer::get_argument_options(const StringName &p_function, int p_idx, List<String> *r_options) const {
const String pf = p_function;
if (p_idx == 0 && (pf == "play" || pf == "play_backwards" || pf == "has_animation" || pf == "queue")) {
List<StringName> al;
get_animation_list(&al);
for (const StringName &name : al) {
r_options->push_back(String(name).quote());
}
}
AnimationMixer::get_argument_options(p_function, p_idx, r_options);
}
#endif

void AnimationPlayer::_animation_removed(const StringName &p_name, const StringName &p_library) {
AnimationMixer::_animation_removed(p_name, p_library);

Expand Down
4 changes: 4 additions & 0 deletions scene/animation/animation_player.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -178,6 +178,10 @@ class AnimationPlayer : public AnimationMixer {
void set_auto_capture_ease_type(Tween::EaseType p_auto_capture_ease_type);
Tween::EaseType get_auto_capture_ease_type() const;

#ifdef TOOLS_ENABLED
void get_argument_options(const StringName &p_function, int p_idx, List<String> *r_options) const override;
#endif

void play(const StringName &p_name = StringName(), double p_custom_blend = -1, float p_custom_scale = 1.0, bool p_from_end = false);
void play_section_with_markers(const StringName &p_name = StringName(), const StringName &p_start_marker = StringName(), const StringName &p_end_marker = StringName(), double p_custom_blend = -1, float p_custom_scale = 1.0, bool p_from_end = false);
void play_section(const StringName &p_name = StringName(), double p_start_time = -1, double p_end_time = -1, double p_custom_blend = -1, float p_custom_scale = 1.0, bool p_from_end = false);
Expand Down