From e03f281f435413d437ee6daed2f87fed59027782 Mon Sep 17 00:00:00 2001 From: Lynix Date: Wed, 3 Aug 2016 13:46:42 +0200 Subject: [PATCH] SDK/StateMachine: Add GetCurrentState function Former-commit-id: 03f3085f56a0f547b21cd7bea75ff61541b0a8a5 [formerly 62183cea1c4c98a06a97de841f65bea108b9819d] [formerly ac9e462b7e2ccd7b5077dcdc315a97c42f5c2079 [formerly bf058e12205e1162a34dedabafe07390528edfb2]] Former-commit-id: 4fe43ca55388960e6506d978d5c82ed3cc696f14 [formerly 5084e4ffbe140a04855374d5f8c9bedbb6cc6b5a] Former-commit-id: c64604994a460fd8356bca46207b3e0d324b7ec4 --- SDK/include/NDK/StateMachine.hpp | 2 ++ SDK/include/NDK/StateMachine.inl | 5 +++++ 2 files changed, 7 insertions(+) diff --git a/SDK/include/NDK/StateMachine.hpp b/SDK/include/NDK/StateMachine.hpp index 8e7ad2f64..c36464fea 100644 --- a/SDK/include/NDK/StateMachine.hpp +++ b/SDK/include/NDK/StateMachine.hpp @@ -23,6 +23,8 @@ namespace Ndk inline void ChangeState(std::shared_ptr state); + inline const std::shared_ptr& GetCurrentState() const; + inline bool Update(float elapsedTime); inline StateMachine& operator=(StateMachine&& fsm) = default; diff --git a/SDK/include/NDK/StateMachine.inl b/SDK/include/NDK/StateMachine.inl index fc4c7f787..7b5109ab5 100644 --- a/SDK/include/NDK/StateMachine.inl +++ b/SDK/include/NDK/StateMachine.inl @@ -26,6 +26,11 @@ namespace Ndk m_nextState = std::move(state); } + inline const std::shared_ptr& StateMachine::GetCurrentState() const + { + return m_currentState; + } + inline bool StateMachine::Update(float elapsedTime) { if (m_nextState)