Merge pull request #290 from MihailRis/global-reformat

Global project reformat

CMakeLists.txt

@@ -13,7 +13,7 @@ set(CMAKE_CXX_STANDARD 17)
 file(GLOB_RECURSE HEADERS ${CMAKE_CURRENT_SOURCE_DIR}/src/*.hpp)
 file(GLOB_RECURSE SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/src/*.cpp)
 
-add_executable(${PROJECT_NAME} ${HEADERS} ${SOURCES})
+add_executable(${PROJECT_NAME} ${SOURCES})
 target_include_directories(${PROJECT_NAME} PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/src)
 
 if(VOXELENGINE_BUILD_APPDIR)

src/assets/Assets.hpp

@@ -1,5 +1,4 @@
-#ifndef ASSETS_ASSETS_HPP_
-#define ASSETS_ASSETS_HPP_
+#pragma once
 
 #include <functional>
 #include <memory>
@@ -11,7 +10,7 @@
 #include <unordered_map>
 #include <vector>
 
-#include <graphics/core/TextureAnimation.hpp>
+#include "graphics/core/TextureAnimation.hpp"
 
 class Assets;
 
@@ -113,5 +112,3 @@ void assetload::assets_setup(const Assets* assets) {
         }
     }
 }
-
-#endif  // ASSETS_ASSETS_HPP_

src/assets/AssetsLoader.cpp

@@ -4,19 +4,19 @@
 #include <memory>
 #include <utility>
 
-#include <coders/imageio.hpp>
-#include <constants.hpp>
-#include <content/Content.hpp>
-#include <content/ContentPack.hpp>
-#include <data/dynamic.hpp>
-#include <debug/Logger.hpp>
-#include <files/engine_paths.hpp>
-#include <files/files.hpp>
-#include <graphics/core/Texture.hpp>
-#include <logic/scripting/scripting.hpp>
-#include <objects/rigging.hpp>
-#include <util/ThreadPool.hpp>
-#include <voxels/Block.hpp>
+#include "coders/imageio.hpp"
+#include "constants.hpp"
+#include "content/Content.hpp"
+#include "content/ContentPack.hpp"
+#include "data/dynamic.hpp"
+#include "debug/Logger.hpp"
+#include "files/engine_paths.hpp"
+#include "files/files.hpp"
+#include "graphics/core/Texture.hpp"
+#include "logic/scripting/scripting.hpp"
+#include "objects/rigging.hpp"
+#include "util/ThreadPool.hpp"
+#include "voxels/Block.hpp"
 #include "Assets.hpp"
 #include "assetload_funcs.hpp"
 

src/assets/AssetsLoader.hpp

@@ -1,5 +1,4 @@
-#ifndef ASSETS_ASSETS_LOADER_HPP_
-#define ASSETS_ASSETS_LOADER_HPP_
+#pragma once
 
 #include <filesystem>
 #include <functional>
@@ -9,9 +8,9 @@
 #include <string>
 #include <utility>
 
-#include <delegates.hpp>
-#include <interfaces/Task.hpp>
-#include <typedefs.hpp>
+#include "delegates.hpp"
+#include "interfaces/Task.hpp"
+#include "typedefs.hpp"
 #include "Assets.hpp"
 
 namespace dynamic {
@@ -104,5 +103,3 @@ public:
         const std::vector<std::filesystem::path>& alternatives
     );
 };
-
-#endif  // ASSETS_ASSETS_LOADER_HPP_

src/assets/assetload_funcs.cpp

@@ -4,25 +4,25 @@
 #include <iostream>
 #include <stdexcept>
 
-#include <audio/audio.hpp>
-#include <coders/GLSLExtension.hpp>
-#include <coders/commons.hpp>
-#include <coders/imageio.hpp>
-#include <coders/json.hpp>
-#include <coders/obj.hpp>
-#include <constants.hpp>
-#include <data/dynamic.hpp>
-#include <files/engine_paths.hpp>
-#include <files/files.hpp>
-#include <frontend/UiDocument.hpp>
-#include <graphics/core/Atlas.hpp>
-#include <graphics/core/Font.hpp>
-#include <graphics/core/ImageData.hpp>
-#include <graphics/core/Model.hpp>
-#include <graphics/core/Shader.hpp>
-#include <graphics/core/Texture.hpp>
-#include <graphics/core/TextureAnimation.hpp>
-#include <objects/rigging.hpp>
+#include "audio/audio.hpp"
+#include "coders/GLSLExtension.hpp"
+#include "coders/commons.hpp"
+#include "coders/imageio.hpp"
+#include "coders/json.hpp"
+#include "coders/obj.hpp"
+#include "constants.hpp"
+#include "data/dynamic.hpp"
+#include "files/engine_paths.hpp"
+#include "files/files.hpp"
+#include "frontend/UiDocument.hpp"
+#include "graphics/core/Atlas.hpp"
+#include "graphics/core/Font.hpp"
+#include "graphics/core/ImageData.hpp"
+#include "graphics/core/Model.hpp"
+#include "graphics/core/Shader.hpp"
+#include "graphics/core/Texture.hpp"
+#include "graphics/core/TextureAnimation.hpp"
+#include "objects/rigging.hpp"
 #include "Assets.hpp"
 #include "AssetsLoader.hpp"
 

src/assets/assetload_funcs.hpp

@@ -1,5 +1,4 @@
-#ifndef ASSETS_ASSET_LOADERS_HPP_
-#define ASSETS_ASSET_LOADERS_HPP_
+#pragma once
 
 #include <memory>
 #include <string>
@@ -64,5 +63,3 @@ namespace assetload {
         const std::shared_ptr<AssetCfg>& settings
     );
 }
-
-#endif  // ASSETS_ASSET_LOADERS_HPP_

src/audio/AL/ALAudio.cpp

@@ -3,7 +3,7 @@
 #include <string>
 #include <utility>
 
-#include <debug/Logger.hpp>
+#include "debug/Logger.hpp"
 #include "alutil.hpp"
 
 static debug::Logger logger("al-audio");

src/audio/AL/ALAudio.hpp

@@ -1,5 +1,4 @@
-#ifndef SRC_AUDIO_AUDIO_HPP_
-#define SRC_AUDIO_AUDIO_HPP_
+#pragma once
 
 #include <glm/glm.hpp>
 #include <queue>
@@ -7,8 +6,8 @@
 #include <unordered_map>
 #include <vector>
 
-#include <typedefs.hpp>
-#include <audio/audio.hpp>
+#include "typedefs.hpp"
+#include "audio/audio.hpp"
 
 #ifdef __APPLE__
 #include <OpenAL/al.h>
@@ -178,5 +177,3 @@ namespace audio {
         static std::unique_ptr<ALAudio> create();
     };
 }
-
-#endif  // SRC_AUDIO_AUDIO_HPP_

src/audio/AL/alutil.cpp

@@ -5,7 +5,7 @@
 #include <memory>
 #include <type_traits>
 
-#include <debug/Logger.hpp>
+#include "debug/Logger.hpp"
 
 #ifdef __APPLE__
 #include <OpenAL/al.h>

src/audio/AL/alutil.hpp

@@ -1,11 +1,10 @@
-#ifndef AUDIO_AUDIOUTIL_HPP_
-#define AUDIO_AUDIOUTIL_HPP_
+#pragma once
 
 #include <cstdint>
 #include <string>
 #include <type_traits>
 
-#include <typedefs.hpp>
+#include "typedefs.hpp"
 
 #ifdef __APPLE__
 #include <OpenAL/al.h>
@@ -83,5 +82,3 @@ namespace AL {
         }
     }
 }
-
-#endif  // AUDIO_AUDIOUTIL_HPP_

src/audio/NoAudio.hpp

@@ -1,5 +1,4 @@
-#ifndef AUDIO_NOAUDIO_HPP_
-#define AUDIO_NOAUDIO_HPP_
+#pragma once
 
 #include "audio.hpp"
 
@@ -91,5 +90,3 @@ namespace audio {
         static std::unique_ptr<NoAudio> create();
     };
 }
-
-#endif  // AUDIO_NOAUDIO_HPP_

src/audio/audio.cpp

@@ -4,8 +4,8 @@
 #include <stdexcept>
 #include <utility>
 
-#include <coders/ogg.hpp>
-#include <coders/wav.hpp>
+#include "coders/ogg.hpp"
+#include "coders/wav.hpp"
 #include "AL/ALAudio.hpp"
 #include "NoAudio.hpp"
 

src/audio/audio.hpp

@@ -1,12 +1,11 @@
-#ifndef AUDIO_AUDIO_HPP_
-#define AUDIO_AUDIO_HPP_
+#pragma once
 
 #include <filesystem>
 #include <glm/glm.hpp>
 #include <memory>
 #include <vector>
 
-#include <typedefs.hpp>
+#include "typedefs.hpp"
 
 namespace fs = std::filesystem;
 
@@ -520,5 +519,3 @@ namespace audio {
     /// @brief Finalize audio system
     void close();
 };
-
-#endif  // AUDIO_AUDIO_HPP_

src/coders/GLSLExtension.cpp

@@ -5,10 +5,10 @@
 #include <stdexcept>
 #include <utility>
 
-#include <files/engine_paths.hpp>
-#include <files/files.hpp>
-#include <typedefs.hpp>
-#include <util/stringutil.hpp>
+#include "files/engine_paths.hpp"
+#include "files/files.hpp"
+#include "typedefs.hpp"
+#include "util/stringutil.hpp"
 
 namespace fs = std::filesystem;
 

src/coders/GLSLExtension.hpp

@@ -1,5 +1,4 @@
-#ifndef CODERS_GLSL_EXTESION_HPP_
-#define CODERS_GLSL_EXTESION_HPP_
+#pragma once
 
 #include <filesystem>
 #include <string>
@@ -35,5 +34,3 @@ public:
         bool header = false
     );
 };
-
-#endif  // CODERS_GLSL_EXTESION_HPP_

src/coders/binary_json.cpp

@@ -2,7 +2,7 @@
 
 #include <stdexcept>
 
-#include <data/dynamic.hpp>
+#include "data/dynamic.hpp"
 #include "byte_utils.hpp"
 #include "gzip.hpp"
 

src/coders/binary_json.hpp

@@ -1,10 +1,9 @@
-#ifndef CODERS_BINARY_JSON_HPP_
-#define CODERS_BINARY_JSON_HPP_
+#pragma once
 
 #include <memory>
 #include <vector>
 
-#include <data/dynamic_fwd.hpp>
+#include "data/dynamic_fwd.hpp"
 
 namespace dynamic {
     class Map;
@@ -34,5 +33,3 @@ namespace json {
     );
     std::shared_ptr<dynamic::Map> from_binary(const ubyte* src, size_t size);
 }
-
-#endif  // CODERS_BINARY_JSON_HPP_

src/coders/byte_utils.hpp

@@ -1,10 +1,9 @@
-#ifndef CODERS_BYTE_UTILS_HPP_
-#define CODERS_BYTE_UTILS_HPP_
+#pragma once
 
 #include <string>
 #include <vector>
 
-#include <typedefs.hpp>
+#include "typedefs.hpp"
 
 /* byteorder: little-endian */
 class ByteBuilder {
@@ -79,5 +78,3 @@ public:
     const ubyte* pointer() const;
     void skip(size_t n);
 };
-
-#endif  // CODERS_BYTE_UTILS_HPP_

src/coders/commons.cpp

@@ -5,7 +5,7 @@
 #include <sstream>
 #include <stdexcept>
 
-#include <util/stringutil.hpp>
+#include "util/stringutil.hpp"
 
 inline double power(double base, int64_t power) {
     double result = 1.0;

src/coders/commons.hpp

@@ -1,11 +1,10 @@
-#ifndef CODERS_COMMONS_HPP_
-#define CODERS_COMMONS_HPP_
+#pragma once
 
 #include <stdexcept>
 #include <string>
 
-#include <data/dynamic.hpp>
-#include <typedefs.hpp>
+#include "data/dynamic.hpp"
+#include "typedefs.hpp"
 
 inline int is_box(int c) {
     switch (c) {
@@ -108,5 +107,3 @@ public:
 
     BasicParser(std::string_view file, std::string_view source);
 };
-
-#endif  // CODERS_COMMONS_HPP_

src/coders/gzip.hpp

@@ -1,9 +1,8 @@
-#ifndef CODERS_GZIP_HPP_
-#define CODERS_GZIP_HPP_
+#pragma once
 
 #include <vector>
 
-#include <typedefs.hpp>
+#include "typedefs.hpp"
 
 namespace gzip {
     const unsigned char MAGIC[] = "\x1F\x8B";
@@ -18,5 +17,3 @@ namespace gzip {
      @param size length of GZIP data */
     std::vector<ubyte> decompress(const ubyte* src, size_t size);
 }
-
-#endif  // CODERS_GZIP_HPP_

src/coders/imageio.cpp

@@ -4,7 +4,7 @@
 #include <functional>
 #include <unordered_map>
 
-#include <graphics/core/ImageData.hpp>
+#include "graphics/core/ImageData.hpp"
 #include "png.hpp"
 
 namespace fs = std::filesystem;

src/coders/imageio.hpp

@@ -1,5 +1,4 @@
-#ifndef CODERS_IMAGEIO_HPP_
-#define CODERS_IMAGEIO_HPP_
+#pragma once
 
 #include <memory>
 #include <string>
@@ -15,5 +14,3 @@ namespace imageio {
     std::unique_ptr<ImageData> read(const std::string& filename);
     void write(const std::string& filename, const ImageData* image);
 }
-
-#endif  // CODERS_IMAGEIO_HPP_

src/coders/json.cpp

@@ -6,8 +6,8 @@
 #include <memory>
 #include <sstream>
 
-#include <data/dynamic.hpp>
-#include <util/stringutil.hpp>
+#include "data/dynamic.hpp"
+#include "util/stringutil.hpp"
 #include "commons.hpp"
 
 using namespace json;

src/coders/json.hpp

@@ -1,10 +1,9 @@
-#ifndef CODERS_JSON_HPP_
-#define CODERS_JSON_HPP_
+#pragma once
 
 #include <string>
 
-#include <data/dynamic.hpp>
-#include <typedefs.hpp>
+#include "data/dynamic.hpp"
+#include "typedefs.hpp"
 #include "binary_json.hpp"
 
 namespace json {
@@ -19,5 +18,3 @@ namespace json {
         const dynamic::Value& value, bool nice, const std::string& indent
     );
 }
-
-#endif  // CODERS_JSON_HPP_

src/coders/obj.cpp

@@ -1,6 +1,6 @@
 #include "obj.hpp"
 
-#include <graphics/core/Model.hpp>
+#include "graphics/core/Model.hpp"
 #include "commons.hpp"
 
 using namespace model;

src/coders/obj.hpp

@@ -1,5 +1,4 @@
-#ifndef CODERS_OBJ_HPP_
-#define CODERS_OBJ_HPP_
+#pragma once
 
 #include <memory>
 #include <string>
@@ -15,5 +14,3 @@ namespace obj {
         const std::string_view file, const std::string_view src
     );
 }
-
-#endif  // CODERS_OBJ_HPP_

src/coders/ogg.cpp

@@ -5,9 +5,9 @@
 
 #include <string>
 
-#include <audio/audio.hpp>
-#include <debug/Logger.hpp>
-#include <typedefs.hpp>
+#include "audio/audio.hpp"
+#include "debug/Logger.hpp"
+#include "typedefs.hpp"
 
 static debug::Logger logger("ogg");
 

src/coders/ogg.hpp

@@ -1,5 +1,4 @@
-#ifndef CODERS_OGG_HPP_
-#define CODERS_OGG_HPP_
+#pragma once
 
 #include <filesystem>
 
@@ -16,5 +15,3 @@ namespace ogg {
         const std::filesystem::path& file
     );
 }
-
-#endif  // CODERS_OGG_HPP_

src/coders/png.cpp

@@ -4,10 +4,10 @@
 
 #include <iostream>
 
-#include <debug/Logger.hpp>
-#include <files/files.hpp>
-#include <graphics/core/GLTexture.hpp>
-#include <graphics/core/ImageData.hpp>
+#include "debug/Logger.hpp"
+#include "files/files.hpp"
+#include "graphics/core/GLTexture.hpp"
+#include "graphics/core/ImageData.hpp"
 
 static debug::Logger logger("png-coder");
 

src/coders/png.hpp

@@ -1,5 +1,4 @@
-#ifndef CODERS_PNG_HPP_
-#define CODERS_PNG_HPP_
+#pragma once
 
 #include <memory>
 #include <string>
@@ -12,5 +11,3 @@ namespace png {
     void write_image(const std::string& filename, const ImageData* image);
     std::unique_ptr<Texture> load_texture(const std::string& filename);
 }
-
-#endif  // CODERS_PNG_HPP_

src/coders/rle.hpp

@@ -1,7 +1,6 @@
-#ifndef CODERS_RLE_HPP_
-#define CODERS_RLE_HPP_
+#pragma once
 
-#include <typedefs.hpp>
+#include "typedefs.hpp"
 
 namespace rle {
     size_t encode(const ubyte* src, size_t length, ubyte* dst);
@@ -13,5 +12,3 @@ namespace extrle {
     size_t encode(const ubyte* src, size_t length, ubyte* dst);
     size_t decode(const ubyte* src, size_t length, ubyte* dst);
 }
-
-#endif  // CODERS_RLE_HPP_

src/coders/toml.cpp

@@ -6,10 +6,10 @@
 #include <iomanip>
 #include <sstream>
 
-#include <data/dynamic.hpp>
-#include <data/setting.hpp>
-#include <files/settings_io.hpp>
-#include <util/stringutil.hpp>
+#include "data/dynamic.hpp"
+#include "data/setting.hpp"
+#include "files/settings_io.hpp"
+#include "util/stringutil.hpp"
 #include "commons.hpp"
 
 using namespace toml;

src/coders/toml.hpp

@@ -1,9 +1,8 @@
-#ifndef CODERS_TOML_HPP_
-#define CODERS_TOML_HPP_
+#pragma once
 
 #include <string>
 
-#include <data/dynamic.hpp>
+#include "data/dynamic.hpp"
 
 class SettingsHandler;
 
@@ -16,5 +15,3 @@ namespace toml {
         SettingsHandler& handler, std::string_view file, std::string_view source
     );
 }
-
-#endif  // CODERS_TOML_HPP_

src/coders/wav.cpp

@@ -6,8 +6,8 @@
 #include <string>
 #include <vector>
 
-#include <audio/audio.hpp>
-#include <debug/Logger.hpp>
+#include "audio/audio.hpp"
+#include "debug/Logger.hpp"
 
 namespace fs = std::filesystem;
 

src/coders/wav.hpp

@@ -1,5 +1,4 @@
-#ifndef CODERS_WAV_HPP_
-#define CODERS_WAV_HPP_
+#pragma once
 
 #include <filesystem>
 
@@ -16,5 +15,3 @@ namespace wav {
         const std::filesystem::path& file
     );
 }
-
-#endif  // CODERS_WAV_HPP_

src/coders/xml.cpp

@@ -5,7 +5,7 @@
 #include <stdexcept>
 #include <utility>
 
-#include <util/stringutil.hpp>
+#include "util/stringutil.hpp"
 
 using namespace xml;
 

src/coders/xml.hpp

@@ -1,5 +1,4 @@
-#ifndef CODERS_XML_HPP_
-#define CODERS_XML_HPP_
+#pragma once
 
 #include <glm/glm.hpp>
 #include <memory>
@@ -144,5 +143,3 @@ namespace xml {
         const std::string& filename, const std::string& source
     );
 }
