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

Fixed dumb mistakes with references, got rid of unnecessary OpenVulkano::

Browse Source
This commit is contained in:
Vladyslav Baranovskyi
2024-06-06 15:32:17 +03:00
parent 8a23389973
commit f672193211
2 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
openVulkanoCpp/Scene/SimpleAnimationController.cpp
View File

@@ -22,10 +22,10 @@ namespace OpenVulkano::Scene
if(!m_node || m_duration <= 0 || m_elapsed > m_duration)
return;
m_elapsed += OpenVulkano::CURRENT_FRAME.frameTime;
m_elapsed += CURRENT_FRAME.frameTime;
double progress = GetProgress();
OpenVulkano::Math::Pose<float> currentPose = m_initialPose.Interpolate(m_targetPose, progress);
Math::Pose<float> currentPose = m_initialPose.Interpolate(m_targetPose, progress);
m_node->SetMatrix(currentPose.ToMatrix());
if(m_elapsed > m_duration)

18
openVulkanoCpp/Scene/SimpleAnimationController.hpp
View File

@@ -18,26 +18,26 @@ namespace OpenVulkano::Scene
{
class SimpleAnimationController : public ITickable
{
OpenVulkano::Scene::Node *m_node = nullptr;
OpenVulkano::Math::PoseF m_targetPose;
OpenVulkano::Math::PoseF m_initialPose;
Node *m_node = nullptr;
Math::PoseF m_targetPose;
Math::PoseF m_initialPose;
double m_duration = 0;
double m_elapsed = 0;
public:
OpenVulkano::Event<SimpleAnimationController *> m_completionEvent;
Event<SimpleAnimationController *> m_completionEvent;
SimpleAnimationController() = default;
void Reset() { m_elapsed = 0; }
void SwapPoses() { std::swap(m_initialPose, m_targetPose); }
OpenVulkano::Scene::Node* GetNode() { return m_node; }
void SetNode(OpenVulkano::Scene::Node *node) { m_node = node; }
Node* GetNode() { return m_node; }
void SetNode(Node *node) { m_node = node; }
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; }
const Math::PoseF& GetInitialPose() { return m_initialPose; }
const Math::PoseF& GetTargetPose() { return m_targetPose; }
void SetPoses(const Math::PoseF &initialPose, const Math::PoseF &targetPose) { m_initialPose = initialPose; m_targetPose = targetPose; }
double GetDuration() { return m_duration; }
void SetDuration(double duration) { m_duration = duration; }