replace include guards with pragma once

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>
@@ -113,5 +112,3 @@ void assetload::assets_setup(const Assets* assets) {
         }
     }
 }
-
-#endif  // ASSETS_ASSETS_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>
@@ -104,5 +103,3 @@ public:
         const std::vector<std::filesystem::path>& alternatives
     );
 };
-
-#endif  // ASSETS_ASSETS_LOADER_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.hpp

@@ -1,5 +1,4 @@
-#ifndef SRC_AUDIO_AUDIO_HPP_
-#define SRC_AUDIO_AUDIO_HPP_
+#pragma once
 
 #include <glm/glm.hpp>
 #include <queue>
@@ -178,5 +177,3 @@ namespace audio {
         static std::unique_ptr<ALAudio> create();
     };
 }
-
-#endif  // SRC_AUDIO_AUDIO_HPP_

src/audio/AL/alutil.hpp

@@ -1,5 +1,4 @@
-#ifndef AUDIO_AUDIOUTIL_HPP_
-#define AUDIO_AUDIOUTIL_HPP_
+#pragma once
 
 #include <cstdint>
 #include <string>
@@ -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.hpp

@@ -1,5 +1,4 @@
-#ifndef AUDIO_AUDIO_HPP_
-#define AUDIO_AUDIO_HPP_
+#pragma once
 
 #include <filesystem>
 #include <glm/glm.hpp>
@@ -520,5 +519,3 @@ namespace audio {
     /// @brief Finalize audio system
     void close();
 };
-
-#endif  // AUDIO_AUDIO_HPP_

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.hpp

@@ -1,5 +1,4 @@
-#ifndef CODERS_BINARY_JSON_HPP_
-#define CODERS_BINARY_JSON_HPP_
+#pragma once
 
 #include <memory>
 #include <vector>
@@ -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,5 +1,4 @@
-#ifndef CODERS_BYTE_UTILS_HPP_
-#define CODERS_BYTE_UTILS_HPP_
+#pragma once
 
 #include <string>
 #include <vector>
@@ -79,5 +78,3 @@ public:
     const ubyte* pointer() const;
     void skip(size_t n);
 };
-
-#endif  // CODERS_BYTE_UTILS_HPP_

src/coders/commons.hpp

@@ -1,5 +1,4 @@
-#ifndef CODERS_COMMONS_HPP_
-#define CODERS_COMMONS_HPP_
+#pragma once
 
 #include <stdexcept>
 #include <string>
@@ -108,5 +107,3 @@ public:
 
     BasicParser(std::string_view file, std::string_view source);
 };
-
-#endif  // CODERS_COMMONS_HPP_

src/coders/gzip.hpp

@@ -1,5 +1,4 @@
-#ifndef CODERS_GZIP_HPP_
-#define CODERS_GZIP_HPP_
+#pragma once
 
 #include <vector>
 
@@ -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.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.hpp

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

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.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.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,5 +1,4 @@
-#ifndef CODERS_RLE_HPP_
-#define CODERS_RLE_HPP_
+#pragma once
 
 #include "typedefs.hpp"
 
@@ -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.hpp

@@ -1,5 +1,4 @@
-#ifndef CODERS_TOML_HPP_
-#define CODERS_TOML_HPP_
+#pragma once
 
 #include <string>
 
@@ -16,5 +15,3 @@ namespace toml {
         SettingsHandler& handler, std::string_view file, std::string_view source
     );
 }
-
-#endif  // CODERS_TOML_HPP_

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.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,5 +1,4 @@
-#ifndef CONSTANTS_HPP_
-#define CONSTANTS_HPP_
+#pragma once
 
 #include "typedefs.hpp"
 
@@ -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.hpp

@@ -1,5 +1,4 @@
-#ifndef CONTENT_CONTENT_HPP_
-#define CONTENT_CONTENT_HPP_
+#pragma once
 
 #include <memory>
 #include <optional>
@@ -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.hpp

