Housekeeping

diff --git a/src/engine/asset.c b/src/engine/asset.c
index a93524c59c8f68f7b8ec6b6dc95261c735c37cfc..8bb19e50a686099ad95470b35bd13fcda46aa4f2 100644 (file)
--- 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 042361d39b6bd2260cb12017e34c1692f576fbd7..9354c47c7615faa952baf8112b03ae98da855985 100644 (file)
--- 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 5e0efab99cfce35d2cf410b062bfa49f76f312b9..302dcde30e603bd7251e571417b828f6e754bb81 100644 (file)
--- 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 32642a59e3da562ea5403f92f79dcbc64e19d313..e883dc9a6aa7e5db3b317e7eb4c0837c95200bb5 100644 (file)
--- 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 f0bb838386751896c98f8aa99ee28746406ecb20..8ba286f1f22bdaf1a9fcbb93f62839d3a4584131 100644 (file)
--- 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 d4ee9a1213a03205d3a35c37f873ce4fa88eb5fe..bd171b9dbc6c383c5abcfeb8dbb81860d540ed75 100644 (file)
--- 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 443652cedccbaae87b648c6ca6bf0c2f0354067f..0281e6277b26fa4b855251e721851d22e4f343f9 100644 (file)
--- 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 b4ded6bcac416065590302d155542ae577e490ca..fa47fe2a9d5b53d250d9edad1b89770669318f1f 100644 (file)
--- 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 a26cfab5206219f04cc1a3b29f83314467d9319d..121fe7d38893c208ce73476adf91d6603892f067 100644 (file)
--- 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 df18281a2be1301b254438e1024973b9a68fafa0..4fd0f413b2bf6e82613c9fd430ce186dfde876e5 100644 (file)
--- 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 0812c79bf95eb51f62cff56e92e64d7a672649eb..9b8c8dda28bb140fba4a0015fce3feaa96cb0846 100644 (file)
--- 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 551039cb3555a3b6155bb70c262d6e7e4e308df5..430fab7f8f22833dedf59c4f6f1238bd4e7bf4fd 100644 (file)
--- 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 96be414be5e54b36f5b00c915ce01665ad56f04a..d044362a24b03dc7851e9ccb4f3b76a9de8c464b 100644 (file)
--- 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 a5b8b1ec3b936fc511cf3d8827135ce722871c08..4b06f0ce62f0fe8b1ea90a0a928a1dde262c6591 100644 (file)
--- 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 5d3117aedfec55938ab6731208d1b82b0bde3624..1e1cedfa6a3ac6e5b10c083dee5b227f78ac8308 100644 (file)
--- 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 ad1158e44d4b63d08e021ebfd4f4bd725ed0e541..2b45eecdc2839a9dbb480e79ffea548b4f3e428b 100644 (file)
--- 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 4795d5de7d7819544c391ecf33604d85cec6965e..6d685ef1e70d6c4ba1c77e90c4a7ff8e1c2d08d6 100644 (file)
--- 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 144d0cfd4416486fc0a1d8e5649d2117f4601821..2b091fde62d266fb6448abedce823bec6f32478e 100644 (file)
--- 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 373204f3b5ec69f322d39a7c21dd8e60bf1002fa..d534e8ea65e72caab830b86be8b483cd8e5cdbc7 100644 (file)
--- 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_