From 4ac8ea1ab3b0f45472717110701498502fe1b6b6 Mon Sep 17 00:00:00 2001 From: MihailRis Date: Wed, 24 Apr 2024 19:01:28 +0300 Subject: [PATCH] final rename --- src/content/PacksManager.cpp | 2 +- src/content/{PacksManager.h => PacksManager.hpp} | 6 +++--- src/engine.h | 2 +- src/frontend/ContentGfxCache.cpp | 2 +- src/frontend/screens/LevelScreen.cpp | 2 +- src/graphics/core/Atlas.hpp | 2 +- src/graphics/core/Batch2D.hpp | 2 +- src/graphics/core/Batch3D.hpp | 2 +- src/graphics/render/BlocksRenderer.cpp | 2 +- src/graphics/ui/elements/Image.cpp | 2 +- src/logic/scripting/scripting_hud.cpp | 2 +- src/logic/scripting/{scripting_hud.h => scripting_hud.hpp} | 6 +++--- src/maths/{UVRegion.h => UVRegion.hpp} | 6 +++--- src/voxels/Block.h | 2 +- 14 files changed, 20 insertions(+), 20 deletions(-) rename src/content/{PacksManager.h => PacksManager.hpp} (93%) rename src/logic/scripting/{scripting_hud.h => scripting_hud.hpp} (74%) rename src/maths/{UVRegion.h => UVRegion.hpp} (70%) diff --git a/src/content/PacksManager.cpp b/src/content/PacksManager.cpp index 2a83d612..96d9da3d 100644 --- a/src/content/PacksManager.cpp +++ b/src/content/PacksManager.cpp @@ -1,4 +1,4 @@ -#include "PacksManager.h" +#include "PacksManager.hpp" #include "../util/listutil.h" diff --git a/src/content/PacksManager.h b/src/content/PacksManager.hpp similarity index 93% rename from src/content/PacksManager.h rename to src/content/PacksManager.hpp index 24c6d239..f9f97f33 100644 --- a/src/content/PacksManager.h +++ b/src/content/PacksManager.hpp @@ -1,5 +1,5 @@ -#ifndef CONTENT_PACKS_MANAGER_H_ -#define CONTENT_PACKS_MANAGER_H_ +#ifndef CONTENT_PACKS_MANAGER_HPP_ +#define CONTENT_PACKS_MANAGER_HPP_ #include "ContentPack.h" @@ -44,4 +44,4 @@ public: static std::vector getNames(const std::vector& packs); }; -#endif // CONTENT_PACKS_MANAGER_H_ +#endif // CONTENT_PACKS_MANAGER_HPP_ diff --git a/src/engine.h b/src/engine.h index 36d61806..938fd0d4 100644 --- a/src/engine.h +++ b/src/engine.h @@ -8,7 +8,7 @@ #include "assets/Assets.h" #include "content/Content.h" #include "content/ContentPack.h" -#include "content/PacksManager.h" +#include "content/PacksManager.hpp" #include "files/engine_paths.h" #include "files/settings_io.h" #include "util/ObjectsKeeper.hpp" diff --git a/src/frontend/ContentGfxCache.cpp b/src/frontend/ContentGfxCache.cpp index 8d33a878..c9ceca09 100644 --- a/src/frontend/ContentGfxCache.cpp +++ b/src/frontend/ContentGfxCache.cpp @@ -7,7 +7,7 @@ #include "../content/ContentPack.h" #include "../core_defs.h" #include "../graphics/core/Atlas.hpp" -#include "../maths/UVRegion.h" +#include "../maths/UVRegion.hpp" #include "../voxels/Block.h" #include "UiDocument.h" diff --git a/src/frontend/screens/LevelScreen.cpp b/src/frontend/screens/LevelScreen.cpp index 62bc4e01..47a68fa8 100644 --- a/src/frontend/screens/LevelScreen.cpp +++ b/src/frontend/screens/LevelScreen.cpp @@ -13,7 +13,7 @@ #include "../../graphics/ui/elements/Menu.hpp" #include "../../graphics/render/WorldRenderer.hpp" #include "../../logic/LevelController.h" -#include "../../logic/scripting/scripting_hud.h" +#include "../../logic/scripting/scripting_hud.hpp" #include "../../physics/Hitbox.h" #include "../../voxels/Chunks.h" #include "../../world/Level.h" diff --git a/src/graphics/core/Atlas.hpp b/src/graphics/core/Atlas.hpp index 1450196d..88c1d51d 100644 --- a/src/graphics/core/Atlas.hpp +++ b/src/graphics/core/Atlas.hpp @@ -6,7 +6,7 @@ #include #include #include -#include "../../maths/UVRegion.h" +#include "../../maths/UVRegion.hpp" #include "../../typedefs.h" class ImageData; diff --git a/src/graphics/core/Batch2D.hpp b/src/graphics/core/Batch2D.hpp index 7c0832ef..ff93157d 100644 --- a/src/graphics/core/Batch2D.hpp +++ b/src/graphics/core/Batch2D.hpp @@ -6,7 +6,7 @@ #include #include "commons.hpp" -#include "../../maths/UVRegion.h" +#include "../../maths/UVRegion.hpp" class Mesh; class Texture; diff --git a/src/graphics/core/Batch3D.hpp b/src/graphics/core/Batch3D.hpp index 8a457a67..536e9e81 100644 --- a/src/graphics/core/Batch3D.hpp +++ b/src/graphics/core/Batch3D.hpp @@ -1,7 +1,7 @@ #ifndef GRAPHICS_CORE_BATCH3D_HPP_ #define GRAPHICS_CORE_BATCH3D_HPP_ -#include "../../maths/UVRegion.h" +#include "../../maths/UVRegion.hpp" #include "../../typedefs.h" #include diff --git a/src/graphics/render/BlocksRenderer.cpp b/src/graphics/render/BlocksRenderer.cpp index 171e456a..367d6f39 100644 --- a/src/graphics/render/BlocksRenderer.cpp +++ b/src/graphics/render/BlocksRenderer.cpp @@ -1,6 +1,6 @@ #include "BlocksRenderer.hpp" #include "../core/Mesh.hpp" -#include "../../maths/UVRegion.h" +#include "../../maths/UVRegion.hpp" #include "../../constants.h" #include "../../content/Content.h" #include "../../voxels/Block.h" diff --git a/src/graphics/ui/elements/Image.cpp b/src/graphics/ui/elements/Image.cpp index b613f24c..463f24b9 100644 --- a/src/graphics/ui/elements/Image.cpp +++ b/src/graphics/ui/elements/Image.cpp @@ -4,7 +4,7 @@ #include "../../core/Batch2D.hpp" #include "../../core/Texture.hpp" #include "../../../assets/Assets.h" -#include "../../../maths/UVRegion.h" +#include "../../../maths/UVRegion.hpp" using namespace gui; diff --git a/src/logic/scripting/scripting_hud.cpp b/src/logic/scripting/scripting_hud.cpp index b7c766a7..e33c6205 100644 --- a/src/logic/scripting/scripting_hud.cpp +++ b/src/logic/scripting/scripting_hud.cpp @@ -1,4 +1,4 @@ -#include "scripting_hud.h" +#include "scripting_hud.hpp" #include "scripting.h" #include "lua/api_lua.h" diff --git a/src/logic/scripting/scripting_hud.h b/src/logic/scripting/scripting_hud.hpp similarity index 74% rename from src/logic/scripting/scripting_hud.h rename to src/logic/scripting/scripting_hud.hpp index 0add6354..c977506d 100644 --- a/src/logic/scripting/scripting_hud.h +++ b/src/logic/scripting/scripting_hud.hpp @@ -1,5 +1,5 @@ -#ifndef LOGIC_SCRIPTING_SCRIPTING_HUD_H_ -#define LOGIC_SCRIPTING_SCRIPTING_HUD_H_ +#ifndef LOGIC_SCRIPTING_SCRIPTING_HUD_HPP_ +#define LOGIC_SCRIPTING_SCRIPTING_HUD_HPP_ #include "../../typedefs.h" @@ -25,4 +25,4 @@ namespace scripting { void load_hud_script(scriptenv env, std::string packid, fs::path file); } -#endif // LOGIC_SCRIPTING_SCRIPTING_HUD_H_ +#endif // LOGIC_SCRIPTING_SCRIPTING_HUD_HPP_ diff --git a/src/maths/UVRegion.h b/src/maths/UVRegion.hpp similarity index 70% rename from src/maths/UVRegion.h rename to src/maths/UVRegion.hpp index 9ef0bd79..e606c63b 100644 --- a/src/maths/UVRegion.h +++ b/src/maths/UVRegion.hpp @@ -1,5 +1,5 @@ -#ifndef MATHS_UVREGION_H_ -#define MATHS_UVREGION_H_ +#ifndef MATHS_UVREGION_HPP_ +#define MATHS_UVREGION_HPP_ struct UVRegion { float u1; @@ -13,4 +13,4 @@ struct UVRegion { UVRegion() : u1(0.0f), v1(0.0f), u2(1.0f), v2(1.0f){} }; -#endif // MATHS_UVREGION_H_ +#endif // MATHS_UVREGION_HPP_ diff --git a/src/voxels/Block.h b/src/voxels/Block.h index a2760655..d3db753f 100644 --- a/src/voxels/Block.h +++ b/src/voxels/Block.h @@ -6,7 +6,7 @@ #include #include "../maths/aabb.h" -#include "../maths/UVRegion.h" +#include "../maths/UVRegion.hpp" #include "../typedefs.h" #define BLOCK_ITEM_SUFFIX ".item"