@@ -1,5 +1,4 @@
-#ifndef CONTENT_CONTENT_BUILDER_HPP_
-#define CONTENT_CONTENT_BUILDER_HPP_
+#pragma once
 
 #include <memory>
 #include <unordered_map>
@@ -71,5 +70,3 @@ public:
 
     std::unique_ptr<Content> build();
 };
-
-#endif  // CONTENT_CONTENT_BUILDER_HPP_

src/content/ContentLUT.hpp

@@ -1,5 +1,4 @@
-#ifndef CONTENT_CONTENT_LUT_HPP_
-#define CONTENT_CONTENT_LUT_HPP_
+#pragma once
 
 #include <filesystem>
 #include <string>
@@ -113,5 +112,3 @@ public:
 
     std::vector<contententry> getMissingContent() const;
 };
-
-#endif  // CONTENT_CONTENT_LUT_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.hpp

@@ -1,5 +1,4 @@
-#ifndef CONTENT_CONTENT_PACK_HPP_
-#define CONTENT_CONTENT_PACK_HPP_
+#pragma once
 
 #include <filesystem>
 #include <stdexcept>
@@ -115,5 +114,3 @@ public:
         return env;
     }
 };
-
-#endif  // CONTENT_CONTENT_PACK_HPP_

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,5 +1,4 @@
-#ifndef CONTENT_CONTENT_FWD_HPP_
-#define CONTENT_CONTENT_FWD_HPP_
+#pragma once
 
 #include "typedefs.hpp"
 
@@ -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.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.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,5 +1,4 @@
-#ifndef DATA_DYNAMIC_FWD_HPP_
-#define DATA_DYNAMIC_FWD_HPP_
+#pragma once
 
 #include <functional>
 #include <memory>
@@ -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.hpp

@@ -1,5 +1,4 @@
-#ifndef DATA_SETTING_HPP_
-#define DATA_SETTING_HPP_
+#pragma once
 
 #include <limits>
 #include <string>
@@ -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.hpp

@@ -1,5 +1,4 @@
-#ifndef ENGINE_HPP_
-#define ENGINE_HPP_
+#pragma once
 
 #include "delegates.hpp"
 #include "typedefs.hpp"
@@ -148,5 +147,3 @@ public:
 
     SettingsHandler& getSettingsHandler();
 };
-
-#endif // ENGINE_HPP_

src/files/WorldConverter.hpp

@@ -1,5 +1,4 @@
-#ifndef FILES_WORLD_CONVERTER_HPP_
-#define FILES_WORLD_CONVERTER_HPP_
+#pragma once
 
 #include <filesystem>
 #include <memory>
@@ -61,4 +60,3 @@ public:
     );
 };
 
-#endif  // FILES_WORLD_CONVERTER_HPP_

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>
@@ -72,5 +71,3 @@ public:
         return doWriteLights;
     }
 };
-
-#endif  // FILES_WORLD_FILES_HPP_

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>
@@ -213,5 +212,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.hpp

@@ -1,5 +1,4 @@
-#ifndef FILES_ENGINE_PATHS_HPP_
-#define FILES_ENGINE_PATHS_HPP_
+#pragma once
 
 #include <filesystem>
 #include <stdexcept>
@@ -68,5 +67,3 @@ private:
     std::filesystem::path mainRoot;
     std::vector<PathsRoot> roots;
 };
-
-#endif  // FILES_ENGINE_PATHS_HPP_

src/files/files.hpp

@@ -1,5 +1,4 @@
-#ifndef FILES_FILES_HPP_
-#define FILES_FILES_HPP_
+#pragma once
 
 #include <filesystem>
 #include <fstream>
@@ -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.hpp

@@ -1,5 +1,4 @@
-#ifndef FILES_SETTINGS_IO_HPP_
-#define FILES_SETTINGS_IO_HPP_
+#pragma once
 
 #include <memory>
 #include <string>
@@ -30,5 +29,3 @@ public:
 
     std::vector<Section>& getSections();
 };
-
-#endif  // FILES_SETTINGS_IO_HPP_

