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

Merge branch 'skinned-box-fix' of https://github.com/Tryibion/FlaxEngine into Tryibion-skinned-box-fix

Browse Source
This commit is contained in:
Wojtek Figat
2023-10-04 13:34:25 +02:00
parent 7c932d3a2f b948152a41
commit 9bfc5f5daa
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
Source/Engine/Level/Actors/AnimatedModel.cpp
View File

@@ -519,6 +519,7 @@ void AnimatedModel::UpdateBounds()
}
else if (SkinnedModel && SkinnedModel->IsLoaded())
{
const auto modelBox = SkinnedModel->GetBox(_transform.GetWorld());
if (GraphInstance.NodesPose.Count() != 0)
{
// Per-bone bounds estimated from positions
@@ -526,6 +527,7 @@ void AnimatedModel::UpdateBounds()
const int32 bonesCount = skeleton.Bones.Count();
#define GET_NODE_POS(i) _transform.LocalToWorld(GraphInstance.NodesPose[skeleton.Bones[i].NodeIndex].GetTranslation())
BoundingBox box(GET_NODE_POS(0));
box.Merge(modelBox);
for (int32 boneIndex = 1; boneIndex < bonesCount; boneIndex++)
box.Merge(GET_NODE_POS(boneIndex));
_box = box;
@@ -533,11 +535,12 @@ void AnimatedModel::UpdateBounds()
}
else
{
_box = SkinnedModel->GetBox(_transform.GetWorld());
// No animation asset applied
_box = modelBox;
}
// Apply margin based on model dimensions
const Vector3 modelBoxSize = SkinnedModel->GetBox().GetSize();
const Vector3 modelBoxSize = modelBox.GetSize();
const Vector3 center = _box.GetCenter();
const Vector3 sizeHalf = Vector3::Max(_box.GetSize() + modelBoxSize * 0.2f, modelBoxSize) * 0.5f;
_box = BoundingBox(center - sizeHalf, center + sizeHalf);