aboutsummaryrefslogtreecommitdiff
path: root/src/crepe
diff options
context:
space:
mode:
Diffstat (limited to 'src/crepe')
-rw-r--r--src/crepe/api/Sprite.cpp2
-rw-r--r--src/crepe/api/Texture.cpp2
-rw-r--r--src/crepe/system/ParticleSystem.cpp2
-rw-r--r--src/crepe/system/PhysicsSystem.cpp2
-rw-r--r--src/crepe/system/RenderSystem.cpp4
-rw-r--r--src/crepe/system/ScriptSystem.cpp2
-rw-r--r--src/crepe/util/LogColor.h2
-rw-r--r--src/crepe/util/log.h3
8 files changed, 9 insertions, 10 deletions
diff --git a/src/crepe/api/Sprite.cpp b/src/crepe/api/Sprite.cpp
index 3fd6018..3dd44f2 100644
--- a/src/crepe/api/Sprite.cpp
+++ b/src/crepe/api/Sprite.cpp
@@ -3,9 +3,9 @@
#include "../util/log.h"
-#include "Texture.h"
#include "Component.h"
#include "Sprite.h"
+#include "Texture.h"
using namespace std;
using namespace crepe;
diff --git a/src/crepe/api/Texture.cpp b/src/crepe/api/Texture.cpp
index b84a3c6..b5001a6 100644
--- a/src/crepe/api/Texture.cpp
+++ b/src/crepe/api/Texture.cpp
@@ -1,7 +1,7 @@
#include <SDL2/SDL_render.h>
-#include "../util/log.h"
#include "../SDLContext.h"
+#include "../util/log.h"
#include "Asset.h"
#include "Texture.h"
diff --git a/src/crepe/system/ParticleSystem.cpp b/src/crepe/system/ParticleSystem.cpp
index 367c7d8..397b586 100644
--- a/src/crepe/system/ParticleSystem.cpp
+++ b/src/crepe/system/ParticleSystem.cpp
@@ -1,8 +1,8 @@
#include <cmath>
#include <ctime>
-#include "../api/ParticleEmitter.h"
#include "../ComponentManager.h"
+#include "../api/ParticleEmitter.h"
#include "ParticleSystem.h"
diff --git a/src/crepe/system/PhysicsSystem.cpp b/src/crepe/system/PhysicsSystem.cpp
index efec750..cea8062 100644
--- a/src/crepe/system/PhysicsSystem.cpp
+++ b/src/crepe/system/PhysicsSystem.cpp
@@ -1,9 +1,9 @@
#include <iostream>
+#include "../ComponentManager.h"
#include "../api/Force.h"
#include "../api/Rigidbody.h"
#include "../api/Transform.h"
-#include "../ComponentManager.h"
#include "PhysicsSystem.h"
diff --git a/src/crepe/system/RenderSystem.cpp b/src/crepe/system/RenderSystem.cpp
index b3c53db..ee3cdf2 100644
--- a/src/crepe/system/RenderSystem.cpp
+++ b/src/crepe/system/RenderSystem.cpp
@@ -1,11 +1,11 @@
#include <functional>
#include <vector>
+#include "../ComponentManager.h"
+#include "../SDLContext.h"
#include "../api/Sprite.h"
#include "../api/Transform.h"
#include "../util/log.h"
-#include "../SDLContext.h"
-#include "../ComponentManager.h"
#include "RenderSystem.h"
diff --git a/src/crepe/system/ScriptSystem.cpp b/src/crepe/system/ScriptSystem.cpp
index 731adae..f1fae4d 100644
--- a/src/crepe/system/ScriptSystem.cpp
+++ b/src/crepe/system/ScriptSystem.cpp
@@ -2,10 +2,10 @@
#include <functional>
#include <vector>
+#include "../ComponentManager.h"
#include "../api/BehaviorScript.h"
#include "../api/Script.h"
#include "../util/log.h"
-#include "../ComponentManager.h"
#include "ScriptSystem.h"
diff --git a/src/crepe/util/LogColor.h b/src/crepe/util/LogColor.h
index 7e60ba2..c1170cb 100644
--- a/src/crepe/util/LogColor.h
+++ b/src/crepe/util/LogColor.h
@@ -48,4 +48,4 @@ private:
std::string final = "";
};
-} // namespace crepe::util
+} // namespace crepe
diff --git a/src/crepe/util/log.h b/src/crepe/util/log.h
index b13b9cc..5a1cf00 100644
--- a/src/crepe/util/log.h
+++ b/src/crepe/util/log.h
@@ -17,8 +17,7 @@
// NOLINTBEGIN
#define dbg_logf(fmt, ...) \
_crepe_logf_here(crepe::LogLevel::DEBUG, ": " fmt, __VA_ARGS__)
-#define dbg_log(str) \
- _crepe_logf_here(crepe::LogLevel::DEBUG, "%s: " str, "")
+#define dbg_log(str) _crepe_logf_here(crepe::LogLevel::DEBUG, "%s: " str, "")
#define dbg_trace() _crepe_logf_here(crepe::LogLevel::TRACE, "%s", "")
// NOLINTEND