hpp+

src/engine.cpp

@@ -13,7 +13,7 @@
 #include "core_defs.h"
 #include "files/files.h"
 #include "files/settings_io.hpp"
-#include "frontend/locale/langs.h"
+#include "frontend/locale.hpp"
 #include "frontend/menu.hpp"
 #include "frontend/screens/Screen.hpp"
 #include "frontend/screens/MenuScreen.hpp"

src/frontend/ContentGfxCache.cpp

@@ -1,5 +1,7 @@
 #include "ContentGfxCache.hpp"
 
+#include "UiDocument.hpp"
+
 #include "../assets/Assets.h"
 #include "../content/Content.h"
 #include "../content/ContentPack.h"
@@ -7,7 +9,6 @@
 #include "../graphics/core/Atlas.hpp"
 #include "../maths/UVRegion.hpp"
 #include "../voxels/Block.h"
-#include "UiDocument.hpp"
 
 #include <string>
 

src/frontend/LevelFrontend.cpp

@@ -1,4 +1,6 @@
-#include "LevelFrontend.h"
+#include "LevelFrontend.hpp"
+
+#include "ContentGfxCache.hpp"
 
 #include "../assets/Assets.h"
 #include "../audio/audio.hpp"
@@ -9,7 +11,6 @@
 #include "../logic/PlayerController.h"
 #include "../voxels/Block.h"
 #include "../world/Level.h"
-#include "ContentGfxCache.hpp"
 
 LevelFrontend::LevelFrontend(LevelController* controller, Assets* assets) 
   : level(controller->getLevel()),

src/frontend/LevelFrontend.hpp

@@ -1,5 +1,5 @@
-#ifndef FRONTEND_LEVEL_FRONTEND_H_
-#define FRONTEND_LEVEL_FRONTEND_H_
+#ifndef FRONTEND_LEVEL_FRONTEND_HPP_
+#define FRONTEND_LEVEL_FRONTEND_HPP_
 
 #include <memory>
 
@@ -23,4 +23,4 @@ public:
     LevelController* getController() const;
 };
 
-#endif // FRONTEND_LEVEL_FRONTEND_H_
+#endif // FRONTEND_LEVEL_FRONTEND_HPP_

src/frontend/hud.cpp

@@ -1,5 +1,9 @@
 #include "hud.hpp"
 
+#include "ContentGfxCache.hpp"
+#include "LevelFrontend.hpp"
+#include "UiDocument.hpp"
+
 #include "../assets/Assets.h"
 #include "../content/Content.h"
 #include "../core_defs.h"
@@ -39,9 +43,6 @@
 #include "../window/Window.hpp"
 #include "../world/Level.h"
 #include "../world/World.h"
-#include "ContentGfxCache.hpp"
-#include "LevelFrontend.h"
-#include "UiDocument.hpp"
 
 #include <assert.h>
 #include <memory>

src/frontend/locale.cpp

@@ -1,13 +1,14 @@
-#include "langs.h"
+#include "locale.hpp"
 
-#include <iostream>
+#include "../coders/json.h"
+#include "../coders/commons.h"
+#include "../content/ContentPack.h"
+#include "../files/files.h"
+#include "../util/stringutil.h"
+#include "../data/dynamic.h"
+#include "../debug/Logger.hpp"
 
-#include "../../coders/json.h"
-#include "../../coders/commons.h"
-#include "../../content/ContentPack.h"
-#include "../../files/files.h"
-#include "../../util/stringutil.h"
-#include "../../data/dynamic.h"
+static debug::Logger logger("locale");
 
 namespace fs = std::filesystem;
 

src/frontend/locale.hpp

@@ -1,5 +1,7 @@
-#ifndef FRONTEND_LOCALE_LANGS_H
-#define FRONTEND_LOCALE_LANGS_H
+#ifndef FRONTEND_LOCALES_HPP_
+#define FRONTEND_LOCALES_HPP_
+
+#include "../content/ContentPack.h"
 
 #include <string>
 #include <vector>
@@ -7,8 +9,6 @@
 #include <filesystem>
 #include <unordered_map>
 
-#include "../../content/ContentPack.h"
-
 namespace langs {
     const char LANG_FILE_EXT[] = ".txt";
     const char TEXTS_FOLDER[] = "texts";
@@ -69,4 +69,4 @@ namespace langs {
                       const std::vector<ContentPack>& packs);
 }
 
-#endif // FRONTEND_LOCALE_LANGS_H
+#endif // FRONTEND_LOCALES_HPP_

src/frontend/menu.cpp

@@ -1,7 +1,7 @@
 #include "menu.hpp"
 
-#include <filesystem>
-#include <glm/glm.hpp>
+#include "locale.hpp"
+#include "UiDocument.hpp"
 
 #include "../delegates.h"
 #include "../engine.h"
@@ -16,8 +16,9 @@
 #include "../coders/commons.h"
 #include "../util/stringutil.h"
 #include "../window/Window.hpp"
-#include "locale/langs.h"
-#include "UiDocument.hpp"
+
+#include <filesystem>
+#include <glm/glm.hpp>
 
 namespace fs = std::filesystem;
 using namespace gui;

src/frontend/screens/LevelScreen.cpp

@@ -1,7 +1,7 @@
 #include "LevelScreen.hpp"
 
 #include "../hud.hpp"
