Refactored BlendTreeResources to be a subclass of AnimGraphResource.
The latter is used to abstract saving/loading for both BlendTrees and StateMachines.
This commit is contained in:
Martin Felis
+175
-222
@@ -11,22 +11,26 @@
|
||||
#include "ozz/base/io/stream.h"
|
||||
#include "ozz/base/log.h"
|
||||
|
||||
class SimpleAnimSamplerGraphResource {
|
||||
protected:
|
||||
AnimGraphResource graph_resource;
|
||||
class BlendTreeResourceFixture {
|
||||
public:
|
||||
BlendTreeResourceFixture() {
|
||||
blend_tree_resource =
|
||||
dynamic_cast<BlendTreeResource*>(AnimNodeResourceFactory("BlendTree"));
|
||||
}
|
||||
|
||||
virtual ~BlendTreeResourceFixture() { delete blend_tree_resource; }
|
||||
|
||||
BlendTreeResource* blend_tree_resource = nullptr;
|
||||
};
|
||||
|
||||
class SimpleAnimSamplerBlendTreeResourceFixture
|
||||
: public BlendTreeResourceFixture {
|
||||
protected:
|
||||
size_t walk_node_index = -1;
|
||||
AnimNodeResource* walk_node = nullptr;
|
||||
|
||||
public:
|
||||
SimpleAnimSamplerGraphResource()
|
||||
: graph_resource(AnimGraphType::GraphTypeBlendTree) {
|
||||
graph_resource.m_name = "AnimSamplerBlendTree";
|
||||
graph_resource.m_node_type_name = "BlendTree";
|
||||
graph_resource.m_graph_type_name = "BlendTree";
|
||||
|
||||
blend_tree_resource = &graph_resource.m_blend_tree_resource;
|
||||
|
||||
SimpleAnimSamplerBlendTreeResourceFixture() {
|
||||
// Prepare graph inputs and outputs
|
||||
walk_node_index =
|
||||
blend_tree_resource->AddNode(AnimNodeResourceFactory("AnimSampler"));
|
||||
@@ -49,10 +53,8 @@ class SimpleAnimSamplerGraphResource {
|
||||
}
|
||||
};
|
||||
|
||||
class Blend2GraphResource {
|
||||
class Blend2BlendTreeResource : public BlendTreeResourceFixture {
|
||||
protected:
|
||||
AnimGraphResourcePtr graph_resource;
|
||||
BlendTreeResource* blend_tree_resource = nullptr;
|
||||
size_t walk_node_index = -1;
|
||||
size_t run_node_index = -1;
|
||||
size_t blend_node_index = -1;
|
||||
@@ -61,13 +63,8 @@ class Blend2GraphResource {
|
||||
AnimNodeResource* blend_node = nullptr;
|
||||
|
||||
public:
|
||||
Blend2GraphResource()
|
||||
: graph_resource(
|
||||
dynamic_cast<AnimGraphResource*>(
|
||||
AnimNodeResourceFactory("BlendTree"))) {
|
||||
graph_resource->m_name = "WalkRunBlendGraph";
|
||||
|
||||
blend_tree_resource = &graph_resource->m_blend_tree_resource;
|
||||
Blend2BlendTreeResource() {
|
||||
blend_tree_resource->m_name = "WalkRunBlendGraph";
|
||||
|
||||
// Prepare graph inputs and outputs
|
||||
walk_node_index =
|
||||
@@ -129,12 +126,8 @@ class Blend2GraphResource {
|
||||
// | |
|
||||
// +----------------------------------------+
|
||||
//
|
||||
class EmbeddedBlendTreeGraphResource {
|
||||
class EmbeddedBlendTreeGraphResource : public BlendTreeResourceFixture {
|
||||
protected:
|
||||
AnimGraphResource parent_graph_resource;
|
||||
BlendTreeResource* parent_blend_tree_resource = nullptr;
|
||||
|
||||
AnimGraphResource* embedded_graph = nullptr;
|
||||
BlendTreeResource* embedded_blend_tree_resource = nullptr;
|
||||
|
||||
size_t walk_node_index = -1;
|
||||
@@ -143,19 +136,14 @@ class EmbeddedBlendTreeGraphResource {
|
||||
size_t embedded_speed_scale_index = -1;
|
||||
|
||||
public:
|
||||
EmbeddedBlendTreeGraphResource()
|
||||
: parent_graph_resource(AnimGraphType::GraphTypeBlendTree) {
|
||||
parent_graph_resource.m_name = "ParentBlendTree";
|
||||
parent_graph_resource.m_graph_type_name = "BlendTree";
|
||||
parent_graph_resource.m_node_type_name = "BlendTree";
|
||||
|
||||
parent_blend_tree_resource = &parent_graph_resource.m_blend_tree_resource;
|
||||
EmbeddedBlendTreeGraphResource() {
|
||||
blend_tree_resource->m_name = "ParentBlendTree";
|
||||
|
||||
// Parent AnimSampler
|
||||
walk_node_index = parent_blend_tree_resource->AddNode(
|
||||
AnimNodeResourceFactory("AnimSampler"));
|
||||
walk_node_index =
|
||||
blend_tree_resource->AddNode(AnimNodeResourceFactory("AnimSampler"));
|
||||
|
||||
walk_node_resource = parent_blend_tree_resource->GetNode(walk_node_index);
|
||||
walk_node_resource = blend_tree_resource->GetNode(walk_node_index);
|
||||
walk_node_resource->m_name = "WalkAnim";
|
||||
walk_node_resource->m_virtual_socket_accessor->SetPropertyValue(
|
||||
"Filename",
|
||||
@@ -164,14 +152,11 @@ class EmbeddedBlendTreeGraphResource {
|
||||
//
|
||||
// Embedded Tree
|
||||
//
|
||||
embedded_blend_tree_node_index = parent_blend_tree_resource->AddNode(
|
||||
AnimNodeResourceFactory("BlendTree"));
|
||||
embedded_graph = dynamic_cast<AnimGraphResource*>(
|
||||
parent_blend_tree_resource->GetNode(embedded_blend_tree_node_index));
|
||||
embedded_graph->m_name = "EmbeddedBlendTree";
|
||||
embedded_graph->m_node_type_name = "BlendTree";
|
||||
embedded_graph->m_graph_type_name = "BlendTree";
|
||||
embedded_blend_tree_resource = &embedded_graph->m_blend_tree_resource;
|
||||
embedded_blend_tree_node_index =
|
||||
blend_tree_resource->AddNode(AnimNodeResourceFactory("BlendTree"));
|
||||
embedded_blend_tree_resource = dynamic_cast<BlendTreeResource*>(
|
||||
blend_tree_resource->GetNode(embedded_blend_tree_node_index));
|
||||
embedded_blend_tree_resource->m_name = "EmbeddedBlendTree";
|
||||
|
||||
// Embedded: outputs
|
||||
AnimNodeResource* embedded_outputs =
|
||||
@@ -210,15 +195,15 @@ class EmbeddedBlendTreeGraphResource {
|
||||
|
||||
// Parent: setup connections
|
||||
const AnimNodeResource* parent_blend_tree_outputs =
|
||||
parent_blend_tree_resource->GetGraphOutputNode();
|
||||
blend_tree_resource->GetGraphOutputNode();
|
||||
|
||||
REQUIRE(parent_blend_tree_resource->ConnectSockets(
|
||||
REQUIRE(blend_tree_resource->ConnectSockets(
|
||||
walk_node_resource,
|
||||
"Output",
|
||||
embedded_graph,
|
||||
embedded_blend_tree_resource,
|
||||
"AnimInput"));
|
||||
REQUIRE(parent_blend_tree_resource->ConnectSockets(
|
||||
embedded_graph,
|
||||
REQUIRE(blend_tree_resource->ConnectSockets(
|
||||
embedded_blend_tree_resource,
|
||||
"AnimOutput",
|
||||
parent_blend_tree_outputs,
|
||||
"Output"));
|
||||
@@ -238,12 +223,8 @@ class EmbeddedBlendTreeGraphResource {
|
||||
// | |
|
||||
// +----------------------------------------+
|
||||
//
|
||||
class EmbeddedTreeBlend2GraphResource {
|
||||
class EmbeddedTreeBlend2GraphResource : public BlendTreeResourceFixture {
|
||||
protected:
|
||||
AnimGraphResource parent_graph_resource;
|
||||
BlendTreeResource* parent_blend_tree_resource = nullptr;
|
||||
|
||||
AnimGraphResource* embedded_graph = nullptr;
|
||||
BlendTreeResource* embedded_blend_tree_resource = nullptr;
|
||||
|
||||
size_t walk_node_index = -1;
|
||||
@@ -256,26 +237,21 @@ class EmbeddedTreeBlend2GraphResource {
|
||||
AnimNodeResource* embedded_run_node_resource = nullptr;
|
||||
|
||||
public:
|
||||
EmbeddedTreeBlend2GraphResource()
|
||||
: parent_graph_resource(AnimGraphType::GraphTypeBlendTree) {
|
||||
parent_graph_resource.m_name = "ParentBlendTree";
|
||||
parent_graph_resource.m_graph_type_name = "BlendTree";
|
||||
parent_graph_resource.m_node_type_name = "BlendTree";
|
||||
|
||||
parent_blend_tree_resource = &parent_graph_resource.m_blend_tree_resource;
|
||||
EmbeddedTreeBlend2GraphResource() {
|
||||
blend_tree_resource->m_name = "ParentBlendTree";
|
||||
|
||||
// Setup parent inputs
|
||||
AnimNodeResource* parent_blend_tree_inputs =
|
||||
parent_blend_tree_resource->GetGraphInputNode();
|
||||
blend_tree_resource->GetGraphInputNode();
|
||||
parent_blend_tree_inputs->m_virtual_socket_accessor->RegisterOutput<float>(
|
||||
"EmbeddedBlend2Weight",
|
||||
nullptr);
|
||||
|
||||
// Parent AnimSampler
|
||||
walk_node_index = parent_blend_tree_resource->AddNode(
|
||||
AnimNodeResourceFactory("AnimSampler"));
|
||||
walk_node_index =
|
||||
blend_tree_resource->AddNode(AnimNodeResourceFactory("AnimSampler"));
|
||||
|
||||
walk_node_resource = parent_blend_tree_resource->GetNode(walk_node_index);
|
||||
walk_node_resource = blend_tree_resource->GetNode(walk_node_index);
|
||||
walk_node_resource->m_name = "WalkAnim";
|
||||
walk_node_resource->m_virtual_socket_accessor->SetPropertyValue(
|
||||
"Filename",
|
||||
@@ -284,18 +260,17 @@ class EmbeddedTreeBlend2GraphResource {
|
||||
//
|
||||
// Embedded Tree
|
||||
//
|
||||
embedded_blend_tree_node_index = parent_blend_tree_resource->AddNode(
|
||||
AnimNodeResourceFactory("BlendTree"));
|
||||
embedded_graph = dynamic_cast<AnimGraphResource*>(
|
||||
parent_blend_tree_resource->GetNode(embedded_blend_tree_node_index));
|
||||
embedded_graph->m_name = "EmbeddedTreeBlend2GraphResource";
|
||||
embedded_graph->m_node_type_name = "BlendTree";
|
||||
embedded_graph->m_graph_type_name = "BlendTree";
|
||||
embedded_blend_tree_resource = &embedded_graph->m_blend_tree_resource;
|
||||
embedded_blend_tree_node_index =
|
||||
blend_tree_resource->AddNode(AnimNodeResourceFactory("BlendTree"));
|
||||
embedded_blend_tree_resource = dynamic_cast<BlendTreeResource*>(
|
||||
blend_tree_resource->GetNode(embedded_blend_tree_node_index));
|
||||
embedded_blend_tree_resource->m_name = "EmbeddedTreeBlend2GraphResource";
|
||||
|
||||
// Embedded: inputs
|
||||
embedded_graph->RegisterBlendTreeInputSocket<AnimData>("AnimInput");
|
||||
embedded_graph->RegisterBlendTreeInputSocket<float>("BlendWeight");
|
||||
embedded_blend_tree_resource->RegisterBlendTreeInputSocket<AnimData>(
|
||||
"AnimInput");
|
||||
embedded_blend_tree_resource->RegisterBlendTreeInputSocket<float>(
|
||||
"BlendWeight");
|
||||
|
||||
// Embedded nodes
|
||||
embedded_blend2_node_index = embedded_blend_tree_resource->AddNode(
|
||||
@@ -342,22 +317,22 @@ class EmbeddedTreeBlend2GraphResource {
|
||||
|
||||
// Parent: setup connections
|
||||
AnimNodeResource* parent_blend_tree_outputs =
|
||||
parent_blend_tree_resource->GetGraphOutputNode();
|
||||
blend_tree_resource->GetGraphOutputNode();
|
||||
|
||||
REQUIRE(parent_blend_tree_resource->ConnectSockets(
|
||||
REQUIRE(blend_tree_resource->ConnectSockets(
|
||||
walk_node_resource,
|
||||
"Output",
|
||||
embedded_graph,
|
||||
embedded_blend_tree_resource,
|
||||
"AnimInput"));
|
||||
REQUIRE(parent_blend_tree_resource->ConnectSockets(
|
||||
embedded_graph,
|
||||
REQUIRE(blend_tree_resource->ConnectSockets(
|
||||
embedded_blend_tree_resource,
|
||||
AnimGraphResource::DefaultAnimOutput,
|
||||
parent_blend_tree_outputs,
|
||||
AnimGraphResource::DefaultAnimOutput));
|
||||
REQUIRE(parent_blend_tree_resource->ConnectSockets(
|
||||
REQUIRE(blend_tree_resource->ConnectSockets(
|
||||
parent_blend_tree_inputs,
|
||||
"EmbeddedBlend2Weight",
|
||||
embedded_graph,
|
||||
embedded_blend_tree_resource,
|
||||
"BlendWeight"));
|
||||
}
|
||||
};
|
||||
@@ -386,6 +361,14 @@ bool load_skeleton(ozz::animation::Skeleton& skeleton, const char* filename) {
|
||||
void CheckBlendTreeResourcesEqual(
|
||||
const BlendTreeResource* blend_tree_resource_reference,
|
||||
const BlendTreeResource* blend_tree_resource_rhs) {
|
||||
REQUIRE(
|
||||
blend_tree_resource_reference->m_node_type_name
|
||||
== blend_tree_resource_rhs->m_node_type_name);
|
||||
REQUIRE(blend_tree_resource_reference->m_node_type_name == "BlendTree");
|
||||
|
||||
REQUIRE(
|
||||
blend_tree_resource_reference->m_name == blend_tree_resource_rhs->m_name);
|
||||
|
||||
REQUIRE(
|
||||
blend_tree_resource_reference->GetNumNodes()
|
||||
== blend_tree_resource_rhs->GetNumNodes());
|
||||
@@ -420,27 +403,6 @@ void CheckBlendTreeResourcesEqual(
|
||||
}
|
||||
}
|
||||
|
||||
void CheckAnimGraphResourceEqual(
|
||||
const AnimGraphResource& graph_resource_reference,
|
||||
const AnimGraphResource& graph_resource_rhs) {
|
||||
REQUIRE(
|
||||
graph_resource_reference.m_graph_type_name
|
||||
== graph_resource_rhs.m_graph_type_name);
|
||||
REQUIRE(graph_resource_reference.m_name == graph_resource_rhs.m_name);
|
||||
|
||||
REQUIRE(graph_resource_reference.m_graph_type_name == "BlendTree");
|
||||
|
||||
const BlendTreeResource* blend_tree_resource_reference =
|
||||
&graph_resource_reference.m_blend_tree_resource;
|
||||
|
||||
const BlendTreeResource* blend_tree_resource_rhs =
|
||||
&graph_resource_rhs.m_blend_tree_resource;
|
||||
|
||||
CheckBlendTreeResourcesEqual(
|
||||
blend_tree_resource_reference,
|
||||
blend_tree_resource_rhs);
|
||||
}
|
||||
|
||||
TEST_CASE("InputAttributeConversion", "[AnimGraphResource]") {
|
||||
int node_id = 3321;
|
||||
int input_index = 221;
|
||||
@@ -461,24 +423,26 @@ TEST_CASE("InputAttributeConversion", "[AnimGraphResource]") {
|
||||
}
|
||||
|
||||
TEST_CASE_METHOD(
|
||||
SimpleAnimSamplerGraphResource,
|
||||
SimpleAnimSamplerBlendTreeResourceFixture,
|
||||
"SimpleAnimSamplerGraphResource saving and loading results in same "
|
||||
"resource",
|
||||
"[SimpleAnimSamplerGraphResource]") {
|
||||
graph_resource.SaveToFile("TestGraphAnimSamplerBlendTree.json");
|
||||
blend_tree_resource->SaveToFile("TestGraphAnimSamplerBlendTree.json");
|
||||
|
||||
std::unique_ptr<AnimGraphResource> graph_resource_loaded(
|
||||
AnimGraphResource::CreateFromFile("TestGraphAnimSamplerBlendTree.json"));
|
||||
std::unique_ptr<BlendTreeResource> blend_tree_resource_loaded(
|
||||
BlendTreeResource::CreateFromFile("TestGraphAnimSamplerBlendTree.json"));
|
||||
|
||||
CheckAnimGraphResourceEqual(graph_resource, *graph_resource_loaded);
|
||||
CheckBlendTreeResourcesEqual(
|
||||
blend_tree_resource,
|
||||
blend_tree_resource_loaded.get());
|
||||
}
|
||||
|
||||
TEST_CASE_METHOD(
|
||||
SimpleAnimSamplerGraphResource,
|
||||
SimpleAnimSamplerBlendTreeResourceFixture,
|
||||
"SimpleAnimSamplerGraphResource emulated evaluation",
|
||||
"[SimpleAnimSamplerGraphResource]") {
|
||||
AnimGraphBlendTree anim_graph_blend_tree;
|
||||
graph_resource.CreateBlendTreeInstance(anim_graph_blend_tree);
|
||||
blend_tree_resource->CreateBlendTreeInstance(anim_graph_blend_tree);
|
||||
AnimGraphContext graph_context;
|
||||
|
||||
ozz::animation::Skeleton skeleton;
|
||||
@@ -537,29 +501,25 @@ TEST_CASE_METHOD(
|
||||
// Checks that node const inputs are properly set.
|
||||
//
|
||||
TEST_CASE("AnimSamplerSpeedScaleGraph", "[AnimGraphResource]") {
|
||||
AnimGraphResourcePtr graph_resource(
|
||||
dynamic_cast<AnimGraphResource*>(AnimNodeResourceFactory("BlendTree")));
|
||||
graph_resource->m_name = "AnimSamplerSpeedScaleGraph";
|
||||
graph_resource->m_graph_type_name = "BlendTree";
|
||||
|
||||
BlendTreeResource& blend_tree_resource =
|
||||
graph_resource->m_blend_tree_resource;
|
||||
BlendTreeResource* blend_tree_resource =
|
||||
dynamic_cast<BlendTreeResource*>(AnimNodeResourceFactory("BlendTree"));
|
||||
blend_tree_resource->m_name = "AnimSamplerSpeedScaleBlendTree";
|
||||
|
||||
// Prepare graph inputs and outputs
|
||||
size_t walk_node_index =
|
||||
blend_tree_resource.AddNode(AnimNodeResourceFactory("AnimSampler"));
|
||||
blend_tree_resource->AddNode(AnimNodeResourceFactory("AnimSampler"));
|
||||
|
||||
size_t speed_scale_node_index =
|
||||
blend_tree_resource.AddNode(AnimNodeResourceFactory("SpeedScale"));
|
||||
blend_tree_resource->AddNode(AnimNodeResourceFactory("SpeedScale"));
|
||||
|
||||
AnimNodeResource* walk_node = blend_tree_resource.GetNode(walk_node_index);
|
||||
AnimNodeResource* walk_node = blend_tree_resource->GetNode(walk_node_index);
|
||||
walk_node->m_name = "WalkAnim";
|
||||
walk_node->m_virtual_socket_accessor->SetPropertyValue(
|
||||
"Filename",
|
||||
std::string("media/Walking-loop.ozz"));
|
||||
|
||||
AnimNodeResource* speed_scale_node =
|
||||
blend_tree_resource.GetNode(speed_scale_node_index);
|
||||
blend_tree_resource->GetNode(speed_scale_node_index);
|
||||
speed_scale_node->m_name = "SpeedScale";
|
||||
float speed_scale_value = 1.35f;
|
||||
speed_scale_node->m_virtual_socket_accessor->SetInputValue(
|
||||
@@ -567,25 +527,23 @@ TEST_CASE("AnimSamplerSpeedScaleGraph", "[AnimGraphResource]") {
|
||||
speed_scale_value);
|
||||
|
||||
blend_tree_resource
|
||||
.ConnectSockets(walk_node, "Output", speed_scale_node, "Input");
|
||||
->ConnectSockets(walk_node, "Output", speed_scale_node, "Input");
|
||||
|
||||
blend_tree_resource.ConnectSockets(
|
||||
blend_tree_resource->ConnectSockets(
|
||||
speed_scale_node,
|
||||
"Output",
|
||||
blend_tree_resource.GetGraphOutputNode(),
|
||||
blend_tree_resource->GetGraphOutputNode(),
|
||||
AnimGraphResource::DefaultAnimOutput);
|
||||
|
||||
graph_resource->SaveToFile(
|
||||
"TestGraphAnimSamplerSpeedScaleGraph.animgraph.json");
|
||||
AnimGraphResourcePtr graph_resource_loaded(
|
||||
AnimGraphResource::CreateFromFile(
|
||||
"TestGraphAnimSamplerSpeedScaleGraph.animgraph.json"));
|
||||
constexpr char filename[] =
|
||||
"TestGraphAnimSamplerSpeedScaleGraph.animgraph.json";
|
||||
|
||||
BlendTreeResource& blend_tree_resource_loaded =
|
||||
graph_resource_loaded->m_blend_tree_resource;
|
||||
REQUIRE(blend_tree_resource->SaveToFile(filename));
|
||||
BlendTreeResource* blend_tree_resource_loaded =
|
||||
BlendTreeResource::CreateFromFile(filename);
|
||||
|
||||
Socket* speed_scale_resource_loaded_input =
|
||||
blend_tree_resource_loaded.GetNode(speed_scale_node_index)
|
||||
blend_tree_resource_loaded->GetNode(speed_scale_node_index)
|
||||
->m_virtual_socket_accessor->GetInputSocket("SpeedScale");
|
||||
REQUIRE(speed_scale_resource_loaded_input != nullptr);
|
||||
|
||||
@@ -594,7 +552,7 @@ TEST_CASE("AnimSamplerSpeedScaleGraph", "[AnimGraphResource]") {
|
||||
Catch::Matchers::WithinAbs(speed_scale_value, 0.1));
|
||||
|
||||
AnimGraphBlendTree blend_tree;
|
||||
graph_resource_loaded->CreateBlendTreeInstance(blend_tree);
|
||||
blend_tree_resource_loaded->CreateBlendTreeInstance(blend_tree);
|
||||
|
||||
REQUIRE_THAT(
|
||||
*dynamic_cast<SpeedScaleNode*>(blend_tree.m_nodes[speed_scale_node_index])
|
||||
@@ -603,7 +561,7 @@ TEST_CASE("AnimSamplerSpeedScaleGraph", "[AnimGraphResource]") {
|
||||
|
||||
WHEN("Checking node eval order and node subtrees") {
|
||||
const std::vector<size_t>& eval_order =
|
||||
graph_resource_loaded->m_blend_tree_resource.GetNodeEvalOrder();
|
||||
blend_tree_resource_loaded->GetNodeEvalOrder();
|
||||
|
||||
THEN("Walk node gets evaluated before speed scale node") {
|
||||
CHECK(eval_order.size() == 2);
|
||||
@@ -613,23 +571,26 @@ TEST_CASE("AnimSamplerSpeedScaleGraph", "[AnimGraphResource]") {
|
||||
|
||||
THEN("Subtree of the speed scale node contains only the walk node") {
|
||||
CHECK(
|
||||
graph_resource_loaded->m_blend_tree_resource
|
||||
.m_node_inputs_subtree[speed_scale_node_index]
|
||||
blend_tree_resource_loaded
|
||||
->m_node_inputs_subtree[speed_scale_node_index]
|
||||
.size()
|
||||
== 1);
|
||||
CHECK(
|
||||
graph_resource_loaded->m_blend_tree_resource
|
||||
.m_node_inputs_subtree[speed_scale_node_index][0]
|
||||
blend_tree_resource_loaded
|
||||
->m_node_inputs_subtree[speed_scale_node_index][0]
|
||||
== walk_node_index);
|
||||
}
|
||||
}
|
||||
|
||||
delete blend_tree_resource_loaded;
|
||||
delete blend_tree_resource;
|
||||
}
|
||||
|
||||
//
|
||||
// Checks that connections additions and removals are properly validated.
|
||||
//
|
||||
TEST_CASE_METHOD(
|
||||
Blend2GraphResource,
|
||||
Blend2BlendTreeResource,
|
||||
"Connectivity Tests",
|
||||
"[AnimGraphResource][Blend2GraphResource]") {
|
||||
INFO("Removing Blend2 -> Output Connection")
|
||||
@@ -704,18 +665,16 @@ TEST_CASE("FreeAnimGraphResource", "[Test]") {
|
||||
}
|
||||
|
||||
TEST_CASE_METHOD(
|
||||
Blend2GraphResource,
|
||||
Blend2BlendTreeResource,
|
||||
"Blend2GraphResource saving and loading results in same resource",
|
||||
"[Blend2GraphResource]") {
|
||||
graph_resource->SaveToFile("TestGraphBlend2Graph.animgraph.json");
|
||||
|
||||
AnimGraphResourcePtr graph_resource_loaded(
|
||||
AnimGraphResource::CreateFromFile("TestGraphBlend2Graph.animgraph.json"));
|
||||
|
||||
CheckAnimGraphResourceEqual(*graph_resource, *graph_resource_loaded);
|
||||
constexpr char filename[] = "TestGraphBlend2Graph.animgraph.json";
|
||||
|
||||
REQUIRE(blend_tree_resource->SaveToFile(filename));
|
||||
BlendTreeResource* blend_tree_resource_loaded =
|
||||
&graph_resource_loaded->m_blend_tree_resource;
|
||||
BlendTreeResource::CreateFromFile(filename);
|
||||
|
||||
CheckBlendTreeResourcesEqual(blend_tree_resource, blend_tree_resource_loaded);
|
||||
|
||||
// Check that the constant weight of the Blend2 node was properly applied when
|
||||
// loading the resource.
|
||||
@@ -729,14 +688,16 @@ TEST_CASE_METHOD(
|
||||
Catch::Matchers::WithinAbs(
|
||||
blend2_node_descriptor_loaded->GetInputValue<float>("Weight"),
|
||||
0.01));
|
||||
|
||||
delete blend_tree_resource_loaded;
|
||||
}
|
||||
|
||||
TEST_CASE_METHOD(
|
||||
Blend2GraphResource,
|
||||
Blend2BlendTreeResource,
|
||||
"Blend2GraphResource graph unsynced evaluation",
|
||||
"[Blend2GraphResource]") {
|
||||
AnimGraphBlendTree blend_tree_graph;
|
||||
graph_resource->CreateBlendTreeInstance(blend_tree_graph);
|
||||
blend_tree_resource->CreateBlendTreeInstance(blend_tree_graph);
|
||||
AnimGraphContext graph_context;
|
||||
|
||||
ozz::animation::Skeleton skeleton;
|
||||
@@ -835,19 +796,16 @@ TEST_CASE_METHOD(
|
||||
//
|
||||
//
|
||||
TEST_CASE("ResourceSaveLoadMathGraphInputs", "[AnimGraphResource]") {
|
||||
AnimGraphResource graph_resource_origin(AnimGraphType::GraphTypeBlendTree);
|
||||
graph_resource_origin.m_name = "TestInputOutputGraph";
|
||||
graph_resource_origin.m_graph_type_name = "BlendTree";
|
||||
|
||||
BlendTreeResource& blend_tree_resource =
|
||||
graph_resource_origin.m_blend_tree_resource;
|
||||
BlendTreeResource* blend_tree_resource =
|
||||
dynamic_cast<BlendTreeResource*>(AnimNodeResourceFactory("BlendTree"));
|
||||
blend_tree_resource->m_name = "TestInputOutputGraph";
|
||||
|
||||
// Prepare graph inputs and outputs
|
||||
size_t float_to_vec3_node_index = blend_tree_resource.AddNode(
|
||||
size_t float_to_vec3_node_index = blend_tree_resource->AddNode(
|
||||
AnimNodeResourceFactory("MathFloatToVec3Node"));
|
||||
|
||||
AnimNodeResource* graph_output_node =
|
||||
blend_tree_resource.GetGraphOutputNode();
|
||||
blend_tree_resource->GetGraphOutputNode();
|
||||
graph_output_node->m_virtual_socket_accessor->RegisterInput<float>(
|
||||
"GraphFloatOutput",
|
||||
nullptr);
|
||||
@@ -856,38 +814,38 @@ TEST_CASE("ResourceSaveLoadMathGraphInputs", "[AnimGraphResource]") {
|
||||
nullptr);
|
||||
|
||||
AnimNodeResource* graph_input_node_resource =
|
||||
blend_tree_resource.GetGraphInputNode();
|
||||
blend_tree_resource->GetGraphInputNode();
|
||||
graph_input_node_resource->m_virtual_socket_accessor->RegisterOutput<float>(
|
||||
"GraphFloatInput",
|
||||
nullptr);
|
||||
|
||||
// Prepare graph inputs and outputs
|
||||
AnimNodeResource* float_to_vec3_node_resource =
|
||||
blend_tree_resource.GetNode(float_to_vec3_node_index);
|
||||
blend_tree_resource->GetNode(float_to_vec3_node_index);
|
||||
|
||||
REQUIRE(blend_tree_resource.ConnectSockets(
|
||||
REQUIRE(blend_tree_resource->ConnectSockets(
|
||||
graph_input_node_resource,
|
||||
"GraphFloatInput",
|
||||
graph_output_node,
|
||||
"GraphFloatOutput"));
|
||||
|
||||
REQUIRE(blend_tree_resource.ConnectSockets(
|
||||
REQUIRE(blend_tree_resource->ConnectSockets(
|
||||
graph_input_node_resource,
|
||||
"GraphFloatInput",
|
||||
float_to_vec3_node_resource,
|
||||
"Input0"));
|
||||
REQUIRE(blend_tree_resource.ConnectSockets(
|
||||
REQUIRE(blend_tree_resource->ConnectSockets(
|
||||
graph_input_node_resource,
|
||||
"GraphFloatInput",
|
||||
float_to_vec3_node_resource,
|
||||
"Input1"));
|
||||
REQUIRE(blend_tree_resource.ConnectSockets(
|
||||
REQUIRE(blend_tree_resource->ConnectSockets(
|
||||
graph_input_node_resource,
|
||||
"GraphFloatInput",
|
||||
float_to_vec3_node_resource,
|
||||
"Input2"));
|
||||
|
||||
REQUIRE(blend_tree_resource.ConnectSockets(
|
||||
REQUIRE(blend_tree_resource->ConnectSockets(
|
||||
float_to_vec3_node_resource,
|
||||
"Output",
|
||||
graph_output_node,
|
||||
@@ -895,18 +853,15 @@ TEST_CASE("ResourceSaveLoadMathGraphInputs", "[AnimGraphResource]") {
|
||||
|
||||
WHEN("Saving and loading graph resource") {
|
||||
const char* filename = "TestGraphResourceSaveLoadGraphInputs.json";
|
||||
graph_resource_origin.SaveToFile(filename);
|
||||
REQUIRE(blend_tree_resource->SaveToFile(filename));
|
||||
|
||||
AnimGraphResourcePtr graph_resource_loaded(
|
||||
AnimGraphResource::CreateFromFile(filename));
|
||||
|
||||
BlendTreeResource& graph_blend_tree_loaded =
|
||||
graph_resource_loaded->m_blend_tree_resource;
|
||||
BlendTreeResource* blend_tree_resource_loaded =
|
||||
BlendTreeResource::CreateFromFile(filename);
|
||||
|
||||
const AnimNodeResource* graph_loaded_output_node =
|
||||
graph_blend_tree_loaded.GetGraphOutputNode();
|
||||
blend_tree_resource_loaded->GetGraphOutputNode();
|
||||
const AnimNodeResource* graph_loaded_input_node =
|
||||
graph_blend_tree_loaded.GetGraphInputNode();
|
||||
blend_tree_resource_loaded->GetGraphInputNode();
|
||||
|
||||
THEN("Graph inputs and outputs must be in loaded resource as well.") {
|
||||
REQUIRE(
|
||||
@@ -935,7 +890,7 @@ TEST_CASE("ResourceSaveLoadMathGraphInputs", "[AnimGraphResource]") {
|
||||
|
||||
WHEN("Instantiating an AnimGraph") {
|
||||
AnimGraphBlendTree blend_tree_node;
|
||||
graph_resource_loaded->CreateBlendTreeInstance(blend_tree_node);
|
||||
blend_tree_resource_loaded->CreateBlendTreeInstance(blend_tree_node);
|
||||
|
||||
float graph_float_input = 123.456f;
|
||||
blend_tree_node.SetInput("GraphFloatInput", &graph_float_input);
|
||||
@@ -975,7 +930,11 @@ TEST_CASE("ResourceSaveLoadMathGraphInputs", "[AnimGraphResource]") {
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
delete blend_tree_resource_loaded;
|
||||
}
|
||||
|
||||
delete blend_tree_resource;
|
||||
}
|
||||
|
||||
//
|
||||
@@ -992,21 +951,18 @@ TEST_CASE("ResourceSaveLoadMathGraphInputs", "[AnimGraphResource]") {
|
||||
// GraphFloat1Output -> GraphFLoatInputSingle * 3
|
||||
//
|
||||
TEST_CASE("SimpleMathEvaluations", "[AnimGraphResource]") {
|
||||
AnimGraphResource graph_resource_origin(AnimGraphType::GraphTypeBlendTree);
|
||||
graph_resource_origin.m_name = "TestSimpleMathGraph";
|
||||
graph_resource_origin.m_graph_type_name = "BlendTree";
|
||||
|
||||
BlendTreeResource& blend_tree_resource =
|
||||
graph_resource_origin.m_blend_tree_resource;
|
||||
BlendTreeResource* blend_tree_resource =
|
||||
dynamic_cast<BlendTreeResource*>(AnimNodeResourceFactory("BlendTree"));
|
||||
blend_tree_resource->m_name = "TestSimpleMathGraph";
|
||||
|
||||
// Prepare graph inputs and outputs
|
||||
size_t math_add0_node_index =
|
||||
blend_tree_resource.AddNode(AnimNodeResourceFactory("MathAddNode"));
|
||||
blend_tree_resource->AddNode(AnimNodeResourceFactory("MathAddNode"));
|
||||
size_t math_add1_node_index =
|
||||
blend_tree_resource.AddNode(AnimNodeResourceFactory("MathAddNode"));
|
||||
blend_tree_resource->AddNode(AnimNodeResourceFactory("MathAddNode"));
|
||||
|
||||
AnimNodeResource* graph_output_node =
|
||||
blend_tree_resource.GetGraphOutputNode();
|
||||
blend_tree_resource->GetGraphOutputNode();
|
||||
|
||||
graph_output_node->m_virtual_socket_accessor->RegisterInput<float>(
|
||||
"GraphFloat0Output",
|
||||
@@ -1018,57 +974,57 @@ TEST_CASE("SimpleMathEvaluations", "[AnimGraphResource]") {
|
||||
"GraphFloat2Output",
|
||||
nullptr);
|
||||
|
||||
AnimNodeResource* graph_input_node = blend_tree_resource.GetGraphInputNode();
|
||||
AnimNodeResource* graph_input_node = blend_tree_resource->GetGraphInputNode();
|
||||
graph_input_node->m_virtual_socket_accessor->RegisterOutput<float>(
|
||||
"GraphFloatInput",
|
||||
nullptr);
|
||||
|
||||
// Prepare graph inputs and outputs
|
||||
AnimNodeResource* math_add0_node =
|
||||
blend_tree_resource.GetNode(math_add0_node_index);
|
||||
blend_tree_resource->GetNode(math_add0_node_index);
|
||||
AnimNodeResource* math_add1_node =
|
||||
blend_tree_resource.GetNode(math_add1_node_index);
|
||||
blend_tree_resource->GetNode(math_add1_node_index);
|
||||
|
||||
// direct output
|
||||
REQUIRE(blend_tree_resource.ConnectSockets(
|
||||
REQUIRE(blend_tree_resource->ConnectSockets(
|
||||
graph_input_node,
|
||||
"GraphFloatInput",
|
||||
graph_output_node,
|
||||
"GraphFloat0Output"));
|
||||
|
||||
// add0 node
|
||||
REQUIRE(blend_tree_resource.ConnectSockets(
|
||||
REQUIRE(blend_tree_resource->ConnectSockets(
|
||||
graph_input_node,
|
||||
"GraphFloatInput",
|
||||
math_add0_node,
|
||||
"Input0"));
|
||||
|
||||
REQUIRE(blend_tree_resource.ConnectSockets(
|
||||
REQUIRE(blend_tree_resource->ConnectSockets(
|
||||
graph_input_node,
|
||||
"GraphFloatInput",
|
||||
math_add0_node,
|
||||
"Input1"));
|
||||
|
||||
REQUIRE(blend_tree_resource.ConnectSockets(
|
||||
REQUIRE(blend_tree_resource->ConnectSockets(
|
||||
math_add0_node,
|
||||
"Output",
|
||||
graph_output_node,
|
||||
"GraphFloat1Output"));
|
||||
|
||||
// add1 node
|
||||
REQUIRE(blend_tree_resource.ConnectSockets(
|
||||
REQUIRE(blend_tree_resource->ConnectSockets(
|
||||
math_add0_node,
|
||||
"Output",
|
||||
math_add1_node,
|
||||
"Input0"));
|
||||
|
||||
REQUIRE(blend_tree_resource.ConnectSockets(
|
||||
REQUIRE(blend_tree_resource->ConnectSockets(
|
||||
graph_input_node,
|
||||
"GraphFloatInput",
|
||||
math_add1_node,
|
||||
"Input1"));
|
||||
|
||||
REQUIRE(blend_tree_resource.ConnectSockets(
|
||||
REQUIRE(blend_tree_resource->ConnectSockets(
|
||||
math_add1_node,
|
||||
"Output",
|
||||
graph_output_node,
|
||||
@@ -1076,14 +1032,14 @@ TEST_CASE("SimpleMathEvaluations", "[AnimGraphResource]") {
|
||||
|
||||
WHEN("Saving and loading graph resource") {
|
||||
const char* filename = "TestGraphResourceSaveLoadGraphInputs.json";
|
||||
graph_resource_origin.SaveToFile(filename);
|
||||
REQUIRE(blend_tree_resource->SaveToFile(filename));
|
||||
|
||||
AnimGraphResourcePtr graph_resource_loaded(
|
||||
AnimGraphResource::CreateFromFile(filename));
|
||||
BlendTreeResource* blend_tree_resource_loaded =
|
||||
BlendTreeResource::CreateFromFile(filename);
|
||||
|
||||
WHEN("Instantiating an AnimGraph") {
|
||||
AnimGraphBlendTree blend_tree;
|
||||
graph_resource_loaded->CreateBlendTreeInstance(blend_tree);
|
||||
blend_tree_resource_loaded->CreateBlendTreeInstance(blend_tree);
|
||||
|
||||
float graph_float_input = 123.456f;
|
||||
blend_tree.SetInput("GraphFloatInput", &graph_float_input);
|
||||
@@ -1117,7 +1073,11 @@ TEST_CASE("SimpleMathEvaluations", "[AnimGraphResource]") {
|
||||
context.freeAnimations();
|
||||
}
|
||||
}
|
||||
|
||||
delete blend_tree_resource_loaded;
|
||||
}
|
||||
|
||||
delete blend_tree_resource;
|
||||
}
|
||||
|
||||
//
|
||||
@@ -1137,33 +1097,28 @@ TEST_CASE_METHOD(
|
||||
"EmbeddedBlendTreeGraphResource saving and loading results in same "
|
||||
"resource",
|
||||
"[EmbeddedBlendTreeGraphResource]") {
|
||||
parent_graph_resource.SaveToFile("TestGraphEmbeddedBlendTree.json");
|
||||
constexpr char filename[] = "TestGraphEmbeddedBlendTree.json";
|
||||
REQUIRE(blend_tree_resource->SaveToFile(filename));
|
||||
|
||||
AnimGraphResourcePtr parent_graph_resource_loaded(
|
||||
AnimGraphResource::CreateFromFile("TestGraphEmbeddedBlendTree.json"));
|
||||
BlendTreeResource* blend_tree_resource_loaded =
|
||||
BlendTreeResource::CreateFromFile(filename);
|
||||
|
||||
// Check the loaded parent graph
|
||||
CheckAnimGraphResourceEqual(
|
||||
parent_graph_resource,
|
||||
*parent_graph_resource_loaded);
|
||||
|
||||
const BlendTreeResource& parent_blend_tree_resource_loaded =
|
||||
parent_graph_resource_loaded->m_blend_tree_resource;
|
||||
CheckBlendTreeResourcesEqual(blend_tree_resource, blend_tree_resource_loaded);
|
||||
|
||||
// Check the loaded embedded graph
|
||||
REQUIRE(
|
||||
parent_blend_tree_resource_loaded.GetNode(3)->m_node_type_name
|
||||
== "BlendTree");
|
||||
blend_tree_resource_loaded->GetNode(3)->m_node_type_name == "BlendTree");
|
||||
|
||||
const AnimGraphResource* embedded_graph_loaded =
|
||||
dynamic_cast<const AnimGraphResource*>(
|
||||
parent_blend_tree_resource_loaded.GetNode(3));
|
||||
const BlendTreeResource* embedded_blend_tree_resource_loaded =
|
||||
&embedded_graph_loaded->m_blend_tree_resource;
|
||||
dynamic_cast<const BlendTreeResource*>(
|
||||
blend_tree_resource_loaded->GetNode(3));
|
||||
|
||||
CheckBlendTreeResourcesEqual(
|
||||
embedded_blend_tree_resource,
|
||||
embedded_blend_tree_resource_loaded);
|
||||
|
||||
delete blend_tree_resource_loaded;
|
||||
}
|
||||
|
||||
TEST_CASE_METHOD(
|
||||
@@ -1172,7 +1127,7 @@ TEST_CASE_METHOD(
|
||||
"[EmbeddedBlendTreeGraphResource]") {
|
||||
AnimGraphBlendTree blend_tree;
|
||||
|
||||
parent_graph_resource.CreateBlendTreeInstance(blend_tree);
|
||||
blend_tree_resource->CreateBlendTreeInstance(blend_tree);
|
||||
AnimGraphContext graph_context;
|
||||
|
||||
ozz::animation::Skeleton skeleton;
|
||||
@@ -1249,7 +1204,7 @@ TEST_CASE_METHOD(
|
||||
"[EmbeddedTreeBlend2GraphResource]") {
|
||||
AnimGraphBlendTree blend_tree;
|
||||
|
||||
parent_graph_resource.CreateBlendTreeInstance(blend_tree);
|
||||
blend_tree_resource->CreateBlendTreeInstance(blend_tree);
|
||||
AnimGraphContext graph_context;
|
||||
|
||||
ozz::animation::Skeleton skeleton;
|
||||
@@ -1332,21 +1287,19 @@ TEST_CASE_METHOD(
|
||||
TEST_CASE(
|
||||
"Register AnimGraphResource Blendtree Sockets",
|
||||
"[AnimGraphResource]") {
|
||||
AnimNodeResource* blend_tree_anim_node_resource =
|
||||
AnimNodeResourceFactory("BlendTree");
|
||||
AnimGraphResource* blend_tree_graph_resource =
|
||||
dynamic_cast<AnimGraphResource*>(blend_tree_anim_node_resource);
|
||||
BlendTreeResource* blend_tree_resource =
|
||||
dynamic_cast<BlendTreeResource*>(AnimNodeResourceFactory("BlendTree"));
|
||||
|
||||
Socket socket;
|
||||
socket.m_name = "FloatSocket";
|
||||
socket.m_type = SocketType::SocketTypeFloat;
|
||||
socket.m_reference.ptr = nullptr;
|
||||
|
||||
CHECK(blend_tree_graph_resource->RegisterBlendTreeInputSocket(socket));
|
||||
CHECK(!blend_tree_graph_resource->RegisterBlendTreeInputSocket(socket));
|
||||
CHECK(blend_tree_resource->RegisterBlendTreeInputSocket(socket));
|
||||
CHECK(!blend_tree_resource->RegisterBlendTreeInputSocket(socket));
|
||||
|
||||
CHECK(blend_tree_graph_resource->RegisterBlendTreeOutputSocket(socket));
|
||||
CHECK(!blend_tree_graph_resource->RegisterBlendTreeOutputSocket(socket));
|
||||
CHECK(blend_tree_resource->RegisterBlendTreeOutputSocket(socket));
|
||||
CHECK(!blend_tree_resource->RegisterBlendTreeOutputSocket(socket));
|
||||
|
||||
delete blend_tree_anim_node_resource;
|
||||
delete blend_tree_resource;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user