godotengine
/
godot
mirror of https://github.com/godotengine/godot
1
0
Fork 0
Code

Merge pull request #71839 from TokageItLab/expose-fading-from-statemachine 

Expose `fading_from` from StateMachine
This commit is contained in:
Rémi Verschelde 2023-01-22 11:08:34 +01:00
parent 813d7c417b 8b04f58604
commit c0f35a8db1
No known key found for this signature in database
GPG Key ID: C3336907360768E1
4 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
doc/classes/AnimationNodeStateMachinePlayback.xml
View File

@ -38,6 +38,12 @@
Returns the playback position within the current animation state. Returns the playback position within the current animation state.
</description> </description>
</method> </method>
<method name="get_fading_from_node" qualifiers="const">
<return type="StringName" />
<description>
Returns the starting state of currently fading animation.
</description>
</method>
<method name="get_travel_path" qualifiers="const"> <method name="get_travel_path" qualifiers="const">
<return type="PackedStringArray" /> <return type="PackedStringArray" />
<description> <description>

4
editor/plugins/animation_state_machine_editor.cpp
View File

@ -1237,7 +1237,7 @@ void AnimationNodeStateMachineEditor::_state_machine_draw() {
if (playback.is_valid()) { if (playback.is_valid()) {
playing = playback->is_playing(); playing = playback->is_playing();
current = playback->get_current_node(); current = playback->get_current_node();
blend_from = playback->get_blend_from_node(); blend_from = playback->get_fading_from_node();
travel_path = playback->get_travel_path(); travel_path = playback->get_travel_path();
} }
@ -1695,7 +1695,7 @@ void AnimationNodeStateMachineEditor::_notification(int p_what) {
tp = playback->get_travel_path(); tp = playback->get_travel_path();
is_playing = playback->is_playing(); is_playing = playback->is_playing();
current_node = playback->get_current_node(); current_node = playback->get_current_node();
blend_from_node = playback->get_blend_from_node(); blend_from_node = playback->get_fading_from_node();
play_pos = playback->get_current_play_pos(); play_pos = playback->get_current_play_pos();
current_length = playback->get_current_length(); current_length = playback->get_current_length();
} }

3
scene/animation/animation_node_state_machine.cpp
View File

@ -212,7 +212,7 @@ StringName AnimationNodeStateMachinePlayback::get_current_node() const {
return current; return current;
} }
StringName AnimationNodeStateMachinePlayback::get_blend_from_node() const { StringName AnimationNodeStateMachinePlayback::get_fading_from_node() const {
return fading_from; return fading_from;
} }
@ -703,6 +703,7 @@ void AnimationNodeStateMachinePlayback::_bind_methods() {
ClassDB::bind_method(D_METHOD("get_current_node"), &AnimationNodeStateMachinePlayback::get_current_node); ClassDB::bind_method(D_METHOD("get_current_node"), &AnimationNodeStateMachinePlayback::get_current_node);
ClassDB::bind_method(D_METHOD("get_current_play_position"), &AnimationNodeStateMachinePlayback::get_current_play_pos); ClassDB::bind_method(D_METHOD("get_current_play_position"), &AnimationNodeStateMachinePlayback::get_current_play_pos);
ClassDB::bind_method(D_METHOD("get_current_length"), &AnimationNodeStateMachinePlayback::get_current_length); ClassDB::bind_method(D_METHOD("get_current_length"), &AnimationNodeStateMachinePlayback::get_current_length);
ClassDB::bind_method(D_METHOD("get_fading_from_node"), &AnimationNodeStateMachinePlayback::get_fading_from_node);
ClassDB::bind_method(D_METHOD("get_travel_path"), &AnimationNodeStateMachinePlayback::get_travel_path); ClassDB::bind_method(D_METHOD("get_travel_path"), &AnimationNodeStateMachinePlayback::get_travel_path);
} }

2
scene/animation/animation_node_state_machine.h
View File

@ -159,7 +159,7 @@ public:
void stop(); void stop();
bool is_playing() const; bool is_playing() const;
StringName get_current_node() const; StringName get_current_node() const;
StringName get_blend_from_node() const; StringName get_fading_from_node() const;
Vector<StringName> get_travel_path() const; Vector<StringName> get_travel_path() const;
float get_current_play_pos() const; float get_current_play_pos() const;
float get_current_length() const; float get_current_length() const;