src/frontend/ContentGfxCache.hpp

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

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.hpp

@@ -1,5 +1,4 @@
-#ifndef FRONTEND_UI_DOCUMENT_HPP_
-#define FRONTEND_UI_DOCUMENT_HPP_
+#pragma once
 
 #include "typedefs.hpp"
 
@@ -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/hud.hpp

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

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.hpp

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

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.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.hpp

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

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,6 +6,7 @@
 #include <vector>
 #include <optional>
 #include <unordered_map>
+
 #include "maths/UVRegion.hpp"
 #include "typedefs.hpp"
 
@@ -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.hpp

@@ -1,5 +1,4 @@
-#ifndef GRAPHICS_CORE_BATCH2D_HPP_
-#define GRAPHICS_CORE_BATCH2D_HPP_
+#pragma once
 
 #include <memory>
 #include <stdlib.h>
@@ -93,5 +92,3 @@ public:
 
     void lineWidth(float width);
 };
-
-#endif // GRAPHICS_CORE_BATCH2D_HPP_

src/graphics/core/Batch3D.hpp

@@ -1,5 +1,4 @@
-#ifndef GRAPHICS_CORE_BATCH3D_HPP_
-#define GRAPHICS_CORE_BATCH3D_HPP_
+#pragma once
 
 #include "typedefs.hpp"
 #include "commons.hpp"
@@ -58,5 +57,3 @@ public:
     void flush() override;
     void flushPoints();
 };
-
-#endif // GRAPHICS_CORE_BATCH3D_HPP_

src/graphics/core/Cubemap.hpp

@@ -1,5 +1,4 @@
-#ifndef GRAPHICS_CORE_CUBEMAP_HPP_
-#define GRAPHICS_CORE_CUBEMAP_HPP_
+#pragma once
 
 #include "GLTexture.hpp"
 
@@ -11,5 +10,3 @@ public:
     virtual void bind() override;
     virtual void unbind() override;
 };
-
-#endif // GRAPHICS_CORE_CUBEMAP_HPP_

src/graphics/core/DrawContext.hpp

@@ -1,5 +1,4 @@
-#ifndef GRAPHICS_CORE_GFX_CONTEXT_HPP_
-#define GRAPHICS_CORE_GFX_CONTEXT_HPP_
+#pragma once
 
 #include "commons.hpp"
 #include "Viewport.hpp"
@@ -38,5 +37,3 @@ public:
     void setScissors(glm::vec4 area);
     void setLineWidth(float width);
 };
-
-#endif // GRAPHICS_CORE_GFX_CONTEXT_HPP_

src/graphics/core/Font.hpp

@@ -1,5 +1,4 @@
-#ifndef GRAPHICS_CORE_FONT_HPP_
-#define GRAPHICS_CORE_FONT_HPP_
+#pragma once
 
 #include <memory>
 #include <string>
@@ -46,5 +45,3 @@ public:
     void draw(Batch2D* batch, const std::wstring& text, int x, int y, FontStyle style);
     void draw(Batch2D* batch, std::wstring_view text, int x, int y, FontStyle style);
 };
-
-#endif // GRAPHICS_CORE_FONT_HPP_

src/graphics/core/Framebuffer.hpp

@@ -1,5 +1,4 @@
-#ifndef GRAPHICS_CORE_FRAMEBUFFER_HPP_
-#define GRAPHICS_CORE_FRAMEBUFFER_HPP_
+#pragma once
 
 #include "typedefs.hpp"
 
@@ -38,5 +37,3 @@ public:
     /// @brief Get framebuffer height
     uint getHeight() const;
 };
-
-#endif // GRAPHICS_CORE_FRAMEBUFFER_HPP_

src/graphics/core/GLTexture.hpp

@@ -1,5 +1,4 @@
-#ifndef GRAPHICS_CORE_GLTEXTURE_HPP_
-#define GRAPHICS_CORE_GLTEXTURE_HPP_
+#pragma once
 
 #include "Texture.hpp"
 
