GeorgH93/OpenVulkano
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Early exiting Tick function, returning Poses as const references

Browse Source
This commit is contained in:
Vladyslav Baranovskyi
2024-06-06 13:51:28 +03:00
parent 193c942f06
commit 8a23389973
2 changed files with 9 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
openVulkanoCpp/Scene/SimpleAnimationController.cpp
View File

@@ -19,17 +19,16 @@ namespace OpenVulkano::Scene
void SimpleAnimationController::Tick()
{
// NOTE(vb): We can't early quit by condition elapsed > duration because we need to
// emit an event when animation is completed
if(!m_node || m_duration <= 0)
if(!m_node || m_duration <= 0 || m_elapsed > m_duration)
return;
m_elapsed += OpenVulkano::CURRENT_FRAME.frameTime;
if(m_elapsed > m_duration)
m_completionEvent.NotifyAll(this);
double progress = GetProgress();
OpenVulkano::Math::Pose<float> currentPose = m_initialPose.Interpolate(m_targetPose, progress);
m_node->SetMatrix(currentPose.ToMatrix());
if(m_elapsed > m_duration)
m_completionEvent.NotifyAll(this);
}
}

10
openVulkanoCpp/Scene/SimpleAnimationController.hpp
View File

@@ -19,8 +19,8 @@ namespace OpenVulkano::Scene
class SimpleAnimationController : public ITickable
{
OpenVulkano::Scene::Node *m_node = nullptr;
OpenVulkano::Math::Pose<float> m_targetPose;
OpenVulkano::Math::Pose<float> m_initialPose;
OpenVulkano::Math::PoseF m_targetPose;
OpenVulkano::Math::PoseF m_initialPose;
double m_duration = 0;
double m_elapsed = 0;
@@ -35,9 +35,9 @@ namespace OpenVulkano::Scene
OpenVulkano::Scene::Node* GetNode() { return m_node; }
void SetNode(OpenVulkano::Scene::Node *node) { m_node = node; }
OpenVulkano::Math::Pose<float> GetInitialPose() { return m_initialPose; }
OpenVulkano::Math::Pose<float> GetTargetPose() { return m_targetPose; }
void SetPoses(const OpenVulkano::Math::Pose<float> &initialPose, const OpenVulkano::Math::Pose<float> &targetPose) { m_initialPose = initialPose; m_targetPose = targetPose; }
const OpenVulkano::Math::PoseF GetInitialPose() { return m_initialPose; }
const OpenVulkano::Math::PoseF GetTargetPose() { return m_targetPose; }
void SetPoses(const OpenVulkano::Math::PoseF &initialPose, const OpenVulkano::Math::PoseF &targetPose) { m_initialPose = initialPose; m_targetPose = targetPose; }
double GetDuration() { return m_duration; }
void SetDuration(double duration) { m_duration = duration; }