celisej567/Nuake
1
0
Fork 0
mirror of https://github.com/antopilo/Nuake.git synced 2026-09-09 20:08:57 +03:00
Code Issues Packages Projects Releases Wiki Activity

Fixed crash when no animation is set

Browse Source
This commit is contained in:
Antoine Pilote
2023-10-02 01:33:28 -04:00
parent 5699de29ef
commit 7dd30dfa41
1 changed files with 26 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

47
Nuake/src/Scene/Systems/AnimationSystem.cpp
View File

@@ -31,46 +31,51 @@ namespace Nuake
continue;
}
float animationTime = 0.0f;
Ref<SkeletalAnimation> animation = model->GetCurrentAnimation();
if (animation && model->IsPlaying)
{
float newAnimationTime = animation->GetCurrentTime() + (ts * animation->GetTicksPerSecond());
animation->SetCurrentTime(newAnimationTime);
animationTime = animation->GetCurrentTime() + (ts * animation->GetTicksPerSecond());
animation->SetCurrentTime(animationTime);
}
auto& rootBone = model->GetSkeletonRootNode();
UpdateBonePositionTraversal(rootBone, animation, animation->GetCurrentTime(), model->IsPlaying);
UpdateBonePositionTraversal(rootBone, animation, animationTime, model->IsPlaying);
}
}
void AnimationSystem::UpdateBonePositionTraversal(SkeletonNode& bone, Ref<SkeletalAnimation> animation, float time, bool isPlaying)
{
auto& animationTrack = animation->GetTrack(bone.Name);
Entity boneEnt = m_Scene->GetEntityByID(bone.EntityHandle);
if (boneEnt.IsValid())
if (Entity boneEnt = m_Scene->GetEntityByID(bone.EntityHandle);
boneEnt.IsValid())
{
// Update the bone transform
auto& transformComponent = boneEnt.GetComponent<TransformComponent>();
bone.FinalTransform = transformComponent.GetGlobalTransform() * bone.Offset;
if (!animationTrack.IsEmpty() && isPlaying)
if (animation)
{
// Get Update transform
animationTrack.Update(time);
if (auto& animationTrack = animation->GetTrack(bone.Name);
!animationTrack.IsEmpty() && isPlaying)
{
// Get Update transform
animationTrack.Update(time);
const Matrix4& finalTransform = animationTrack.GetFinalTransform();
const Matrix4& finalTransform = animationTrack.GetFinalTransform();
Vector3 localPosition;
Quat localRotation;
Vector3 localScale;
Decompose(finalTransform, localPosition, localRotation, localScale);
Vector3 localPosition;
Quat localRotation;
Vector3 localScale;
Decompose(finalTransform, localPosition, localRotation, localScale);
transformComponent.SetLocalPosition(localPosition);
transformComponent.SetLocalRotation(localRotation);
transformComponent.SetLocalScale(localScale);
transformComponent.SetLocalTransform(finalTransform);
transformComponent.Dirty = false;
transformComponent.SetLocalPosition(localPosition);
transformComponent.SetLocalRotation(localRotation);
transformComponent.SetLocalScale(localScale);
transformComponent.SetLocalTransform(finalTransform);
transformComponent.Dirty = false;
}
}
}
for (auto& childBone : bone.Children)