-#include "../LevelFrontend.h"
+#include "../LevelFrontend.hpp"
 #include "../../debug/Logger.hpp"
 #include "../../audio/audio.hpp"
 #include "../../coders/imageio.hpp"

src/graphics/core/Atlas.cpp

@@ -1,9 +1,10 @@
 #include "Atlas.hpp"
 
-#include <stdexcept>
-#include "../../maths/LMPacker.h"
 #include "Texture.hpp"
 #include "ImageData.hpp"
+#include "../../maths/LMPacker.hpp"
+
+#include <stdexcept>
 
 Atlas::Atlas(
     std::unique_ptr<ImageData> image, 

src/graphics/render/WorldRenderer.cpp

@@ -1,15 +1,17 @@
 #include "WorldRenderer.hpp"
+
 #include "ChunksRenderer.hpp"
 #include "Skybox.hpp"
+
 #include "../../assets/Assets.h"
 #include "../../content/Content.h"
 #include "../../engine.h"
-#include "../../frontend/LevelFrontend.h"
+#include "../../frontend/LevelFrontend.hpp"
 #include "../../items/Inventory.h"
 #include "../../items/ItemDef.h"
 #include "../../items/ItemStack.h"
 #include "../../logic/PlayerController.h"
-#include "../../maths/FrustumCulling.h"
+#include "../../maths/FrustumCulling.hpp"
 #include "../../maths/voxmaths.h"
 #include "../../objects/Player.h"
 #include "../../settings.h"

src/graphics/ui/elements/InventoryView.cpp

@@ -1,7 +1,7 @@
 #include "InventoryView.hpp"
 #include "../../../assets/Assets.h"
 #include "../../../content/Content.h"
-#include "../../../frontend/LevelFrontend.h"
+#include "../../../frontend/LevelFrontend.hpp"
 #include "../../../items/Inventories.h"
 #include "../../../items/Inventory.h"
 #include "../../../items/ItemDef.h"

src/graphics/ui/gui_util.cpp

@@ -7,7 +7,7 @@
 #include <glm/glm.hpp>
 
 #include "../../logic/scripting/scripting.h"
-#include "../../frontend/locale/langs.h"
+#include "../../frontend/locale.hpp"
 #include "../../util/stringutil.h"
 #include "../../delegates.h"
 

src/graphics/ui/gui_xml.cpp

@@ -11,7 +11,7 @@
 #include "elements/InventoryView.hpp"
 
 #include "../../frontend/menu.hpp"
-#include "../../frontend/locale/langs.h"
+#include "../../frontend/locale.hpp"
 #include "../../items/Inventory.h"
 #include "../../logic/scripting/scripting.h"
 #include "../../maths/voxmaths.h"

src/logic/EngineController.cpp

@@ -5,7 +5,7 @@
 #include "../engine.h"
 #include "../files/WorldFiles.h"
 #include "../files/WorldConverter.h"
-#include "../frontend/locale/langs.h"
+#include "../frontend/locale.hpp"
 #include "../frontend/screens/MenuScreen.hpp"
 #include "../frontend/screens/LevelScreen.hpp"
 #include "../frontend/menu.hpp"

src/logic/scripting/lua/libgui.cpp

@@ -17,7 +17,7 @@
 #include "../../../graphics/ui/elements/Menu.hpp"
 #include "../../../graphics/ui/elements/InventoryView.hpp"
 #include "../../../frontend/UiDocument.hpp"
-#include "../../../frontend/locale/langs.h"
+#include "../../../frontend/locale.hpp"
 #include "../../../util/stringutil.h"
 #include "../../../world/Level.h"
 

src/maths/FrustumCulling.hpp

@@ -1,3 +1,6 @@
+#ifndef MATHS_FRUSTUM_CULLING_HPP_
+#define MATHS_FRUSTUM_CULLING_HPP_
+
 #include <glm/matrix.hpp>
 
 class Frustum
@@ -110,4 +113,6 @@ inline glm::vec3 Frustum::intersection(const glm::vec3* crosses) const
 	glm::vec3 res = glm::mat3(crosses[ij2k<b, c>::k], -crosses[ij2k<a, c>::k], crosses[ij2k<a, b>::k]) *
 		glm::vec3(m_planes[a].w, m_planes[b].w, m_planes[c].w);
 	return res * (-1.0f / D);
-}
+}
+
+#endif // MATHS_FRUSTUM_CULLING_HPP_

src/maths/LMPacker.cpp

@@ -1,4 +1,4 @@
-#include "LMPacker.h"
+#include "LMPacker.hpp"
 
 #include <algorithm>
 

src/maths/LMPacker.hpp

@@ -1,9 +1,7 @@
-/*
-    C++ LMPacker port
-        https://github.com/MihailRis/LMPacker
-*/
-#ifndef LMPACKER_H_
-#define LMPACKER_H_
+///    C++ LMPacker port
+///        https://github.com/MihailRis/LMPacker
+#ifndef LMPACKER_HPP_
+#define LMPACKER_HPP_
 
 #include <stdlib.h>
 #include <stdint.h>
@@ -50,4 +48,4 @@ public:
     }
 };
 
-#endif /* LMPACKER_H_ */
+#endif // LMPACKER_HPP_