@@ -26,5 +25,3 @@ public:
 
     static std::unique_ptr<GLTexture> from(const ImageData* image);
 };
-
-#endif // GRAPHICS_CORE_GLTEXTURE_HPP_

src/graphics/core/ImageData.hpp

@@ -1,5 +1,4 @@
-#ifndef GRAPHICS_CORE_IMAGE_DATA_HPP_
-#define GRAPHICS_CORE_IMAGE_DATA_HPP_
+#pragma once
 
 #include "typedefs.hpp"
 
@@ -48,5 +47,3 @@ public:
 };
 
 std::unique_ptr<ImageData> add_atlas_margins(ImageData* image, int grid_size);
-
-#endif // GRAPHICS_CORE_IMAGE_DATA_HPP_

src/graphics/core/LineBatch.hpp

@@ -1,5 +1,4 @@
-#ifndef GRAPHICS_CORE_LINEBATCH_HPP_
-#define GRAPHICS_CORE_LINEBATCH_HPP_
+#pragma once
 
 #include <memory>
 #include <stdlib.h>
@@ -34,5 +33,3 @@ public:
     void flush() override;
     void lineWidth(float width);
 };
-
-#endif // GRAPHICS_CORE_LINEBATCH_HPP_

src/graphics/core/Mesh.hpp

@@ -1,5 +1,4 @@
-#ifndef GRAPHICS_CORE_MESH_HPP_
-#define GRAPHICS_CORE_MESH_HPP_
+#pragma once
 
 #include <stdlib.h>
 #include "typedefs.hpp"
@@ -39,5 +38,3 @@ public:
     static int meshesCount;
     static int drawCalls;
 };
-
-#endif // GRAPHICS_CORE_MESH_HPP_

src/graphics/core/Model.hpp

@@ -1,5 +1,4 @@
-#ifndef GRAPHICS_CORE_MODEL_HPP_
-#define GRAPHICS_CORE_MODEL_HPP_
+#pragma once
 
 #include <string>
 #include <vector>
@@ -34,5 +33,3 @@ namespace model {
         void clean();
     };
 }
-
-#endif // GRAPHICS_CORE_MODEL_HPP_

src/graphics/core/PostProcessing.hpp

@@ -1,5 +1,4 @@
-#ifndef GRAPHICS_CORE_POST_PROCESSING_HPP_
-#define GRAPHICS_CORE_POST_PROCESSING_HPP_
+#pragma once
 
 #include <memory>
 
@@ -37,5 +36,3 @@ public:
 
     Framebuffer* getFramebuffer() const;
 };
-
-#endif // GRAPHICS_CORE_POST_PROCESSING_HPP_

src/graphics/core/Shader.hpp

@@ -1,5 +1,4 @@
-#ifndef GRAPHICS_CORE_SHADER_HPP_
-#define GRAPHICS_CORE_SHADER_HPP_
+#pragma once
 
 #include "typedefs.hpp"
 
@@ -44,5 +43,3 @@ public:
         const std::string& fragmentSource
     );
 };
-
-#endif // GRAPHICS_SHADER_HPP_

src/graphics/core/Texture.hpp

@@ -1,5 +1,4 @@
-#ifndef GRAPHICS_CORE_TEXTURE_HPP_
-#define GRAPHICS_CORE_TEXTURE_HPP_
+#pragma once
 
 #include "typedefs.hpp"
 #include "maths/UVRegion.hpp"
@@ -35,5 +34,3 @@ public:
 
     static std::unique_ptr<Texture> from(const ImageData* image);
 };
-
-#endif // GRAPHICS_CORE_TEXTURE_HPP_

src/graphics/core/TextureAnimation.hpp

@@ -1,5 +1,4 @@
-#ifndef GRAPHICS_CORE_TEXTURE_ANIMATION_HPP_
-#define GRAPHICS_CORE_TEXTURE_ANIMATION_HPP_
+#pragma once
 
 #include "typedefs.hpp"
 
@@ -48,5 +47,3 @@ private:
 
     std::vector<TextureAnimation> animations;
 };
