From: outfrost <kotlet.bahn@gmail.com>
Date: Wed, 27 May 2020 00:05:17 +0000 (+0200)
Subject: Housekeeping
X-Git-Url: https://git.lizzy.rs/?a=commitdiff_plain;h=73a2f00122d9fe942cf8d2558b00cc8353b45316;p=shadowclad.git

Housekeeping
---

diff --git a/src/engine/asset.c b/src/engine/asset.c
index a93524c..8bb19e5 100644
--- a/src/engine/asset.c
+++ b/src/engine/asset.c
@@ -1,9 +1,10 @@
+#include "asset.h"
+
 #include <stdlib.h>
 #include <assimp/cimport.h>
 #include <assimp/postprocess.h>
 #include <assimp/scene.h>
 
-#include "asset.h"
 #include "logger.h"
 #include "tga.h"
 
diff --git a/src/engine/asset.h b/src/engine/asset.h
index 042361d..9354c47 100644
--- a/src/engine/asset.h
+++ b/src/engine/asset.h
@@ -2,7 +2,6 @@
 #define ASSET_H_
 
 #include <stddef.h>
-
 #include <GL/gl.h>
 
 #include "geometry.h"
@@ -40,4 +39,4 @@ struct Material {
 
 const Solid* importSolid(const char* path);
 
-#endif
+#endif // ASSET_H_
diff --git a/src/engine/geometry.c b/src/engine/geometry.c
index 5e0efab..302dcde 100644
--- a/src/engine/geometry.c
+++ b/src/engine/geometry.c
@@ -1,7 +1,7 @@
-#include <stddef.h>
-
 #include "geometry.h"
 
+#include <stddef.h>
+
 Transform identity() {
 	return (Transform) { .a1 = 1.0f, .a2 = 0.0f, .a3 = 0.0f, .a4 = 0.0f,
 	                     .b1 = 0.0f, .b2 = 1.0f, .b3 = 0.0f, .b4 = 0.0f,
diff --git a/src/engine/geometry.h b/src/engine/geometry.h
index 32642a5..e883dc9 100644
--- a/src/engine/geometry.h
+++ b/src/engine/geometry.h
@@ -23,4 +23,4 @@ Transform identity();
 void translate(Transform* transform, Vector3D vec);
 Vector3D translationOf(Transform transform);
 
-#endif
+#endif // GEOMETRY_H_
diff --git a/src/engine/logger.c b/src/engine/logger.c
index f0bb838..8ba286f 100644
--- a/src/engine/logger.c
+++ b/src/engine/logger.c
@@ -1,8 +1,8 @@
+#include "logger.h"
+
 #include <stdarg.h>
 #include <stdio.h>
 
-#include "logger.h"
-
 LogLevel logLevel = LOGLEVEL_DEBUG;
 
 
diff --git a/src/engine/logger.h b/src/engine/logger.h
index d4ee9a1..bd171b9 100644
--- a/src/engine/logger.h
+++ b/src/engine/logger.h
@@ -17,4 +17,4 @@ LogLevel logLevel;
 
 void logMessage(LogLevel msgLevel, const char* func, const char* message, ...);
 
-#endif
+#endif // LOGGER_H_
diff --git a/src/engine/performance.c b/src/engine/performance.c
index 443652c..0281e62 100644
--- a/src/engine/performance.c
+++ b/src/engine/performance.c
@@ -2,6 +2,8 @@
 #define _POSIX_C_SOURCE 199309L
 #endif
 
+#include "performance.h"
+
 #include <stdbool.h>
 #include <stdio.h> // TODO remove
 #include <time.h>
diff --git a/src/engine/performance.h b/src/engine/performance.h
index b4ded6b..fa47fe2 100644
--- a/src/engine/performance.h
+++ b/src/engine/performance.h
@@ -4,4 +4,4 @@
 void initPerformanceMetering();
 void frameRendered();
 
-#endif
+#endif // PERFORMANCE_H_
diff --git a/src/engine/render.c b/src/engine/render.c
index a26cfab..121fe7d 100644
--- a/src/engine/render.c
+++ b/src/engine/render.c
@@ -1,9 +1,10 @@
-#include <GL/glut.h>
+#include "render.h"
+
 #include <stdbool.h>
+#include <GL/glut.h>
 
 #include "geometry.h"
 #include "performance.h"
-#include "scene.h"
 
 float viewportAspectRatio = 1.0f;
 const Scene* cameraAnchor;
diff --git a/src/engine/render.h b/src/engine/render.h
index df18281..4fd0f41 100644
--- a/src/engine/render.h
+++ b/src/engine/render.h
@@ -9,4 +9,4 @@ const Scene* cameraAnchor;
 void initRender();
 void renderFrame();
 
-#endif
+#endif // RENDER_H_
diff --git a/src/engine/scene.c b/src/engine/scene.c
index 0812c79..9b8c8dd 100644
--- a/src/engine/scene.c
+++ b/src/engine/scene.c
@@ -1,10 +1,9 @@
+#include "scene.h"
+
 #include <stdlib.h>
 
 #include "engine/logger.h"
 
-#include "geometry.h"
-#include "scene.h"
-
 Scene* currentScene = NULL;
 
 
diff --git a/src/engine/tga.c b/src/engine/tga.c
index 551039c..430fab7 100644
--- a/src/engine/tga.c
+++ b/src/engine/tga.c
@@ -1,8 +1,8 @@
+#include "tga.h"
+
 #include <stdio.h>
 #include <stdlib.h>
 
-#include "tga.h"
-
 TgaImage* readTga(const char* path) {
 	FILE* tgaFile = fopen(path, "rb");
 	if (tgaFile == NULL) {
diff --git a/src/engine/tga.h b/src/engine/tga.h
index 96be414..d044362 100644
--- a/src/engine/tga.h
+++ b/src/engine/tga.h
@@ -29,4 +29,4 @@ typedef struct {
 
 TgaImage* readTga(const char* path);
 
-#endif
+#endif // TGA_H_
diff --git a/src/engine/ui.c b/src/engine/ui.c
index a5b8b1e..4b06f0c 100644
--- a/src/engine/ui.c
+++ b/src/engine/ui.c
@@ -1,4 +1,4 @@
-#include <GL/gl.h>
+#include "ui.h"
 
 #include "render.h"
 
diff --git a/src/engine/ui.h b/src/engine/ui.h
index 5d3117a..1e1cedf 100644
--- a/src/engine/ui.h
+++ b/src/engine/ui.h
@@ -1,8 +1,8 @@
-#ifndef GLUT_JANITOR_H_
-#define GLUT_JANITOR_H_
+#ifndef UI_H_
+#define UI_H_
 
 #include <GL/gl.h>
 
 void resizeStage(GLsizei width, GLsizei height);
 
-#endif
+#endif // UI_H_
diff --git a/src/game/level.c b/src/game/level.c
index ad1158e..2b45eec 100644
--- a/src/game/level.c
+++ b/src/game/level.c
@@ -1,10 +1,11 @@
-#include <GL/gl.h>
+#include "level.h"
+
 #include <stdlib.h>
+#include <GL/gl.h>
 
 #include "engine/logger.h"
 #include "engine/scene.h"
 
-#include "level.h"
 #include "player.h"
 
 BlockGrid levelGrid;
diff --git a/src/game/level.h b/src/game/level.h
index 4795d5d..6d685ef 100644
--- a/src/game/level.h
+++ b/src/game/level.h
@@ -40,4 +40,4 @@ static inline void setBlockInGrid(BlockGrid grid, size_t x, size_t z, Block* blo
 	grid.blocks[(z * grid.width) + x] = block;
 }
 
-#endif
+#endif // LEVEL_H_
diff --git a/src/game/player.c b/src/game/player.c
index 144d0cf..2b091fd 100644
--- a/src/game/player.c
+++ b/src/game/player.c
@@ -1,8 +1,8 @@
+#include "player.h"
+
 #include "engine/asset.h"
 #include "engine/render.h"
 
-#include "player.h"
-
 Scene* playerCharacter;
 
 
diff --git a/src/game/player.h b/src/game/player.h
index 373204f..d534e8e 100644
--- a/src/game/player.h
+++ b/src/game/player.h
@@ -10,4 +10,4 @@ Scene* playerCharacter;
 void initPlayer();
 void spawnPlayer(Transform transform);
 
-#endif
+#endif // PLAYER_H_