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

Added marking of nodes active/inactive.

AnimGraphEditor
Martin Felis 2022-02-20 15:57:19 +01:00
parent 618f6b613e
commit b01acc2a88
3 changed files with 89 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/AnimGraphResource.cc
View File

@ -389,7 +389,20 @@ void AnimGraph::UpdateOrderedNodes() {
void AnimGraph::MarkActiveNodes() {
m_frame_counter++;
// TODO: start from output and trigger updating of the frame counter.
int first_node_index = getAnimNodeIndex(m_ordered_nodes[0]);
m_ordered_nodes[0]->m_frame_counter = m_frame_counter;
m_ordered_nodes[0]->UpdateActiveInputFrameCounters(m_node_inputs[first_node_index]);
for (size_t i = 1, n = m_ordered_nodes.size(); i < n; i++) {
AnimNode* node = m_ordered_nodes[i];
if (CheckIsNodeActive(node)) {
int node_index = getAnimNodeIndex(node);
node->UpdateActiveInputFrameCounters(m_node_inputs[node_index]);
} else {
// Avoid active frame counter overrun.
node->m_frame_counter = m_frame_counter - 1;
}
}
}
void* AnimGraph::GetOutput(const std::string& name) const {

27
src/AnimGraphResource.h
View File

@ -319,6 +319,26 @@ struct Blend2Node : public AnimNode {
AnimData* m_output = nullptr;
float m_blend_weight = 0.f;
bool m_sync_blend = false;
virtual void UpdateActiveInputFrameCounters (const std::vector<AnimNodeInput>& inputs) override {
for (size_t i = 0, n = inputs.size(); i < n; i++) {
AnimNode* input_node = inputs[i].m_node;
if (input_node == nullptr) {
continue;
}
if (inputs[i].m_input_name == "Input0" && m_blend_weight < 0.999) {
input_node->m_frame_counter = m_frame_counter;
continue;
}
if (inputs[i].m_input_name == "Input1" && m_blend_weight > 0.001) {
input_node->m_frame_counter = m_frame_counter;
continue;
}
}
}
};
template <>
@ -532,14 +552,13 @@ struct AnimGraph {
void UpdateOrderedNodes();
void MarkActiveNodes();
bool CheckNodeActive(int node_index) {
assert(node_index < m_nodes.size());
return m_nodes[node_index]->m_frame_counter == m_frame_counter;
bool CheckIsNodeActive(AnimNode* node) {
return node->m_frame_counter == m_frame_counter;
}
void UpdateTime(float dt);
void Evaluate();
int m_frame_counter;
int m_frame_counter = 0;
AnimData m_local_transforms;
std::vector<AnimNode*> m_nodes;

55
tests/AnimGraphResourceTests.cc
View File

@ -439,9 +439,58 @@ TEST_CASE("GraphInputOutputConnectivity", "[AnimGraphResource]") {
//
// check ordering
//
REQUIRE (anim_graph.getAnimNodeOrderIndex(blend2_node) < anim_graph.getAnimNodeOrderIndex(sampler_node));
REQUIRE (anim_graph.getAnimNodeOrderIndex(blend2_node) < anim_graph.getAnimNodeOrderIndex(speed_scale_node));
REQUIRE (anim_graph.getAnimNodeOrderIndex(speed_scale_node) < anim_graph.getAnimNodeOrderIndex(sampler_node));
REQUIRE(
anim_graph.getAnimNodeOrderIndex(blend2_node)
< anim_graph.getAnimNodeOrderIndex(sampler_node));
REQUIRE(
anim_graph.getAnimNodeOrderIndex(blend2_node)
< anim_graph.getAnimNodeOrderIndex(speed_scale_node));
REQUIRE(
anim_graph.getAnimNodeOrderIndex(speed_scale_node)
< anim_graph.getAnimNodeOrderIndex(sampler_node));
}
WHEN("Instantiating graph") {
AnimGraph anim_graph = AnimGraph::createFromResource(graph_resource);
float* blend_weight_input =
reinterpret_cast<float*>(anim_graph.GetInput("GraphFloatInput"));
Blend2Node* blend2_node =
dynamic_cast<Blend2Node*>(anim_graph.m_nodes[blend2_node_index]);
SpeedScaleNode* speed_scale_node = dynamic_cast<SpeedScaleNode*>(
anim_graph.m_nodes[speed_scale_node_index]);
AnimSamplerNode* sampler_node = dynamic_cast<AnimSamplerNode*>(
anim_graph.m_nodes[sampler_node_index]);
WHEN("Setting weight to 0. and marking nodes active.") {
*blend_weight_input = 0.;
anim_graph.MarkActiveNodes();
THEN("Speed scale and sampler node are inactive") {
REQUIRE(anim_graph.CheckIsNodeActive(speed_scale_node) == false);
REQUIRE(anim_graph.CheckIsNodeActive(sampler_node) == false);
}
}
WHEN("Setting weight to 0. and marking nodes active") {
*blend_weight_input = 0.1;
anim_graph.MarkActiveNodes();
THEN("Speed scale and sampler nodes are active") {
REQUIRE(anim_graph.CheckIsNodeActive(speed_scale_node) == true);
REQUIRE(anim_graph.CheckIsNodeActive(sampler_node) == true);
}
}
WHEN("Setting weight to 1. and marking nodes active") {
*blend_weight_input = 1.0;
anim_graph.MarkActiveNodes();
THEN("Speed scale and sampler nodes are active") {
REQUIRE(anim_graph.CheckIsNodeActive(speed_scale_node) == true);
REQUIRE(anim_graph.CheckIsNodeActive(sampler_node) == true);
}
}
}
}
}