-
-#endif // GRAPHICS_CORE_TEXTURE_ANIMATION_HPP_

src/graphics/core/Viewport.hpp

@@ -1,5 +1,4 @@
-#ifndef GRAPHICS_CORE_VIEWPORT_HPP_
-#define GRAPHICS_CORE_VIEWPORT_HPP_
+#pragma once
 
 #include <glm/glm.hpp>
 
@@ -18,5 +17,3 @@ public:
         return glm::ivec2(width, height);
     }
 };
-
-#endif // GRAPHICS_VIEWPORT_HPP_

src/graphics/core/commons.hpp

@@ -1,5 +1,4 @@
-#ifndef GRAPHICS_CORE_COMMONS_HPP_
-#define GRAPHICS_CORE_COMMONS_HPP_
+#pragma once
 
 enum class DrawPrimitive {
     point = 0,
@@ -17,5 +16,3 @@ public:
 
     virtual void flush() = 0;
 };
-
-#endif // GRAPHICS_CORE_COMMONS_HPP_

src/graphics/core/gl_util.hpp

@@ -1,5 +1,4 @@
-#ifndef GRAPHICS_CORE_GL_UTIL_HPP_
-#define GRAPHICS_CORE_GL_UTIL_HPP_
+#pragma once
 
 #include "commons.hpp"
 #include "ImageData.hpp"
@@ -25,5 +24,3 @@ namespace gl {
         return primitives[static_cast<int>(primitive)];
     }
 }
-
-#endif // GRAPHICS_CORE_GL_UTIL_HPP_

src/graphics/render/BlocksPreview.hpp

@@ -1,5 +1,4 @@
-#ifndef GRAPHICS_RENDER_BLOCKS_PREVIEW_HPP_
-#define GRAPHICS_RENDER_BLOCKS_PREVIEW_HPP_
+#pragma once
 
 #include "typedefs.hpp"
 
@@ -32,5 +31,3 @@ public:
         const Content* content
     );
 };
-
-#endif // GRAPHICS_RENDER_BLOCKS_PREVIEW_HPP_

src/graphics/render/BlocksRenderer.hpp

@@ -1,5 +1,4 @@
-#ifndef GRAPHICS_RENDER_BLOCKS_RENDERER_HPP_
-#define GRAPHICS_RENDER_BLOCKS_RENDERER_HPP_
+#pragma once
 
 #include <stdlib.h>
 #include <vector>
@@ -132,5 +131,3 @@ public:
     std::shared_ptr<Mesh> createMesh();
     VoxelsVolume* getVoxelsBuffer() const;
 };
-
-#endif // GRAPHICS_RENDER_BLOCKS_RENDERER_HPP_

src/graphics/render/ChunksRenderer.hpp

@@ -1,5 +1,4 @@
-#ifndef GRAPHICS_RENDER_CHUNKSRENDERER_HPP_
-#define GRAPHICS_RENDER_CHUNKSRENDERER_HPP_
+#pragma once
 
 #include <queue>
 #include <memory>
@@ -46,5 +45,3 @@ public:
 
     void update();
 };
-
-#endif // GRAPHICS_RENDER_CHUNKSRENDERER_HPP_

src/graphics/render/ModelBatch.hpp

@@ -1,5 +1,4 @@
-#ifndef GRAPHICS_RENDER_MODEL_BATCH_HPP_
-#define GRAPHICS_RENDER_MODEL_BATCH_HPP_
+#pragma once
 
 #include "maths/UVRegion.hpp"
 
@@ -90,5 +89,3 @@ public:
               const texture_names_map* varTextures);
     void render();
 };
-
-#endif // GRAPHICS_RENDER_MODEL_BATCH_HPP_

src/graphics/render/Skybox.hpp

@@ -1,5 +1,4 @@
-#ifndef GRAPHICS_RENDER_SKYBOX_HPP_
-#define GRAPHICS_RENDER_SKYBOX_HPP_
+#pragma once
 
 #include <memory>
 #include <string>