-
-#endif  // CODERS_XML_HPP_

src/constants.hpp

@@ -1,7 +1,6 @@
-#ifndef CONSTANTS_HPP_
-#define CONSTANTS_HPP_
+#pragma once
 
-#include <typedefs.hpp>
+#include "typedefs.hpp"
 
 #include <limits>
 #include <string>
@@ -52,5 +51,3 @@ inline const std::string LAYOUTS_FOLDER = "layouts";
 inline const std::string SOUNDS_FOLDER = "sounds";
 inline const std::string MODELS_FOLDER = "models";
 inline const std::string SKELETONS_FOLDER = "skeletons";
-
-#endif // CONSTANTS_HPP_

src/content/Content.cpp

@@ -5,11 +5,11 @@
 #include <stdexcept>
 #include <utility>
 
-#include <items/ItemDef.hpp>
-#include <logic/scripting/scripting.hpp>
-#include <objects/EntityDef.hpp>
-#include <objects/rigging.hpp>
-#include <voxels/Block.hpp>
+#include "items/ItemDef.hpp"
+#include "logic/scripting/scripting.hpp"
+#include "objects/EntityDef.hpp"
+#include "objects/rigging.hpp"
+#include "voxels/Block.hpp"
 #include "ContentPack.hpp"
 
 ContentIndices::ContentIndices(

src/content/Content.hpp

@@ -1,5 +1,4 @@
-#ifndef CONTENT_CONTENT_HPP_
-#define CONTENT_CONTENT_HPP_
+#pragma once
 
 #include <memory>
 #include <optional>
@@ -9,7 +8,7 @@
 #include <unordered_map>
 #include <vector>
 
-#include <data/dynamic_fwd.hpp>
+#include "data/dynamic_fwd.hpp"
 #include "content_fwd.hpp"
 
 using DrawGroups = std::set<ubyte>;
@@ -230,5 +229,3 @@ public:
     const UptrsMap<std::string, ContentPackRuntime>& getPacks() const;
     const UptrsMap<std::string, rigging::SkeletonConfig>& getSkeletons() const;
 };
