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

Merge pull request #79598 from TokageItLab/orderdhashmap-blendtree

Browse source 
[3.x] Make AnimationNodeBlendTree use `OrderedHashMap` insteads `Map`
This commit is contained in:
Rémi Verschelde 2023-08-18 17:52:15 +02:00
commit cf4ccdfb09
No known key found for this signature in database
GPG key ID: C3336907360768E1
2 changed files with 11 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
scene/animation/animation_blend_tree.cpp
View file

@ -848,7 +848,7 @@ Ref<AnimationNode> AnimationNodeBlendTree::get_node(const StringName &p_name) co
} }
StringName AnimationNodeBlendTree::get_node_name(const Ref<AnimationNode> &p_node) const { StringName AnimationNodeBlendTree::get_node_name(const Ref<AnimationNode> &p_node) const {
for (Map<StringName, Node>::Element *E = nodes.front(); E; E = E->next()) { for (NodeMap::Element *E = nodes.front(); E; E = E->next()) {
if (E->get().node == p_node) { if (E->get().node == p_node) {
return E->key(); return E->key();
} }
@ -870,12 +870,10 @@ Vector2 AnimationNodeBlendTree::get_node_position(const StringName &p_node) cons
void AnimationNodeBlendTree::get_child_nodes(List<ChildNode> *r_child_nodes) { void AnimationNodeBlendTree::get_child_nodes(List<ChildNode> *r_child_nodes) {
Vector<StringName> ns; Vector<StringName> ns;
for (Map<StringName, Node>::Element *E = nodes.front(); E; E = E->next()) { for (NodeMap::Element *E = nodes.front(); E; E = E->next()) {
ns.push_back(E->key()); ns.push_back(E->key());
} }
ns.sort_custom<StringName::AlphCompare>();
for (int i = 0; i < ns.size(); i++) { for (int i = 0; i < ns.size(); i++) {
ChildNode cn; ChildNode cn;
cn.name = ns[i]; cn.name = ns[i];
@ -904,7 +902,7 @@ void AnimationNodeBlendTree::remove_node(const StringName &p_name) {
nodes.erase(p_name); nodes.erase(p_name);
//erase connections to name //erase connections to name
for (Map<StringName, Node>::Element *E = nodes.front(); E; E = E->next()) { for (NodeMap::Element *E = nodes.front(); E; E = E->next()) {
for (int i = 0; i < E->get().connections.size(); i++) { for (int i = 0; i < E->get().connections.size(); i++) {
if (E->get().connections[i] == p_name) { if (E->get().connections[i] == p_name) {
E->get().connections.write[i] = StringName(); E->get().connections.write[i] = StringName();
@ -928,7 +926,7 @@ void AnimationNodeBlendTree::rename_node(const StringName &p_name, const StringN
nodes.erase(p_name); nodes.erase(p_name);
//rename connections //rename connections
for (Map<StringName, Node>::Element *E = nodes.front(); E; E = E->next()) { for (NodeMap::Element *E = nodes.front(); E; E = E->next()) {
for (int i = 0; i < E->get().connections.size(); i++) { for (int i = 0; i < E->get().connections.size(); i++) {
if (E->get().connections[i] == p_name) { if (E->get().connections[i] == p_name) {
E->get().connections.write[i] = p_new_name; E->get().connections.write[i] = p_new_name;
@ -950,7 +948,7 @@ void AnimationNodeBlendTree::connect_node(const StringName &p_input_node, int p_
Ref<AnimationNode> input = nodes[p_input_node].node; Ref<AnimationNode> input = nodes[p_input_node].node;
ERR_FAIL_INDEX(p_input_index, nodes[p_input_node].connections.size()); ERR_FAIL_INDEX(p_input_index, nodes[p_input_node].connections.size());
for (Map<StringName, Node>::Element *E = nodes.front(); E; E = E->next()) { for (NodeMap::Element *E = nodes.front(); E; E = E->next()) {
for (int i = 0; i < E->get().connections.size(); i++) { for (int i = 0; i < E->get().connections.size(); i++) {
StringName output = E->get().connections[i]; StringName output = E->get().connections[i];
ERR_FAIL_COND(output == p_output_node); ERR_FAIL_COND(output == p_output_node);
@ -994,7 +992,7 @@ AnimationNodeBlendTree::ConnectionError AnimationNodeBlendTree::can_connect_node
return CONNECTION_ERROR_CONNECTION_EXISTS; return CONNECTION_ERROR_CONNECTION_EXISTS;
} }
for (Map<StringName, Node>::Element *E = nodes.front(); E; E = E->next()) { for (NodeMap::Element *E = nodes.front(); E; E = E->next()) {
for (int i = 0; i < E->get().connections.size(); i++) { for (int i = 0; i < E->get().connections.size(); i++) {
StringName output = E->get().connections[i]; StringName output = E->get().connections[i];
if (output == p_output_node) { if (output == p_output_node) {
@ -1006,7 +1004,7 @@ AnimationNodeBlendTree::ConnectionError AnimationNodeBlendTree::can_connect_node
} }
void AnimationNodeBlendTree::get_node_connections(List<NodeConnection> *r_connections) const { void AnimationNodeBlendTree::get_node_connections(List<NodeConnection> *r_connections) const {
for (Map<StringName, Node>::Element *E = nodes.front(); E; E = E->next()) { for (NodeMap::Element *E = nodes.front(); E; E = E->next()) {
for (int i = 0; i < E->get().connections.size(); i++) { for (int i = 0; i < E->get().connections.size(); i++) {
StringName output = E->get().connections[i]; StringName output = E->get().connections[i];
if (output != StringName()) { if (output != StringName()) {
@ -1030,7 +1028,7 @@ float AnimationNodeBlendTree::process(float p_time, bool p_seek) {
} }
void AnimationNodeBlendTree::get_node_list(List<StringName> *r_list) { void AnimationNodeBlendTree::get_node_list(List<StringName> *r_list) {
for (Map<StringName, Node>::Element *E = nodes.front(); E; E = E->next()) { for (NodeMap::Element *E = nodes.front(); E; E = E->next()) {
r_list->push_back(E->key()); r_list->push_back(E->key());
} }
} }
@ -1121,10 +1119,9 @@ bool AnimationNodeBlendTree::_get(const StringName &p_name, Variant &r_ret) cons
} }
void AnimationNodeBlendTree::_get_property_list(List<PropertyInfo> *p_list) const { void AnimationNodeBlendTree::_get_property_list(List<PropertyInfo> *p_list) const {
List<StringName> names; List<StringName> names;
for (Map<StringName, Node>::Element *E = nodes.front(); E; E = E->next()) { for (NodeMap::Element *E = nodes.front(); E; E = E->next()) {
names.push_back(E->key()); names.push_back(E->key());
} }
names.sort_custom<StringName::AlphCompare>();
for (List<StringName>::Element *E = names.front(); E; E = E->next()) { for (List<StringName>::Element *E = names.front(); E; E = E->next()) {
String name = E->get(); String name = E->get();

3
scene/animation/animation_blend_tree.h
View file

@ -339,7 +339,8 @@ class AnimationNodeBlendTree : public AnimationRootNode {
Vector<StringName> connections; Vector<StringName> connections;
}; };
Map<StringName, Node> nodes; typedef Map<StringName, Node, StringName::AlphCompare> NodeMap;
NodeMap nodes;
Vector2 graph_offset; Vector2 graph_offset;