From cff284cedde9f0cc133ff2855557299ce1d8083c Mon Sep 17 00:00:00 2001 From: Loek Le Blansch Date: Wed, 18 Dec 2024 14:20:59 +0100 Subject: add fixed/frame update functions to script --- src/crepe/api/Script.h | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) (limited to 'src/crepe/api') diff --git a/src/crepe/api/Script.h b/src/crepe/api/Script.h index 2422cdc..5f68928 100644 --- a/src/crepe/api/Script.h +++ b/src/crepe/api/Script.h @@ -48,14 +48,23 @@ protected: */ virtual void init() {} /** - * \brief Script update function (empty by default) + * \brief Script fixed update function (empty by default) * * \param delta_time Time since last fixed update * - * This function is called during the ScriptSystem::update() routine if the \c BehaviorScript - * component holding this script instance is active. + * \note This function is called during the ScriptSystem::update() routine if the \c + * BehaviorScript component holding this script instance is active. */ - virtual void update(duration_t delta_time) {} + virtual void fixed_update(duration_t delta_time) {} + /** + * \brief Script frame update function (empty by default) + * + * \param delta_time Time since last frame update + * + * \note This function is called during the ScriptSystem::update() routine if the \c + * BehaviorScript component holding this script instance is active. + */ + virtual void frame_update(duration_t delta_time) {} //! \} //! ScriptSystem calls \c init() and \c update() -- cgit v1.2.3 From 5605d438a242a6252f7a27ce772eb092b62d78ae Mon Sep 17 00:00:00 2001 From: Loek Le Blansch Date: Wed, 18 Dec 2024 14:21:09 +0100 Subject: `make format` --- src/crepe/api/Script.cpp | 1 - src/crepe/facade/Texture.cpp | 5 ++--- src/crepe/system/ScriptSystem.cpp | 4 ++-- src/crepe/system/ScriptSystem.h | 2 +- 4 files changed, 5 insertions(+), 7 deletions(-) (limited to 'src/crepe/api') diff --git a/src/crepe/api/Script.cpp b/src/crepe/api/Script.cpp index 6de6830..b147252 100644 --- a/src/crepe/api/Script.cpp +++ b/src/crepe/api/Script.cpp @@ -61,4 +61,3 @@ bool Script::get_key_state(Keycode key) const noexcept { return false; } } - diff --git a/src/crepe/facade/Texture.cpp b/src/crepe/facade/Texture.cpp index cd06439..6fb22e1 100644 --- a/src/crepe/facade/Texture.cpp +++ b/src/crepe/facade/Texture.cpp @@ -1,8 +1,8 @@ -#include "../util/dbg.h" +#include "../Resource.h" #include "../facade/SDLContext.h" #include "../manager/Mediator.h" #include "../types.h" -#include "../Resource.h" +#include "../util/dbg.h" #include "Texture.h" @@ -27,4 +27,3 @@ const ivec2 & Texture::get_size() const noexcept { return this->size; } const float & Texture::get_ratio() const noexcept { return this->aspect_ratio; } SDL_Texture * Texture::get_img() const noexcept { return this->texture.get(); } - diff --git a/src/crepe/system/ScriptSystem.cpp b/src/crepe/system/ScriptSystem.cpp index 9977396..93b4853 100644 --- a/src/crepe/system/ScriptSystem.cpp +++ b/src/crepe/system/ScriptSystem.cpp @@ -19,7 +19,8 @@ void ScriptSystem::frame_update() { this->update(&Script::frame_update, delta_time); } -void ScriptSystem::update(void (Script::* update_function)(duration_t), const duration_t & delta_time) { +void ScriptSystem::update(void (Script::*update_function)(duration_t), + const duration_t & delta_time) { ComponentManager & mgr = this->mediator.component_manager; RefVector behavior_scripts = mgr.get_components_by_type(); @@ -37,4 +38,3 @@ void ScriptSystem::update(void (Script::* update_function)(duration_t), const du (*script.*update_function)(delta_time); } } - diff --git a/src/crepe/system/ScriptSystem.h b/src/crepe/system/ScriptSystem.h index ca4534a..095515f 100644 --- a/src/crepe/system/ScriptSystem.h +++ b/src/crepe/system/ScriptSystem.h @@ -36,7 +36,7 @@ public: void frame_update() override; private: - void update(void (Script::* update_function)(duration_t), const duration_t & delta_time); + void update(void (Script::*update_function)(duration_t), const duration_t & delta_time); }; } // namespace crepe -- cgit v1.2.3