-
-#endif  // CONTENT_CONTENT_HPP_

src/content/ContentBuilder.cpp

@@ -1,6 +1,6 @@
 #include "ContentBuilder.hpp"
 
-#include <objects/rigging.hpp>
+#include "objects/rigging.hpp"
 
 ContentBuilder::~ContentBuilder() = default;
 

src/content/ContentBuilder.hpp

@@ -1,5 +1,4 @@
-#ifndef CONTENT_CONTENT_BUILDER_HPP_
-#define CONTENT_CONTENT_BUILDER_HPP_
+#pragma once
 
 #include <memory>
 #include <unordered_map>
@@ -7,9 +6,9 @@
 
 #include "Content.hpp"
 #include "ContentPack.hpp"
-#include <items/ItemDef.hpp>
-#include <objects/EntityDef.hpp>
-#include <voxels/Block.hpp>
+#include "items/ItemDef.hpp"
+#include "objects/EntityDef.hpp"
+#include "voxels/Block.hpp"
 
 template <class T>
 class ContentUnitBuilder {
@@ -71,5 +70,3 @@ public:
 
     std::unique_ptr<Content> build();
 };
-
-#endif  // CONTENT_CONTENT_BUILDER_HPP_

src/content/ContentLUT.cpp

@@ -2,11 +2,11 @@
 
 #include <memory>
 
-#include <coders/json.hpp>
-#include <constants.hpp>
-#include <files/files.hpp>
-#include <items/ItemDef.hpp>
-#include <voxels/Block.hpp>
+#include "coders/json.hpp"
+#include "constants.hpp"
+#include "files/files.hpp"
+#include "items/ItemDef.hpp"
+#include "voxels/Block.hpp"
 #include "Content.hpp"
 
 ContentLUT::ContentLUT(

src/content/ContentLUT.hpp

@@ -1,14 +1,13 @@
-#ifndef CONTENT_CONTENT_LUT_HPP_
-#define CONTENT_CONTENT_LUT_HPP_
+#pragma once
 
 #include <filesystem>
 #include <string>
 #include <utility>
 #include <vector>
 
-#include <constants.hpp>
-#include <data/dynamic.hpp>
-#include <typedefs.hpp>
+#include "constants.hpp"
+#include "data/dynamic.hpp"
+#include "typedefs.hpp"
 #include "Content.hpp"
 
 namespace fs = std::filesystem;
@@ -113,5 +112,3 @@ public:
 
     std::vector<contententry> getMissingContent() const;
 };
-
-#endif  // CONTENT_CONTENT_LUT_HPP_

src/content/ContentLoader.cpp

@@ -6,18 +6,18 @@
 #include <memory>
 #include <string>
 
-#include <coders/json.hpp>
-#include <core_defs.hpp>
-#include <data/dynamic.hpp>
-#include <debug/Logger.hpp>
-#include <files/files.hpp>
-#include <items/ItemDef.hpp>
-#include <logic/scripting/scripting.hpp>
-#include <objects/rigging.hpp>
-#include <typedefs.hpp>
-#include <util/listutil.hpp>
-#include <util/stringutil.hpp>
-#include <voxels/Block.hpp>
+#include "coders/json.hpp"
+#include "core_defs.hpp"
+#include "data/dynamic.hpp"
+#include "debug/Logger.hpp"
+#include "files/files.hpp"
+#include "items/ItemDef.hpp"
+#include "logic/scripting/scripting.hpp"
+#include "objects/rigging.hpp"
+#include "typedefs.hpp"
+#include "util/listutil.hpp"
+#include "util/stringutil.hpp"
+#include "voxels/Block.hpp"
 #include "Content.hpp"
 #include "ContentBuilder.hpp"
 #include "ContentPack.hpp"

src/content/ContentLoader.hpp

@@ -1,5 +1,4 @@
-#ifndef CONTENT_CONTENT_LOADER_HPP_
-#define CONTENT_CONTENT_LOADER_HPP_
+#pragma once
 
 #include <filesystem>
 #include <memory>
