From 297d621987c224db26eadfb9bde9235741387496 Mon Sep 17 00:00:00 2001 From: Loek Le Blansch Date: Thu, 12 Dec 2024 19:46:15 +0100 Subject: more cleanup + script utilities --- src/crepe/facade/Texture.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/crepe/facade/Texture.cpp') diff --git a/src/crepe/facade/Texture.cpp b/src/crepe/facade/Texture.cpp index b63403d..23a9c8e 100644 --- a/src/crepe/facade/Texture.cpp +++ b/src/crepe/facade/Texture.cpp @@ -1,4 +1,4 @@ -#include "../util/Log.h" +#include "../util/dbg.h" #include "facade/SDLContext.h" #include "manager/Mediator.h" -- cgit v1.2.3 From f71769f7d2e9530a49295d0c0c86c2f6add069d8 Mon Sep 17 00:00:00 2001 From: Loek Le Blansch Date: Wed, 18 Dec 2024 13:22:18 +0100 Subject: process feedback --- src/crepe/api/Engine.cpp | 2 +- src/crepe/facade/Texture.cpp | 10 ++++++---- src/crepe/manager/ReplayManager.h | 4 +++- 3 files changed, 10 insertions(+), 6 deletions(-) (limited to 'src/crepe/facade/Texture.cpp') diff --git a/src/crepe/api/Engine.cpp b/src/crepe/api/Engine.cpp index bbb4494..2e9d35a 100644 --- a/src/crepe/api/Engine.cpp +++ b/src/crepe/api/Engine.cpp @@ -39,7 +39,7 @@ void Engine::loop() { LoopTimerManager & timer = this->loop_timer; SystemManager & systems = this->system_manager; - while (game_running) { + while (this->game_running) { timer.update(); while (timer.get_lag() >= timer.get_fixed_delta_time()) { diff --git a/src/crepe/facade/Texture.cpp b/src/crepe/facade/Texture.cpp index 23a9c8e..cd06439 100644 --- a/src/crepe/facade/Texture.cpp +++ b/src/crepe/facade/Texture.cpp @@ -1,10 +1,10 @@ #include "../util/dbg.h" -#include "facade/SDLContext.h" -#include "manager/Mediator.h" +#include "../facade/SDLContext.h" +#include "../manager/Mediator.h" +#include "../types.h" +#include "../Resource.h" -#include "Resource.h" #include "Texture.h" -#include "types.h" using namespace crepe; using namespace std; @@ -23,6 +23,8 @@ Texture::~Texture() { } 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/manager/ReplayManager.h b/src/crepe/manager/ReplayManager.h index ab15b27..f06a58b 100644 --- a/src/crepe/manager/ReplayManager.h +++ b/src/crepe/manager/ReplayManager.h @@ -2,12 +2,14 @@ #include +#include "../util/OptionalRef.h" + #include "ComponentManager.h" #include "Manager.h" -#include "util/OptionalRef.h" namespace crepe { +//! Handle to recording held by ReplayManager typedef size_t recording_t; /** -- 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/facade/Texture.cpp') 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 From 88d84763147fbd6bcc087f15a7460566a009cdb2 Mon Sep 17 00:00:00 2001 From: Loek Le Blansch Date: Thu, 19 Dec 2024 13:41:02 +0100 Subject: fix header ordering --- src/crepe/facade/Texture.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/crepe/facade/Texture.cpp') diff --git a/src/crepe/facade/Texture.cpp b/src/crepe/facade/Texture.cpp index cd06439..9a10f9b 100644 --- a/src/crepe/facade/Texture.cpp +++ b/src/crepe/facade/Texture.cpp @@ -1,9 +1,9 @@ #include "../util/dbg.h" -#include "../facade/SDLContext.h" #include "../manager/Mediator.h" #include "../types.h" #include "../Resource.h" +#include "SDLContext.h" #include "Texture.h" using namespace crepe; -- cgit v1.2.3