From 9f2bceb039859ba3a76d788dfea63891e134a757 Mon Sep 17 00:00:00 2001 From: MihailRis Date: Tue, 23 Apr 2024 02:00:03 +0300 Subject: [PATCH] just a minor refactor, nothing special --- src/assets/Assets.cpp | 8 ++++---- src/assets/Assets.h | 2 +- src/assets/assetload_funcs.cpp | 12 ++++++------ src/coders/imageio.cpp | 2 +- src/coders/png.cpp | 4 ++-- src/engine.cpp | 8 ++++---- src/frontend/ContentGfxCache.cpp | 2 +- src/frontend/InventoryView.cpp | 10 +++++----- src/frontend/LevelFrontend.cpp | 2 +- src/frontend/debug_panel.cpp | 2 +- src/frontend/hud.cpp | 16 ++++++++-------- src/frontend/screens/LevelScreen.cpp | 6 +++--- src/frontend/screens/MenuScreen.cpp | 4 ++-- src/frontend/screens/Screen.cpp | 2 +- src/graphics/core/Atlas.cpp | 6 +++--- src/graphics/core/{Atlas.h => Atlas.hpp} | 0 src/graphics/core/Batch2D.cpp | 8 ++++---- src/graphics/core/{Batch2D.h => Batch2D.hpp} | 2 +- src/graphics/core/Batch3D.cpp | 6 +++--- src/graphics/core/{Batch3D.h => Batch3D.hpp} | 0 src/graphics/core/Cubemap.cpp | 4 ++-- src/graphics/core/{Cubemap.h => Cubemap.hpp} | 2 +- src/graphics/core/Font.cpp | 6 +++--- src/graphics/core/{Font.h => Font.hpp} | 0 src/graphics/core/Framebuffer.cpp | 4 ++-- .../core/{Framebuffer.h => Framebuffer.hpp} | 0 src/graphics/core/GfxContext.cpp | 6 +++--- .../core/{GfxContext.h => GfxContext.hpp} | 2 +- src/graphics/core/ImageData.cpp | 2 +- src/graphics/core/{ImageData.h => ImageData.hpp} | 0 src/graphics/core/LineBatch.cpp | 4 ++-- src/graphics/core/{LineBatch.h => LineBatch.hpp} | 0 src/graphics/core/Mesh.cpp | 2 +- src/graphics/core/{Mesh.h => Mesh.hpp} | 0 src/graphics/core/PostProcessing.cpp | 8 ++++---- src/graphics/core/PostProcessing.h | 6 +++--- src/graphics/core/Shader.cpp | 2 +- src/graphics/core/{Shader.h => Shader.hpp} | 0 src/graphics/core/Texture.cpp | 8 ++++---- src/graphics/core/{Texture.h => Texture.hpp} | 2 +- src/graphics/core/TextureAnimation.cpp | 6 +++--- .../{TextureAnimation.h => TextureAnimation.hpp} | 0 src/graphics/core/Viewport.cpp | 4 ++-- src/graphics/core/{Viewport.h => Viewport.hpp} | 0 src/graphics/core/{commons.h => commons.hpp} | 0 src/graphics/core/{gl_util.h => gl_util.hpp} | 4 ++-- src/graphics/render/BlocksPreview.cpp | 14 +++++++------- src/graphics/render/BlocksRenderer.cpp | 2 +- src/graphics/render/ChunksRenderer.cpp | 2 +- src/graphics/render/Skybox.cpp | 14 +++++++------- src/graphics/render/WorldRenderer.cpp | 14 +++++++------- src/graphics/ui/GUI.cpp | 6 +++--- src/graphics/ui/elements/Button.cpp | 4 ++-- src/graphics/ui/elements/CheckBox.cpp | 4 ++-- src/graphics/ui/elements/Container.cpp | 4 ++-- src/graphics/ui/elements/Image.cpp | 6 +++--- src/graphics/ui/elements/InputBindBox.cpp | 4 ++-- src/graphics/ui/elements/Label.cpp | 6 +++--- src/graphics/ui/elements/Plotter.cpp | 6 +++--- src/graphics/ui/elements/TextBox.cpp | 6 +++--- src/graphics/ui/elements/TrackBar.cpp | 4 ++-- src/graphics/ui/elements/UINode.cpp | 2 +- src/logic/ChunksController.cpp | 2 +- src/logic/scripting/lua/libpack.cpp | 2 +- src/logic/scripting/lua/libworld.cpp | 4 ++-- src/voxels/Chunks.cpp | 2 +- src/window/Window.cpp | 4 ++-- 67 files changed, 143 insertions(+), 143 deletions(-) rename src/graphics/core/{Atlas.h => Atlas.hpp} (100%) rename src/graphics/core/{Batch2D.h => Batch2D.hpp} (98%) rename src/graphics/core/{Batch3D.h => Batch3D.hpp} (100%) rename src/graphics/core/{Cubemap.h => Cubemap.hpp} (88%) rename src/graphics/core/{Font.h => Font.hpp} (100%) rename src/graphics/core/{Framebuffer.h => Framebuffer.hpp} (100%) rename src/graphics/core/{GfxContext.h => GfxContext.hpp} (97%) rename src/graphics/core/{ImageData.h => ImageData.hpp} (100%) rename src/graphics/core/{LineBatch.h => LineBatch.hpp} (100%) rename src/graphics/core/{Mesh.h => Mesh.hpp} (100%) rename src/graphics/core/{Shader.h => Shader.hpp} (100%) rename src/graphics/core/{Texture.h => Texture.hpp} (96%) rename src/graphics/core/{TextureAnimation.h => TextureAnimation.hpp} (100%) rename src/graphics/core/{Viewport.h => Viewport.hpp} (100%) rename src/graphics/core/{commons.h => commons.hpp} (100%) rename src/graphics/core/{gl_util.h => gl_util.hpp} (89%) diff --git a/src/assets/Assets.cpp b/src/assets/Assets.cpp index 4c6b7808..99095929 100644 --- a/src/assets/Assets.cpp +++ b/src/assets/Assets.cpp @@ -1,10 +1,10 @@ #include "Assets.h" #include "../audio/audio.h" -#include "../graphics/core/Texture.h" -#include "../graphics/core/Shader.h" -#include "../graphics/core/Atlas.h" -#include "../graphics/core/Font.h" +#include "../graphics/core/Texture.hpp" +#include "../graphics/core/Shader.hpp" +#include "../graphics/core/Atlas.hpp" +#include "../graphics/core/Font.hpp" #include "../frontend/UiDocument.h" #include "../logic/scripting/scripting.h" diff --git a/src/assets/Assets.h b/src/assets/Assets.h index d2d1ed00..84f4a839 100644 --- a/src/assets/Assets.h +++ b/src/assets/Assets.h @@ -1,7 +1,7 @@ #ifndef ASSETS_ASSETS_H_ #define ASSETS_ASSETS_H_ -#include "../graphics/core/TextureAnimation.h" +#include "../graphics/core/TextureAnimation.hpp" #include #include diff --git a/src/assets/assetload_funcs.cpp b/src/assets/assetload_funcs.cpp index 660fb539..f77de6e5 100644 --- a/src/assets/assetload_funcs.cpp +++ b/src/assets/assetload_funcs.cpp @@ -11,12 +11,12 @@ #include "../coders/imageio.h" #include "../coders/json.h" #include "../coders/GLSLExtension.h" -#include "../graphics/core/Shader.h" -#include "../graphics/core/Texture.h" -#include "../graphics/core/ImageData.h" -#include "../graphics/core/Atlas.h" -#include "../graphics/core/Font.h" -#include "../graphics/core/TextureAnimation.h" +#include "../graphics/core/Shader.hpp" +#include "../graphics/core/Texture.hpp" +#include "../graphics/core/ImageData.hpp" +#include "../graphics/core/Atlas.hpp" +#include "../graphics/core/Font.hpp" +#include "../graphics/core/TextureAnimation.hpp" #include "../frontend/UiDocument.h" namespace fs = std::filesystem; diff --git a/src/coders/imageio.cpp b/src/coders/imageio.cpp index 511abd23..9700b6c0 100644 --- a/src/coders/imageio.cpp +++ b/src/coders/imageio.cpp @@ -1,7 +1,7 @@ #include "imageio.h" #include "png.h" -#include "../graphics/core/ImageData.h" +#include "../graphics/core/ImageData.hpp" #include #include diff --git a/src/coders/png.cpp b/src/coders/png.cpp index 6736afe0..e347adf9 100644 --- a/src/coders/png.cpp +++ b/src/coders/png.cpp @@ -4,8 +4,8 @@ #include #include -#include "../graphics/core/ImageData.h" -#include "../graphics/core/Texture.h" +#include "../graphics/core/ImageData.hpp" +#include "../graphics/core/Texture.hpp" #include "../files/files.h" #ifndef _WIN32 diff --git a/src/engine.cpp b/src/engine.cpp index 53e1a6a8..3fbd1ed6 100644 --- a/src/engine.cpp +++ b/src/engine.cpp @@ -14,10 +14,10 @@ #include "frontend/menu.hpp" #include "frontend/screens/Screen.hpp" #include "frontend/screens/MenuScreen.hpp" -#include "graphics/core/Batch2D.h" -#include "graphics/core/GfxContext.h" -#include "graphics/core/ImageData.h" -#include "graphics/core/Shader.h" +#include "graphics/core/Batch2D.hpp" +#include "graphics/core/GfxContext.hpp" +#include "graphics/core/ImageData.hpp" +#include "graphics/core/Shader.hpp" #include "graphics/ui/GUI.h" #include "logic/EngineController.hpp" #include "logic/scripting/scripting.h" diff --git a/src/frontend/ContentGfxCache.cpp b/src/frontend/ContentGfxCache.cpp index 93257dcd..8d33a878 100644 --- a/src/frontend/ContentGfxCache.cpp +++ b/src/frontend/ContentGfxCache.cpp @@ -6,7 +6,7 @@ #include "../content/Content.h" #include "../content/ContentPack.h" #include "../core_defs.h" -#include "../graphics/core/Atlas.h" +#include "../graphics/core/Atlas.hpp" #include "../maths/UVRegion.h" #include "../voxels/Block.h" #include "UiDocument.h" diff --git a/src/frontend/InventoryView.cpp b/src/frontend/InventoryView.cpp index 9096e33a..94b24016 100644 --- a/src/frontend/InventoryView.cpp +++ b/src/frontend/InventoryView.cpp @@ -5,11 +5,11 @@ #include "../assets/Assets.h" #include "../content/Content.h" -#include "../graphics/core/Atlas.h" -#include "../graphics/core/Batch2D.h" -#include "../graphics/core/Font.h" -#include "../graphics/core/GfxContext.h" -#include "../graphics/core/Shader.h" +#include "../graphics/core/Atlas.hpp" +#include "../graphics/core/Batch2D.hpp" +#include "../graphics/core/Font.hpp" +#include "../graphics/core/GfxContext.hpp" +#include "../graphics/core/Shader.hpp" #include "../graphics/render/BlocksPreview.h" #include "../items/Inventories.h" #include "../items/Inventory.h" diff --git a/src/frontend/LevelFrontend.cpp b/src/frontend/LevelFrontend.cpp index f3ac1917..65de979b 100644 --- a/src/frontend/LevelFrontend.cpp +++ b/src/frontend/LevelFrontend.cpp @@ -3,7 +3,7 @@ #include "../assets/Assets.h" #include "../audio/audio.h" #include "../content/Content.h" -#include "../graphics/core/Atlas.h" +#include "../graphics/core/Atlas.hpp" #include "../graphics/render/BlocksPreview.h" #include "../logic/LevelController.h" #include "../logic/PlayerController.h" diff --git a/src/frontend/debug_panel.cpp b/src/frontend/debug_panel.cpp index c56a36ae..57c090b9 100644 --- a/src/frontend/debug_panel.cpp +++ b/src/frontend/debug_panel.cpp @@ -5,7 +5,7 @@ #include "../audio/audio.h" #include "../delegates.h" #include "../engine.h" -#include "../graphics/core/Mesh.h" +#include "../graphics/core/Mesh.hpp" #include "../graphics/ui/elements/CheckBox.hpp" #include "../graphics/ui/elements/TextBox.hpp" #include "../graphics/ui/elements/TrackBar.hpp" diff --git a/src/frontend/hud.cpp b/src/frontend/hud.cpp index bfa31b86..e6d53eb7 100644 --- a/src/frontend/hud.cpp +++ b/src/frontend/hud.cpp @@ -5,14 +5,14 @@ #include "../core_defs.h" #include "../delegates.h" #include "../engine.h" -#include "../graphics/core/Atlas.h" -#include "../graphics/core/Batch2D.h" -#include "../graphics/core/Batch3D.h" -#include "../graphics/core/Font.h" -#include "../graphics/core/GfxContext.h" -#include "../graphics/core/Mesh.h" -#include "../graphics/core/Shader.h" -#include "../graphics/core/Texture.h" +#include "../graphics/core/Atlas.hpp" +#include "../graphics/core/Batch2D.hpp" +#include "../graphics/core/Batch3D.hpp" +#include "../graphics/core/Font.hpp" +#include "../graphics/core/GfxContext.hpp" +#include "../graphics/core/Mesh.hpp" +#include "../graphics/core/Shader.hpp" +#include "../graphics/core/Texture.hpp" #include "../graphics/render/BlocksPreview.h" #include "../graphics/render/WorldRenderer.h" #include "../graphics/ui/elements/UINode.hpp" diff --git a/src/frontend/screens/LevelScreen.cpp b/src/frontend/screens/LevelScreen.cpp index 850e138d..7d049dd8 100644 --- a/src/frontend/screens/LevelScreen.cpp +++ b/src/frontend/screens/LevelScreen.cpp @@ -6,9 +6,9 @@ #include "../../audio/audio.h" #include "../../coders/imageio.h" #include "../../graphics/core/PostProcessing.h" -#include "../../graphics/core/GfxContext.h" -#include "../../graphics/core/Viewport.h" -#include "../../graphics/core/ImageData.h" +#include "../../graphics/core/GfxContext.hpp" +#include "../../graphics/core/Viewport.hpp" +#include "../../graphics/core/ImageData.hpp" #include "../../graphics/ui/GUI.h" #include "../../graphics/ui/elements/Menu.hpp" #include "../../graphics/render/WorldRenderer.h" diff --git a/src/frontend/screens/MenuScreen.cpp b/src/frontend/screens/MenuScreen.cpp index 26242e14..f7b31dd4 100644 --- a/src/frontend/screens/MenuScreen.cpp +++ b/src/frontend/screens/MenuScreen.cpp @@ -2,8 +2,8 @@ #include "../../graphics/ui/GUI.h" #include "../../graphics/ui/elements/Menu.hpp" -#include "../../graphics/core/Batch2D.h" -#include "../../graphics/core/Shader.h" +#include "../../graphics/core/Batch2D.hpp" +#include "../../graphics/core/Shader.hpp" #include "../../window/Window.h" #include "../../window/Camera.h" #include "../../engine.h" diff --git a/src/frontend/screens/Screen.cpp b/src/frontend/screens/Screen.cpp index e09d0f10..9c0fc0da 100644 --- a/src/frontend/screens/Screen.cpp +++ b/src/frontend/screens/Screen.cpp @@ -1,6 +1,6 @@ #include "Screen.hpp" -#include "../../graphics/core/Batch2D.h" +#include "../../graphics/core/Batch2D.hpp" #include "../../engine.h" Screen::Screen(Engine* engine) : engine(engine), batch(new Batch2D(1024)) { diff --git a/src/graphics/core/Atlas.cpp b/src/graphics/core/Atlas.cpp index d15f6850..980170ea 100644 --- a/src/graphics/core/Atlas.cpp +++ b/src/graphics/core/Atlas.cpp @@ -1,9 +1,9 @@ -#include "Atlas.h" +#include "Atlas.hpp" #include #include "../../maths/LMPacker.h" -#include "Texture.h" -#include "ImageData.h" +#include "Texture.hpp" +#include "ImageData.hpp" Atlas::Atlas( std::unique_ptr image, diff --git a/src/graphics/core/Atlas.h b/src/graphics/core/Atlas.hpp similarity index 100% rename from src/graphics/core/Atlas.h rename to src/graphics/core/Atlas.hpp diff --git a/src/graphics/core/Batch2D.cpp b/src/graphics/core/Batch2D.cpp index 04c3ab69..ded51861 100644 --- a/src/graphics/core/Batch2D.cpp +++ b/src/graphics/core/Batch2D.cpp @@ -1,7 +1,7 @@ -#include "Batch2D.h" -#include "Mesh.h" -#include "Texture.h" -#include "gl_util.h" +#include "Batch2D.hpp" +#include "Mesh.hpp" +#include "Texture.hpp" +#include "gl_util.hpp" #include diff --git a/src/graphics/core/Batch2D.h b/src/graphics/core/Batch2D.hpp similarity index 98% rename from src/graphics/core/Batch2D.h rename to src/graphics/core/Batch2D.hpp index 8eace82f..d3313312 100644 --- a/src/graphics/core/Batch2D.h +++ b/src/graphics/core/Batch2D.hpp @@ -5,7 +5,7 @@ #include #include -#include "commons.h" +#include "commons.hpp" #include "../../maths/UVRegion.h" class Mesh; diff --git a/src/graphics/core/Batch3D.cpp b/src/graphics/core/Batch3D.cpp index a3f56b46..2f2aeea8 100644 --- a/src/graphics/core/Batch3D.cpp +++ b/src/graphics/core/Batch3D.cpp @@ -1,7 +1,7 @@ -#include "Batch3D.h" +#include "Batch3D.hpp" -#include "Mesh.h" -#include "Texture.h" +#include "Mesh.hpp" +#include "Texture.hpp" #include #include "../../typedefs.h" diff --git a/src/graphics/core/Batch3D.h b/src/graphics/core/Batch3D.hpp similarity index 100% rename from src/graphics/core/Batch3D.h rename to src/graphics/core/Batch3D.hpp diff --git a/src/graphics/core/Cubemap.cpp b/src/graphics/core/Cubemap.cpp index 5dcd7a2e..4477c9c0 100644 --- a/src/graphics/core/Cubemap.cpp +++ b/src/graphics/core/Cubemap.cpp @@ -1,5 +1,5 @@ -#include "Cubemap.h" -#include "gl_util.h" +#include "Cubemap.hpp" +#include "gl_util.hpp" #include diff --git a/src/graphics/core/Cubemap.h b/src/graphics/core/Cubemap.hpp similarity index 88% rename from src/graphics/core/Cubemap.h rename to src/graphics/core/Cubemap.hpp index 21cf0450..8921116a 100644 --- a/src/graphics/core/Cubemap.h +++ b/src/graphics/core/Cubemap.hpp @@ -1,7 +1,7 @@ #ifndef GRAPHICS_CORE_CUBEMAP_H_ #define GRAPHICS_CORE_CUBEMAP_H_ -#include "Texture.h" +#include "Texture.hpp" /// @brief Cubemap texture class Cubemap : public Texture { diff --git a/src/graphics/core/Font.cpp b/src/graphics/core/Font.cpp index bf9e67c1..79ede561 100644 --- a/src/graphics/core/Font.cpp +++ b/src/graphics/core/Font.cpp @@ -1,6 +1,6 @@ -#include "Font.h" -#include "Texture.h" -#include "Batch2D.h" +#include "Font.hpp" +#include "Texture.hpp" +#include "Batch2D.hpp" inline constexpr uint GLYPH_SIZE = 16; inline constexpr uint MAX_CODEPAGES = 10000; // idk ho many codepages unicode has diff --git a/src/graphics/core/Font.h b/src/graphics/core/Font.hpp similarity index 100% rename from src/graphics/core/Font.h rename to src/graphics/core/Font.hpp diff --git a/src/graphics/core/Framebuffer.cpp b/src/graphics/core/Framebuffer.cpp index f9553c2f..c9a59bcf 100644 --- a/src/graphics/core/Framebuffer.cpp +++ b/src/graphics/core/Framebuffer.cpp @@ -1,7 +1,7 @@ -#include "Framebuffer.h" +#include "Framebuffer.hpp" #include -#include "Texture.h" +#include "Texture.hpp" Framebuffer::Framebuffer(uint fbo, uint depth, std::unique_ptr texture) : fbo(fbo), depth(depth), texture(std::move(texture)) diff --git a/src/graphics/core/Framebuffer.h b/src/graphics/core/Framebuffer.hpp similarity index 100% rename from src/graphics/core/Framebuffer.h rename to src/graphics/core/Framebuffer.hpp diff --git a/src/graphics/core/GfxContext.cpp b/src/graphics/core/GfxContext.cpp index da306fd4..0181e88d 100644 --- a/src/graphics/core/GfxContext.cpp +++ b/src/graphics/core/GfxContext.cpp @@ -1,9 +1,9 @@ -#include "GfxContext.h" +#include "GfxContext.hpp" #include -#include "Batch2D.h" -#include "Framebuffer.h" +#include "Batch2D.hpp" +#include "Framebuffer.hpp" GfxContext::GfxContext( const GfxContext* parent, diff --git a/src/graphics/core/GfxContext.h b/src/graphics/core/GfxContext.hpp similarity index 97% rename from src/graphics/core/GfxContext.h rename to src/graphics/core/GfxContext.hpp index 991339cb..a3b1de3b 100644 --- a/src/graphics/core/GfxContext.h +++ b/src/graphics/core/GfxContext.hpp @@ -1,7 +1,7 @@ #ifndef GRAPHICS_CORE_GFX_CONTEXT_H_ #define GRAPHICS_CORE_GFX_CONTEXT_H_ -#include "Viewport.h" +#include "Viewport.hpp" #include "../../window/Window.h" #include "../../typedefs.h" diff --git a/src/graphics/core/ImageData.cpp b/src/graphics/core/ImageData.cpp index 824178a7..a7f3939b 100644 --- a/src/graphics/core/ImageData.cpp +++ b/src/graphics/core/ImageData.cpp @@ -1,4 +1,4 @@ -#include "ImageData.h" +#include "ImageData.hpp" #include #include diff --git a/src/graphics/core/ImageData.h b/src/graphics/core/ImageData.hpp similarity index 100% rename from src/graphics/core/ImageData.h rename to src/graphics/core/ImageData.hpp diff --git a/src/graphics/core/LineBatch.cpp b/src/graphics/core/LineBatch.cpp index 5246c05b..33d72def 100644 --- a/src/graphics/core/LineBatch.cpp +++ b/src/graphics/core/LineBatch.cpp @@ -1,5 +1,5 @@ -#include "LineBatch.h" -#include "Mesh.h" +#include "LineBatch.hpp" +#include "Mesh.hpp" #include diff --git a/src/graphics/core/LineBatch.h b/src/graphics/core/LineBatch.hpp similarity index 100% rename from src/graphics/core/LineBatch.h rename to src/graphics/core/LineBatch.hpp diff --git a/src/graphics/core/Mesh.cpp b/src/graphics/core/Mesh.cpp index 304a6734..45ba2878 100644 --- a/src/graphics/core/Mesh.cpp +++ b/src/graphics/core/Mesh.cpp @@ -1,4 +1,4 @@ -#include "Mesh.h" +#include "Mesh.hpp" #include int Mesh::meshesCount = 0; diff --git a/src/graphics/core/Mesh.h b/src/graphics/core/Mesh.hpp similarity index 100% rename from src/graphics/core/Mesh.h rename to src/graphics/core/Mesh.hpp diff --git a/src/graphics/core/PostProcessing.cpp b/src/graphics/core/PostProcessing.cpp index 7a62652b..b3264d1d 100644 --- a/src/graphics/core/PostProcessing.cpp +++ b/src/graphics/core/PostProcessing.cpp @@ -1,8 +1,8 @@ #include "PostProcessing.h" -#include "Mesh.h" -#include "Shader.h" -#include "Texture.h" -#include "Framebuffer.h" +#include "Mesh.hpp" +#include "Shader.hpp" +#include "Texture.hpp" +#include "Framebuffer.hpp" #include diff --git a/src/graphics/core/PostProcessing.h b/src/graphics/core/PostProcessing.h index c8b0e268..a8668edc 100644 --- a/src/graphics/core/PostProcessing.h +++ b/src/graphics/core/PostProcessing.h @@ -1,8 +1,8 @@ #ifndef GRAPHICS_CORE_POST_PROCESSING_H_ #define GRAPHICS_CORE_POST_PROCESSING_H_ -#include "Viewport.h" -#include "GfxContext.h" +#include "Viewport.hpp" +#include "GfxContext.hpp" #include @@ -35,7 +35,7 @@ public: /// @brief Make an image from the last rendered frame std::unique_ptr toImage(); - + Framebuffer* getFramebuffer() const; }; diff --git a/src/graphics/core/Shader.cpp b/src/graphics/core/Shader.cpp index b7b17d44..52ecacd1 100644 --- a/src/graphics/core/Shader.cpp +++ b/src/graphics/core/Shader.cpp @@ -1,4 +1,4 @@ -#include "Shader.h" +#include "Shader.hpp" #include #include diff --git a/src/graphics/core/Shader.h b/src/graphics/core/Shader.hpp similarity index 100% rename from src/graphics/core/Shader.h rename to src/graphics/core/Shader.hpp diff --git a/src/graphics/core/Texture.cpp b/src/graphics/core/Texture.cpp index e0123837..ad4733ca 100644 --- a/src/graphics/core/Texture.cpp +++ b/src/graphics/core/Texture.cpp @@ -1,11 +1,11 @@ -#include "Texture.h" +#include "Texture.hpp" +#include "ImageData.hpp" +#include "gl_util.hpp" + #include #include #include -#include "ImageData.h" -#include "gl_util.h" - uint Texture::MAX_RESOLUTION = 1024; // Window.initialize overrides it Texture::Texture(uint id, uint width, uint height) diff --git a/src/graphics/core/Texture.h b/src/graphics/core/Texture.hpp similarity index 96% rename from src/graphics/core/Texture.h rename to src/graphics/core/Texture.hpp index 13c9254e..250a758b 100644 --- a/src/graphics/core/Texture.h +++ b/src/graphics/core/Texture.hpp @@ -4,7 +4,7 @@ #include #include #include "../../typedefs.h" -#include "ImageData.h" +#include "ImageData.hpp" class Texture { protected: diff --git a/src/graphics/core/TextureAnimation.cpp b/src/graphics/core/TextureAnimation.cpp index 19baba7a..c4ee09b4 100644 --- a/src/graphics/core/TextureAnimation.cpp +++ b/src/graphics/core/TextureAnimation.cpp @@ -1,6 +1,6 @@ -#include "TextureAnimation.h" -#include "Texture.h" -#include "Framebuffer.h" +#include "TextureAnimation.hpp" +#include "Texture.hpp" +#include "Framebuffer.hpp" #include #include diff --git a/src/graphics/core/TextureAnimation.h b/src/graphics/core/TextureAnimation.hpp similarity index 100% rename from src/graphics/core/TextureAnimation.h rename to src/graphics/core/TextureAnimation.hpp diff --git a/src/graphics/core/Viewport.cpp b/src/graphics/core/Viewport.cpp index 166d28f8..7419936d 100644 --- a/src/graphics/core/Viewport.cpp +++ b/src/graphics/core/Viewport.cpp @@ -1,4 +1,4 @@ -#include "Viewport.h" +#include "Viewport.hpp" Viewport::Viewport(uint width, uint height) : width(width), height(height) { @@ -10,4 +10,4 @@ uint Viewport::getWidth() const { uint Viewport::getHeight() const { return height; -} \ No newline at end of file +} diff --git a/src/graphics/core/Viewport.h b/src/graphics/core/Viewport.hpp similarity index 100% rename from src/graphics/core/Viewport.h rename to src/graphics/core/Viewport.hpp diff --git a/src/graphics/core/commons.h b/src/graphics/core/commons.hpp similarity index 100% rename from src/graphics/core/commons.h rename to src/graphics/core/commons.hpp diff --git a/src/graphics/core/gl_util.h b/src/graphics/core/gl_util.hpp similarity index 89% rename from src/graphics/core/gl_util.h rename to src/graphics/core/gl_util.hpp index 5ef9ee21..39af411f 100644 --- a/src/graphics/core/gl_util.h +++ b/src/graphics/core/gl_util.hpp @@ -1,8 +1,8 @@ #ifndef GRAPHICS_CORE_GL_UTIL_H_ #define GRAPHICS_CORE_GL_UTIL_H_ -#include "commons.h" -#include "ImageData.h" +#include "commons.hpp" +#include "ImageData.hpp" #include diff --git a/src/graphics/render/BlocksPreview.cpp b/src/graphics/render/BlocksPreview.cpp index 3ba8232a..8eaa69c2 100644 --- a/src/graphics/render/BlocksPreview.cpp +++ b/src/graphics/render/BlocksPreview.cpp @@ -9,13 +9,13 @@ #include "../../voxels/Block.h" #include "../../window/Camera.h" #include "../../window/Window.h" -#include "../core/Atlas.h" -#include "../core/Batch3D.h" -#include "../core/Framebuffer.h" -#include "../core/GfxContext.h" -#include "../core/Shader.h" -#include "../core/Texture.h" -#include "../core/Viewport.h" +#include "../core/Atlas.hpp" +#include "../core/Batch3D.hpp" +#include "../core/Framebuffer.hpp" +#include "../core/GfxContext.hpp" +#include "../core/Shader.hpp" +#include "../core/Texture.hpp" +#include "../core/Viewport.hpp" std::unique_ptr BlocksPreview::draw( const ContentGfxCache* cache, diff --git a/src/graphics/render/BlocksRenderer.cpp b/src/graphics/render/BlocksRenderer.cpp index f1e455ca..23102a80 100644 --- a/src/graphics/render/BlocksRenderer.cpp +++ b/src/graphics/render/BlocksRenderer.cpp @@ -2,7 +2,7 @@ #include -#include "../core/Mesh.h" +#include "../core/Mesh.hpp" #include "../../maths/UVRegion.h" #include "../../constants.h" #include "../../content/Content.h" diff --git a/src/graphics/render/ChunksRenderer.cpp b/src/graphics/render/ChunksRenderer.cpp index b91f4d65..fd4ffeb5 100644 --- a/src/graphics/render/ChunksRenderer.cpp +++ b/src/graphics/render/ChunksRenderer.cpp @@ -1,7 +1,7 @@ #include "ChunksRenderer.h" #include "../../debug/Logger.h" -#include "../../graphics/core/Mesh.h" +#include "../../graphics/core/Mesh.hpp" #include "BlocksRenderer.h" #include "../../voxels/Chunk.h" #include "../../world/Level.h" diff --git a/src/graphics/render/Skybox.cpp b/src/graphics/render/Skybox.cpp index be7157da..d9d891b2 100644 --- a/src/graphics/render/Skybox.cpp +++ b/src/graphics/render/Skybox.cpp @@ -5,13 +5,13 @@ #include #include "../../assets/Assets.h" -#include "../../graphics/core/Shader.h" -#include "../../graphics/core/Mesh.h" -#include "../../graphics/core/Batch3D.h" -#include "../../graphics/core/Texture.h" -#include "../../graphics/core/Cubemap.h" -#include "../../graphics/core/Framebuffer.h" -#include "../../graphics/core/GfxContext.h" +#include "../../graphics/core/Shader.hpp" +#include "../../graphics/core/Mesh.hpp" +#include "../../graphics/core/Batch3D.hpp" +#include "../../graphics/core/Texture.hpp" +#include "../../graphics/core/Cubemap.hpp" +#include "../../graphics/core/Framebuffer.hpp" +#include "../../graphics/core/GfxContext.hpp" #include "../../window/Window.h" #include "../../window/Camera.h" diff --git a/src/graphics/render/WorldRenderer.cpp b/src/graphics/render/WorldRenderer.cpp index 96a4d0bc..d7d8f27b 100644 --- a/src/graphics/render/WorldRenderer.cpp +++ b/src/graphics/render/WorldRenderer.cpp @@ -21,14 +21,14 @@ #include "../../world/Level.h" #include "../../world/LevelEvents.h" #include "../../world/World.h" -#include "../core/Atlas.h" -#include "../core/Batch3D.h" -#include "../core/GfxContext.h" -#include "../core/LineBatch.h" -#include "../core/Mesh.h" +#include "../core/Atlas.hpp" +#include "../core/Batch3D.hpp" +#include "../core/GfxContext.hpp" +#include "../core/LineBatch.hpp" +#include "../core/Mesh.hpp" #include "../core/PostProcessing.h" -#include "../core/Shader.h" -#include "../core/Texture.h" +#include "../core/Shader.hpp" +#include "../core/Texture.hpp" #include "ChunksRenderer.h" #include "Skybox.h" diff --git a/src/graphics/ui/GUI.cpp b/src/graphics/ui/GUI.cpp index 50945bed..d2f2c28f 100644 --- a/src/graphics/ui/GUI.cpp +++ b/src/graphics/ui/GUI.cpp @@ -7,9 +7,9 @@ #include "../../assets/Assets.h" #include "../../frontend/UiDocument.h" -#include "../../graphics/core/Batch2D.h" -#include "../../graphics/core/Shader.h" -#include "../../graphics/core/GfxContext.h" +#include "../../graphics/core/Batch2D.hpp" +#include "../../graphics/core/Shader.hpp" +#include "../../graphics/core/GfxContext.hpp" #include "../../window/Events.h" #include "../../window/input.h" #include "../../window/Camera.h" diff --git a/src/graphics/ui/elements/Button.cpp b/src/graphics/ui/elements/Button.cpp index 92c04970..8db172f0 100644 --- a/src/graphics/ui/elements/Button.cpp +++ b/src/graphics/ui/elements/Button.cpp @@ -1,8 +1,8 @@ #include "Button.hpp" #include "Label.hpp" -#include "../../core/GfxContext.h" -#include "../../core/Batch2D.h" +#include "../../core/GfxContext.hpp" +#include "../../core/Batch2D.hpp" using namespace gui; diff --git a/src/graphics/ui/elements/CheckBox.cpp b/src/graphics/ui/elements/CheckBox.cpp index 2c2490d7..f65ae9fa 100644 --- a/src/graphics/ui/elements/CheckBox.cpp +++ b/src/graphics/ui/elements/CheckBox.cpp @@ -1,7 +1,7 @@ #include "CheckBox.hpp" -#include "../../core/GfxContext.h" -#include "../../core/Batch2D.h" +#include "../../core/GfxContext.hpp" +#include "../../core/Batch2D.hpp" #include "Label.hpp" using namespace gui; diff --git a/src/graphics/ui/elements/Container.cpp b/src/graphics/ui/elements/Container.cpp index 3eb5fd60..28b1f721 100644 --- a/src/graphics/ui/elements/Container.cpp +++ b/src/graphics/ui/elements/Container.cpp @@ -1,7 +1,7 @@ #include "Container.hpp" -#include "../../core/GfxContext.h" -#include "../../core/Batch2D.h" +#include "../../core/GfxContext.hpp" +#include "../../core/Batch2D.hpp" using namespace gui; diff --git a/src/graphics/ui/elements/Image.cpp b/src/graphics/ui/elements/Image.cpp index 5e3831ec..b613f24c 100644 --- a/src/graphics/ui/elements/Image.cpp +++ b/src/graphics/ui/elements/Image.cpp @@ -1,8 +1,8 @@ #include "Image.hpp" -#include "../../core/GfxContext.h" -#include "../../core/Batch2D.h" -#include "../../core/Texture.h" +#include "../../core/GfxContext.hpp" +#include "../../core/Batch2D.hpp" +#include "../../core/Texture.hpp" #include "../../../assets/Assets.h" #include "../../../maths/UVRegion.h" diff --git a/src/graphics/ui/elements/InputBindBox.cpp b/src/graphics/ui/elements/InputBindBox.cpp index 15256cda..27c67a68 100644 --- a/src/graphics/ui/elements/InputBindBox.cpp +++ b/src/graphics/ui/elements/InputBindBox.cpp @@ -1,8 +1,8 @@ #include "InputBindBox.hpp" #include "Label.hpp" -#include "../../core/GfxContext.h" -#include "../../core/Batch2D.h" +#include "../../core/GfxContext.hpp" +#include "../../core/Batch2D.hpp" #include "../../../util/stringutil.h" using namespace gui; diff --git a/src/graphics/ui/elements/Label.cpp b/src/graphics/ui/elements/Label.cpp index 73f1079f..3f88184b 100644 --- a/src/graphics/ui/elements/Label.cpp +++ b/src/graphics/ui/elements/Label.cpp @@ -1,8 +1,8 @@ #include "Label.hpp" -#include "../../core/GfxContext.h" -#include "../../core/Batch2D.h" -#include "../../core/Font.h" +#include "../../core/GfxContext.hpp" +#include "../../core/Batch2D.hpp" +#include "../../core/Font.hpp" #include "../../../assets/Assets.h" #include "../../../util/stringutil.h" diff --git a/src/graphics/ui/elements/Plotter.cpp b/src/graphics/ui/elements/Plotter.cpp index 6c20caa7..267c4f0e 100644 --- a/src/graphics/ui/elements/Plotter.cpp +++ b/src/graphics/ui/elements/Plotter.cpp @@ -1,8 +1,8 @@ #include "Plotter.hpp" -#include "../../core/Batch2D.h" -#include "../../core/Font.h" -#include "../../core/GfxContext.h" +#include "../../core/Batch2D.hpp" +#include "../../core/Font.hpp" +#include "../../core/GfxContext.hpp" #include "../../../assets/Assets.h" #include "../../../util/stringutil.h" diff --git a/src/graphics/ui/elements/TextBox.cpp b/src/graphics/ui/elements/TextBox.cpp index 8791b4eb..bad7fbcc 100644 --- a/src/graphics/ui/elements/TextBox.cpp +++ b/src/graphics/ui/elements/TextBox.cpp @@ -1,9 +1,9 @@ #include "TextBox.hpp" #include "Label.hpp" -#include "../../core/GfxContext.h" -#include "../../core/Batch2D.h" -#include "../../core/Font.h" +#include "../../core/GfxContext.hpp" +#include "../../core/Batch2D.hpp" +#include "../../core/Font.hpp" #include "../../../assets/Assets.h" #include "../../../util/stringutil.h" #include "../../../window/Events.h" diff --git a/src/graphics/ui/elements/TrackBar.cpp b/src/graphics/ui/elements/TrackBar.cpp index 0ccf9b02..2dfae299 100644 --- a/src/graphics/ui/elements/TrackBar.cpp +++ b/src/graphics/ui/elements/TrackBar.cpp @@ -1,7 +1,7 @@ #include "TrackBar.hpp" -#include "../../core/GfxContext.h" -#include "../../core/Batch2D.h" +#include "../../core/GfxContext.hpp" +#include "../../core/Batch2D.hpp" #include "../../../assets/Assets.h" using namespace gui; diff --git a/src/graphics/ui/elements/UINode.cpp b/src/graphics/ui/elements/UINode.cpp index 407e6996..c465e00c 100644 --- a/src/graphics/ui/elements/UINode.cpp +++ b/src/graphics/ui/elements/UINode.cpp @@ -1,7 +1,7 @@ #include "UINode.hpp" #include "Container.hpp" -#include "../../core/Batch2D.h" +#include "../../core/Batch2D.hpp" using gui::UINode; using gui::Align; diff --git a/src/logic/ChunksController.cpp b/src/logic/ChunksController.cpp index f32bc6b5..bff2ebb1 100644 --- a/src/logic/ChunksController.cpp +++ b/src/logic/ChunksController.cpp @@ -11,7 +11,7 @@ #include "../voxels/ChunksStorage.h" #include "../voxels/WorldGenerator.h" #include "../world/WorldGenerators.h" -#include "../graphics/core/Mesh.h" +#include "../graphics/core/Mesh.hpp" #include "../lighting/Lighting.h" #include "../files/WorldFiles.h" #include "../world/Level.h" diff --git a/src/logic/scripting/lua/libpack.cpp b/src/logic/scripting/lua/libpack.cpp index 2c50fbf4..24188f2a 100644 --- a/src/logic/scripting/lua/libpack.cpp +++ b/src/logic/scripting/lua/libpack.cpp @@ -7,7 +7,7 @@ #include "../../../files/WorldFiles.h" #include "../../../world/Level.h" #include "../../../world/World.h" -#include "../../../graphics/core/Texture.h" +#include "../../../graphics/core/Texture.hpp" #include #include diff --git a/src/logic/scripting/lua/libworld.cpp b/src/logic/scripting/lua/libworld.cpp index a7383410..5e81274d 100644 --- a/src/logic/scripting/lua/libworld.cpp +++ b/src/logic/scripting/lua/libworld.cpp @@ -3,7 +3,7 @@ #include "../scripting.h" #include "../../../assets/Assets.h" #include "../../../coders/imageio.h" -#include "../../../graphics/core/Texture.h" +#include "../../../graphics/core/Texture.hpp" #include "../../../files/engine_paths.h" #include "../../../world/Level.h" #include "../../../world/World.h" @@ -41,7 +41,7 @@ static int l_world_get_list(lua_State* L) { } lua_pushstring(L, icon.c_str()); lua_setfield(L, -2, "icon"); - + lua_rawseti(L, -2, i + 1); } return 1; diff --git a/src/voxels/Chunks.cpp b/src/voxels/Chunks.cpp index 2f2323ed..3c0024f9 100644 --- a/src/voxels/Chunks.cpp +++ b/src/voxels/Chunks.cpp @@ -7,7 +7,7 @@ #include "../lighting/Lightmap.h" #include "../files/WorldFiles.h" #include "../world/LevelEvents.h" -#include "../graphics/core/Mesh.h" +#include "../graphics/core/Mesh.hpp" #include "../maths/voxmaths.h" #include "../maths/aabb.h" #include "../maths/rays.h" diff --git a/src/window/Window.cpp b/src/window/Window.cpp index 7a00edf7..316f3a5b 100644 --- a/src/window/Window.cpp +++ b/src/window/Window.cpp @@ -2,8 +2,8 @@ #include "Window.h" #include "Events.h" #include "../debug/Logger.h" -#include "../graphics/core/ImageData.h" -#include "../graphics/core/Texture.h" +#include "../graphics/core/ImageData.hpp" +#include "../graphics/core/Texture.hpp" #include #include