godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2026-01-06 10:11:57 +03:00
Code Issues Packages Projects Releases Wiki Activity

Fix AnimationPlayer to use StringName instead of String

Browse Source 
Co-Authored-By: A Thousand Ships <96648715+AThousandShips@users.noreply.github.com>
This commit is contained in:
Ryan
2025-09-21 22:46:40 -04:00
parent c01c7b800d
commit 35999a16dd
7 changed files with 96 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
scene/animation/animation_player.cpp
View File

@@ -365,8 +365,8 @@ void AnimationPlayer::queue(const StringName &p_name) {
}
}
Vector<String> AnimationPlayer::get_queue() {
Vector<String> ret;
TypedArray<StringName> AnimationPlayer::get_queue() {
TypedArray<StringName> ret;
for (const StringName &E : playback_queue) {
ret.push_back(E);
}
@@ -579,8 +579,8 @@ bool AnimationPlayer::is_playing() const {
return playing;
}
void AnimationPlayer::set_current_animation(const String &p_animation) {
if (p_animation == "[stop]" || p_animation.is_empty()) {
void AnimationPlayer::set_current_animation(const StringName &p_animation) {
if (p_animation == SNAME("[stop]") || p_animation.is_empty()) {
stop();
} else if (!is_playing()) {
play(p_animation);
@@ -592,16 +592,16 @@ void AnimationPlayer::set_current_animation(const String &p_animation) {
}
}
String AnimationPlayer::get_current_animation() const {
return (is_playing() ? playback.assigned : "");
StringName AnimationPlayer::get_current_animation() const {
return (is_playing() ? playback.assigned : StringName());
}
void AnimationPlayer::set_assigned_animation(const String &p_animation) {
void AnimationPlayer::set_assigned_animation(const StringName &p_animation) {
if (is_playing()) {
float speed = playback.current.speed_scale;
play(p_animation, -1.0, speed, std::signbit(speed));
} else {
ERR_FAIL_COND_MSG(!animation_set.has(p_animation), vformat("Animation not found: %s.", p_animation));
ERR_FAIL_COND_MSG(!animation_set.has(p_animation), vformat("Animation not found: %s.", p_animation.operator String()));
playback.current.pos = 0;
playback.current.from = &animation_set[p_animation];
playback.current.start_time = -1;
@@ -611,7 +611,7 @@ void AnimationPlayer::set_assigned_animation(const String &p_animation) {
}
}
String AnimationPlayer::get_assigned_animation() const {
StringName AnimationPlayer::get_assigned_animation() const {
return playback.assigned;
}
@@ -745,7 +745,7 @@ bool AnimationPlayer::has_section() const {
return Animation::is_greater_or_equal_approx(playback.current.start_time, 0) || Animation::is_greater_or_equal_approx(playback.current.end_time, 0);
}
void AnimationPlayer::set_autoplay(const String &p_name) {
void AnimationPlayer::set_autoplay(const StringName &p_name) {
if (is_inside_tree() && !Engine::get_singleton()->is_editor_hint()) {
WARN_PRINT("Setting autoplay after the node has been added to the scene has no effect.");
}
@@ -753,7 +753,7 @@ void AnimationPlayer::set_autoplay(const String &p_name) {
autoplay = p_name;
}
String AnimationPlayer::get_autoplay() const {
StringName AnimationPlayer::get_autoplay() const {
return autoplay;
}
@@ -1028,7 +1028,7 @@ void AnimationPlayer::_bind_methods() {
ADD_PROPERTY(PropertyInfo(Variant::FLOAT, "speed_scale", PROPERTY_HINT_RANGE, "-4,4,0.001,or_less,or_greater"), "set_speed_scale", "get_speed_scale");
ADD_PROPERTY(PropertyInfo(Variant::BOOL, "movie_quit_on_finish"), "set_movie_quit_on_finish_enabled", "is_movie_quit_on_finish_enabled");
ADD_SIGNAL(MethodInfo(SNAME("current_animation_changed"), PropertyInfo(Variant::STRING, "name")));
ADD_SIGNAL(MethodInfo(SNAME("current_animation_changed"), PropertyInfo(Variant::STRING_NAME, "name")));
ADD_SIGNAL(MethodInfo(SNAME("animation_changed"), PropertyInfo(Variant::STRING_NAME, "old_name"), PropertyInfo(Variant::STRING_NAME, "new_name")));
}