@@ -64,5 +63,3 @@ public:
     void fixPackIndices();
     void load();
 };
-
-#endif  // CONTENT_CONTENT_LOADER_HPP_

src/content/ContentPack.cpp

@@ -4,10 +4,10 @@
 #include <iostream>
 #include <utility>
 
-#include <coders/json.hpp>
-#include <data/dynamic.hpp>
-#include <files/engine_paths.hpp>
-#include <files/files.hpp>
+#include "coders/json.hpp"
+#include "data/dynamic.hpp"
+#include "files/engine_paths.hpp"
+#include "files/files.hpp"
 
 namespace fs = std::filesystem;
 

src/content/ContentPack.hpp

@@ -1,12 +1,11 @@
-#ifndef CONTENT_CONTENT_PACK_HPP_
-#define CONTENT_CONTENT_PACK_HPP_
+#pragma once
 
 #include <filesystem>
 #include <stdexcept>
 #include <string>
 #include <vector>
 
-#include <typedefs.hpp>
+#include "typedefs.hpp"
 
 class EnginePaths;
 
@@ -115,5 +114,3 @@ public:
         return env;
     }
 };
-
-#endif  // CONTENT_CONTENT_PACK_HPP_

src/content/PacksManager.cpp

@@ -3,7 +3,7 @@
 #include <queue>
 #include <sstream>
 
-#include <util/listutil.hpp>
+#include "util/listutil.hpp"
 
 PacksManager::PacksManager() = default;
 

src/content/PacksManager.hpp

@@ -1,5 +1,4 @@
-#ifndef CONTENT_PACKS_MANAGER_HPP_
-#define CONTENT_PACKS_MANAGER_HPP_
+#pragma once
 
 #include <filesystem>
 #include <unordered_map>
@@ -47,5 +46,3 @@ public:
         const std::vector<ContentPack>& packs
     );
 };
-
-#endif  // CONTENT_PACKS_MANAGER_HPP_

src/content/content_fwd.hpp

@@ -1,7 +1,6 @@
-#ifndef CONTENT_CONTENT_FWD_HPP_
-#define CONTENT_CONTENT_FWD_HPP_
+#pragma once
 
-#include <typedefs.hpp>
+#include "typedefs.hpp"
 
 class Content;
 class ContentPackRuntime;
@@ -12,5 +11,3 @@ enum class ResourceType : size_t { CAMERA, LAST = CAMERA };
 
 inline constexpr auto RESOURCE_TYPES_COUNT =
     static_cast<size_t>(ResourceType::LAST) + 1;
-
-#endif  // CONTENT_CONTENT_FWD_HPP_

src/core_defs.cpp

@@ -1,14 +1,14 @@
 #include "core_defs.hpp"
 
-#include <items/ItemDef.hpp>
-#include <content/Content.hpp>
-#include <content/ContentBuilder.hpp>
-#include <files/files.hpp>
-#include <files/engine_paths.hpp>
-#include <window/Window.hpp>
-#include <window/Events.hpp>
-#include <window/input.hpp>
-#include <voxels/Block.hpp>
+#include "items/ItemDef.hpp"
+#include "content/Content.hpp"
+#include "content/ContentBuilder.hpp"
+#include "files/files.hpp"
+#include "files/engine_paths.hpp"
+#include "window/Window.hpp"
+#include "window/Events.hpp"
+#include "window/input.hpp"
+#include "voxels/Block.hpp"
 
 // All in-game definitions (blocks, items, etc..)
 void corecontent::setup(EnginePaths* paths, ContentBuilder* builder) {

src/core_defs.hpp

@@ -1,5 +1,4 @@
-#ifndef CORE_DEFS_HPP_
-#define CORE_DEFS_HPP_
+#pragma once
 
 #include <string>
 
@@ -34,5 +33,3 @@ class ContentBuilder;
 namespace corecontent {
     void setup(EnginePaths* paths, ContentBuilder* builder);
 }
-
-#endif // CORE_DEFS_HPP_

src/data/dynamic.cpp

@@ -1,6 +1,6 @@
 #include "dynamic.hpp"
 
-#include <coders/json.hpp>
+#include "coders/json.hpp"
 
 using namespace dynamic;
 

src/data/dynamic.hpp

@@ -1,5 +1,4 @@
-#ifndef DATA_DYNAMIC_HPP_
-#define DATA_DYNAMIC_HPP_
+#pragma once
 
 #include <cmath>
 #include <memory>
@@ -163,5 +162,3 @@ namespace dynamic {
 std::ostream& operator<<(std::ostream& stream, const dynamic::Value& value);
 std::ostream& operator<<(std::ostream& stream, const dynamic::Map_sptr& value);
 std::ostream& operator<<(std::ostream& stream, const dynamic::List_sptr& value);
-
-#endif  // DATA_DYNAMIC_HPP_

src/data/dynamic_fwd.hpp

@@ -1,12 +1,11 @@
-#ifndef DATA_DYNAMIC_FWD_HPP_
-#define DATA_DYNAMIC_FWD_HPP_
+#pragma once
 
 #include <functional>
 #include <memory>
 #include <string>
 #include <variant>
 
-#include <typedefs.hpp>
+#include "typedefs.hpp"
 
 namespace dynamic {
     class Map;
@@ -30,5 +29,3 @@ namespace dynamic {
 
     using to_string_func = std::function<std::string(const Value&)>;
 }
-
-#endif  // DATA_DYNAMIC_FWD_HPP_

src/data/dynamic_util.hpp

@@ -1,5 +1,4 @@
-#ifndef DATA_DYNAMIC_UTIL_HPP_
-#define DATA_DYNAMIC_UTIL_HPP_
+#pragma once
 
 #include <glm/glm.hpp>
 
@@ -78,5 +77,3 @@ namespace dynamic {
         }
     }
 }
-
-#endif  // DATA_DYNAMIC_UTIL_HPP_

src/data/setting.cpp

@@ -1,6 +1,6 @@
 #include "setting.hpp"
 
-#include <util/stringutil.hpp>
+#include "util/stringutil.hpp"
 
 std::string NumberSetting::toString() const {
     switch (getFormat()) {

src/data/setting.hpp

@@ -1,13 +1,12 @@
-#ifndef DATA_SETTING_HPP_
-#define DATA_SETTING_HPP_
+#pragma once
 
 #include <limits>
 #include <string>
 #include <unordered_map>
 #include <vector>
 
-#include <delegates.hpp>
-#include <typedefs.hpp>
+#include "delegates.hpp"
+#include "typedefs.hpp"
 
 enum class setting_format { simple, percent };
 
@@ -174,5 +173,3 @@ public:
 
     virtual std::string toString() const override;
 };
-
-#endif  // DATA_SETTING_HPP_

src/debug/Logger.hpp

@@ -1,5 +1,4 @@
-#ifndef DEBUG_LOGGER_HPP_
-#define DEBUG_LOGGER_HPP_
+#pragma once
 
 #include <fstream>
 #include <mutex>
@@ -63,5 +62,3 @@ namespace debug {
         }
     };
 }
-
-#endif  // DEBUG_LOGGER_HPP_

src/delegates.hpp

@@ -1,5 +1,4 @@
-#ifndef DELEGATES_HPP_
-#define DELEGATES_HPP_
+#pragma once
 
 #include <glm/glm.hpp>
 #include <functional>
@@ -21,5 +20,3 @@ using doubleconsumer = std::function<void(double)>;
 using boolconsumer = std::function<void(bool)>;
 using int_array_consumer = std::function<void(const int[], size_t)>;
 using wstringchecker = std::function<bool(const std::wstring&)>;
-
-#endif // DELEGATES_HPP_

src/engine.cpp

@@ -2,42 +2,42 @@
 
 #define GLEW_STATIC
 
