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

Simplify

Browse Source
This commit is contained in:
Chandler Cox
2023-10-03 09:40:46 -05:00
parent 9fbc51a22a
commit b948152a41
1 changed files with 4 additions and 3 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()) else if (SkinnedModel && SkinnedModel->IsLoaded())
{ {
const auto modelBox = SkinnedModel->GetBox(_transform.GetWorld());
if (GraphInstance.NodesPose.Count() != 0) if (GraphInstance.NodesPose.Count() != 0)
{ {
// Per-bone bounds estimated from positions // Per-bone bounds estimated from positions
@@ -526,7 +527,7 @@ void AnimatedModel::UpdateBounds()
const int32 bonesCount = skeleton.Bones.Count(); const int32 bonesCount = skeleton.Bones.Count();
#define GET_NODE_POS(i) _transform.LocalToWorld(GraphInstance.NodesPose[skeleton.Bones[i].NodeIndex].GetTranslation()) #define GET_NODE_POS(i) _transform.LocalToWorld(GraphInstance.NodesPose[skeleton.Bones[i].NodeIndex].GetTranslation())
BoundingBox box(GET_NODE_POS(0)); BoundingBox box(GET_NODE_POS(0));
box.Merge(SkinnedModel->GetBox(_transform.GetWorld())); box.Merge(modelBox);
for (int32 boneIndex = 1; boneIndex < bonesCount; boneIndex++) for (int32 boneIndex = 1; boneIndex < bonesCount; boneIndex++)
box.Merge(GET_NODE_POS(boneIndex)); box.Merge(GET_NODE_POS(boneIndex));
_box = box; _box = box;
@@ -535,11 +536,11 @@ void AnimatedModel::UpdateBounds()
else else
{ {
// No animation asset applied // No animation asset applied
_box = SkinnedModel->GetBox(_transform.GetWorld()); _box = modelBox;
} }
// Apply margin based on model dimensions // Apply margin based on model dimensions
const Vector3 modelBoxSize = SkinnedModel->GetBox(_transform.GetWorld()).GetSize(); const Vector3 modelBoxSize = modelBox.GetSize();
const Vector3 center = _box.GetCenter(); const Vector3 center = _box.GetCenter();
const Vector3 sizeHalf = Vector3::Max(_box.GetSize() + modelBoxSize * 0.2f, modelBoxSize) * 0.5f; const Vector3 sizeHalf = Vector3::Max(_box.GetSize() + modelBoxSize * 0.2f, modelBoxSize) * 0.5f;
_box = BoundingBox(center - sizeHalf, center + sizeHalf); _box = BoundingBox(center - sizeHalf, center + sizeHalf);