@@ -54,5 +53,3 @@ public:
         return ready;
     }
 };
-
-#endif // GRAPHICS_RENDER_SKYBOX_HPP_

src/graphics/render/WorldRenderer.hpp

@@ -1,5 +1,4 @@
-#ifndef GRAPHICS_RENDER_WORLD_RENDERER_HPP_
-#define GRAPHICS_RENDER_WORLD_RENDERER_HPP_
+#pragma once
 
 #include <vector>
 #include <memory>
@@ -98,6 +97,3 @@ public:
         bool pause
     );
 };
-
-
-#endif // GRAPHICS_RENDER_WORLD_RENDERER_HPP_

src/graphics/ui/GUI.hpp

@@ -1,5 +1,4 @@
-#ifndef FRONTEND_GUI_GUI_HPP_
-#define FRONTEND_GUI_GUI_HPP_
+#pragma once
 
 #include "delegates.hpp"
 
@@ -135,5 +134,3 @@ namespace gui {
         float getDoubleClickDelay() const;
     };
 }
-
-#endif // FRONTEND_GUI_GUI_HPP_

src/graphics/ui/elements/Button.hpp

@@ -1,5 +1,4 @@
-#ifndef GRAPHICS_UI_ELEMENTS_BUTTON_HPP_
-#define GRAPHICS_UI_ELEMENTS_BUTTON_HPP_
+#pragma once
 
 #include "Panel.hpp"
 
@@ -31,5 +30,3 @@ namespace gui {
         virtual void refresh() override;
     };
 }
-
-#endif // GRAPHICS_UI_ELEMENTS_BUTTON_HPP_

src/graphics/ui/elements/CheckBox.hpp

@@ -1,5 +1,4 @@
-#ifndef GRAPHICS_UI_ELEMENTS_CHECKBOX_HPP_
-#define GRAPHICS_UI_ELEMENTS_CHECKBOX_HPP_
+#pragma once
 
 #include <utility>
 
@@ -59,5 +58,3 @@ namespace gui {
         }
     };
 }
-
-#endif // GRAPHICS_UI_ELEMENTS_CHECKBOX_HPP_

src/graphics/ui/elements/Container.hpp

@@ -1,5 +1,4 @@
-#ifndef GRAPHICS_UI_ELEMENTS_CONTAINER_HPP_
-#define GRAPHICS_UI_ELEMENTS_CONTAINER_HPP_
+#pragma once
 
 #include "UINode.hpp"
 #include "commons.hpp"
@@ -38,5 +37,3 @@ namespace gui {
         const std::vector<std::shared_ptr<UINode>>& getNodes() const;
     };
 }
-
-#endif // GRAPHICS_UI_ELEMENTS_CONTAINER_HPP_

src/graphics/ui/elements/Image.hpp

@@ -1,5 +1,4 @@
-#ifndef GRAPHICS_UI_ELEMENTS_IMAGE_HPP_
-#define GRAPHICS_UI_ELEMENTS_IMAGE_HPP_
+#pragma once
 
 #include "UINode.hpp"
 
@@ -19,5 +18,3 @@ namespace gui {
         virtual void setTexture(const std::string& name);
     };
 }
-
-#endif // GRAPHICS_UI_ELEMENTS_IMAGE_HPP_

src/graphics/ui/elements/InputBindBox.hpp

@@ -1,5 +1,4 @@
-#ifndef GRAPHICS_UI_ELEMENTS_INPUTBINDBOX_HPP_
-#define GRAPHICS_UI_ELEMENTS_INPUTBINDBOX_HPP_
+#pragma once
 
 #include "Panel.hpp"
 
@@ -21,5 +20,3 @@ namespace gui {
         virtual bool isFocuskeeper() const override {return true;}
     };
 }
-
-#endif // GRAPHICS_UI_ELEMENTS_INPUTBINDBOX_HPP_

src/graphics/ui/elements/InventoryView.hpp

