aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLoek Le Blansch <loek@pipeframe.xyz>2024-12-11 15:01:58 +0100
committerLoek Le Blansch <loek@pipeframe.xyz>2024-12-11 15:01:58 +0100
commit68c9e7511ea52c6ee70d052bbdf2923cd68bfa8a (patch)
tree508bfd76d4759eab936300531c7a468aaf740cf2
parente49893e8de74534494792955c50ea0eabaf3ba38 (diff)
`make format`wouter/gameloop
-rw-r--r--mwe/events/include/event.h2
-rw-r--r--src/crepe/api/LoopManager.cpp8
-rw-r--r--src/crepe/api/LoopManager.h2
-rw-r--r--src/crepe/manager/LoopTimerManager.cpp14
-rw-r--r--src/crepe/system/AISystem.cpp2
-rw-r--r--src/test/LoopTimerTest.cpp5
6 files changed, 16 insertions, 17 deletions
diff --git a/mwe/events/include/event.h b/mwe/events/include/event.h
index e1b220b..ee1bf52 100644
--- a/mwe/events/include/event.h
+++ b/mwe/events/include/event.h
@@ -148,7 +148,7 @@ private:
};
class ShutDownEvent : public Event {
public:
- ShutDownEvent() : Event("ShutDownEvent"){};
+ ShutDownEvent() : Event("ShutDownEvent") {};
REGISTER_EVENT_TYPE(ShutDownEvent)
diff --git a/src/crepe/api/LoopManager.cpp b/src/crepe/api/LoopManager.cpp
index aa4a21a..b5e5ff7 100644
--- a/src/crepe/api/LoopManager.cpp
+++ b/src/crepe/api/LoopManager.cpp
@@ -1,4 +1,6 @@
#include "../facade/SDLContext.h"
+#include "../manager/EventManager.h"
+#include "../manager/LoopTimerManager.h"
#include "../system/AISystem.h"
#include "../system/AnimatorSystem.h"
#include "../system/AudioSystem.h"
@@ -8,8 +10,6 @@
#include "../system/PhysicsSystem.h"
#include "../system/RenderSystem.h"
#include "../system/ScriptSystem.h"
-#include "../manager/EventManager.h"
-#include "../manager/LoopTimerManager.h"
#include "../util/Log.h"
#include "LoopManager.h"
@@ -54,7 +54,7 @@ void LoopManager::loop() {
this->frame_update();
this->loop_timer.enforce_frame_rate();
}
- }catch(const exception & e){
+ } catch (const exception & e) {
Log::logf(Log::Level::ERROR, "Exception caught in main loop: {}", e.what());
this->event_manager.trigger_event<ShutDownEvent>(ShutDownEvent{});
}
@@ -72,7 +72,7 @@ void LoopManager::fixed_update() {
}
// will be called every frame
-void LoopManager::frame_update() {
+void LoopManager::frame_update() {
this->scene_manager.load_next_scene();
this->get_system<AnimatorSystem>().update();
//render
diff --git a/src/crepe/api/LoopManager.h b/src/crepe/api/LoopManager.h
index 0110695..487f07a 100644
--- a/src/crepe/api/LoopManager.h
+++ b/src/crepe/api/LoopManager.h
@@ -69,6 +69,7 @@ private:
//! Indicates whether the game is running.
bool game_running = false;
+
private:
//! Global context
Mediator mediator;
@@ -90,7 +91,6 @@ private:
SDLContext & sdl_context = SDLContext::get_instance();
private:
-
/**
* \brief Callback function for ShutDownEvent
*
diff --git a/src/crepe/manager/LoopTimerManager.cpp b/src/crepe/manager/LoopTimerManager.cpp
index 92a2150..ccca950 100644
--- a/src/crepe/manager/LoopTimerManager.cpp
+++ b/src/crepe/manager/LoopTimerManager.cpp
@@ -24,8 +24,7 @@ void LoopTimerManager::start() {
}
void LoopTimerManager::update() {
- time_point_t current_frame_time
- = std::chrono::steady_clock::now();
+ time_point_t current_frame_time = std::chrono::steady_clock::now();
// Convert to duration in seconds for delta time
this->delta_time = current_frame_time - last_frame_time;
@@ -41,12 +40,15 @@ void LoopTimerManager::update() {
this->last_frame_time = current_frame_time;
}
-duration_t LoopTimerManager::get_delta_time() const {return this->delta_time * this->time_scale;}
+duration_t LoopTimerManager::get_delta_time() const {
+ return this->delta_time * this->time_scale;
+}
elapsed_time_t LoopTimerManager::get_elapsed_time() const { return this->elapsed_time; }
void LoopTimerManager::advance_fixed_elapsed_time() {
- this->elapsed_fixed_time += std::chrono::duration_cast<elapsed_time_t>(this->fixed_delta_time);
+ this->elapsed_fixed_time
+ += std::chrono::duration_cast<elapsed_time_t>(this->fixed_delta_time);
}
void LoopTimerManager::set_target_framerate(unsigned fps) {
@@ -88,6 +90,4 @@ void LoopTimerManager::set_fixed_delta_time(float seconds) {
this->fixed_delta_time = duration_t(seconds);
}
-duration_t LoopTimerManager::get_fixed_delta_time() const {
- return this->fixed_delta_time;
-}
+duration_t LoopTimerManager::get_fixed_delta_time() const { return this->fixed_delta_time; }
diff --git a/src/crepe/system/AISystem.cpp b/src/crepe/system/AISystem.cpp
index ffb1bcd..ed22203 100644
--- a/src/crepe/system/AISystem.cpp
+++ b/src/crepe/system/AISystem.cpp
@@ -1,8 +1,8 @@
#include <algorithm>
#include <cmath>
-#include "manager/LoopTimerManager.h"
#include "manager/ComponentManager.h"
+#include "manager/LoopTimerManager.h"
#include "manager/Mediator.h"
#include "AISystem.h"
diff --git a/src/test/LoopTimerTest.cpp b/src/test/LoopTimerTest.cpp
index f99f109..5e1eccf 100644
--- a/src/test/LoopTimerTest.cpp
+++ b/src/test/LoopTimerTest.cpp
@@ -71,9 +71,8 @@ TEST_F(LoopTimerTest, getCurrentTime) {
auto end_time = steady_clock::now();
// Get the elapsed time in seconds as a double
- auto elapsed_time = std::chrono::duration_cast<elapsed_time_t>(end_time - start_time).count();
-
+ auto elapsed_time
+ = std::chrono::duration_cast<elapsed_time_t>(end_time - start_time).count();
ASSERT_NEAR(loop_timer.get_elapsed_time().count(), elapsed_time, 5);
}
-