-#include <debug/Logger.hpp>
-#include <assets/AssetsLoader.hpp>
-#include <audio/audio.hpp>
-#include <coders/GLSLExtension.hpp>
-#include <coders/imageio.hpp>
-#include <coders/json.hpp>
-#include <coders/toml.hpp>
-#include <content/Content.hpp>
-#include <content/ContentBuilder.hpp>
-#include <content/ContentLoader.hpp>
-#include <core_defs.hpp>
-#include <files/files.hpp>
-#include <files/settings_io.hpp>
-#include <frontend/locale.hpp>
-#include <frontend/menu.hpp>
-#include <frontend/screens/Screen.hpp>
-#include <frontend/screens/MenuScreen.hpp>
-#include <graphics/core/Batch2D.hpp>
-#include <graphics/core/DrawContext.hpp>
-#include <graphics/core/ImageData.hpp>
-#include <graphics/core/Shader.hpp>
-#include <graphics/ui/GUI.hpp>
-#include <objects/rigging.hpp>
-#include <logic/EngineController.hpp>
-#include <logic/CommandsInterpreter.hpp>
-#include <logic/scripting/scripting.hpp>
-#include <util/listutil.hpp>
-#include <util/platform.hpp>
-#include <voxels/DefaultWorldGenerator.hpp>
-#include <voxels/FlatWorldGenerator.hpp>
-#include <window/Camera.hpp>
-#include <window/Events.hpp>
-#include <window/input.hpp>
-#include <window/Window.hpp>
-#include <world/WorldGenerators.hpp>
-#include <settings.hpp>
+#include "debug/Logger.hpp"
+#include "assets/AssetsLoader.hpp"
+#include "audio/audio.hpp"
+#include "coders/GLSLExtension.hpp"
+#include "coders/imageio.hpp"
+#include "coders/json.hpp"
+#include "coders/toml.hpp"
+#include "content/Content.hpp"
+#include "content/ContentBuilder.hpp"
+#include "content/ContentLoader.hpp"
+#include "core_defs.hpp"
+#include "files/files.hpp"
+#include "files/settings_io.hpp"
+#include "frontend/locale.hpp"
+#include "frontend/menu.hpp"
+#include "frontend/screens/Screen.hpp"
+#include "frontend/screens/MenuScreen.hpp"
+#include "graphics/core/Batch2D.hpp"
+#include "graphics/core/DrawContext.hpp"
+#include "graphics/core/ImageData.hpp"
+#include "graphics/core/Shader.hpp"
+#include "graphics/ui/GUI.hpp"
+#include "objects/rigging.hpp"
+#include "logic/EngineController.hpp"
+#include "logic/CommandsInterpreter.hpp"
+#include "logic/scripting/scripting.hpp"
+#include "util/listutil.hpp"
+#include "util/platform.hpp"
+#include "voxels/DefaultWorldGenerator.hpp"
+#include "voxels/FlatWorldGenerator.hpp"
+#include "window/Camera.hpp"
+#include "window/Events.hpp"
+#include "window/input.hpp"
+#include "window/Window.hpp"
+#include "world/WorldGenerators.hpp"
+#include "settings.hpp"
 
 #include <iostream>
 #include <assert.h>

src/engine.hpp

@@ -1,15 +1,14 @@
-#ifndef ENGINE_HPP_
-#define ENGINE_HPP_
+#pragma once
 
-#include <delegates.hpp>
-#include <typedefs.hpp>
+#include "delegates.hpp"
+#include "typedefs.hpp"
 
-#include <assets/Assets.hpp>
-#include <content/content_fwd.hpp>
-#include <content/ContentPack.hpp>
-#include <content/PacksManager.hpp>
-#include <files/engine_paths.hpp>
-#include <util/ObjectsKeeper.hpp>
+#include "assets/Assets.hpp"
+#include "content/content_fwd.hpp"
+#include "content/ContentPack.hpp"
+#include "content/PacksManager.hpp"
+#include "files/engine_paths.hpp"
+#include "util/ObjectsKeeper.hpp"
 
 #include <filesystem>
 #include <memory>
@@ -148,5 +147,3 @@ public:
 
     SettingsHandler& getSettingsHandler();
 };
-
-#endif // ENGINE_HPP_

src/files/WorldConverter.cpp

@@ -5,13 +5,13 @@
 #include <stdexcept>
 #include <utility>
 
-#include <content/ContentLUT.hpp>
-#include <data/dynamic.hpp>
-#include <debug/Logger.hpp>
-#include <files/files.hpp>
-#include <objects/Player.hpp>
-#include <util/ThreadPool.hpp>
-#include <voxels/Chunk.hpp>
+#include "content/ContentLUT.hpp"
+#include "data/dynamic.hpp"
+#include "debug/Logger.hpp"
+#include "files/files.hpp"
+#include "objects/Player.hpp"
+#include "util/ThreadPool.hpp"
+#include "voxels/Chunk.hpp"
 #include "WorldFiles.hpp"
 
 namespace fs = std::filesystem;

src/files/WorldConverter.hpp

@@ -1,13 +1,12 @@
-#ifndef FILES_WORLD_CONVERTER_HPP_
-#define FILES_WORLD_CONVERTER_HPP_
+#pragma once
 
 #include <filesystem>
 #include <memory>
 #include <queue>
 
-#include <delegates.hpp>
-#include <interfaces/Task.hpp>
-#include <typedefs.hpp>
+#include "delegates.hpp"
+#include "interfaces/Task.hpp"
+#include "typedefs.hpp"
 
 namespace fs = std::filesystem;
 
@@ -61,4 +60,3 @@ public:
     );
 };
 
-#endif  // FILES_WORLD_CONVERTER_HPP_

src/files/WorldFiles.cpp

@@ -8,28 +8,28 @@
 #include <sstream>
 #include <utility>
 
-#include <coders/byte_utils.hpp>
-#include <coders/json.hpp>
-#include <constants.hpp>
-#include <content/Content.hpp>
-#include <core_defs.hpp>
-#include <data/dynamic.hpp>
-#include <debug/Logger.hpp>
-#include <items/Inventory.hpp>
-#include <items/ItemDef.hpp>
-#include <lighting/Lightmap.hpp>
-#include <maths/voxmaths.hpp>
-#include <objects/EntityDef.hpp>
-#include <objects/Player.hpp>
-#include <physics/Hitbox.hpp>
-#include <settings.hpp>
-#include <typedefs.hpp>
-#include <util/data_io.hpp>
-#include <voxels/Block.hpp>
-#include <voxels/Chunk.hpp>
-#include <voxels/voxel.hpp>
-#include <window/Camera.hpp>
-#include <world/World.hpp>
+#include "coders/byte_utils.hpp"
+#include "coders/json.hpp"
+#include "constants.hpp"
+#include "content/Content.hpp"
+#include "core_defs.hpp"
+#include "data/dynamic.hpp"
+#include "debug/Logger.hpp"
+#include "items/Inventory.hpp"
+#include "items/ItemDef.hpp"
+#include "lighting/Lightmap.hpp"
+#include "maths/voxmaths.hpp"
+#include "objects/EntityDef.hpp"
+#include "objects/Player.hpp"
+#include "physics/Hitbox.hpp"
+#include "settings.hpp"
+#include "typedefs.hpp"
+#include "util/data_io.hpp"
+#include "voxels/Block.hpp"
+#include "voxels/Chunk.hpp"
+#include "voxels/voxel.hpp"
+#include "window/Camera.hpp"
+#include "world/World.hpp"
 
 #define WORLD_FORMAT_MAGIC ".VOXWLD"
 

src/files/WorldFiles.hpp

@@ -1,5 +1,4 @@
-#ifndef FILES_WORLD_FILES_HPP_
-#define FILES_WORLD_FILES_HPP_
+#pragma once
 
 #include <filesystem>
 #include <glm/glm.hpp>
@@ -7,13 +6,13 @@
 #include <string>
 #include <vector>
 
-#include <content/ContentPack.hpp>
-#include <typedefs.hpp>
-#include <voxels/Chunk.hpp>
+#include "content/ContentPack.hpp"
+#include "typedefs.hpp"
+#include "voxels/Chunk.hpp"
 #include "WorldRegions.hpp"
 #include "files.hpp"
 #define GLM_ENABLE_EXPERIMENTAL
-#include "glm/gtx/hash.hpp"
+#include <glm/gtx/hash.hpp>
 
 inline constexpr uint WORLD_FORMAT_VERSION = 1;
 
@@ -72,5 +71,3 @@ public:
         return doWriteLights;
     }
 };
-
-#endif  // FILES_WORLD_FILES_HPP_

src/files/WorldRegions.cpp

@@ -4,12 +4,12 @@
 #include <utility>
 #include <vector>
 
-#include <coders/byte_utils.hpp>
-#include <coders/rle.hpp>
-#include <data/dynamic.hpp>
-#include <items/Inventory.hpp>
-#include <maths/voxmaths.hpp>
-#include <util/data_io.hpp>
+#include "coders/byte_utils.hpp"
+#include "coders/rle.hpp"
+#include "data/dynamic.hpp"
+#include "items/Inventory.hpp"
+#include "maths/voxmaths.hpp"
+#include "util/data_io.hpp"
 
 #define REGION_FORMAT_MAGIC ".VOXREG"
 

src/files/WorldRegions.hpp