@@ -1,5 +1,4 @@
-#ifndef FRONTEND_INVENTORY_VIEW_HPP_
-#define FRONTEND_INVENTORY_VIEW_HPP_
+#pragma once
 
 #include "UINode.hpp"
 #include "Container.hpp"
@@ -140,5 +139,3 @@ namespace gui {
         std::shared_ptr<InventoryView> build();
     };
 }
-
-#endif // FRONTEND_INVENTORY_VIEW_HPP_

src/graphics/ui/elements/Label.hpp

@@ -1,5 +1,4 @@
-#ifndef GRAPHICS_UI_ELEMENTS_LABEL_HPP_
-#define GRAPHICS_UI_ELEMENTS_LABEL_HPP_
+#pragma once
 
 #include "UINode.hpp"
 
@@ -110,5 +109,3 @@ namespace gui {
         virtual bool isTextWrapping() const;
     };
 }
-
-#endif // GRAPHICS_UI_ELEMENTS_LABEL_HPP_

src/graphics/ui/elements/Menu.hpp

@@ -1,5 +1,4 @@
-#ifndef GRAPHICS_UI_ELEMENTS_MENU_HPP_
-#define GRAPHICS_UI_ELEMENTS_MENU_HPP_
+#pragma once
 
 #include "Container.hpp"
 
@@ -56,5 +55,3 @@ namespace gui {
         Page& getCurrent();
     };
 }
-
-#endif // GRAPHICS_UI_ELEMENTS_MENU_HPP_

src/graphics/ui/elements/Panel.hpp

@@ -1,5 +1,4 @@
-#ifndef GRAPHICS_UI_ELEMENTS_PANEL_HPP_
-#define GRAPHICS_UI_ELEMENTS_PANEL_HPP_
+#pragma once
 
 #include "commons.hpp"
 #include "Container.hpp"
@@ -36,5 +35,3 @@ namespace gui {
         glm::vec4 getPadding() const;
     };
 }
-
-#endif // GRAPHICS_UI_ELEMENTS_PANEL_HPP_

src/graphics/ui/elements/Plotter.hpp

@@ -1,5 +1,4 @@
-#ifndef GRAPHICS_UI_ELEMENTS_PLOTTER_HPP_
-#define GRAPHICS_UI_ELEMENTS_PLOTTER_HPP_
+#pragma once
 
 #include "UINode.hpp"
 #include "typedefs.hpp"
@@ -33,5 +32,3 @@ namespace gui {
         void draw(const DrawContext* pctx, Assets* assets) override;
     };
 }
-
-#endif // GRAPHICS_UI_ELEMENTS_PLOTTER_HPP_

src/graphics/ui/elements/TextBox.hpp

@@ -1,5 +1,4 @@
-#ifndef GRAPHICS_UI_ELEMENTS_TEXTBOX_HPP_
-#define GRAPHICS_UI_ELEMENTS_TEXTBOX_HPP_
+#pragma once
 
 #include "Panel.hpp"
 #include "Label.hpp"
@@ -173,5 +172,3 @@ namespace gui {
         virtual void setOnDownPressed(const runnable &callback);
     };
 }
-
-#endif // GRAPHICS_UI_ELEMENTS_TEXTBOX_HPP_

src/graphics/ui/elements/TrackBar.hpp

@@ -1,5 +1,4 @@
-#ifndef GRAPHICS_UI_ELEMENTS_TRACKBAR_HPP_
-#define GRAPHICS_UI_ELEMENTS_TRACKBAR_HPP_
+#pragma once
 
 #include "UINode.hpp"
 #include "data/dynamic_fwd.hpp"
@@ -49,5 +48,3 @@ namespace gui {
         virtual void setChangeOnRelease(bool);
     };
 }
-
-#endif // GRAPHICS_UI_ELEMENTS_TRACKBAR_HPP_

src/graphics/ui/elements/UINode.hpp

@@ -1,5 +1,4 @@
-#ifndef GRAPHICS_UI_ELEMENTS_UINODE_HPP_
-#define GRAPHICS_UI_ELEMENTS_UINODE_HPP_
+#pragma once
 
 #include "delegates.hpp"
 #include "window/input.hpp"
