From 7f8a86b7401b6f393345622d4613b9518d03fd38 Mon Sep 17 00:00:00 2001 From: MihailRis Date: Sun, 5 May 2024 20:08:25 +0300 Subject: [PATCH] minor refactor --- src/coders/toml.cpp | 2 +- src/coders/{toml.h => toml.hpp} | 6 +++--- src/core_defs.cpp | 8 ++++---- src/engine.cpp | 10 +++++----- src/files/WorldFiles.cpp | 2 +- src/files/settings_io.cpp | 6 +++--- src/frontend/hud.cpp | 10 +++++----- src/frontend/menu.cpp | 2 +- src/frontend/screens/LevelScreen.cpp | 4 ++-- src/frontend/screens/MenuScreen.cpp | 4 ++-- src/graphics/core/DrawContext.hpp | 2 +- src/graphics/render/BlocksPreview.cpp | 4 ++-- src/graphics/render/Skybox.cpp | 4 ++-- src/graphics/render/WorldRenderer.cpp | 4 ++-- src/graphics/ui/GUI.cpp | 6 +++--- src/graphics/ui/elements/InventoryView.cpp | 4 ++-- src/graphics/ui/elements/TextBox.cpp | 2 +- src/graphics/ui/elements/UINode.hpp | 2 +- src/graphics/ui/gui_xml.cpp | 2 +- src/logic/PlayerController.cpp | 7 ++++--- src/logic/scripting/lua/libcore.cpp | 4 ++-- src/logic/scripting/lua/libinput.cpp | 4 ++-- src/logic/scripting/lua/libplayer.cpp | 2 +- src/logic/scripting/lua/libtime.cpp | 2 +- src/objects/Player.cpp | 4 ++-- src/voxel_engine.cpp | 10 +--------- src/window/Camera.cpp | 4 ++-- src/window/{Camera.h => Camera.hpp} | 6 +++--- src/window/Events.cpp | 3 ++- src/window/{Events.h => Events.hpp} | 9 ++++----- src/window/Window.cpp | 4 ++-- src/window/{Window.h => Window.hpp} | 6 +++--- src/window/input.cpp | 2 +- src/window/{input.h => input.hpp} | 6 +++--- src/world/World.cpp | 2 +- 35 files changed, 76 insertions(+), 83 deletions(-) rename src/coders/{toml.h => toml.hpp} (80%) rename src/window/{Camera.h => Camera.hpp} (87%) rename src/window/{Events.h => Events.hpp} (92%) rename src/window/{Window.h => Window.hpp} (95%) rename src/window/{input.h => input.hpp} (92%) diff --git a/src/coders/toml.cpp b/src/coders/toml.cpp index 3902cec0..162d18f1 100644 --- a/src/coders/toml.cpp +++ b/src/coders/toml.cpp @@ -1,4 +1,4 @@ -#include "toml.h" +#include "toml.hpp" #include "commons.h" #include "../data/setting.hpp" #include "../data/dynamic.h" diff --git a/src/coders/toml.h b/src/coders/toml.hpp similarity index 80% rename from src/coders/toml.h rename to src/coders/toml.hpp index 22bc00f1..4e347f2c 100644 --- a/src/coders/toml.h +++ b/src/coders/toml.hpp @@ -1,5 +1,5 @@ -#ifndef CODERS_TOML_H_ -#define CODERS_TOML_H_ +#ifndef CODERS_TOML_HPP_ +#define CODERS_TOML_HPP_ #include #include @@ -19,4 +19,4 @@ namespace toml { ); } -#endif // CODERS_TOML_H_ +#endif // CODERS_TOML_HPP_ diff --git a/src/core_defs.cpp b/src/core_defs.cpp index adf3c938..d0f3a8f0 100644 --- a/src/core_defs.cpp +++ b/src/core_defs.cpp @@ -2,9 +2,9 @@ #include "items/ItemDef.h" #include "content/Content.h" -#include "window/Window.h" -#include "window/Events.h" -#include "window/input.h" +#include "window/Window.hpp" +#include "window/Events.hpp" +#include "window/input.hpp" #include "voxels/Block.h" // All in-game definitions (blocks, items, etc..) @@ -40,4 +40,4 @@ void corecontent::setup_bindings() { Events::bind(BIND_PLAYER_BUILD, inputtype::mouse, mousecode::BUTTON_2); Events::bind(BIND_PLAYER_PICK, inputtype::mouse, mousecode::BUTTON_3); Events::bind(BIND_HUD_INVENTORY, inputtype::keyboard, keycode::TAB); -} \ No newline at end of file +} diff --git a/src/engine.cpp b/src/engine.cpp index 72efd647..19542eee 100644 --- a/src/engine.cpp +++ b/src/engine.cpp @@ -8,7 +8,7 @@ #include "coders/GLSLExtension.h" #include "coders/imageio.hpp" #include "coders/json.h" -#include "coders/toml.h" +#include "coders/toml.hpp" #include "content/ContentLoader.h" #include "core_defs.h" #include "files/files.h" @@ -28,10 +28,10 @@ #include "util/platform.h" #include "voxels/DefaultWorldGenerator.h" #include "voxels/FlatWorldGenerator.h" -#include "window/Camera.h" -#include "window/Events.h" -#include "window/input.h" -#include "window/Window.h" +#include "window/Camera.hpp" +#include "window/Events.hpp" +#include "window/input.hpp" +#include "window/Window.hpp" #include "world/WorldGenerators.h" #include diff --git a/src/files/WorldFiles.cpp b/src/files/WorldFiles.cpp index d3c3c0dc..f19ed40e 100644 --- a/src/files/WorldFiles.cpp +++ b/src/files/WorldFiles.cpp @@ -17,7 +17,7 @@ #include "../voxels/Block.h" #include "../voxels/Chunk.h" #include "../voxels/voxel.h" -#include "../window/Camera.h" +#include "../window/Camera.hpp" #include "../world/World.h" #include diff --git a/src/files/settings_io.cpp b/src/files/settings_io.cpp index 6bd03c24..5559f363 100644 --- a/src/files/settings_io.cpp +++ b/src/files/settings_io.cpp @@ -1,8 +1,8 @@ #include "settings_io.hpp" -#include "../window/Events.h" -#include "../window/input.h" -#include "../coders/toml.h" +#include "../window/Events.hpp" +#include "../window/input.hpp" +#include "../coders/toml.hpp" #include "../coders/json.h" #include "../debug/Logger.hpp" #include "../settings.h" diff --git a/src/frontend/hud.cpp b/src/frontend/hud.cpp index f067989e..e649f5f5 100644 --- a/src/frontend/hud.cpp +++ b/src/frontend/hud.cpp @@ -8,8 +8,8 @@ #include "../graphics/core/Atlas.hpp" #include "../graphics/core/Batch2D.hpp" #include "../graphics/core/Batch3D.hpp" -#include "../graphics/core/Font.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" @@ -33,10 +33,10 @@ #include "../voxels/Block.h" #include "../voxels/Chunk.h" #include "../voxels/Chunks.h" -#include "../window/Camera.h" -#include "../window/Events.h" -#include "../window/input.h" -#include "../window/Window.h" +#include "../window/Camera.hpp" +#include "../window/Events.hpp" +#include "../window/input.hpp" +#include "../window/Window.hpp" #include "../world/Level.h" #include "../world/World.h" #include "ContentGfxCache.h" diff --git a/src/frontend/menu.cpp b/src/frontend/menu.cpp index 4e98b808..f36e1cfd 100644 --- a/src/frontend/menu.cpp +++ b/src/frontend/menu.cpp @@ -14,7 +14,7 @@ #include "../logic/scripting/scripting.h" #include "../settings.h" #include "../util/stringutil.h" -#include "../window/Window.h" +#include "../window/Window.hpp" #include "locale/langs.h" #include "UiDocument.h" diff --git a/src/frontend/screens/LevelScreen.cpp b/src/frontend/screens/LevelScreen.cpp index 9052af73..3d402ef3 100644 --- a/src/frontend/screens/LevelScreen.cpp +++ b/src/frontend/screens/LevelScreen.cpp @@ -18,8 +18,8 @@ #include "../../voxels/Chunks.h" #include "../../world/Level.h" #include "../../world/World.h" -#include "../../window/Camera.h" -#include "../../window/Events.h" +#include "../../window/Camera.hpp" +#include "../../window/Events.hpp" #include "../../engine.h" static debug::Logger logger("level-screen"); diff --git a/src/frontend/screens/MenuScreen.cpp b/src/frontend/screens/MenuScreen.cpp index c61cda05..f6ec4a4d 100644 --- a/src/frontend/screens/MenuScreen.cpp +++ b/src/frontend/screens/MenuScreen.cpp @@ -5,8 +5,8 @@ #include "../../graphics/core/Batch2D.hpp" #include "../../graphics/core/Shader.hpp" #include "../../graphics/core/Texture.hpp" -#include "../../window/Window.h" -#include "../../window/Camera.h" +#include "../../window/Window.hpp" +#include "../../window/Camera.hpp" #include "../../engine.h" MenuScreen::MenuScreen(Engine* engine) : Screen(engine) { diff --git a/src/graphics/core/DrawContext.hpp b/src/graphics/core/DrawContext.hpp index fd56360a..1d69441d 100644 --- a/src/graphics/core/DrawContext.hpp +++ b/src/graphics/core/DrawContext.hpp @@ -3,7 +3,7 @@ #include "commons.hpp" #include "Viewport.hpp" -#include "../../window/Window.h" +#include "../../window/Window.hpp" #include "../../typedefs.h" class Batch2D; diff --git a/src/graphics/render/BlocksPreview.cpp b/src/graphics/render/BlocksPreview.cpp index dfc853a9..9ee4d797 100644 --- a/src/graphics/render/BlocksPreview.cpp +++ b/src/graphics/render/BlocksPreview.cpp @@ -4,8 +4,8 @@ #include "../../content/Content.h" #include "../../frontend/ContentGfxCache.h" #include "../../voxels/Block.h" -#include "../../window/Camera.h" -#include "../../window/Window.h" +#include "../../window/Camera.hpp" +#include "../../window/Window.hpp" #include "../core/Atlas.hpp" #include "../core/Batch3D.hpp" #include "../core/Framebuffer.hpp" diff --git a/src/graphics/render/Skybox.cpp b/src/graphics/render/Skybox.cpp index 1db8e931..1351c4b8 100644 --- a/src/graphics/render/Skybox.cpp +++ b/src/graphics/render/Skybox.cpp @@ -7,8 +7,8 @@ #include "../../graphics/core/Cubemap.hpp" #include "../../graphics/core/Framebuffer.hpp" #include "../../graphics/core/DrawContext.hpp" -#include "../../window/Window.h" -#include "../../window/Camera.h" +#include "../../window/Window.hpp" +#include "../../window/Camera.hpp" #include #include diff --git a/src/graphics/render/WorldRenderer.cpp b/src/graphics/render/WorldRenderer.cpp index 2177e01d..cc7a0dd3 100644 --- a/src/graphics/render/WorldRenderer.cpp +++ b/src/graphics/render/WorldRenderer.cpp @@ -16,8 +16,8 @@ #include "../../voxels/Block.h" #include "../../voxels/Chunk.h" #include "../../voxels/Chunks.h" -#include "../../window/Camera.h" -#include "../../window/Window.h" +#include "../../window/Camera.hpp" +#include "../../window/Window.hpp" #include "../../world/Level.h" #include "../../world/LevelEvents.h" #include "../../world/World.h" diff --git a/src/graphics/ui/GUI.cpp b/src/graphics/ui/GUI.cpp index 43ffebbd..35337ef7 100644 --- a/src/graphics/ui/GUI.cpp +++ b/src/graphics/ui/GUI.cpp @@ -10,9 +10,9 @@ #include "../../graphics/core/Batch2D.hpp" #include "../../graphics/core/Shader.hpp" #include "../../graphics/core/DrawContext.hpp" -#include "../../window/Events.h" -#include "../../window/input.h" -#include "../../window/Camera.h" +#include "../../window/Events.hpp" +#include "../../window/input.hpp" +#include "../../window/Camera.hpp" using namespace gui; diff --git a/src/graphics/ui/elements/InventoryView.cpp b/src/graphics/ui/elements/InventoryView.cpp index d72aa77e..5c0b2a00 100644 --- a/src/graphics/ui/elements/InventoryView.cpp +++ b/src/graphics/ui/elements/InventoryView.cpp @@ -11,8 +11,8 @@ #include "../../../objects/Player.h" #include "../../../util/stringutil.h" #include "../../../voxels/Block.h" -#include "../../../window/Events.h" -#include "../../../window/input.h" +#include "../../../window/Events.hpp" +#include "../../../window/input.hpp" #include "../../../world/Level.h" #include "../../core/Atlas.hpp" #include "../../core/Batch2D.hpp" diff --git a/src/graphics/ui/elements/TextBox.cpp b/src/graphics/ui/elements/TextBox.cpp index 389d8087..b46d08c7 100644 --- a/src/graphics/ui/elements/TextBox.cpp +++ b/src/graphics/ui/elements/TextBox.cpp @@ -6,7 +6,7 @@ #include "../../core/Font.hpp" #include "../../../assets/Assets.h" #include "../../../util/stringutil.h" -#include "../../../window/Events.h" +#include "../../../window/Events.hpp" using namespace gui; diff --git a/src/graphics/ui/elements/UINode.hpp b/src/graphics/ui/elements/UINode.hpp index 30be2aa3..3f0e3c09 100644 --- a/src/graphics/ui/elements/UINode.hpp +++ b/src/graphics/ui/elements/UINode.hpp @@ -2,7 +2,7 @@ #define GRAPHICS_UI_ELEMENTS_UINODE_H_ #include "../../../delegates.h" -#include "../../../window/input.h" +#include "../../../window/input.hpp" #include #include diff --git a/src/graphics/ui/gui_xml.cpp b/src/graphics/ui/gui_xml.cpp index 656785fe..46611073 100644 --- a/src/graphics/ui/gui_xml.cpp +++ b/src/graphics/ui/gui_xml.cpp @@ -16,7 +16,7 @@ #include "../../logic/scripting/scripting.h" #include "../../maths/voxmaths.h" #include "../../util/stringutil.h" -#include "../../window/Events.h" +#include "../../window/Events.hpp" #include diff --git a/src/logic/PlayerController.cpp b/src/logic/PlayerController.cpp index d19de7ee..daf253f5 100644 --- a/src/logic/PlayerController.cpp +++ b/src/logic/PlayerController.cpp @@ -12,9 +12,10 @@ #include "../voxels/Block.h" #include "../voxels/voxel.h" #include "../voxels/Chunks.h" -#include "../window/Camera.h" -#include "../window/Events.h" -#include "../window/input.h" +#include "../window/Camera.hpp" +#include "../window/Window.hpp" +#include "../window/Events.hpp" +#include "../window/input.hpp" #include "../items/ItemDef.h" #include "../items/ItemStack.h" #include "../items/Inventory.h" diff --git a/src/logic/scripting/lua/libcore.cpp b/src/logic/scripting/lua/libcore.cpp index a83c3679..bb23db90 100644 --- a/src/logic/scripting/lua/libcore.cpp +++ b/src/logic/scripting/lua/libcore.cpp @@ -10,8 +10,8 @@ #include "../../../logic/LevelController.h" #include "../../../logic/EngineController.hpp" #include "../../../world/Level.h" -#include "../../../window/Events.h" -#include "../../../window/Window.h" +#include "../../../window/Events.hpp" +#include "../../../window/Window.hpp" #include "../../../world/WorldGenerators.h" #include "../scripting.h" diff --git a/src/logic/scripting/lua/libinput.cpp b/src/logic/scripting/lua/libinput.cpp index 4e3fe58c..4aeb6561 100644 --- a/src/logic/scripting/lua/libinput.cpp +++ b/src/logic/scripting/lua/libinput.cpp @@ -2,8 +2,8 @@ #include "lua_commons.h" #include "../scripting.h" -#include "../../../window/input.h" -#include "../../../window/Events.h" +#include "../../../window/input.hpp" +#include "../../../window/Events.hpp" #include "../../../frontend/screens/Screen.hpp" #include "../../../frontend/hud.h" #include "../../../engine.h" diff --git a/src/logic/scripting/lua/libplayer.cpp b/src/logic/scripting/lua/libplayer.cpp index 7806b535..ea4c6211 100644 --- a/src/logic/scripting/lua/libplayer.cpp +++ b/src/logic/scripting/lua/libplayer.cpp @@ -4,7 +4,7 @@ #include "../../../world/Level.h" #include "../../../objects/Player.h" #include "../../../physics/Hitbox.h" -#include "../../../window/Camera.h" +#include "../../../window/Camera.hpp" #include "../../../items/Inventory.h" #include diff --git a/src/logic/scripting/lua/libtime.cpp b/src/logic/scripting/lua/libtime.cpp index 9347e23b..f6419af7 100644 --- a/src/logic/scripting/lua/libtime.cpp +++ b/src/logic/scripting/lua/libtime.cpp @@ -2,7 +2,7 @@ #include "lua_commons.h" #include "../scripting.h" #include "../../../engine.h" -#include "../../../window/Window.h" +#include "../../../window/Window.hpp" static int l_time_uptime(lua_State* L) { lua_pushnumber(L, Window::time()); diff --git a/src/objects/Player.cpp b/src/objects/Player.cpp index fcc85c37..024aa8f4 100644 --- a/src/objects/Player.cpp +++ b/src/objects/Player.cpp @@ -4,8 +4,8 @@ #include "../physics/PhysicsSolver.h" #include "../voxels/Chunks.h" #include "../world/Level.h" -#include "../window/Events.h" -#include "../window/Camera.h" +#include "../window/Events.hpp" +#include "../window/Camera.hpp" #include "../items/Inventory.h" #include diff --git a/src/voxel_engine.cpp b/src/voxel_engine.cpp index 1cdd098f..a4551c49 100644 --- a/src/voxel_engine.cpp +++ b/src/voxel_engine.cpp @@ -1,8 +1,3 @@ -#include -#include -#include -#include -#include #include #include "core_defs.h" @@ -12,13 +7,11 @@ #include "files/engine_paths.h" #include "util/platform.h" #include "util/command_line.hpp" -#include "window/Events.h" +#include "window/Events.hpp" #include "debug/Logger.hpp" static debug::Logger logger("main"); -namespace fs = std::filesystem; - int main(int argc, char** argv) { debug::Logger::init("latest.log"); @@ -27,7 +20,6 @@ int main(int argc, char** argv) { return EXIT_SUCCESS; platform::configure_encoding(); - fs::path userfiles = paths.getUserfiles(); try { EngineSettings settings; SettingsHandler handler(settings); diff --git a/src/window/Camera.cpp b/src/window/Camera.cpp index 79a31208..0dc486b5 100644 --- a/src/window/Camera.cpp +++ b/src/window/Camera.cpp @@ -1,5 +1,5 @@ -#include "Camera.h" -#include "Window.h" +#include "Camera.hpp" +#include "Window.hpp" #include diff --git a/src/window/Camera.h b/src/window/Camera.hpp similarity index 87% rename from src/window/Camera.h rename to src/window/Camera.hpp index 03e16b0d..593f473e 100644 --- a/src/window/Camera.h +++ b/src/window/Camera.hpp @@ -1,5 +1,5 @@ -#ifndef WINDOW_CAMERA_H_ -#define WINDOW_CAMERA_H_ +#ifndef WINDOW_CAMERA_HPP_ +#define WINDOW_CAMERA_HPP_ #include @@ -31,4 +31,4 @@ public: float getFov() const; }; -#endif /* WINDOW_CAMERA_H_ */ +#endif // WINDOW_CAMERA_HPP_ diff --git a/src/window/Events.cpp b/src/window/Events.cpp index 958cdddf..e5cee667 100644 --- a/src/window/Events.cpp +++ b/src/window/Events.cpp @@ -1,4 +1,5 @@ -#include "Events.h" +#include "Events.hpp" +#include "Window.hpp" #include "../debug/Logger.hpp" #include diff --git a/src/window/Events.h b/src/window/Events.hpp similarity index 92% rename from src/window/Events.h rename to src/window/Events.hpp index 4a57d5f7..b7cd5a4d 100644 --- a/src/window/Events.h +++ b/src/window/Events.hpp @@ -1,8 +1,7 @@ -#ifndef WINDOW_EVENTS_H_ -#define WINDOW_EVENTS_H_ +#ifndef WINDOW_EVENTS_HPP_ +#define WINDOW_EVENTS_HPP_ -#include "Window.h" -#include "input.h" +#include "input.hpp" #include #include @@ -54,4 +53,4 @@ public: static void loadBindings(const std::string& filename, const std::string& source); }; -#endif /* WINDOW_EVENTS_H_ */ +#endif // WINDOW_EVENTS_HPP_ diff --git a/src/window/Window.cpp b/src/window/Window.cpp index efdbdeeb..6b73dad8 100644 --- a/src/window/Window.cpp +++ b/src/window/Window.cpp @@ -1,6 +1,6 @@ #include -#include "Window.h" -#include "Events.h" +#include "Window.hpp" +#include "Events.hpp" #include "../debug/Logger.hpp" #include "../graphics/core/ImageData.hpp" #include "../graphics/core/Texture.hpp" diff --git a/src/window/Window.h b/src/window/Window.hpp similarity index 95% rename from src/window/Window.h rename to src/window/Window.hpp index 7eb9eb0f..758d9d5f 100644 --- a/src/window/Window.h +++ b/src/window/Window.hpp @@ -1,5 +1,5 @@ -#ifndef WINDOW_WINDOW_H_ -#define WINDOW_WINDOW_H_ +#ifndef WINDOW_WINDOW_HPP_ +#define WINDOW_WINDOW_HPP_ #include "../typedefs.h" @@ -61,4 +61,4 @@ public: static std::unique_ptr takeScreenshot(); }; -#endif /* WINDOW_WINDOW_H_ */ +#endif // WINDOW_WINDOW_HPP_ diff --git a/src/window/input.cpp b/src/window/input.cpp index e982521d..2d1d7c65 100644 --- a/src/window/input.cpp +++ b/src/window/input.cpp @@ -1,4 +1,4 @@ -#include "input.h" +#include "input.hpp" #include #include diff --git a/src/window/input.h b/src/window/input.hpp similarity index 92% rename from src/window/input.h rename to src/window/input.hpp index b99673a3..19865f5e 100644 --- a/src/window/input.h +++ b/src/window/input.hpp @@ -1,5 +1,5 @@ -#ifndef WINDOW_INPUT_H_ -#define WINDOW_INPUT_H_ +#ifndef WINDOW_INPUT_HPP_ +#define WINDOW_INPUT_HPP_ #include "../util/RunnablesList.hpp" @@ -154,4 +154,4 @@ struct Binding { }; -#endif // WINDOW_INPUT_H_ +#endif // WINDOW_INPUT_HPP_ diff --git a/src/world/World.cpp b/src/world/World.cpp index b400aae7..2661dd5d 100644 --- a/src/world/World.cpp +++ b/src/world/World.cpp @@ -13,7 +13,7 @@ #include "../voxels/Chunks.h" #include "../voxels/ChunksStorage.h" #include "../objects/Player.h" -#include "../window/Camera.h" +#include "../window/Camera.hpp" #include "../items/Inventories.h" world_load_error::world_load_error(std::string message)