Added support for const node inputs.
This commit is contained in:
@@ -2,16 +2,15 @@
|
||||
// Created by martin on 04.02.22.
|
||||
//
|
||||
|
||||
#include "ozz/base/io/archive.h"
|
||||
#include "ozz/base/io/stream.h"
|
||||
#include "ozz/base/log.h"
|
||||
|
||||
#include "AnimGraph/AnimGraph.h"
|
||||
#include "AnimGraph/AnimGraphEditor.h"
|
||||
#include "AnimGraph/AnimGraphResource.h"
|
||||
#include "catch.hpp"
|
||||
#include "ozz/base/io/archive.h"
|
||||
#include "ozz/base/io/stream.h"
|
||||
#include "ozz/base/log.h"
|
||||
|
||||
bool load_skeleton (ozz::animation::Skeleton& skeleton, const char* filename) {
|
||||
bool load_skeleton(ozz::animation::Skeleton& skeleton, const char* filename) {
|
||||
assert(filename);
|
||||
ozz::io::File file(filename, "rb");
|
||||
if (!file.opened()) {
|
||||
@@ -32,12 +31,11 @@ bool load_skeleton (ozz::animation::Skeleton& skeleton, const char* filename) {
|
||||
return true;
|
||||
}
|
||||
|
||||
|
||||
TEST_CASE("BasicGraph", "[AnimGraphResource]") {
|
||||
TEST_CASE("AnimSamplerGraph", "[AnimGraphResource]") {
|
||||
AnimGraphResource graph_resource;
|
||||
|
||||
graph_resource.clear();
|
||||
graph_resource.m_name = "WalkRunBlendGraph";
|
||||
graph_resource.m_name = "AnimSamplerGraph";
|
||||
|
||||
// Prepare graph inputs and outputs
|
||||
size_t walk_node_index =
|
||||
@@ -45,7 +43,9 @@ TEST_CASE("BasicGraph", "[AnimGraphResource]") {
|
||||
|
||||
AnimNodeResource& walk_node = graph_resource.m_nodes[walk_node_index];
|
||||
walk_node.m_name = "WalkAnim";
|
||||
walk_node.m_socket_accessor->SetPropertyValue("Filename", std::string("data/walk.anim.ozz"));
|
||||
walk_node.m_socket_accessor->SetPropertyValue(
|
||||
"Filename",
|
||||
std::string("data/walk.anim.ozz"));
|
||||
|
||||
AnimNodeResource& graph_node = graph_resource.m_nodes[0];
|
||||
graph_node.m_socket_accessor->RegisterInput<AnimData>("GraphOutput", nullptr);
|
||||
@@ -56,9 +56,9 @@ TEST_CASE("BasicGraph", "[AnimGraphResource]") {
|
||||
graph_resource.getGraphOutputNode(),
|
||||
"GraphOutput");
|
||||
|
||||
graph_resource.saveToFile("WalkGraph.animgraph.json");
|
||||
graph_resource.saveToFile("AnimSamplerGraph.animgraph.json");
|
||||
AnimGraphResource graph_resource_loaded;
|
||||
graph_resource_loaded.loadFromFile("WalkGraph.animgraph.json");
|
||||
graph_resource_loaded.loadFromFile("AnimSamplerGraph.animgraph.json");
|
||||
|
||||
AnimGraph graph;
|
||||
graph_resource_loaded.createInstance(graph);
|
||||
@@ -108,6 +108,67 @@ TEST_CASE("BasicGraph", "[AnimGraphResource]") {
|
||||
graph_context.freeAnimations();
|
||||
}
|
||||
|
||||
/*
|
||||
* Checks that node const inputs are properly set.
|
||||
*/
|
||||
TEST_CASE("AnimSamplerSpeedScaleGraph", "[AnimGraphResource]") {
|
||||
AnimGraphResource graph_resource;
|
||||
|
||||
graph_resource.clear();
|
||||
graph_resource.m_name = "AnimSamplerSpeedScaleGraph";
|
||||
|
||||
// Prepare graph inputs and outputs
|
||||
size_t walk_node_index =
|
||||
graph_resource.addNode(AnimNodeResourceFactory("AnimSampler"));
|
||||
|
||||
size_t speed_scale_node_index =
|
||||
graph_resource.addNode(AnimNodeResourceFactory("SpeedScale"));
|
||||
|
||||
AnimNodeResource& walk_node = graph_resource.m_nodes[walk_node_index];
|
||||
walk_node.m_name = "WalkAnim";
|
||||
walk_node.m_socket_accessor->SetPropertyValue(
|
||||
"Filename",
|
||||
std::string("data/walk.anim.ozz"));
|
||||
|
||||
AnimNodeResource& speed_scale_node =
|
||||
graph_resource.m_nodes[speed_scale_node_index];
|
||||
speed_scale_node.m_name = "SpeedScale";
|
||||
float speed_scale_value = 1.35f;
|
||||
speed_scale_node.m_socket_accessor->SetInputValue(
|
||||
"SpeedScale",
|
||||
speed_scale_value);
|
||||
|
||||
AnimNodeResource& graph_node = graph_resource.m_nodes[0];
|
||||
graph_node.m_socket_accessor->RegisterInput<AnimData>("GraphOutput", nullptr);
|
||||
|
||||
graph_resource.connectSockets(walk_node, "Output", speed_scale_node, "Input");
|
||||
|
||||
graph_resource.connectSockets(
|
||||
speed_scale_node,
|
||||
"Output",
|
||||
graph_resource.getGraphOutputNode(),
|
||||
"GraphOutput");
|
||||
|
||||
graph_resource.saveToFile("AnimSamplerSpeedScaleGraph.animgraph.json");
|
||||
AnimGraphResource graph_resource_loaded;
|
||||
graph_resource_loaded.loadFromFile(
|
||||
"AnimSamplerSpeedScaleGraph.animgraph.json");
|
||||
|
||||
Socket* speed_scale_resource_loaded_input =
|
||||
graph_resource_loaded.m_nodes[speed_scale_node_index]
|
||||
.m_socket_accessor->GetInputSocket("SpeedScale");
|
||||
REQUIRE(speed_scale_resource_loaded_input != nullptr);
|
||||
|
||||
REQUIRE_THAT(
|
||||
speed_scale_resource_loaded_input->m_value.float_value,
|
||||
Catch::Matchers::WithinAbs(speed_scale_value, 0.1));
|
||||
|
||||
AnimGraph graph;
|
||||
graph_resource_loaded.createInstance(graph);
|
||||
|
||||
REQUIRE_THAT(*dynamic_cast<SpeedScaleNode*>(graph.m_nodes[speed_scale_node_index])->i_speed_scale,
|
||||
Catch::Matchers::WithinAbs(speed_scale_value, 0.1));
|
||||
}
|
||||
|
||||
|
||||
TEST_CASE("Blend2Graph", "[AnimGraphResource]") {
|
||||
@@ -126,9 +187,13 @@ TEST_CASE("Blend2Graph", "[AnimGraphResource]") {
|
||||
|
||||
AnimNodeResource& walk_node = graph_resource.m_nodes[walk_node_index];
|
||||
walk_node.m_name = "WalkAnim";
|
||||
walk_node.m_socket_accessor->SetPropertyValue("Filename", std::string("data/walk.anim.ozz"));
|
||||
walk_node.m_socket_accessor->SetPropertyValue(
|
||||
"Filename",
|
||||
std::string("data/walk.anim.ozz"));
|
||||
AnimNodeResource& run_node = graph_resource.m_nodes[run_node_index];
|
||||
run_node.m_socket_accessor->SetPropertyValue("Filename", std::string("data/run.anim.ozz"));
|
||||
run_node.m_socket_accessor->SetPropertyValue(
|
||||
"Filename",
|
||||
std::string("data/run.anim.ozz"));
|
||||
run_node.m_name = "RunAnim";
|
||||
AnimNodeResource& blend_node = graph_resource.m_nodes[blend_node_index];
|
||||
blend_node.m_name = "BlendWalkRun";
|
||||
@@ -215,15 +280,17 @@ TEST_CASE("Blend2Graph", "[AnimGraphResource]") {
|
||||
AnimData* graph_output =
|
||||
static_cast<AnimData*>(*graph_output_socket->m_reference.ptr_ptr);
|
||||
|
||||
CHECK(graph_output->m_local_matrices.size() == graph_context.m_skeleton->num_soa_joints());
|
||||
CHECK(
|
||||
graph_output->m_local_matrices.size()
|
||||
== graph_context.m_skeleton->num_soa_joints());
|
||||
|
||||
CHECK(blend2_instance->o_output == *graph_output_socket->m_reference.ptr_ptr);
|
||||
CHECK(
|
||||
blend2_instance->o_output == *graph_output_socket->m_reference.ptr_ptr);
|
||||
}
|
||||
|
||||
graph_context.freeAnimations();
|
||||
}
|
||||
|
||||
|
||||
TEST_CASE("InputAttributeConversion", "[AnimGraphResource]") {
|
||||
int node_id = 3321;
|
||||
int input_index = 221;
|
||||
@@ -243,7 +310,6 @@ TEST_CASE("InputAttributeConversion", "[AnimGraphResource]") {
|
||||
CHECK(output_index == parsed_output_index);
|
||||
}
|
||||
|
||||
|
||||
TEST_CASE("ResourceSaveLoadMathGraphInputs", "[AnimGraphResource]") {
|
||||
AnimGraphResource graph_resource_origin;
|
||||
|
||||
@@ -504,7 +570,9 @@ TEST_CASE("SimpleMathEvaluations", "[AnimGraphResource]") {
|
||||
THEN("output vector components equal the graph input vaulues") {
|
||||
CHECK(*float0_output_ptr == Approx(graph_float_input));
|
||||
CHECK(float1_output == Approx(graph_float_input * 2.f));
|
||||
REQUIRE_THAT(float2_output, Catch::Matchers::WithinAbs(graph_float_input * 3.f, 10));
|
||||
REQUIRE_THAT(
|
||||
float2_output,
|
||||
Catch::Matchers::WithinAbs(graph_float_input * 3.f, 10));
|
||||
}
|
||||
|
||||
context.freeAnimations();
|
||||
|
||||
Reference in New Issue
Block a user