martin/AnimTestbed
1
0
Fork 0
Code Issues 11 Pull Requests Projects 1 Releases Wiki Activity

Renamed AnimData to Pose.

Browse Source
This commit is contained in:
Martin Felis
2025-03-19 21:43:01 +01:00
parent f52b19a8d2
commit 86ea476881
10 changed files with 70 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tests/AnimGraphEvalTests.cc
+11 -11
View File
@@ -121,18 +121,18 @@ TEST_CASE_METHOD(
sampled_translation.z[0] == Approx(translation_key.value.z).margin(0.01));
}
TEST_CASE("AnimDataPlacementNew", "[AnimGraphEval]") {
int anim_data_size = sizeof(AnimData);
char* buf = new char[anim_data_size];
TEST_CASE("PosePlacementNew", "[AnimGraphEval]") {
int pose_size = sizeof(Pose);
char* buf = new char[pose_size];
AnimData* anim_data_newed = new AnimData;
anim_data_newed->m_local_matrices.resize(2);
delete anim_data_newed;
Pose* pose_newed = new Pose;
pose_newed->m_local_matrices.resize(2);
delete pose_newed;
AnimData* anim_data_ptr = new (buf) AnimData;
anim_data_ptr->m_local_matrices.resize(4);
anim_data_ptr->m_local_matrices.resize(0);
anim_data_ptr->m_local_matrices.vector::~vector();
Pose* pose_ptr = new (buf) Pose;
pose_ptr->m_local_matrices.resize(4);
pose_ptr->m_local_matrices.resize(0);
pose_ptr->m_local_matrices.vector::~vector();
delete[] buf;
}
@@ -214,7 +214,7 @@ TEST_CASE_METHOD(
*blend_tree.GetGraphInputs()[0].m_reference.ptr_ptr
== &graph_float_input);
AnimData graph_anim_output;
Pose graph_anim_output;
graph_anim_output.m_local_matrices.resize(skeleton->num_joints());
blend_tree.SetOutput("Output", &graph_anim_output);
tests/AnimGraphResourceTests.cc
+7 -8
View File
@@ -41,7 +41,7 @@ class SimpleAnimSamplerBlendTreeResourceFixture
std::string("media/Walking-loop.ozz"));
AnimNodeResource* graph_node = blend_tree_resource->GetGraphOutputNode();
graph_node->m_virtual_socket_accessor->RegisterInput<AnimData>(
graph_node->m_virtual_socket_accessor->RegisterInput<Pose>(
"GraphOutput",
nullptr);
@@ -161,14 +161,14 @@ class EmbeddedBlendTreeGraphResource : public BlendTreeResourceFixture {
// Embedded: outputs
AnimNodeResource* embedded_outputs =
embedded_blend_tree_resource->GetGraphOutputNode();
embedded_outputs->m_virtual_socket_accessor->RegisterInput<AnimData>(
embedded_outputs->m_virtual_socket_accessor->RegisterInput<Pose>(
"AnimOutput",
nullptr);
// Embedded: inputs
AnimNodeResource* embedded_inputs =
embedded_blend_tree_resource->GetGraphInputNode();
embedded_inputs->m_virtual_socket_accessor->RegisterOutput<AnimData>(
embedded_inputs->m_virtual_socket_accessor->RegisterOutput<Pose>(
"AnimInput",
nullptr);
@@ -267,7 +267,7 @@ class EmbeddedTreeBlend2GraphResource : public BlendTreeResourceFixture {
embedded_blend_tree_resource->m_name = "EmbeddedTreeBlend2GraphResource";
// Embedded: inputs
embedded_blend_tree_resource->RegisterBlendTreeInputSocket<AnimData>(
embedded_blend_tree_resource->RegisterBlendTreeInputSocket<Pose>(
"AnimInput");
embedded_blend_tree_resource->RegisterBlendTreeInputSocket<float>(
"BlendWeight");
@@ -482,7 +482,7 @@ TEST_CASE_METHOD(
REQUIRE(anim_sampler_walk->m_animation != nullptr);
// Ensure that outputs are properly propagated.
AnimData output;
Pose output;
output.m_local_matrices.resize(skeleton.num_soa_joints());
anim_graph_blend_tree.SetOutput(
AnimGraphResource::DefaultAnimOutput,
@@ -764,9 +764,8 @@ TEST_CASE_METHOD(
CHECK(blend2_instance->i_input0 == anim_sampler_walk->o_output);
CHECK(blend2_instance->i_input1 == anim_sampler_run->o_output);
AnimData* graph_output =
static_cast<AnimData*>(blend_tree_graph.GetOutputPtr<AnimData>(
AnimGraphResource::DefaultAnimOutput));
Pose* graph_output = blend_tree_graph.GetOutputPtr<Pose>(
AnimGraphResource::DefaultAnimOutput);
CHECK(
graph_output->m_local_matrices.size()
tests/NodeDescriptorTests.cc
+21 -12
View File
@@ -8,26 +8,34 @@
TEST_CASE("Descriptor Access", "[NodeDescriptorTests]") {
Blend2Node blend2Node;
NodeDescriptor<Blend2Node> blend2Descriptor (&blend2Node);
NodeDescriptor<Blend2Node> blend2Descriptor(&blend2Node);
CHECK(blend2Descriptor.m_inputs.size() == 3);
CHECK(*blend2Descriptor.m_inputs[0].m_reference.ptr_ptr == blend2Node.i_input0);
CHECK(*blend2Descriptor.m_inputs[1].m_reference.ptr_ptr == blend2Node.i_input1);
CHECK(*blend2Descriptor.m_inputs[2].m_reference.ptr_ptr == blend2Node.i_blend_weight);
CHECK(
*blend2Descriptor.m_inputs[0].m_reference.ptr_ptr == blend2Node.i_input0);
CHECK(
*blend2Descriptor.m_inputs[1].m_reference.ptr_ptr == blend2Node.i_input1);
CHECK(
*blend2Descriptor.m_inputs[2].m_reference.ptr_ptr
== blend2Node.i_blend_weight);
CHECK(blend2Descriptor.m_inputs[0].m_type_size == sizeof(AnimData));
CHECK(blend2Descriptor.m_inputs[0].m_type_size == sizeof(Pose));
CHECK(blend2Descriptor.m_inputs[2].m_type_size == 4);
CHECK(blend2Descriptor.m_outputs.size() == 1);
CHECK(*blend2Descriptor.m_outputs[0].m_reference.ptr_ptr == blend2Node.o_output);
CHECK(
*blend2Descriptor.m_outputs[0].m_reference.ptr_ptr
== blend2Node.o_output);
CHECK(blend2Descriptor.m_properties.size() == 1);
CHECK(blend2Descriptor.m_properties[0].m_reference.ptr == &blend2Node.m_sync_blend);
CHECK(
blend2Descriptor.m_properties[0].m_reference.ptr
== &blend2Node.m_sync_blend);
// Check we can properly update inputs
CHECK(blend2Node.i_input0 == nullptr);
AnimData some_anim_data;
blend2Descriptor.SetInput("Input0", &some_anim_data);
CHECK(blend2Node.i_input0 == &some_anim_data);
Pose pose;
blend2Descriptor.SetInput("Input0", &pose);
CHECK(blend2Node.i_input0 == &pose);
// Check we properly can set properties
CHECK(blend2Node.m_sync_blend == false);
@@ -41,6 +49,7 @@ TEST_CASE("Descriptor Access", "[NodeDescriptorTests]") {
blend2Descriptor.UpdateFlags();
Socket* weight_input_socket = blend2Descriptor.GetInputSocket("Weight");
CHECK(weight_input_socket != nullptr);
CHECK(weight_input_socket->m_flags & SocketFlagAffectsTime == SocketFlagAffectsTime);
CHECK(
weight_input_socket->m_flags
& SocketFlagAffectsTime == SocketFlagAffectsTime);
}