@@ -1,5 +1,4 @@
-#ifndef FILES_WORLD_REGIONS_HPP_
-#define FILES_WORLD_REGIONS_HPP_
+#pragma once
 
 #include <condition_variable>
 #include <filesystem>
@@ -9,13 +8,14 @@
 #include <mutex>
 #include <unordered_map>
 
-#include <data/dynamic_fwd.hpp>
-#include <typedefs.hpp>
-#include <util/BufferPool.hpp>
-#include <voxels/Chunk.hpp>
+#include "data/dynamic_fwd.hpp"
+#include "typedefs.hpp"
+#include "util/BufferPool.hpp"
+#include "voxels/Chunk.hpp"
 #include "files.hpp"
+
 #define GLM_ENABLE_EXPERIMENTAL
-#include "glm/gtx/hash.hpp"
+#include <glm/gtx/hash.hpp>
 
 namespace fs = std::filesystem;
 
@@ -213,5 +213,3 @@ public:
     /// @return false if std::invalid_argument or std::out_of_range occurred
     static bool parseRegionFilename(const std::string& name, int& x, int& y);
 };
-
-#endif  // FILES_WORLD_REGIONS_HPP_

src/files/engine_paths.cpp

@@ -5,8 +5,8 @@
 #include <filesystem>
 #include <sstream>
 #include <stack>
-#include <typedefs.hpp>
-#include <util/stringutil.hpp>
+#include "typedefs.hpp"
+#include "util/stringutil.hpp"
 #include <utility>
 
 #include "WorldFiles.hpp"

src/files/engine_paths.hpp

@@ -1,12 +1,11 @@
-#ifndef FILES_ENGINE_PATHS_HPP_
-#define FILES_ENGINE_PATHS_HPP_
+#pragma once
 
 #include <filesystem>
 #include <stdexcept>
 #include <string>
 #include <vector>
 
-#include <content/ContentPack.hpp>
+#include "content/ContentPack.hpp"
 
 
 class files_access_error : public std::runtime_error {
@@ -68,5 +67,3 @@ private:
     std::filesystem::path mainRoot;
     std::vector<PathsRoot> roots;
 };
-
-#endif  // FILES_ENGINE_PATHS_HPP_

src/files/files.cpp

@@ -7,12 +7,12 @@
 #include <memory>
 #include <stdexcept>
 
-#include <coders/commons.hpp>
-#include <coders/gzip.hpp>
-#include <coders/json.hpp>
-#include <coders/toml.hpp>
-#include <data/dynamic.hpp>
-#include <util/stringutil.hpp>
+#include "coders/commons.hpp"
+#include "coders/gzip.hpp"
+#include "coders/json.hpp"
+#include "coders/toml.hpp"
+#include "data/dynamic.hpp"
+#include "util/stringutil.hpp"
 
 namespace fs = std::filesystem;
 

src/files/files.hpp

@@ -1,5 +1,4 @@
-#ifndef FILES_FILES_HPP_
-#define FILES_FILES_HPP_
+#pragma once
 
 #include <filesystem>
 #include <fstream>
@@ -7,7 +6,7 @@
 #include <string>
 #include <vector>
 
-#include <typedefs.hpp>
+#include "typedefs.hpp"
 
 namespace fs = std::filesystem;
 
@@ -71,5 +70,3 @@ namespace files {
     std::shared_ptr<dynamic::Map> read_toml(const fs::path& file);
     std::vector<std::string> read_list(const fs::path& file);
 }
-
-#endif /* FILES_FILES_HPP_ */

src/files/settings_io.cpp

@@ -3,12 +3,12 @@
 #include <memory>
 #include <utility>
 
-#include <coders/json.hpp>
-#include <coders/toml.hpp>
-#include <debug/Logger.hpp>
-#include <settings.hpp>
-#include <window/Events.hpp>
-#include <window/input.hpp>
+#include "coders/json.hpp"
+#include "coders/toml.hpp"
+#include "debug/Logger.hpp"
+#include "settings.hpp"
+#include "window/Events.hpp"
+#include "window/input.hpp"
 
 static debug::Logger logger("settings_io");
 

src/files/settings_io.hpp

@@ -1,12 +1,11 @@
-#ifndef FILES_SETTINGS_IO_HPP_
-#define FILES_SETTINGS_IO_HPP_
+#pragma once
 
 #include <memory>
 #include <string>
 #include <unordered_map>
 #include <vector>
 
-#include <data/dynamic.hpp>
+#include "data/dynamic.hpp"
 
 class Setting;
 struct EngineSettings;
@@ -30,5 +29,3 @@ public:
 
     std::vector<Section>& getSections();
 };
-
-#endif  // FILES_SETTINGS_IO_HPP_

src/frontend/ContentGfxCache.cpp

@@ -2,13 +2,13 @@
 
 #include "UiDocument.hpp"
 
-#include <assets/Assets.hpp>
-#include <content/Content.hpp>
-#include <content/ContentPack.hpp>
-#include <core_defs.hpp>
-#include <graphics/core/Atlas.hpp>
-#include <maths/UVRegion.hpp>
-#include <voxels/Block.hpp>
+#include "assets/Assets.hpp"
+#include "content/Content.hpp"
+#include "content/ContentPack.hpp"
+#include "core_defs.hpp"
+#include "graphics/core/Atlas.hpp"
+#include "maths/UVRegion.hpp"
+#include "voxels/Block.hpp"
 
 #include <string>
 

src/frontend/ContentGfxCache.hpp

@@ -1,7 +1,6 @@
-#ifndef FRONTEND_BLOCKS_GFX_CACHE_HPP_
-#define FRONTEND_BLOCKS_GFX_CACHE_HPP_
+#pragma once
 
-#include <typedefs.hpp>
+#include "typedefs.hpp"
 
 #include <memory>
 
@@ -23,5 +22,3 @@ public:
     
     const Content* getContent() const;
 };
-
-#endif // FRONTEND_BLOCKS_GFX_CACHE_HPP_

src/frontend/LevelFrontend.cpp

@@ -2,16 +2,16 @@
 
 #include "ContentGfxCache.hpp"
 
