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

Compare commits

base: martin:20331d0765d07b32208bb421fcc3052fb4411c60
Branches Tags
martin:main
martin:feature/blend_tree_editor
..
compare: martin:6db99d126b3560b3743701c58912dc9393d97231
Branches Tags
martin:feature/blend_tree_editor
martin:main

1 Commits
20331d0765 ... 6db99d126b

Author SHA1 Message Date
Martin Felis
6db99d126b WIP: Investigating crash on node connection. 2026-02-25 18:33:44 +01:00
2 changed files with 9 additions and 41 deletions
Show Stats Expand all files Collapse all files

20
blendalot_animation_node.h
View File

@ -767,23 +767,14 @@ public:
sort_nodes();
setup_runtime_data();
const HashSet<int> &output_subtree = tree_graph.node_connection_info[0].input_subtree_node_indices;
for (int i = 0; i < tree_graph.nodes.size(); i++) {
const Ref<BLTAnimationNode> &node = tree_graph.nodes[i];
// Initialize, but skip validation of nodes that are not part of the active tree.
if (!output_subtree.has(i)) {
node->initialize(context);
continue;
}
for (const Ref<BLTAnimationNode> &node : tree_graph.nodes) {
if (!node->initialize(context)) {
return false;
}
}
const NodeRuntimeData &node_runtime_data = _node_runtime_data[i];
// All inputs must have a connected node.
for (const NodeRuntimeData &node_runtime_data : _node_runtime_data) {
for (const Ref<BLTAnimationNode> &input_node : node_runtime_data.input_nodes) {
if (!input_node.is_valid()) {
return false;
@ -896,9 +887,6 @@ public:
for (const int child_index : tree_graph.node_connection_info[i].connected_child_node_index_at_port) {
context.animation_data_allocator.free(_node_runtime_data[child_index].output_data);
}
// Node must be deactivated. It'll be activated when actually used next time.
node->active = false;
}
}

30
tests/test_blendalot_animgraph.h
View File

@ -15,7 +15,6 @@ struct BlendTreeFixture {
Ref<Animation> test_animation_a;
Ref<Animation> test_animation_b;
Ref<Animation> test_animation_c;
Ref<Animation> test_animation_sync_a;
Ref<Animation> test_animation_sync_b;
@ -81,16 +80,6 @@ struct BlendTreeFixture {
animation_library->add_animation("TestAnimationB", test_animation_b);
test_animation_c = memnew(Animation);
track_index = test_animation_c->add_track(Animation::TYPE_POSITION_3D);
CHECK(track_index == 0);
test_animation_c->track_insert_key(track_index, 0.0, Vector3(0., 0., 0.));
test_animation_c->track_insert_key(track_index, 3.0, Vector3(2., 4., 6.));
test_animation_c->track_set_path(track_index, NodePath(vformat("%s:%s", skeleton_node->get_path().get_concatenated_names(), "Hips")));
test_animation_c->set_loop_mode(Animation::LOOP_LINEAR);
animation_library->add_animation("TestAnimationC", test_animation_c);
test_animation_sync_a = memnew(Animation);
track_index = test_animation_sync_a->add_track(Animation::TYPE_POSITION_3D);
CHECK(track_index == 0);
@ -609,7 +598,7 @@ TEST_CASE_FIXTURE(BlendTreeFixture, "[SceneTree][Blendalot][BlendTreeGraph][Chan
}
}
SUBCASE("Check evaluation of graph with modified connections") {
SUBCASE("Reconnect graph") {
Ref<BLTAnimationNodeBlendTree> blend_tree_node;
blend_tree_node.instantiate();
blend_tree_node->add_node(animation_sampler_node_a);
@ -619,16 +608,10 @@ TEST_CASE_FIXTURE(BlendTreeFixture, "[SceneTree][Blendalot][BlendTreeGraph][Chan
animation_graph->set_root_animation_node(blend_tree_node);
GraphEvaluationContext &graph_context = animation_graph->get_context();
CHECK(blend_tree_node->initialize(graph_context) == false);
REQUIRE(blend_tree_node->initialize(graph_context) == false);
REQUIRE(BLTAnimationNodeBlendTree::CONNECTION_OK == blend_tree_node->add_connection(animation_sampler_node_a, blend_tree_node->get_output_node(), "Output"));
CHECK(blend_tree_node->initialize(graph_context) == true);
AnimationData *graph_output = graph_context.animation_data_allocator.allocate();
blend_tree_node->activate_inputs(Vector<Ref<BLTAnimationNode>>());
blend_tree_node->calculate_sync_track(Vector<Ref<BLTAnimationNode>>());
blend_tree_node->update_time(0.825);
blend_tree_node->evaluate(graph_context, LocalVector<AnimationData *>(), *graph_output);
REQUIRE(blend_tree_node->initialize(graph_context) == true);
REQUIRE(BLTAnimationNodeBlendTree::CONNECTION_OK == blend_tree_node->add_connection(animation_sampler_node_b, blend2_node_a, "Input0"));
REQUIRE(BLTAnimationNodeBlendTree::CONNECTION_OK == blend_tree_node->add_connection(animation_sampler_node_c, blend2_node_a, "Input1"));
@ -636,12 +619,9 @@ TEST_CASE_FIXTURE(BlendTreeFixture, "[SceneTree][Blendalot][BlendTreeGraph][Chan
REQUIRE(BLTAnimationNodeBlendTree::CONNECTION_OK == blend_tree_node->remove_connection(animation_sampler_node_a, blend_tree_node->get_output_node(), "Output"));
REQUIRE(BLTAnimationNodeBlendTree::CONNECTION_OK == blend_tree_node->add_connection(blend2_node_a, blend_tree_node->get_output_node(), "Output"));
CHECK(blend_tree_node->initialize(graph_context) == true);
REQUIRE(blend_tree_node->initialize(graph_context) == true);
blend_tree_node->activate_inputs(Vector<Ref<BLTAnimationNode>>());
blend_tree_node->calculate_sync_track(Vector<Ref<BLTAnimationNode>>());
blend_tree_node->update_time(0.825);
blend_tree_node->evaluate(graph_context, LocalVector<AnimationData *>(), *graph_output);
blend_tree_graph.sort_nodes_and_references();
}
}