Added support of saving and loading of embedded blend tree resources.
This commit is contained in:
Martin Felis
+217
-69
@@ -55,24 +55,23 @@ TEST_CASE("InputAttributeConversion", "[AnimGraphResource]") {
|
||||
TEST_CASE("AnimSamplerGraph", "[AnimGraphResource]") {
|
||||
AnimGraphResource graph_resource;
|
||||
graph_resource.m_name = "AnimSamplerBlendTree";
|
||||
graph_resource.m_type = "BlendTree";
|
||||
graph_resource.m_graph_type_name = "BlendTree";
|
||||
|
||||
BlendTreeResource& blend_tree_resource = graph_resource.m_blend_tree_resource;
|
||||
blend_tree_resource.Reset();
|
||||
blend_tree_resource.InitGraphConnectors();
|
||||
|
||||
// Prepare graph inputs and outputs
|
||||
blend_tree_resource.m_nodes.push_back(AnimNodeResourceFactory("AnimSampler"));
|
||||
size_t walk_node_index = blend_tree_resource.m_nodes.size() - 1;
|
||||
|
||||
AnimNodeResource& walk_node = blend_tree_resource.m_nodes[walk_node_index];
|
||||
walk_node.m_name = "WalkAnim";
|
||||
walk_node.m_socket_accessor->SetPropertyValue(
|
||||
AnimNodeResource* walk_node = blend_tree_resource.m_nodes[walk_node_index];
|
||||
walk_node->m_name = "WalkAnim";
|
||||
walk_node->m_socket_accessor->SetPropertyValue(
|
||||
"Filename",
|
||||
std::string("media/Walking-loop.ozz"));
|
||||
|
||||
AnimNodeResource& graph_node = blend_tree_resource.m_nodes[0];
|
||||
graph_node.m_socket_accessor->RegisterInput<AnimData>("GraphOutput", nullptr);
|
||||
AnimNodeResource* graph_node = blend_tree_resource.m_nodes[0];
|
||||
graph_node->m_socket_accessor->RegisterInput<AnimData>("GraphOutput", nullptr);
|
||||
|
||||
blend_tree_resource.ConnectSockets(
|
||||
walk_node,
|
||||
@@ -80,10 +79,10 @@ TEST_CASE("AnimSamplerGraph", "[AnimGraphResource]") {
|
||||
blend_tree_resource.GetGraphOutputNode(),
|
||||
"GraphOutput");
|
||||
|
||||
graph_resource.SaveToFile("AnimSamplerBlendTree.json");
|
||||
graph_resource.SaveToFile("TestGraphAnimSamplerBlendTree.json");
|
||||
|
||||
AnimGraphResource graph_resource_loaded;
|
||||
graph_resource_loaded.LoadFromFile("AnimSamplerBlendTree.json");
|
||||
graph_resource_loaded.LoadFromFile("TestGraphAnimSamplerBlendTree.json");
|
||||
|
||||
AnimGraphBlendTree anim_graph_blend_tree;
|
||||
graph_resource_loaded.CreateBlendTreeInstance(anim_graph_blend_tree);
|
||||
@@ -96,8 +95,8 @@ TEST_CASE("AnimSamplerGraph", "[AnimGraphResource]") {
|
||||
REQUIRE(anim_graph_blend_tree.Init(graph_context));
|
||||
|
||||
REQUIRE(anim_graph_blend_tree.m_nodes.size() == 3);
|
||||
REQUIRE(anim_graph_blend_tree.m_nodes[0]->m_node_type_name == "BlendTree");
|
||||
REQUIRE(anim_graph_blend_tree.m_nodes[1]->m_node_type_name == "BlendTree");
|
||||
REQUIRE(anim_graph_blend_tree.m_nodes[0]->m_node_type_name == "BlendTreeSockets");
|
||||
REQUIRE(anim_graph_blend_tree.m_nodes[1]->m_node_type_name == "BlendTreeSockets");
|
||||
REQUIRE(anim_graph_blend_tree.m_nodes[2]->m_node_type_name == "AnimSampler");
|
||||
|
||||
// connections within the graph
|
||||
@@ -139,7 +138,7 @@ TEST_CASE("AnimSamplerGraph", "[AnimGraphResource]") {
|
||||
TEST_CASE("AnimSamplerSpeedScaleGraph", "[AnimGraphResource]") {
|
||||
AnimGraphResource graph_resource;
|
||||
graph_resource.m_name = "AnimSamplerSpeedScaleGraph";
|
||||
graph_resource.m_type = "BlendTree";
|
||||
graph_resource.m_graph_type_name = "BlendTree";
|
||||
|
||||
BlendTreeResource& blend_tree_resource = graph_resource.m_blend_tree_resource;
|
||||
blend_tree_resource.Reset();
|
||||
@@ -152,22 +151,22 @@ TEST_CASE("AnimSamplerSpeedScaleGraph", "[AnimGraphResource]") {
|
||||
blend_tree_resource.m_nodes.push_back(AnimNodeResourceFactory("SpeedScale"));
|
||||
size_t speed_scale_node_index = blend_tree_resource.m_nodes.size() - 1;
|
||||
|
||||
AnimNodeResource& walk_node = blend_tree_resource.m_nodes[walk_node_index];
|
||||
walk_node.m_name = "WalkAnim";
|
||||
walk_node.m_socket_accessor->SetPropertyValue(
|
||||
AnimNodeResource* walk_node = blend_tree_resource.m_nodes[walk_node_index];
|
||||
walk_node->m_name = "WalkAnim";
|
||||
walk_node->m_socket_accessor->SetPropertyValue(
|
||||
"Filename",
|
||||
std::string("media/Walking-loop.ozz"));
|
||||
|
||||
AnimNodeResource& speed_scale_node =
|
||||
AnimNodeResource* speed_scale_node =
|
||||
blend_tree_resource.m_nodes[speed_scale_node_index];
|
||||
speed_scale_node.m_name = "SpeedScale";
|
||||
speed_scale_node->m_name = "SpeedScale";
|
||||
float speed_scale_value = 1.35f;
|
||||
speed_scale_node.m_socket_accessor->SetInputValue(
|
||||
speed_scale_node->m_socket_accessor->SetInputValue(
|
||||
"SpeedScale",
|
||||
speed_scale_value);
|
||||
|
||||
AnimNodeResource& graph_node = blend_tree_resource.m_nodes[0];
|
||||
graph_node.m_socket_accessor->RegisterInput<AnimData>("GraphOutput", nullptr);
|
||||
AnimNodeResource* graph_node = blend_tree_resource.GetGraphOutputNode();
|
||||
graph_node->m_socket_accessor->RegisterInput<AnimData>("GraphOutput", nullptr);
|
||||
|
||||
blend_tree_resource.ConnectSockets(walk_node, "Output", speed_scale_node, "Input");
|
||||
|
||||
@@ -177,16 +176,15 @@ TEST_CASE("AnimSamplerSpeedScaleGraph", "[AnimGraphResource]") {
|
||||
blend_tree_resource.GetGraphOutputNode(),
|
||||
"GraphOutput");
|
||||
|
||||
graph_resource.SaveToFile("AnimSamplerSpeedScaleGraph.animgraph.json");
|
||||
graph_resource.SaveToFile("TestGraphAnimSamplerSpeedScaleGraph.animgraph.json");
|
||||
AnimGraphResource graph_resource_loaded;
|
||||
graph_resource_loaded.LoadFromFile(
|
||||
"AnimSamplerSpeedScaleGraph.animgraph.json");
|
||||
"TestGraphAnimSamplerSpeedScaleGraph.animgraph.json");
|
||||
|
||||
BlendTreeResource& blend_tree_resource_loaded = graph_resource_loaded.m_blend_tree_resource;
|
||||
|
||||
Socket* speed_scale_resource_loaded_input =
|
||||
blend_tree_resource_loaded.m_nodes[speed_scale_node_index]
|
||||
.m_socket_accessor->GetInputSocket("SpeedScale");
|
||||
blend_tree_resource_loaded.m_nodes[speed_scale_node_index]->m_socket_accessor->GetInputSocket("SpeedScale");
|
||||
REQUIRE(speed_scale_resource_loaded_input != nullptr);
|
||||
|
||||
REQUIRE_THAT(
|
||||
@@ -203,7 +201,7 @@ TEST_CASE("AnimSamplerSpeedScaleGraph", "[AnimGraphResource]") {
|
||||
TEST_CASE("Blend2Graph", "[AnimGraphResource]") {
|
||||
AnimGraphResource graph_resource;
|
||||
graph_resource.m_name = "WalkRunBlendGraph";
|
||||
graph_resource.m_type = "BlendTree";
|
||||
graph_resource.m_graph_type_name = "BlendTree";
|
||||
|
||||
BlendTreeResource& blend_tree_resource = graph_resource.m_blend_tree_resource;
|
||||
blend_tree_resource.Reset();
|
||||
@@ -219,25 +217,25 @@ TEST_CASE("Blend2Graph", "[AnimGraphResource]") {
|
||||
blend_tree_resource.m_nodes.push_back(AnimNodeResourceFactory("Blend2"));
|
||||
size_t blend_node_index = blend_tree_resource.m_nodes.size() - 1;
|
||||
|
||||
AnimNodeResource& walk_node = blend_tree_resource.m_nodes[walk_node_index];
|
||||
walk_node.m_name = "WalkAnim";
|
||||
walk_node.m_socket_accessor->SetPropertyValue(
|
||||
AnimNodeResource* walk_node = blend_tree_resource.m_nodes[walk_node_index];
|
||||
walk_node->m_name = "WalkAnim";
|
||||
walk_node->m_socket_accessor->SetPropertyValue(
|
||||
"Filename",
|
||||
std::string("media/Walking-loop.ozz"));
|
||||
AnimNodeResource& run_node = blend_tree_resource.m_nodes[run_node_index];
|
||||
run_node.m_socket_accessor->SetPropertyValue(
|
||||
AnimNodeResource* run_node = blend_tree_resource.m_nodes[run_node_index];
|
||||
run_node->m_socket_accessor->SetPropertyValue(
|
||||
"Filename",
|
||||
std::string("media/Running0-loop.ozz"));
|
||||
run_node.m_name = "RunAnim";
|
||||
AnimNodeResource& blend_node = blend_tree_resource.m_nodes[blend_node_index];
|
||||
blend_node.m_name = "BlendWalkRun";
|
||||
run_node->m_name = "RunAnim";
|
||||
AnimNodeResource* blend_node = blend_tree_resource.m_nodes[blend_node_index];
|
||||
blend_node->m_name = "BlendWalkRun";
|
||||
|
||||
AnimNodeResource& graph_node = blend_tree_resource.m_nodes[0];
|
||||
graph_node.m_socket_accessor->RegisterInput<AnimData>("GraphOutput", nullptr);
|
||||
AnimNodeResource* graph_node = blend_tree_resource.GetGraphOutputNode();
|
||||
graph_node->m_socket_accessor->RegisterInput<AnimData>("GraphOutput", nullptr);
|
||||
|
||||
REQUIRE(graph_node.m_socket_accessor->m_inputs.size() == 1);
|
||||
REQUIRE(blend_node.m_socket_accessor->GetInputIndex("Input0") == 0);
|
||||
REQUIRE(blend_node.m_socket_accessor->GetInputIndex("Input1") == 1);
|
||||
REQUIRE(graph_node->m_socket_accessor->m_inputs.size() == 1);
|
||||
REQUIRE(blend_node->m_socket_accessor->GetInputIndex("Input0") == 0);
|
||||
REQUIRE(blend_node->m_socket_accessor->GetInputIndex("Input1") == 1);
|
||||
|
||||
blend_tree_resource.ConnectSockets(walk_node, "Output", blend_node, "Input0");
|
||||
blend_tree_resource.ConnectSockets(run_node, "Output", blend_node, "Input1");
|
||||
@@ -247,10 +245,10 @@ TEST_CASE("Blend2Graph", "[AnimGraphResource]") {
|
||||
blend_tree_resource.GetGraphOutputNode(),
|
||||
"GraphOutput");
|
||||
|
||||
graph_resource.SaveToFile("Blend2Graph.animgraph.json");
|
||||
graph_resource.SaveToFile("TestGraphBlend2Graph.animgraph.json");
|
||||
|
||||
AnimGraphResource graph_resource_loaded;
|
||||
graph_resource_loaded.LoadFromFile("Blend2Graph.animgraph.json");
|
||||
graph_resource_loaded.LoadFromFile("TestGraphBlend2Graph.animgraph.json");
|
||||
|
||||
AnimGraphBlendTree blend_tree_graph;
|
||||
graph_resource_loaded.CreateBlendTreeInstance(blend_tree_graph);
|
||||
@@ -263,8 +261,8 @@ TEST_CASE("Blend2Graph", "[AnimGraphResource]") {
|
||||
REQUIRE(blend_tree_graph.Init(graph_context));
|
||||
|
||||
REQUIRE(blend_tree_graph.m_nodes.size() == 5);
|
||||
REQUIRE(blend_tree_graph.m_nodes[0]->m_node_type_name == "BlendTree");
|
||||
REQUIRE(blend_tree_graph.m_nodes[1]->m_node_type_name == "BlendTree");
|
||||
REQUIRE(blend_tree_graph.m_nodes[0]->m_node_type_name == "BlendTreeSockets");
|
||||
REQUIRE(blend_tree_graph.m_nodes[1]->m_node_type_name == "BlendTreeSockets");
|
||||
REQUIRE(blend_tree_graph.m_nodes[2]->m_node_type_name == "AnimSampler");
|
||||
REQUIRE(blend_tree_graph.m_nodes[3]->m_node_type_name == "AnimSampler");
|
||||
REQUIRE(blend_tree_graph.m_nodes[4]->m_node_type_name == "Blend2");
|
||||
@@ -349,7 +347,7 @@ TEST_CASE("Blend2Graph", "[AnimGraphResource]") {
|
||||
TEST_CASE("ResourceSaveLoadMathGraphInputs", "[AnimGraphResource]") {
|
||||
AnimGraphResource graph_resource_origin;
|
||||
graph_resource_origin.m_name = "TestInputOutputGraph";
|
||||
graph_resource_origin.m_type = "BlendTree";
|
||||
graph_resource_origin.m_graph_type_name = "BlendTree";
|
||||
|
||||
BlendTreeResource& blend_tree_resource = graph_resource_origin.m_blend_tree_resource;
|
||||
blend_tree_resource.Reset();
|
||||
@@ -359,23 +357,23 @@ TEST_CASE("ResourceSaveLoadMathGraphInputs", "[AnimGraphResource]") {
|
||||
blend_tree_resource.m_nodes.push_back(AnimNodeResourceFactory("MathFloatToVec3Node"));
|
||||
size_t float_to_vec3_node_index = blend_tree_resource.m_nodes.size() - 1;
|
||||
|
||||
AnimNodeResource& graph_output_node =
|
||||
AnimNodeResource* graph_output_node =
|
||||
blend_tree_resource.GetGraphOutputNode();
|
||||
graph_output_node.m_socket_accessor->RegisterInput<float>(
|
||||
graph_output_node->m_socket_accessor->RegisterInput<float>(
|
||||
"GraphFloatOutput",
|
||||
nullptr);
|
||||
graph_output_node.m_socket_accessor->RegisterInput<Vec3>(
|
||||
graph_output_node->m_socket_accessor->RegisterInput<Vec3>(
|
||||
"GraphVec3Output",
|
||||
nullptr);
|
||||
|
||||
AnimNodeResource& graph_input_node =
|
||||
AnimNodeResource* graph_input_node =
|
||||
blend_tree_resource.GetGraphInputNode();
|
||||
graph_input_node.m_socket_accessor->RegisterOutput<float>(
|
||||
graph_input_node->m_socket_accessor->RegisterOutput<float>(
|
||||
"GraphFloatInput",
|
||||
nullptr);
|
||||
|
||||
// Prepare graph inputs and outputs
|
||||
AnimNodeResource& float_to_vec3_node =
|
||||
AnimNodeResource* float_to_vec3_node =
|
||||
blend_tree_resource.m_nodes[float_to_vec3_node_index];
|
||||
|
||||
REQUIRE(blend_tree_resource.ConnectSockets(
|
||||
@@ -407,7 +405,7 @@ TEST_CASE("ResourceSaveLoadMathGraphInputs", "[AnimGraphResource]") {
|
||||
"GraphVec3Output"));
|
||||
|
||||
WHEN("Saving and loading graph resource") {
|
||||
const char* filename = "ResourceSaveLoadGraphInputs.json";
|
||||
const char* filename = "TestGraphResourceSaveLoadGraphInputs.json";
|
||||
graph_resource_origin.SaveToFile(filename);
|
||||
|
||||
AnimGraphResource graph_resource_loaded;
|
||||
@@ -415,31 +413,31 @@ TEST_CASE("ResourceSaveLoadMathGraphInputs", "[AnimGraphResource]") {
|
||||
|
||||
BlendTreeResource& graph_blend_tree_loaded = graph_resource_loaded.m_blend_tree_resource;
|
||||
|
||||
const AnimNodeResource& graph_loaded_output_node =
|
||||
const AnimNodeResource* graph_loaded_output_node =
|
||||
graph_blend_tree_loaded.m_nodes[0];
|
||||
const AnimNodeResource& graph_loaded_input_node =
|
||||
const AnimNodeResource* graph_loaded_input_node =
|
||||
graph_blend_tree_loaded.m_nodes[1];
|
||||
|
||||
THEN("Graph inputs and outputs must be in loaded resource as well.") {
|
||||
REQUIRE(
|
||||
graph_output_node.m_socket_accessor->m_inputs.size()
|
||||
== graph_loaded_output_node.m_socket_accessor->m_inputs.size());
|
||||
graph_output_node->m_socket_accessor->m_inputs.size()
|
||||
== graph_loaded_output_node->m_socket_accessor->m_inputs.size());
|
||||
|
||||
REQUIRE(
|
||||
graph_input_node.m_socket_accessor->m_outputs.size()
|
||||
== graph_loaded_input_node.m_socket_accessor->m_outputs.size());
|
||||
graph_input_node->m_socket_accessor->m_outputs.size()
|
||||
== graph_loaded_input_node->m_socket_accessor->m_outputs.size());
|
||||
|
||||
REQUIRE(
|
||||
graph_loaded_input_node.m_socket_accessor->GetOutputSocket(
|
||||
graph_loaded_input_node->m_socket_accessor->GetOutputSocket(
|
||||
"GraphFloatInput")
|
||||
!= nullptr);
|
||||
|
||||
REQUIRE(
|
||||
graph_loaded_output_node.m_socket_accessor->GetInputSocket(
|
||||
graph_loaded_output_node->m_socket_accessor->GetInputSocket(
|
||||
"GraphFloatOutput")
|
||||
!= nullptr);
|
||||
REQUIRE(
|
||||
graph_loaded_output_node.m_socket_accessor->GetInputSocket(
|
||||
graph_loaded_output_node->m_socket_accessor->GetInputSocket(
|
||||
"GraphVec3Output")
|
||||
!= nullptr);
|
||||
|
||||
@@ -488,7 +486,7 @@ TEST_CASE("ResourceSaveLoadMathGraphInputs", "[AnimGraphResource]") {
|
||||
TEST_CASE("SimpleMathEvaluations", "[AnimGraphResource]") {
|
||||
AnimGraphResource graph_resource_origin;
|
||||
graph_resource_origin.m_name = "TestSimpleMathGraph";
|
||||
graph_resource_origin.m_type = "BlendTree";
|
||||
graph_resource_origin.m_graph_type_name = "BlendTree";
|
||||
|
||||
BlendTreeResource& blend_tree_resource = graph_resource_origin.m_blend_tree_resource;
|
||||
blend_tree_resource.Reset();
|
||||
@@ -501,29 +499,29 @@ TEST_CASE("SimpleMathEvaluations", "[AnimGraphResource]") {
|
||||
blend_tree_resource.m_nodes.push_back(AnimNodeResourceFactory("MathAddNode"));
|
||||
size_t math_add1_node_index = blend_tree_resource.m_nodes.size() - 1;
|
||||
|
||||
AnimNodeResource& graph_output_node =
|
||||
AnimNodeResource* graph_output_node =
|
||||
blend_tree_resource.GetGraphOutputNode();
|
||||
|
||||
graph_output_node.m_socket_accessor->RegisterInput<float>(
|
||||
graph_output_node->m_socket_accessor->RegisterInput<float>(
|
||||
"GraphFloat0Output",
|
||||
nullptr);
|
||||
graph_output_node.m_socket_accessor->RegisterInput<float>(
|
||||
graph_output_node->m_socket_accessor->RegisterInput<float>(
|
||||
"GraphFloat1Output",
|
||||
nullptr);
|
||||
graph_output_node.m_socket_accessor->RegisterInput<float>(
|
||||
graph_output_node->m_socket_accessor->RegisterInput<float>(
|
||||
"GraphFloat2Output",
|
||||
nullptr);
|
||||
|
||||
AnimNodeResource& graph_input_node =
|
||||
AnimNodeResource* graph_input_node =
|
||||
blend_tree_resource.GetGraphInputNode();
|
||||
graph_input_node.m_socket_accessor->RegisterOutput<float>(
|
||||
graph_input_node->m_socket_accessor->RegisterOutput<float>(
|
||||
"GraphFloatInput",
|
||||
nullptr);
|
||||
|
||||
// Prepare graph inputs and outputs
|
||||
AnimNodeResource& math_add0_node =
|
||||
AnimNodeResource* math_add0_node =
|
||||
blend_tree_resource.m_nodes[math_add0_node_index];
|
||||
AnimNodeResource& math_add1_node =
|
||||
AnimNodeResource* math_add1_node =
|
||||
blend_tree_resource.m_nodes[math_add1_node_index];
|
||||
|
||||
// direct output
|
||||
@@ -572,7 +570,7 @@ TEST_CASE("SimpleMathEvaluations", "[AnimGraphResource]") {
|
||||
"GraphFloat2Output"));
|
||||
|
||||
WHEN("Saving and loading graph resource") {
|
||||
const char* filename = "ResourceSaveLoadGraphInputs.json";
|
||||
const char* filename = "TestGraphResourceSaveLoadGraphInputs.json";
|
||||
graph_resource_origin.SaveToFile(filename);
|
||||
|
||||
AnimGraphResource graph_resource_loaded;
|
||||
@@ -618,4 +616,154 @@ TEST_CASE("SimpleMathEvaluations", "[AnimGraphResource]") {
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
//
|
||||
// Tests whether BlendTree within a BlendTree can be saved and loaded
|
||||
//
|
||||
// +-----------Parent BlendTree-------------+
|
||||
// | |
|
||||
// | +-----Embd Btree---+ |
|
||||
// | AnmSmpl--+-\ | |
|
||||
// | | \-SpdScale------+--Out |
|
||||
// | |------------------+ |
|
||||
// | |
|
||||
// +----------------------------------------+
|
||||
//
|
||||
TEST_CASE("EmbeddedBlendTreeSaveLoad", "[AnimGraphResource]") {
|
||||
const char* parent_graph_filename = "TestGraphEmbeddedBlendTree.json";
|
||||
AnimGraphResource parent_graph_resource;
|
||||
parent_graph_resource.m_name = "ParentBlendTree";
|
||||
parent_graph_resource.m_graph_type_name = "BlendTree";
|
||||
parent_graph_resource.m_node_type_name = "BlendTree";
|
||||
|
||||
BlendTreeResource& parent_blend_tree_resource =
|
||||
parent_graph_resource.m_blend_tree_resource;
|
||||
parent_blend_tree_resource.Reset();
|
||||
parent_blend_tree_resource.InitGraphConnectors();
|
||||
|
||||
// Setup parent outputs
|
||||
AnimNodeResource* parent_blend_tree_outputs = parent_blend_tree_resource.GetGraphOutputNode();
|
||||
parent_blend_tree_outputs->m_socket_accessor->RegisterInput<AnimData>("Output", nullptr);
|
||||
|
||||
// Parent AnimSampler
|
||||
parent_blend_tree_resource.m_nodes.push_back(
|
||||
AnimNodeResourceFactory("AnimSampler"));
|
||||
|
||||
AnimNodeResource* walk_node =
|
||||
parent_blend_tree_resource.m_nodes.back();
|
||||
walk_node->m_name = "WalkAnim";
|
||||
walk_node->m_socket_accessor->SetPropertyValue(
|
||||
"Filename",
|
||||
std::string("media/Walking-loop.ozz"));
|
||||
|
||||
//
|
||||
// Embedded Tree
|
||||
//
|
||||
parent_blend_tree_resource.m_nodes.push_back(
|
||||
AnimNodeResourceFactory("BlendTree"));
|
||||
size_t embedded_blend_tree_node_index =
|
||||
parent_blend_tree_resource.m_nodes.size() - 1;
|
||||
AnimGraphResource* embedded_graph =
|
||||
dynamic_cast<AnimGraphResource*>(parent_blend_tree_resource.m_nodes.back());
|
||||
embedded_graph->m_name = "EmbeddedBlendTree";
|
||||
embedded_graph->m_node_type_name = "BlendTree";
|
||||
BlendTreeResource* embedded_blend_tree_resource = &embedded_graph->m_blend_tree_resource;
|
||||
|
||||
// Embedded: outputs
|
||||
AnimNodeResource* embedded_outputs =
|
||||
embedded_blend_tree_resource->GetGraphOutputNode();
|
||||
embedded_outputs->m_socket_accessor->RegisterInput<AnimData>(
|
||||
"AnimOutput",
|
||||
nullptr);
|
||||
|
||||
// Embedded: inputs
|
||||
AnimNodeResource* embedded_inputs =
|
||||
embedded_blend_tree_resource->GetGraphInputNode();
|
||||
embedded_inputs->m_socket_accessor->RegisterOutput<AnimData>(
|
||||
"AnimInput",
|
||||
nullptr);
|
||||
|
||||
// Embedded: SpeedScale node
|
||||
embedded_blend_tree_resource->m_nodes.push_back(
|
||||
AnimNodeResourceFactory("SpeedScale"));
|
||||
AnimNodeResource* embedded_speed_scale_resource = embedded_blend_tree_resource->m_nodes.back();
|
||||
|
||||
embedded_blend_tree_resource->ConnectSockets(embedded_inputs, "AnimInput", embedded_speed_scale_resource, "Input");
|
||||
embedded_blend_tree_resource->ConnectSockets(embedded_speed_scale_resource, "Output", embedded_outputs, "AnimOutput");
|
||||
|
||||
//
|
||||
// Parent: setup connections
|
||||
//
|
||||
REQUIRE(parent_blend_tree_resource.ConnectSockets(walk_node, "Output", embedded_graph, "AnimInput"));
|
||||
REQUIRE(parent_blend_tree_resource.ConnectSockets(embedded_graph, "AnimOutput", parent_blend_tree_outputs, "Output"));
|
||||
|
||||
parent_graph_resource.SaveToFile(parent_graph_filename);
|
||||
|
||||
//
|
||||
// Load the graph
|
||||
//
|
||||
AnimGraphResource parent_graph_resource_loaded;
|
||||
parent_graph_resource_loaded.LoadFromFile(parent_graph_filename);
|
||||
|
||||
//
|
||||
// Check the loaded parent graph
|
||||
//
|
||||
CHECK(parent_graph_resource.m_name == parent_graph_resource_loaded.m_name);
|
||||
CHECK(parent_graph_resource.m_graph_type_name == parent_graph_resource_loaded.m_graph_type_name);
|
||||
CHECK(parent_graph_resource.m_node_type_name
|
||||
== parent_graph_resource_loaded.m_node_type_name);
|
||||
|
||||
const BlendTreeResource& parent_blend_tree_resource_loaded = parent_graph_resource_loaded.m_blend_tree_resource;
|
||||
|
||||
CHECK(parent_blend_tree_resource.m_nodes.size() == parent_blend_tree_resource_loaded.m_nodes.size());
|
||||
for (size_t i = 0; i < parent_blend_tree_resource.m_nodes.size(); i++) {
|
||||
const AnimNodeResource* parent_node = parent_blend_tree_resource.m_nodes[i];
|
||||
const AnimNodeResource* parent_node_loaded = parent_blend_tree_resource_loaded.m_nodes[i];
|
||||
|
||||
CHECK(parent_node->m_name == parent_node_loaded->m_name);
|
||||
CHECK(parent_node->m_node_type_name == parent_node_loaded->m_node_type_name);
|
||||
}
|
||||
|
||||
CHECK(parent_blend_tree_resource.m_connections.size() == parent_blend_tree_resource_loaded.m_connections.size());
|
||||
for (size_t i = 0; i < parent_blend_tree_resource.m_connections.size(); i++) {
|
||||
const BlendTreeConnectionResource& parent_connection = parent_blend_tree_resource.m_connections[i];
|
||||
const BlendTreeConnectionResource& parent_connection_loaded = parent_blend_tree_resource_loaded.m_connections[i];
|
||||
|
||||
CHECK(parent_connection.source_node_index == parent_connection_loaded.source_node_index);
|
||||
CHECK(parent_connection.source_socket_name == parent_connection_loaded.source_socket_name);
|
||||
CHECK(parent_connection.target_node_index == parent_connection_loaded.target_node_index);
|
||||
CHECK(parent_connection.target_socket_name == parent_connection_loaded.target_socket_name);
|
||||
}
|
||||
|
||||
//
|
||||
// Check the loaded embedded graph
|
||||
//
|
||||
REQUIRE(parent_blend_tree_resource_loaded.m_nodes[3]->m_node_type_name == "BlendTree");
|
||||
|
||||
const AnimGraphResource* embedded_graph_loaded = dynamic_cast<AnimGraphResource*>(parent_blend_tree_resource_loaded.m_nodes[3]);
|
||||
const BlendTreeResource& embedded_blend_tree_resource_loaded = embedded_graph_loaded->m_blend_tree_resource;
|
||||
|
||||
CHECK(embedded_blend_tree_resource->m_nodes.size() == embedded_blend_tree_resource_loaded.m_nodes.size());
|
||||
CHECK(embedded_blend_tree_resource->m_connections.size() == embedded_blend_tree_resource_loaded.m_connections.size());
|
||||
|
||||
for (size_t i = 0; i < embedded_blend_tree_resource->m_nodes.size(); i++) {
|
||||
const AnimNodeResource* parent_node = embedded_blend_tree_resource->m_nodes[i];
|
||||
const AnimNodeResource* parent_node_loaded = embedded_blend_tree_resource_loaded.m_nodes[i];
|
||||
|
||||
CHECK(parent_node->m_name == parent_node_loaded->m_name);
|
||||
CHECK(parent_node->m_node_type_name == parent_node_loaded->m_node_type_name);
|
||||
}
|
||||
|
||||
CHECK(embedded_blend_tree_resource->m_connections.size() == embedded_blend_tree_resource_loaded.m_connections.size());
|
||||
for (size_t i = 0; i < embedded_blend_tree_resource->m_connections.size(); i++) {
|
||||
const BlendTreeConnectionResource& embedded_connection = embedded_blend_tree_resource->m_connections[i];
|
||||
const BlendTreeConnectionResource& embedded_connection_loaded = embedded_blend_tree_resource_loaded.m_connections[i];
|
||||
|
||||
CHECK(embedded_connection.source_node_index == embedded_connection_loaded.source_node_index);
|
||||
CHECK(embedded_connection.source_socket_name == embedded_connection_loaded.source_socket_name);
|
||||
CHECK(embedded_connection.target_node_index == embedded_connection_loaded.target_node_index);
|
||||
CHECK(embedded_connection.target_socket_name == embedded_connection_loaded.target_socket_name);
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user