From 2736081578d0b3274f4090e86ae5b70b5a82886f Mon Sep 17 00:00:00 2001 From: Lynix Date: Fri, 1 Apr 2016 18:57:23 +0200 Subject: [PATCH] Sdk/Application: Add GetUpdateTime() Former-commit-id: 55acb0529b41860c56ad0717ab15005e4d237f0f --- SDK/include/NDK/Application.hpp | 4 ++++ SDK/include/NDK/Application.inl | 5 +++++ SDK/src/NDK/Application.cpp | 4 ++-- 3 files changed, 11 insertions(+), 2 deletions(-) diff --git a/SDK/include/NDK/Application.hpp b/SDK/include/NDK/Application.hpp index 644dcc971..91c1bc5da 100644 --- a/SDK/include/NDK/Application.hpp +++ b/SDK/include/NDK/Application.hpp @@ -20,6 +20,7 @@ namespace Ndk public: inline Application(); Application(const Application&) = delete; + Application(Application&&) = delete; inline ~Application(); #ifndef NDK_SERVER @@ -27,11 +28,14 @@ namespace Ndk #endif template World& AddWorld(Args&&... args); + inline float GetUpdateTime() const; + bool Run(); inline void Quit(); Application& operator=(const Application&) = delete; + Application& operator=(Application&&) = delete; inline static Application* Instance(); diff --git a/SDK/include/NDK/Application.inl b/SDK/include/NDK/Application.inl index ca1fa1ffb..e65d8d5d0 100644 --- a/SDK/include/NDK/Application.inl +++ b/SDK/include/NDK/Application.inl @@ -54,6 +54,11 @@ namespace Ndk return m_worlds.back(); } + inline float Application::GetUpdateTime() const + { + return m_updateTime; + } + inline void Application::Quit() { m_shouldQuit = true; diff --git a/SDK/src/NDK/Application.cpp b/SDK/src/NDK/Application.cpp index e15ba2f92..8024614e6 100644 --- a/SDK/src/NDK/Application.cpp +++ b/SDK/src/NDK/Application.cpp @@ -28,11 +28,11 @@ namespace Ndk } #endif - float elapsedTime = m_updateClock.GetSeconds(); + m_updateTime = m_updateClock.GetSeconds(); m_updateClock.Restart(); for (World& world : m_worlds) - world.Update(elapsedTime); + world.Update(m_updateTime); if (m_shouldQuit) return false;