-#include <assets/Assets.hpp>
-#include <audio/audio.hpp>
-#include <content/Content.hpp>
-#include <graphics/core/Atlas.hpp>
-#include <graphics/render/BlocksPreview.hpp>
-#include <logic/LevelController.hpp>
-#include <logic/PlayerController.hpp>
-#include <objects/Player.hpp>
-#include <voxels/Block.hpp>
-#include <world/Level.hpp>
+#include "assets/Assets.hpp"
+#include "audio/audio.hpp"
+#include "content/Content.hpp"
+#include "graphics/core/Atlas.hpp"
+#include "graphics/render/BlocksPreview.hpp"
+#include "logic/LevelController.hpp"
+#include "logic/PlayerController.hpp"
+#include "objects/Player.hpp"
+#include "voxels/Block.hpp"
+#include "world/Level.hpp"
 
 LevelFrontend::LevelFrontend(
     Player* currentPlayer, LevelController* controller, Assets* assets

src/frontend/LevelFrontend.hpp

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

src/frontend/UiDocument.cpp

@@ -2,11 +2,11 @@
 
 #include <utility>
 
-#include <files/files.hpp>
-#include <graphics/ui/elements/UINode.hpp>
-#include <graphics/ui/elements/InventoryView.hpp>
-#include <graphics/ui/gui_xml.hpp>
-#include <logic/scripting/scripting.hpp>
+#include "files/files.hpp"
+#include "graphics/ui/elements/UINode.hpp"
+#include "graphics/ui/elements/InventoryView.hpp"
+#include "graphics/ui/gui_xml.hpp"
+#include "logic/scripting/scripting.hpp"
 
 UiDocument::UiDocument(
     std::string id, 

src/frontend/UiDocument.hpp

@@ -1,7 +1,6 @@
-#ifndef FRONTEND_UI_DOCUMENT_HPP_
-#define FRONTEND_UI_DOCUMENT_HPP_
+#pragma once
 
-#include <typedefs.hpp>
+#include "typedefs.hpp"
 
 #include <string>
 #include <memory>
@@ -49,5 +48,3 @@ public:
     static std::unique_ptr<UiDocument> read(const scriptenv& parent_env, const std::string& name, const fs::path& file);
     static std::shared_ptr<gui::UINode> readElement(const fs::path& file);
 };
-
-#endif // FRONTEND_UI_DOCUMENT_HPP_

src/frontend/debug_panel.cpp

@@ -1,25 +1,25 @@
-#include <audio/audio.hpp>
-#include <delegates.hpp>
-#include <engine.hpp>
-#include <settings.hpp>
-#include <content/Content.hpp>
-#include <graphics/core/Mesh.hpp>
-#include <graphics/ui/elements/CheckBox.hpp>
-#include <graphics/ui/elements/TextBox.hpp>
-#include <graphics/ui/elements/TrackBar.hpp>
-#include <graphics/ui/elements/InputBindBox.hpp>
-#include <graphics/render/WorldRenderer.hpp>
-#include <logic/scripting/scripting.hpp>
-#include <objects/Player.hpp>
-#include <objects/Entities.hpp>
-#include <objects/EntityDef.hpp>
-#include <physics/Hitbox.hpp>
-#include <util/stringutil.hpp>
-#include <voxels/Block.hpp>
-#include <voxels/Chunk.hpp>
-#include <voxels/Chunks.hpp>
-#include <world/Level.hpp>
-#include <world/World.hpp>
+#include "audio/audio.hpp"
+#include "delegates.hpp"
+#include "engine.hpp"
+#include "settings.hpp"
+#include "content/Content.hpp"
+#include "graphics/core/Mesh.hpp"
+#include "graphics/ui/elements/CheckBox.hpp"
+#include "graphics/ui/elements/TextBox.hpp"
+#include "graphics/ui/elements/TrackBar.hpp"
+#include "graphics/ui/elements/InputBindBox.hpp"
+#include "graphics/render/WorldRenderer.hpp"
+#include "logic/scripting/scripting.hpp"
+#include "objects/Player.hpp"
+#include "objects/Entities.hpp"
+#include "objects/EntityDef.hpp"
+#include "physics/Hitbox.hpp"
+#include "util/stringutil.hpp"
+#include "voxels/Block.hpp"
+#include "voxels/Chunk.hpp"
+#include "voxels/Chunks.hpp"
+#include "world/Level.hpp"
+#include "world/World.hpp"
 
 #include <string>
 #include <memory>

src/frontend/hud.cpp

@@ -4,45 +4,45 @@
 #include "LevelFrontend.hpp"
 #include "UiDocument.hpp"
 
-#include <assets/Assets.hpp>
-#include <content/Content.hpp>
-#include <core_defs.hpp>
-#include <delegates.hpp>
-#include <engine.hpp>
-#include <graphics/core/Atlas.hpp>
-#include <graphics/core/Batch2D.hpp>
-#include <graphics/core/Batch3D.hpp>
-#include <graphics/core/DrawContext.hpp>
-#include <graphics/core/Font.hpp>
-#include <graphics/core/Mesh.hpp>
-#include <graphics/core/Shader.hpp>
-#include <graphics/core/Texture.hpp>
-#include <graphics/render/WorldRenderer.hpp>
-#include <graphics/ui/elements/InventoryView.hpp>
-#include <graphics/ui/elements/Menu.hpp>
-#include <graphics/ui/elements/Panel.hpp>
-#include <graphics/ui/elements/Plotter.hpp>
-#include <graphics/ui/elements/UINode.hpp>
-#include <graphics/ui/gui_util.hpp>
-#include <graphics/ui/GUI.hpp>
-#include <items/Inventories.hpp>
-#include <items/Inventory.hpp>
-#include <items/ItemDef.hpp>
-#include <logic/scripting/scripting.hpp>
-#include <maths/voxmaths.hpp>
-#include <objects/Player.hpp>
-#include <physics/Hitbox.hpp>
-#include <typedefs.hpp>
-#include <util/stringutil.hpp>
-#include <voxels/Block.hpp>
-#include <voxels/Chunk.hpp>
-#include <voxels/Chunks.hpp>
-#include <window/Camera.hpp>
-#include <window/Events.hpp>
-#include <window/input.hpp>
-#include <window/Window.hpp>
-#include <world/Level.hpp>
-#include <world/World.hpp>
+#include "assets/Assets.hpp"
+#include "content/Content.hpp"
+#include "core_defs.hpp"
+#include "delegates.hpp"
+#include "engine.hpp"
+#include "graphics/core/Atlas.hpp"
+#include "graphics/core/Batch2D.hpp"
+#include "graphics/core/Batch3D.hpp"
+#include "graphics/core/DrawContext.hpp"
+#include "graphics/core/Font.hpp"
+#include "graphics/core/Mesh.hpp"
+#include "graphics/core/Shader.hpp"
+#include "graphics/core/Texture.hpp"
+#include "graphics/render/WorldRenderer.hpp"
+#include "graphics/ui/elements/InventoryView.hpp"
+#include "graphics/ui/elements/Menu.hpp"
+#include "graphics/ui/elements/Panel.hpp"
+#include "graphics/ui/elements/Plotter.hpp"
+#include "graphics/ui/elements/UINode.hpp"
+#include "graphics/ui/gui_util.hpp"
+#include "graphics/ui/GUI.hpp"
+#include "items/Inventories.hpp"
+#include "items/Inventory.hpp"
+#include "items/ItemDef.hpp"
+#include "logic/scripting/scripting.hpp"
+#include "maths/voxmaths.hpp"
+#include "objects/Player.hpp"
+#include "physics/Hitbox.hpp"
+#include "typedefs.hpp"
+#include "util/stringutil.hpp"
+#include "voxels/Block.hpp"
+#include "voxels/Chunk.hpp"
+#include "voxels/Chunks.hpp"
+#include "window/Camera.hpp"
+#include "window/Events.hpp"
+#include "window/input.hpp"
+#include "window/Window.hpp"
+#include "world/Level.hpp"
+#include "world/World.hpp"
 
 #include <assert.h>
 #include <memory>

src/frontend/hud.hpp

@@ -1,8 +1,7 @@
-#ifndef FRONTEND_HUD_HPP_
-#define FRONTEND_HUD_HPP_
+#pragma once
 
-#include <typedefs.hpp>
-#include <util/ObjectsKeeper.hpp>
+#include "typedefs.hpp"
+#include "util/ObjectsKeeper.hpp"
 
 #include <string>
 #include <memory>
@@ -169,5 +168,3 @@ public:
 
     std::shared_ptr<Inventory> getBlockInventory();
 };
-
-#endif // FRONTEND_HUD_HPP_

src/frontend/locale.cpp

@@ -2,13 +2,13 @@
 
 #include <utility>
 
-#include <coders/json.hpp>
-#include <coders/commons.hpp>
-#include <content/ContentPack.hpp>
-#include <files/files.hpp>
-#include <util/stringutil.hpp>
-#include <data/dynamic.hpp>
-#include <debug/Logger.hpp>
+#include "coders/json.hpp"
+#include "coders/commons.hpp"
+#include "content/ContentPack.hpp"
+#include "files/files.hpp"
+#include "util/stringutil.hpp"
+#include "data/dynamic.hpp"
+#include "debug/Logger.hpp"
 
 static debug::Logger logger("locale");
 

src/frontend/locale.hpp

@@ -1,5 +1,4 @@
-#ifndef FRONTEND_LOCALES_HPP_
-#define FRONTEND_LOCALES_HPP_
+#pragma once
 
 #include <string>
 #include <vector>
@@ -68,5 +67,3 @@ namespace langs {
                       std::string locale,
                       const std::vector<ContentPack>& packs);
 }
-
-#endif // FRONTEND_LOCALES_HPP_

src/frontend/menu.cpp

@@ -4,19 +4,19 @@
 #include "UiDocument.hpp"
 #include "screens/MenuScreen.hpp"
 
-#include <delegates.hpp>
-#include <engine.hpp>
-#include <data/dynamic.hpp>
-#include <interfaces/Task.hpp>
-#include <files/engine_paths.hpp>
-#include <graphics/ui/elements/Menu.hpp>
-#include <graphics/ui/gui_util.hpp>
-#include <graphics/ui/GUI.hpp>
-#include <logic/scripting/scripting.hpp>
-#include <settings.hpp>
-#include <coders/commons.hpp>
-#include <util/stringutil.hpp>
-#include <window/Window.hpp>
+#include "delegates.hpp"
+#include "engine.hpp"
+#include "data/dynamic.hpp"
+#include "interfaces/Task.hpp"
+#include "files/engine_paths.hpp"
+#include "graphics/ui/elements/Menu.hpp"
+#include "graphics/ui/gui_util.hpp"
+#include "graphics/ui/GUI.hpp"
+#include "logic/scripting/scripting.hpp"
+#include "settings.hpp"
+#include "coders/commons.hpp"
+#include "util/stringutil.hpp"
+#include "window/Window.hpp"
 
 #include <filesystem>
 #include <glm/glm.hpp>

src/frontend/menu.hpp

