From 35b7ac0178a95af008cf35bd52b59a5bffb2a682 Mon Sep 17 00:00:00 2001 From: Kah Wei Date: Wed, 18 Jan 2023 19:16:20 +0800 Subject: [PATCH] Fixed SHAnimationClip::GetTotalTime() --- SHADE_Engine/src/Animation/SHAnimationClip.cpp | 2 +- SHADE_Engine/src/Animation/SHAnimationClip.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/SHADE_Engine/src/Animation/SHAnimationClip.cpp b/SHADE_Engine/src/Animation/SHAnimationClip.cpp index 4dab967c..939275d3 100644 --- a/SHADE_Engine/src/Animation/SHAnimationClip.cpp +++ b/SHADE_Engine/src/Animation/SHAnimationClip.cpp @@ -21,7 +21,7 @@ namespace SHADE /*-----------------------------------------------------------------------------------*/ SHAnimationClip::SHAnimationClip(const SHAnimAsset& asset) : ticksPerSecond { static_cast(asset.ticksPerSecond) } - , totalTime { static_cast(asset.duration) } + , totalTime { static_cast(asset.duration) / static_cast(asset.ticksPerSecond) } { // Populate keyframes for (const auto& channel : asset.nodeChannels) diff --git a/SHADE_Engine/src/Animation/SHAnimationClip.h b/SHADE_Engine/src/Animation/SHAnimationClip.h index 58b5681a..8a10ce3a 100644 --- a/SHADE_Engine/src/Animation/SHAnimationClip.h +++ b/SHADE_Engine/src/Animation/SHAnimationClip.h @@ -67,7 +67,7 @@ namespace SHADE /*---------------------------------------------------------------------------------*/ const std::vector& GetChannels() const noexcept { return channels; } int GetTicksPerSecond() const noexcept { return ticksPerSecond; } - float GetTotalTime() const noexcept { return totalTime/(float)ticksPerSecond; } + float GetTotalTime() const noexcept { return totalTime; } private: /*---------------------------------------------------------------------------------*/