GoaLitiuM/FlaxEngine
1
0
Fork 0
Code Issues Pull Requests Actions 7 Packages Projects Releases Wiki Activity

Fix various issues with Multi Blend 2D node

Browse Source
This commit is contained in:
Wojciech Figat
2021-12-09 17:09:31 +01:00
parent 2192852510
commit 2b1e5e4958
2 changed files with 14 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
Source/Engine/Animations/Graph/AnimGraph.Base.cpp
View File

@@ -204,6 +204,18 @@ bool AnimGraphBase::onNodeLoaded(Node* n)
// Triangulate
Array<Delaunay2D::Triangle, FixedAllocation<ANIM_GRAPH_MULTI_BLEND_2D_MAX_TRIS>> triangles;
Delaunay2D::Triangulate(vertices, triangles);
if (triangles.Count() == 0)
{
switch (vertices.Count())
{
case 1:
triangles.Add(Delaunay2D::Triangle(0, 0, 0));
break;
case 2:
triangles.Add(Delaunay2D::Triangle(0, 1, 0));
break;
}
}
// Store triangles vertices indices (map the back to the anim node slots)
for (int32 i = 0; i < triangles.Count(); i++)

6
Source/Engine/Animations/Graph/AnimGroup.Animation.cpp
View File

@@ -1065,6 +1065,7 @@ void AnimGraphExecutor::ProcessGroupAnimation(Box* boxBase, Node* nodeBase, Valu
case 13:
{
ASSERT(box->ID == 0);
value = Value::Null;
// Note data layout:
// [0]: Vector4 Range (minX, maxX, minY, maxY)
@@ -1087,7 +1088,6 @@ void AnimGraphExecutor::ProcessGroupAnimation(Box* boxBase, Node* nodeBase, Valu
if (data.TrianglesP0[0] == ANIM_GRAPH_MULTI_BLEND_MAX_ANIMS)
{
// Nothing to sample
value = Value::Null;
break;
}
@@ -1107,7 +1107,6 @@ void AnimGraphExecutor::ProcessGroupAnimation(Box* boxBase, Node* nodeBase, Valu
if (data.Length <= ZeroTolerance)
{
// Nothing to sample
value = Value::Null;
break;
}
@@ -1122,7 +1121,6 @@ void AnimGraphExecutor::ProcessGroupAnimation(Box* boxBase, Node* nodeBase, Valu
ANIM_GRAPH_PROFILE_EVENT("Multi Blend 2D");
// Find 3 animations to blend (triangle)
value = Value::Null;
Vector2 p(x, y);
bool hasBest = false;
Vector2 bestPoint;
@@ -1230,7 +1228,7 @@ void AnimGraphExecutor::ProcessGroupAnimation(Box* boxBase, Node* nodeBase, Valu
}
// Check if use the closes sample
if (value.AsPointer == nullptr && hasBest)
if ((void*)value == nullptr && hasBest)
{
const auto aAnim = node->Assets[bestAnims[0]].As<Animation>();
const auto aData = node->Values[4 + bestAnims[0] * 2].AsVector4();