@@ -1,8 +1,7 @@
-#ifndef FRONTEND_MENU_MENU_HPP_
-#define FRONTEND_MENU_MENU_HPP_
+#pragma once
 
-#include <data/dynamic.hpp>
-#include <graphics/ui/elements/Menu.hpp>
+#include "data/dynamic.hpp"
+#include "graphics/ui/elements/Menu.hpp"
 
 #include <string>
 #include <vector>
@@ -29,5 +28,3 @@ namespace menus {
 
     bool call(Engine* engine, runnable func);
 }
-
-#endif // FRONTEND_MENU_MENU_HPP_

src/frontend/screens/LevelScreen.cpp

@@ -1,31 +1,31 @@
 #include "LevelScreen.hpp"
 
-#include <core_defs.hpp>
-#include <frontend/hud.hpp>
-#include <frontend/LevelFrontend.hpp>
-#include <audio/audio.hpp>
-#include <coders/imageio.hpp>
-#include <debug/Logger.hpp>
-#include <engine.hpp>
-#include <files/files.hpp>
-#include <content/Content.hpp>
-#include <graphics/core/DrawContext.hpp>
-#include <graphics/core/ImageData.hpp>
-#include <graphics/core/PostProcessing.hpp>
-#include <graphics/core/Viewport.hpp>
-#include <graphics/render/WorldRenderer.hpp>
-#include <graphics/ui/elements/Menu.hpp>
-#include <graphics/ui/GUI.hpp>
-#include <logic/LevelController.hpp>
-#include <logic/scripting/scripting_hud.hpp>
-#include <util/stringutil.hpp>
-#include <physics/Hitbox.hpp>
-#include <voxels/Chunks.hpp>
-#include <window/Camera.hpp>
-#include <window/Events.hpp>
-#include <window/Window.hpp>
-#include <world/Level.hpp>
-#include <world/World.hpp>
+#include "core_defs.hpp"
+#include "frontend/hud.hpp"
+#include "frontend/LevelFrontend.hpp"
+#include "audio/audio.hpp"
+#include "coders/imageio.hpp"
+#include "debug/Logger.hpp"
+#include "engine.hpp"
+#include "files/files.hpp"
+#include "content/Content.hpp"
+#include "graphics/core/DrawContext.hpp"
+#include "graphics/core/ImageData.hpp"
+#include "graphics/core/PostProcessing.hpp"
+#include "graphics/core/Viewport.hpp"
+#include "graphics/render/WorldRenderer.hpp"
+#include "graphics/ui/elements/Menu.hpp"
+#include "graphics/ui/GUI.hpp"
+#include "logic/LevelController.hpp"
+#include "logic/scripting/scripting_hud.hpp"
+#include "util/stringutil.hpp"
+#include "physics/Hitbox.hpp"
+#include "voxels/Chunks.hpp"
+#include "window/Camera.hpp"
+#include "window/Events.hpp"
+#include "window/Window.hpp"
+#include "world/Level.hpp"
+#include "world/World.hpp"
 
 static debug::Logger logger("level-screen");
 

src/frontend/screens/LevelScreen.hpp

@@ -1,5 +1,4 @@
-#ifndef FRONTEND_SCREENS_LEVEL_SCREEN_HPP_
-#define FRONTEND_SCREENS_LEVEL_SCREEN_HPP_
+#pragma once
 
 #include "Screen.hpp"
 
@@ -40,5 +39,3 @@ public:
 
     LevelController* getLevelController() const;
 };
-
-#endif // FRONTEND_SCREENS_LEVEL_SCREEN_HPP_

src/frontend/screens/MenuScreen.cpp

@@ -1,14 +1,14 @@
 #include "MenuScreen.hpp"
 
-#include <graphics/ui/GUI.hpp>
-#include <graphics/ui/elements/Menu.hpp>
-#include <graphics/core/Batch2D.hpp>
-#include <graphics/core/Shader.hpp>
-#include <graphics/core/Texture.hpp>
-#include <maths/UVRegion.hpp>
-#include <window/Window.hpp>
-#include <window/Camera.hpp>
-#include <engine.hpp>
+#include "graphics/ui/GUI.hpp"
+#include "graphics/ui/elements/Menu.hpp"
+#include "graphics/core/Batch2D.hpp"
+#include "graphics/core/Shader.hpp"
+#include "graphics/core/Texture.hpp"
+#include "maths/UVRegion.hpp"
+#include "window/Window.hpp"
+#include "window/Camera.hpp"
+#include "engine.hpp"
 
 MenuScreen::MenuScreen(Engine* engine) : Screen(engine) {
     engine->resetContent();

src/frontend/screens/MenuScreen.hpp

@@ -1,5 +1,4 @@
-#ifndef FRONTEND_SCREENS_MENU_SCREEN_HPP_
-#define FRONTEND_SCREENS_MENU_SCREEN_HPP_
+#pragma once
 
 #include "Screen.hpp"
 
@@ -17,6 +16,3 @@ public:
     void update(float delta) override;
     void draw(float delta) override;
 };
-
-
-#endif // FRONTEND_SCREENS_MENU_SCREEN_HPP_

src/frontend/screens/Screen.cpp

@@ -1,7 +1,7 @@
 #include "Screen.hpp"
 
-#include <graphics/core/Batch2D.hpp>
-#include <engine.hpp>
+#include "graphics/core/Batch2D.hpp"
+#include "engine.hpp"
 
 Screen::Screen(Engine* engine)
   : engine(engine), 

src/frontend/screens/Screen.hpp

@@ -1,7 +1,6 @@
-#ifndef FRONTEND_SCREENS_SCREEN_HPP_
-#define FRONTEND_SCREENS_SCREEN_HPP_
+#pragma once
 
-#include <util/ObjectsKeeper.hpp>
+#include "util/ObjectsKeeper.hpp"
 
 class Engine;
 class Batch2D;
@@ -18,5 +17,3 @@ public:
     virtual void draw(float delta) = 0;
     virtual void onEngineShutdown() {};
 };
-
-#endif // FRONTEND_SCREENS_SCREEN_HPP_

src/graphics/core/Atlas.cpp

@@ -2,7 +2,7 @@
 
 #include "Texture.hpp"
 #include "ImageData.hpp"
-#include <maths/LMPacker.hpp>
+#include "maths/LMPacker.hpp"
 
 #include <stdexcept>
 

src/graphics/core/Atlas.hpp

@@ -1,5 +1,4 @@
-#ifndef GRAPHICS_CORE_ATLAS_HPP_
-#define GRAPHICS_CORE_ATLAS_HPP_
+#pragma once
 
 #include <set>
 #include <string>
@@ -7,8 +6,9 @@
 #include <vector>
 #include <optional>
 #include <unordered_map>
-#include <maths/UVRegion.hpp>
-#include <typedefs.hpp>
+
+#include "maths/UVRegion.hpp"
+#include "typedefs.hpp"
 
 class ImageData;
 class Texture;
@@ -59,5 +59,3 @@ public:
     /// @param maxResolution max atlas resolution
     std::unique_ptr<Atlas> build(uint extrusion, bool prepare=true, uint maxResolution=0);
 };
-
-#endif // GRAPHICS_CORE_ATLAS_HPP_

src/graphics/core/Batch2D.cpp

@@ -2,7 +2,7 @@
 #include "Mesh.hpp"
 #include "Texture.hpp"
 #include "gl_util.hpp"
-#include <maths/UVRegion.hpp>
+#include "maths/UVRegion.hpp"
 
 #include <GL/glew.h>
 

src/graphics/core/Batch2D.hpp

@@ -1,12 +1,11 @@
-#ifndef GRAPHICS_CORE_BATCH2D_HPP_
-#define GRAPHICS_CORE_BATCH2D_HPP_
+#pragma once
 
 #include <memory>
 #include <stdlib.h>
 #include <glm/glm.hpp>
 
 #include "commons.hpp"
-#include <maths/UVRegion.hpp>
+#include "maths/UVRegion.hpp"
 
 class Mesh;
 class Texture;
@@ -93,5 +92,3 @@ public:
 
     void lineWidth(float width);
 };
-
-#endif // GRAPHICS_CORE_BATCH2D_HPP_

src/graphics/core/Batch3D.cpp

@@ -4,8 +4,8 @@
 #include "Texture.hpp"
 
 #include <GL/glew.h>
-#include <typedefs.hpp>
-#include <maths/UVRegion.hpp>
+#include "typedefs.hpp"
+#include "maths/UVRegion.hpp"
 
 /// xyz, uv, rgba
 inline constexpr uint B3D_VERTEX_SIZE = 9;