aboutsummaryrefslogtreecommitdiff
path: root/src/crepe/api
diff options
context:
space:
mode:
Diffstat (limited to 'src/crepe/api')
-rw-r--r--src/crepe/api/LoopManager.cpp26
-rw-r--r--src/crepe/api/LoopManager.h2
2 files changed, 14 insertions, 14 deletions
diff --git a/src/crepe/api/LoopManager.cpp b/src/crepe/api/LoopManager.cpp
index 4ca9928..b335cad 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"
@@ -44,18 +44,18 @@ void LoopManager::setup() {
void LoopManager::loop() {
try {
- while (game_running) {
- this->loop_timer.update();
+ while (game_running) {
+ this->loop_timer.update();
- while (this->loop_timer.get_lag() >= this->loop_timer.get_fixed_delta_time()) {
- this->fixed_update();
- this->loop_timer.advance_fixed_elapsed_time();
- }
+ while (this->loop_timer.get_lag() >= this->loop_timer.get_fixed_delta_time()) {
+ this->fixed_update();
+ this->loop_timer.advance_fixed_elapsed_time();
+ }
- this->frame_update();
- this->loop_timer.enforce_frame_rate();
- }
- }catch(const exception & e){
+ this->frame_update();
+ this->loop_timer.enforce_frame_rate();
+ }
+ } catch (const exception & e) {
Log::logf(Log::Level::ERROR, "Exception caught in main loop: %s", e.what());
this->event_manager.trigger_event<ShutDownEvent>(ShutDownEvent{});
}
@@ -73,7 +73,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
*