aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/crepe/api/LoopManager.cpp8
-rw-r--r--src/crepe/api/LoopTimer.cpp2
-rw-r--r--src/crepe/api/LoopTimer.h2
-rw-r--r--src/crepe/facade/SDLContext.h2
4 files changed, 7 insertions, 7 deletions
diff --git a/src/crepe/api/LoopManager.cpp b/src/crepe/api/LoopManager.cpp
index 99763e4..e737f78 100644
--- a/src/crepe/api/LoopManager.cpp
+++ b/src/crepe/api/LoopManager.cpp
@@ -21,7 +21,7 @@ void LoopManager::fixed_update() {
}
void LoopManager::loop() {
- LoopTimer & timer = LoopTimer::getInstance();
+ LoopTimer & timer = LoopTimer::get_instance();
timer.start();
while (game_running) {
@@ -43,8 +43,8 @@ void LoopManager::loop() {
void LoopManager::setup() {
this->game_running = true;
- LoopTimer::getInstance().start();
- LoopTimer::getInstance().set_fps(60);
+ LoopTimer::get_instance().start();
+ LoopTimer::get_instance().set_fps(60);
}
void LoopManager::render() {
@@ -54,7 +54,7 @@ void LoopManager::render() {
}
void LoopManager::update() {
- LoopTimer & timer = LoopTimer::getInstance();
+ LoopTimer & timer = LoopTimer::get_instance();
}
} // namespace crepe
diff --git a/src/crepe/api/LoopTimer.cpp b/src/crepe/api/LoopTimer.cpp
index c6ffe9d..98ce08d 100644
--- a/src/crepe/api/LoopTimer.cpp
+++ b/src/crepe/api/LoopTimer.cpp
@@ -6,7 +6,7 @@
using namespace crepe;
LoopTimer::LoopTimer() {}
-LoopTimer & LoopTimer::getInstance() {
+LoopTimer & LoopTimer::get_instance() {
static LoopTimer instance;
return instance;
}
diff --git a/src/crepe/api/LoopTimer.h b/src/crepe/api/LoopTimer.h
index 8d95921..5b7d3f2 100644
--- a/src/crepe/api/LoopTimer.h
+++ b/src/crepe/api/LoopTimer.h
@@ -10,7 +10,7 @@ public:
*
* \return A reference to the LoopTimer instance.
*/
-static LoopTimer& getInstance();
+static LoopTimer& get_instance();
/**
* \brief Get the current delta time for the current frame.
diff --git a/src/crepe/facade/SDLContext.h b/src/crepe/facade/SDLContext.h
index 6c57ef9..67e330b 100644
--- a/src/crepe/facade/SDLContext.h
+++ b/src/crepe/facade/SDLContext.h
@@ -9,7 +9,7 @@
#include "../api/Sprite.h"
#include "../api/Transform.h"
-#include "api/Camera.h"
+// #include "../api/Camera.h"
// FIXME: this needs to be removed
const int SCREEN_WIDTH = 640;