asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity Actions

Merge pull request #64247 from guilhermefelipecgs/fix_end_node

Browse source 
Re-add AnimationNodeStateMachine::end_node for root state machine
This commit is contained in:
Rémi Verschelde 2022-08-31 17:40:38 +02:00 committed by GitHub
commit fbf8632556
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 19 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
editor/plugins/animation_state_machine_editor.cpp
View file

@ -802,8 +802,7 @@ void AnimationNodeStateMachineEditor::_open_connect_menu(const Vector2 &p_positi
if (anodesm.is_valid()) { if (anodesm.is_valid()) {
_create_submenu(connect_menu, anodesm, connecting_to_node, connecting_to_node); _create_submenu(connect_menu, anodesm, connecting_to_node, connecting_to_node);
} else { } else {
Ref<AnimationNodeStateMachine> prev = state_machine; _create_submenu(connect_menu, state_machine, connecting_to_node, connecting_to_node, true);
_create_submenu(connect_menu, prev, connecting_to_node, connecting_to_node, true);
} }
connect_menu->add_submenu_item(TTR("To") + " Animation", connecting_to_node); connect_menu->add_submenu_item(TTR("To") + " Animation", connecting_to_node);
@ -835,6 +834,10 @@ bool AnimationNodeStateMachineEditor::_create_submenu(PopupMenu *p_menu, Ref<Ani
String prev_path; String prev_path;
Vector<Ref<AnimationNodeStateMachine>> parents = p_parents; Vector<Ref<AnimationNodeStateMachine>> parents = p_parents;
if (from_root && p_nodesm->get_prev_state_machine() == nullptr) {
return false;
}
if (from_root) { if (from_root) {
AnimationNodeStateMachine *prev = p_nodesm->get_prev_state_machine(); AnimationNodeStateMachine *prev = p_nodesm->get_prev_state_machine();
@ -844,6 +847,8 @@ bool AnimationNodeStateMachineEditor::_create_submenu(PopupMenu *p_menu, Ref<Ani
prev_path += "../"; prev_path += "../";
prev = prev->get_prev_state_machine(); prev = prev->get_prev_state_machine();
} }
end_menu->add_item("Root", nodes_to_connect.size());
nodes_to_connect.push_back(prev_path + state_machine->end_node);
prev_path.remove_at(prev_path.size() - 1); prev_path.remove_at(prev_path.size() - 1);
} }
@ -874,22 +879,22 @@ bool AnimationNodeStateMachineEditor::_create_submenu(PopupMenu *p_menu, Ref<Ani
} }
if (ansm.is_valid()) { if (ansm.is_valid()) {
bool found = false; bool parent_found = false;
for (int i = 0; i < parents.size(); i++) { for (int i = 0; i < parents.size(); i++) {
if (parents[i] == ansm) { if (parents[i] == ansm) {
path = path.replace_first("/../" + E, ""); path = path.replace_first("/../" + E, "");
found = true; parent_found = true;
break; break;
} }
} }
if (!found) { if (parent_found) {
state_machine_menu->add_item(E, nodes_to_connect.size());
nodes_to_connect.push_back(path);
} else {
end_menu->add_item(E, nodes_to_connect.size()); end_menu->add_item(E, nodes_to_connect.size());
nodes_to_connect.push_back(path + "/" + state_machine->end_node); nodes_to_connect.push_back(path + "/" + state_machine->end_node);
} else {
state_machine_menu->add_item(E, nodes_to_connect.size());
nodes_to_connect.push_back(path);
} }
if (_create_submenu(nodes_menu, ansm, E, path, false, parents)) { if (_create_submenu(nodes_menu, ansm, E, path, false, parents)) {

8
scene/animation/animation_node_state_machine.cpp
View file

@ -611,13 +611,15 @@ double AnimationNodeStateMachinePlayback::process(AnimationNodeStateMachine *p_s
if (p_state_machine->end_node != current) { if (p_state_machine->end_node != current) {
rem = 1; rem = 1;
} else { } else {
Ref<AnimationNodeStateMachinePlayback> prev_playback = p_state_machine->prev_state_machine->get_parameter("playback"); if (p_state_machine->prev_state_machine != nullptr) {
Ref<AnimationNodeStateMachinePlayback> prev_playback = p_state_machine->prev_state_machine->get_parameter(p_state_machine->playback);
if (prev_playback.is_valid()) { if (prev_playback.is_valid()) {
prev_playback->current_transition = current_transition; prev_playback->current_transition = current_transition;
prev_playback->force_auto_advance = true; prev_playback->force_auto_advance = true;
} }
} }
}
return rem; return rem;
} }
@ -900,10 +902,6 @@ void AnimationNodeStateMachine::_rename_transitions(const StringName &p_name, co
void AnimationNodeStateMachine::get_node_list(List<StringName> *r_nodes) const { void AnimationNodeStateMachine::get_node_list(List<StringName> *r_nodes) const {
List<StringName> nodes; List<StringName> nodes;
for (const KeyValue<StringName, State> &E : states) { for (const KeyValue<StringName, State> &E : states) {
if (E.key == end_node && prev_state_machine == nullptr) {
continue;
}
nodes.push_back(E.key); nodes.push_back(E.key);
} }
nodes.sort_custom<StringName::AlphCompare>(); nodes.sort_custom<StringName::AlphCompare>();