martin/godot_synced_blend_tree
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Minor code cleanup.

Browse Source
This commit is contained in:
Martin Felis 2025-12-29 15:56:29 +01:00
parent 8a47bc5508
commit ae2e2787cd
3 changed files with 40 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
synced_animation_node.cpp
View File

@ -5,7 +5,7 @@
#include "synced_animation_node.h" #include "synced_animation_node.h"
void SyncedBlendTree::_get_property_list(List<PropertyInfo> *p_list) const { void SyncedBlendTree::_get_property_list(List<PropertyInfo> *p_list) const {
for (const Ref<SyncedAnimationNode> &node : nodes) { for (const Ref<SyncedAnimationNode> &node : tree_graph.nodes) {
String prop_name = node->name; String prop_name = node->name;
if (prop_name != "Output") { if (prop_name != "Output") {
p_list->push_back(PropertyInfo(Variant::OBJECT, "nodes/" + prop_name + "/node", PROPERTY_HINT_RESOURCE_TYPE, "AnimationNode", PROPERTY_USAGE_NO_EDITOR)); p_list->push_back(PropertyInfo(Variant::OBJECT, "nodes/" + prop_name + "/node", PROPERTY_HINT_RESOURCE_TYPE, "AnimationNode", PROPERTY_USAGE_NO_EDITOR));
@ -25,23 +25,23 @@ bool SyncedBlendTree::_get(const StringName &p_name, Variant &r_value) const {
if (what == "node") { if (what == "node") {
if (node_index != -1) { if (node_index != -1) {
r_value = nodes[node_index]; r_value = tree_graph.nodes[node_index];
return true; return true;
} }
} }
if (what == "position") { if (what == "position") {
if (node_index != -1) { if (node_index != -1) {
r_value = nodes[node_index]->position; r_value = tree_graph.nodes[node_index]->position;
return true; return true;
} }
} }
} else if (prop_name == "node_connections") { } else if (prop_name == "node_connections") {
Array conns; Array conns;
conns.resize(tree_builder.connections.size() * 3); conns.resize(tree_graph.connections.size() * 3);
int idx = 0; int idx = 0;
for (const BlendTreeConnection &connection : tree_builder.connections) { for (const BlendTreeConnection &connection : tree_graph.connections) {
conns[idx * 3 + 0] = connection.target_node->name; conns[idx * 3 + 0] = connection.target_node->name;
conns[idx * 3 + 1] = connection.target_node->get_node_input_index(connection.target_port_name); conns[idx * 3 + 1] = connection.target_node->get_node_input_index(connection.target_port_name);
conns[idx * 3 + 2] = connection.source_node->name; conns[idx * 3 + 2] = connection.source_node->name;
@ -73,7 +73,7 @@ bool SyncedBlendTree::_set(const StringName &p_name, const Variant &p_value) {
if (what == "position") { if (what == "position") {
int node_index = find_node_index_by_name(node_name); int node_index = find_node_index_by_name(node_name);
if (node_index > -1) { if (node_index > -1) {
tree_builder.nodes[node_index]->position = p_value; tree_graph.nodes[node_index]->position = p_value;
} }
return true; return true;
} }
@ -86,11 +86,11 @@ bool SyncedBlendTree::_set(const StringName &p_name, const Variant &p_value) {
int target_node_port_index = conns[i + 1]; int target_node_port_index = conns[i + 1];
int source_node_index = find_node_index_by_name(conns[i + 2]); int source_node_index = find_node_index_by_name(conns[i + 2]);
Ref<SyncedAnimationNode> target_node = tree_builder.nodes[target_node_index]; Ref<SyncedAnimationNode> target_node = tree_graph.nodes[target_node_index];
Vector<StringName> target_input_names; Vector<StringName> target_input_names;
target_node->get_input_names(target_input_names); target_node->get_input_names(target_input_names);
add_connection(tree_builder.nodes[source_node_index], target_node, target_input_names[target_node_port_index]); add_connection(tree_graph.nodes[source_node_index], target_node, target_input_names[target_node_port_index]);
} }
return true; return true;
} }

71
synced_animation_node.h
View File

@ -285,11 +285,6 @@ public:
get_input_names(inputs); get_input_names(inputs);
return inputs.size(); return inputs.size();
} }
//protected:
// void _get_property_list(List<PropertyInfo> *p_list) const;
// bool _get(const StringName &p_name, Variant &r_value) const;
// bool _set(const StringName &p_name, const Variant &p_value);
}; };
class AnimationSamplerNode : public SyncedAnimationNode { class AnimationSamplerNode : public SyncedAnimationNode {
@ -353,10 +348,10 @@ struct BlendTreeConnection {
}; };
/** /**
* @class BlendTreeBuilder * @class BlendTreeGraph
* Helper class that is used to build runtime blend trees and also to validate connections. * Helper class that is used to build runtime blend trees and also to validate connections.
*/ */
struct BlendTreeBuilder { struct BlendTreeGraph {
struct NodeConnectionInfo { struct NodeConnectionInfo {
int parent_node_index = -1; int parent_node_index = -1;
HashSet<int> input_subtree_node_indices; // Contains all nodes down to the tree leaves that influence this node. HashSet<int> input_subtree_node_indices; // Contains all nodes down to the tree leaves that influence this node.
@ -405,7 +400,7 @@ struct BlendTreeBuilder {
LocalVector<NodeConnectionInfo> node_connection_info; LocalVector<NodeConnectionInfo> node_connection_info;
LocalVector<BlendTreeConnection> connections; LocalVector<BlendTreeConnection> connections;
BlendTreeBuilder() { BlendTreeGraph() {
Ref<OutputNode> output_node; Ref<OutputNode> output_node;
output_node.instantiate(); output_node.instantiate();
output_node->name = "Output"; output_node->name = "Output";
@ -567,22 +562,18 @@ struct BlendTreeBuilder {
class SyncedBlendTree : public SyncedAnimationNode { class SyncedBlendTree : public SyncedAnimationNode {
GDCLASS(SyncedBlendTree, SyncedAnimationNode); GDCLASS(SyncedBlendTree, SyncedAnimationNode);
Vector<Ref<SyncedAnimationNode>> nodes; BlendTreeGraph tree_graph;
BlendTreeBuilder tree_builder;
bool tree_initialized = false; bool tree_initialized = false;
void sort_nodes() { void sort_nodes() {
nodes.clear();
_node_runtime_data.clear(); _node_runtime_data.clear();
tree_builder.sort_nodes_and_references(); tree_graph.sort_nodes_and_references();
} }
void setup_runtime_data() { void setup_runtime_data() {
// Add nodes and allocate runtime data // Add nodes and allocate runtime data
for (int i = 0; i < tree_builder.nodes.size(); i++) { for (int i = 0; i < tree_graph.nodes.size(); i++) {
const Ref<SyncedAnimationNode> node = tree_builder.nodes[i]; const Ref<SyncedAnimationNode> node = tree_graph.nodes[i];
nodes.push_back(node);
NodeRuntimeData node_runtime_data; NodeRuntimeData node_runtime_data;
for (int ni = 0; ni < node->get_node_input_count(); ni++) { for (int ni = 0; ni < node->get_node_input_count(); ni++) {
@ -594,13 +585,13 @@ class SyncedBlendTree : public SyncedAnimationNode {
} }
// Populate runtime data (only now is this.nodes populated to retrieve the nodes) // Populate runtime data (only now is this.nodes populated to retrieve the nodes)
for (int i = 0; i < nodes.size(); i++) { for (int i = 0; i < tree_graph.nodes.size(); i++) {
Ref<SyncedAnimationNode> node = nodes[i]; Ref<SyncedAnimationNode> node = tree_graph.nodes[i];
NodeRuntimeData &node_runtime_data = _node_runtime_data[i]; NodeRuntimeData &node_runtime_data = _node_runtime_data[i];
for (int port_index = 0; port_index < node->get_node_input_count(); port_index++) { for (int port_index = 0; port_index < node->get_node_input_count(); port_index++) {
const int connected_node_index = tree_builder.node_connection_info[i].connected_child_node_index_at_port[port_index]; const int connected_node_index = tree_graph.node_connection_info[i].connected_child_node_index_at_port[port_index];
node_runtime_data.input_nodes.push_back(nodes[connected_node_index]); node_runtime_data.input_nodes.push_back(tree_graph.nodes[connected_node_index]);
} }
} }
} }
@ -619,15 +610,15 @@ public:
LocalVector<NodeRuntimeData> _node_runtime_data; LocalVector<NodeRuntimeData> _node_runtime_data;
Ref<SyncedAnimationNode> get_output_node() const { Ref<SyncedAnimationNode> get_output_node() const {
return tree_builder.nodes[0]; return tree_graph.nodes[0];
} }
int find_node_index(const Ref<SyncedAnimationNode> &node) const { int find_node_index(const Ref<SyncedAnimationNode> &node) const {
return tree_builder.find_node_index(node); return tree_graph.find_node_index(node);
} }
int find_node_index_by_name(const StringName &name) const { int find_node_index_by_name(const StringName &name) const {
return tree_builder.find_node_index_by_name(name); return tree_graph.find_node_index_by_name(name);
} }
void add_node(const Ref<SyncedAnimationNode> &node) { void add_node(const Ref<SyncedAnimationNode> &node) {
@ -636,7 +627,7 @@ public:
return; return;
} }
tree_builder.add_node(node); tree_graph.add_node(node);
} }
bool add_connection(const Ref<SyncedAnimationNode> &source_node, const Ref<SyncedAnimationNode> &target_node, const StringName &target_port_name) { bool add_connection(const Ref<SyncedAnimationNode> &source_node, const Ref<SyncedAnimationNode> &target_node, const StringName &target_port_name) {
@ -645,7 +636,7 @@ public:
return false; return false;
} }
return tree_builder.add_connection(source_node, target_node, target_port_name); return tree_graph.add_connection(source_node, target_node, target_port_name);
} }
// overrides from SyncedAnimationNode // overrides from SyncedAnimationNode
@ -653,7 +644,7 @@ public:
sort_nodes(); sort_nodes();
setup_runtime_data(); setup_runtime_data();
for (Ref<SyncedAnimationNode> node : nodes) { for (const Ref<SyncedAnimationNode> &node : tree_graph.nodes) {
node->initialize(context); node->initialize(context);
} }
@ -661,9 +652,9 @@ public:
} }
void activate_inputs(Vector<Ref<SyncedAnimationNode>> input_nodes) override { void activate_inputs(Vector<Ref<SyncedAnimationNode>> input_nodes) override {
nodes[0]->active = true; tree_graph.nodes[0]->active = true;
for (int i = 0; i < nodes.size(); i++) { for (int i = 0; i < tree_graph.nodes.size(); i++) {
Ref<SyncedAnimationNode> node = nodes[i]; const Ref<SyncedAnimationNode> &node = tree_graph.nodes[i];
if (!node->active) { if (!node->active) {
continue; continue;
@ -675,8 +666,8 @@ public:
} }
void calculate_sync_track(Vector<Ref<SyncedAnimationNode>> input_nodes) override { void calculate_sync_track(Vector<Ref<SyncedAnimationNode>> input_nodes) override {
for (int i = nodes.size() - 1; i > 0; i--) { for (int i = tree_graph.nodes.size() - 1; i > 0; i--) {
Ref<SyncedAnimationNode> node = nodes[i]; const Ref<SyncedAnimationNode> &node = tree_graph.nodes[i];
if (!node->active) { if (!node->active) {
continue; continue;
@ -689,17 +680,17 @@ public:
} }
void update_time(double p_delta) override { void update_time(double p_delta) override {
nodes[0]->node_time_info.delta = p_delta; tree_graph.nodes[0]->node_time_info.delta = p_delta;
nodes[0]->node_time_info.position += p_delta; tree_graph.nodes[0]->node_time_info.position += p_delta;
for (int i = 1; i < nodes.size(); i++) { for (int i = 1; i < tree_graph.nodes.size(); i++) {
Ref<SyncedAnimationNode> node = nodes[i]; const Ref<SyncedAnimationNode> &node = tree_graph.nodes[i];
if (!node->active) { if (!node->active) {
continue; continue;
} }
Ref<SyncedAnimationNode> node_parent = nodes[tree_builder.node_connection_info[i].parent_node_index]; const Ref<SyncedAnimationNode> &node_parent = tree_graph.nodes[tree_graph.node_connection_info[i].parent_node_index];
if (node->node_time_info.is_synced) { if (node->node_time_info.is_synced) {
node->update_time(node_parent->node_time_info.position); node->update_time(node_parent->node_time_info.position);
@ -710,8 +701,8 @@ public:
} }
void evaluate(GraphEvaluationContext &context, const LocalVector<AnimationData *> &input_datas, AnimationData &output_data) override { void evaluate(GraphEvaluationContext &context, const LocalVector<AnimationData *> &input_datas, AnimationData &output_data) override {
for (int i = nodes.size() - 1; i > 0; i--) { for (int i = tree_graph.nodes.size() - 1; i > 0; i--) {
const Ref<SyncedAnimationNode> &node = nodes[i]; const Ref<SyncedAnimationNode> &node = tree_graph.nodes[i];
if (!node->active) { if (!node->active) {
continue; continue;
@ -721,7 +712,7 @@ public:
// Populate the inputs // Populate the inputs
for (unsigned int j = 0; j < node_runtime_data.input_data.size(); j++) { for (unsigned int j = 0; j < node_runtime_data.input_data.size(); j++) {
int child_index = tree_builder.node_connection_info[i].connected_child_node_index_at_port[j]; int child_index = tree_graph.node_connection_info[i].connected_child_node_index_at_port[j];
node_runtime_data.input_data[j] = _node_runtime_data[child_index].output_data; node_runtime_data.input_data[j] = _node_runtime_data[child_index].output_data;
} }
@ -735,7 +726,7 @@ public:
node->evaluate(context, node_runtime_data.input_data, *node_runtime_data.output_data); node->evaluate(context, node_runtime_data.input_data, *node_runtime_data.output_data);
// All inputs have been consumed and can now be freed. // All inputs have been consumed and can now be freed.
for (int child_index : tree_builder.node_connection_info[i].connected_child_node_index_at_port) { for (const int child_index : tree_graph.node_connection_info[i].connected_child_node_index_at_port) {
memfree(_node_runtime_data[child_index].output_data); memfree(_node_runtime_data[child_index].output_data);
} }
} }

2
tests/test_synced_animation_graph.h
View File

@ -71,7 +71,7 @@ struct SyncedAnimationGraphFixture {
namespace TestSyncedAnimationGraph { namespace TestSyncedAnimationGraph {
TEST_CASE("[SyncedAnimationGraph] Test BlendTree construction") { TEST_CASE("[SyncedAnimationGraph] Test BlendTree construction") {
BlendTreeBuilder tree_constructor; BlendTreeGraph tree_constructor;
Ref<AnimationSamplerNode> animation_sampler_node0; Ref<AnimationSamplerNode> animation_sampler_node0;
animation_sampler_node0.instantiate(); animation_sampler_node0.instantiate();