@@ -259,5 +258,3 @@ namespace gui {
         );
     };
 }
-
-#endif // GRAPHICS_UI_ELEMENTS_UINODE_HPP_

src/graphics/ui/elements/commons.hpp

@@ -1,5 +1,4 @@
-#ifndef GRAPHICS_UI_ELEMENTS_COMMONS_HPP_
-#define GRAPHICS_UI_ELEMENTS_COMMONS_HPP_
+#pragma once
 
 #include <functional>
 
@@ -16,5 +15,3 @@ namespace gui {
         int repeat;
     };
 }
-
-#endif // GRAPHICS_UI_ELEMENTS_COMMONS_HPP_

src/graphics/ui/gui_util.hpp

@@ -1,5 +1,4 @@
-#ifndef FRONTEND_GUI_GUI_UTIL_HPP_
-#define FRONTEND_GUI_GUI_UTIL_HPP_
+#pragma once
 
 #include "GUI.hpp"
 #include "typedefs.hpp"
@@ -26,5 +25,3 @@ namespace guiutil {
         std::wstring yestext=L"", 
         std::wstring notext=L"");
 }
-
-#endif // FRONTEND_GUI_GUI_UTIL_HPP_

src/graphics/ui/gui_xml.hpp

@@ -1,5 +1,4 @@
-#ifndef FRONTEND_GUI_GUI_XML_HPP_
-#define FRONTEND_GUI_GUI_XML_HPP_
+#pragma once
 
 #include "GUI.hpp"
 #include "coders/xml.hpp"
@@ -56,5 +55,3 @@ namespace gui {
         const std::string& getFilename() const;
     };
 }
-
-#endif // FRONTEND_GUI_GUI_XML_HPP_

src/interfaces/Object.hpp

@@ -1,5 +1,4 @@
-#ifndef OBJECT_HPP_
-#define OBJECT_HPP_
+#pragma once
 
 #include <stdint.h>
 #include <stdlib.h>
@@ -22,5 +21,3 @@ public:
     virtual void update(float delta) { }
     virtual void destroyed() {  }
 };
-
-#endif // OBJECT_HPP_

src/interfaces/Serializable.hpp

@@ -1,5 +1,4 @@
-#ifndef SERIALIZABLE_HPP_
-#define SERIALIZABLE_HPP_
+#pragma once
 
 #include "coders/json.hpp"
 
@@ -11,5 +10,3 @@ public:
     virtual std::unique_ptr<dynamic::Map>  serialize() const = 0;
     virtual void deserialize(dynamic::Map* src) = 0;
 };
-
-#endif // SERIALIZABLE_HPP_

src/interfaces/Task.hpp

@@ -1,5 +1,4 @@
-#ifndef INTERFACES_TASK_HPP_
-#define INTERFACES_TASK_HPP_
+#pragma once
 
 #include "typedefs.hpp"
 
@@ -16,6 +15,3 @@ public:
     virtual void waitForEnd() = 0;
     virtual void terminate() = 0;
 };
-
-#endif // INTERFACES_TASK_HPP_
-

src/items/Inventories.hpp

@@ -1,5 +1,4 @@
-#ifndef ITEMS_INVENTORIES_HPP_
-#define ITEMS_INVENTORIES_HPP_
+#pragma once
 
 #include <memory>
 #include <string>
@@ -41,4 +40,3 @@ public:
     const inventories_map& getMap() const;
 };
 
-#endif  // ITEMS_INVENTORIES_HPP_

src/items/Inventory.hpp

@@ -1,5 +1,4 @@
-#ifndef ITEMS_INVENTORY_HPP_
-#define ITEMS_INVENTORY_HPP_
+#pragma once
 
 #include <memory>
 #include <vector>
@@ -59,5 +58,3 @@ public:
 
     static const size_t npos;
 };
-
-#endif  // ITEMS_INVENTORY_HPP_