From 5393977e57a1eef01348b304c449e5228bd0ac75 Mon Sep 17 00:00:00 2001 From: MihailRis Date: Tue, 19 Mar 2024 00:08:46 +0300 Subject: [PATCH] frontend/gui moved to graphics/ui --- src/engine.cpp | 2 +- src/frontend/InventoryView.cpp | 32 ++++----- src/frontend/InventoryView.h | 6 +- src/frontend/UiDocument.cpp | 11 ++- src/frontend/debug_panel.cpp | 18 ++--- src/frontend/hud.cpp | 8 +-- src/frontend/menu/menu.cpp | 9 ++- src/frontend/menu/menu_commons.cpp | 2 +- src/frontend/menu/menu_commons.h | 2 +- src/frontend/menu/menu_create_world.cpp | 22 +++--- src/frontend/menu/menu_pause.cpp | 17 ++--- src/frontend/menu/menu_settings.cpp | 4 +- src/frontend/screens.cpp | 70 +++++++++---------- src/{frontend/gui => graphics/ui}/GUI.cpp | 4 +- src/{frontend/gui => graphics/ui}/GUI.h | 0 .../gui => graphics/ui/elements}/UINode.cpp | 2 +- .../gui => graphics/ui/elements}/UINode.h | 10 +-- .../ui/elements}/containers.cpp | 8 +-- .../gui => graphics/ui/elements}/containers.h | 6 +- .../gui => graphics/ui/elements}/controls.cpp | 16 ++--- .../gui => graphics/ui/elements}/controls.h | 14 ++-- .../gui => graphics/ui}/gui_util.cpp | 6 +- src/{frontend/gui => graphics/ui}/gui_util.h | 0 src/{frontend/gui => graphics/ui}/gui_xml.cpp | 6 +- src/{frontend/gui => graphics/ui}/gui_xml.h | 0 src/logic/scripting/lua/libgui.cpp | 4 +- 26 files changed, 139 insertions(+), 140 deletions(-) rename src/{frontend/gui => graphics/ui}/GUI.cpp (95%) rename src/{frontend/gui => graphics/ui}/GUI.h (100%) rename src/{frontend/gui => graphics/ui/elements}/UINode.cpp (94%) rename src/{frontend/gui => graphics/ui/elements}/UINode.h (94%) rename src/{frontend/gui => graphics/ui/elements}/containers.cpp (94%) rename src/{frontend/gui => graphics/ui/elements}/containers.h (92%) rename src/{frontend/gui => graphics/ui/elements}/controls.cpp (95%) rename src/{frontend/gui => graphics/ui/elements}/controls.h (95%) rename src/{frontend/gui => graphics/ui}/gui_util.cpp (93%) rename src/{frontend/gui => graphics/ui}/gui_util.h (100%) rename src/{frontend/gui => graphics/ui}/gui_xml.cpp (99%) rename src/{frontend/gui => graphics/ui}/gui_xml.h (100%) diff --git a/src/engine.cpp b/src/engine.cpp index c6c23ffe..9d1543ea 100644 --- a/src/engine.cpp +++ b/src/engine.cpp @@ -24,7 +24,7 @@ #include "graphics/core/GfxContext.h" #include "graphics/core/Shader.h" #include "graphics/core/ImageData.h" -#include "frontend/gui/GUI.h" +#include "graphics/ui/GUI.h" #include "frontend/screens.h" #include "frontend/menu/menu.h" #include "util/platform.h" diff --git a/src/frontend/InventoryView.cpp b/src/frontend/InventoryView.cpp index a689cf07..e39ede29 100644 --- a/src/frontend/InventoryView.cpp +++ b/src/frontend/InventoryView.cpp @@ -3,28 +3,28 @@ #include #include -#include "BlocksPreview.h" -#include "LevelFrontend.h" -#include "../window/Events.h" -#include "../window/input.h" #include "../assets/Assets.h" -#include "../graphics/core/Atlas.h" -#include "../graphics/core/Shader.h" -#include "../graphics/core/Batch2D.h" -#include "../graphics/core/GfxContext.h" -#include "../graphics/core/Font.h" #include "../content/Content.h" -#include "../items/ItemDef.h" -#include "../items/Inventory.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/ui/elements/containers.h" +#include "../graphics/ui/elements/controls.h" #include "../items/Inventories.h" +#include "../items/Inventory.h" +#include "../items/ItemDef.h" +#include "../logic/scripting/scripting.h" #include "../maths/voxmaths.h" #include "../objects/Player.h" -#include "../voxels/Block.h" -#include "../frontend/gui/containers.h" -#include "../frontend/gui/controls.h" #include "../util/stringutil.h" +#include "../voxels/Block.h" +#include "../window/Events.h" +#include "../window/input.h" #include "../world/Level.h" -#include "../logic/scripting/scripting.h" +#include "BlocksPreview.h" +#include "LevelFrontend.h" SlotLayout::SlotLayout( int index, @@ -369,7 +369,7 @@ void InventoryView::setInventory(std::shared_ptr inventory) { } #include "../coders/xml.h" -#include "gui/gui_xml.h" +#include "../graphics/ui/gui_xml.h" static slotcallback readSlotFunc(InventoryView* view, gui::UiXmlReader& reader, xml::xmlelement& element, const std::string& attr) { auto consumer = scripting::create_int_array_consumer( diff --git a/src/frontend/InventoryView.h b/src/frontend/InventoryView.h index e7a49af1..fd82d175 100644 --- a/src/frontend/InventoryView.h +++ b/src/frontend/InventoryView.h @@ -5,9 +5,9 @@ #include #include -#include "../frontend/gui/UINode.h" -#include "../frontend/gui/containers.h" -#include "../frontend/gui/controls.h" +#include "../graphics/ui/elements/UINode.h" +#include "../graphics/ui/elements/containers.h" +#include "../graphics/ui/elements/controls.h" #include "../items/ItemStack.h" #include "../typedefs.h" diff --git a/src/frontend/UiDocument.cpp b/src/frontend/UiDocument.cpp index bb3b0a6d..b8ee13b3 100644 --- a/src/frontend/UiDocument.cpp +++ b/src/frontend/UiDocument.cpp @@ -1,12 +1,11 @@ #include "UiDocument.h" -#include -#include "gui/UINode.h" -#include "gui/containers.h" -#include "InventoryView.h" -#include "../logic/scripting/scripting.h" #include "../files/files.h" -#include "../frontend/gui/gui_xml.h" +#include "../graphics/ui/elements/containers.h" +#include "../graphics/ui/elements/UINode.h" +#include "../graphics/ui/gui_xml.h" +#include "../logic/scripting/scripting.h" +#include "InventoryView.h" UiDocument::UiDocument( std::string id, diff --git a/src/frontend/debug_panel.cpp b/src/frontend/debug_panel.cpp index 7d11e04c..725ebb75 100644 --- a/src/frontend/debug_panel.cpp +++ b/src/frontend/debug_panel.cpp @@ -2,18 +2,18 @@ #include #include -#include "gui/controls.h" #include "../audio/audio.h" -#include "../graphics/core/Mesh.h" -#include "../objects/Player.h" -#include "../physics/Hitbox.h" -#include "../world/Level.h" -#include "../world/World.h" -#include "../voxels/Chunks.h" -#include "../voxels/Block.h" -#include "../util/stringutil.h" #include "../delegates.h" #include "../engine.h" +#include "../graphics/core/Mesh.h" +#include "../graphics/ui/elements/controls.h" +#include "../objects/Player.h" +#include "../physics/Hitbox.h" +#include "../util/stringutil.h" +#include "../voxels/Block.h" +#include "../voxels/Chunks.h" +#include "../world/Level.h" +#include "../world/World.h" #include "WorldRenderer.h" diff --git a/src/frontend/hud.cpp b/src/frontend/hud.cpp index b4627620..16e1e069 100644 --- a/src/frontend/hud.cpp +++ b/src/frontend/hud.cpp @@ -32,10 +32,10 @@ #include "../objects/Player.h" #include "../physics/Hitbox.h" #include "../maths/voxmaths.h" -#include "gui/controls.h" -#include "gui/containers.h" -#include "gui/UINode.h" -#include "gui/GUI.h" +#include "../graphics/ui/elements/controls.h" +#include "../graphics/ui/elements/containers.h" +#include "../graphics/ui/elements/UINode.h" +#include "../graphics/ui/GUI.h" #include "ContentGfxCache.h" #include "menu/menu.h" #include "screens.h" diff --git a/src/frontend/menu/menu.cpp b/src/frontend/menu/menu.cpp index bddbb9f8..caa816ca 100644 --- a/src/frontend/menu/menu.cpp +++ b/src/frontend/menu/menu.cpp @@ -8,9 +8,10 @@ #include #include -#include "../gui/GUI.h" -#include "../gui/containers.h" -#include "../gui/controls.h" +#include "../../graphics/ui/GUI.h" +#include "../../graphics/ui/gui_util.h" +#include "../../graphics/ui/elements/containers.h" +#include "../../graphics/ui/elements/controls.h" #include "../screens.h" #include "../../coders/png.h" @@ -29,8 +30,6 @@ #include "../../content/Content.h" #include "../../content/ContentLUT.h" #include "../../content/ContentPack.h" - -#include "../gui/gui_util.h" #include "../locale/langs.h" #include "menu_commons.h" diff --git a/src/frontend/menu/menu_commons.cpp b/src/frontend/menu/menu_commons.cpp index 7ac70552..9f3bb9ec 100644 --- a/src/frontend/menu/menu_commons.cpp +++ b/src/frontend/menu/menu_commons.cpp @@ -1,7 +1,7 @@ #include "menu_commons.h" #include "../../engine.h" -#include "../gui/containers.h" +#include "../../graphics/ui/elements/containers.h" #include "../locale/langs.h" using namespace gui; diff --git a/src/frontend/menu/menu_commons.h b/src/frontend/menu/menu_commons.h index 0fc6dce1..3181c2d9 100644 --- a/src/frontend/menu/menu_commons.h +++ b/src/frontend/menu/menu_commons.h @@ -5,7 +5,7 @@ #include #include -#include "../gui/controls.h" +#include "../../graphics/ui/elements/controls.h" class Engine; diff --git a/src/frontend/menu/menu_create_world.cpp b/src/frontend/menu/menu_create_world.cpp index c2e0b442..62116311 100644 --- a/src/frontend/menu/menu_create_world.cpp +++ b/src/frontend/menu/menu_create_world.cpp @@ -1,19 +1,19 @@ #ifndef FRONTEND_MENU_MENU_CREATE_WORLD_H_ #define FRONTEND_MENU_MENU_CREATE_WORLD_H_ -#include "menu.h" -#include "menu_commons.h" -#include "../gui/controls.h" -#include "../gui/containers.h" -#include "../gui/gui_util.h" +#include "../../engine.h" +#include "../../files/WorldFiles.h" +#include "../../graphics/ui/elements/containers.h" +#include "../../graphics/ui/elements/controls.h" +#include "../../graphics/ui/gui_util.h" +#include "../../util/stringutil.h" +#include "../../world/Level.h" +#include "../../world/World.h" +#include "../../world/WorldGenerators.h" #include "../locale/langs.h" #include "../screens.h" -#include "../../world/WorldGenerators.h" -#include "../../files/WorldFiles.h" -#include "../../world/World.h" -#include "../../world/Level.h" -#include "../../util/stringutil.h" -#include "../../engine.h" +#include "menu_commons.h" +#include "menu.h" #include diff --git a/src/frontend/menu/menu_pause.cpp b/src/frontend/menu/menu_pause.cpp index 73eb593a..a77f72de 100644 --- a/src/frontend/menu/menu_pause.cpp +++ b/src/frontend/menu/menu_pause.cpp @@ -1,16 +1,17 @@ #include "menu.h" #include "menu_commons.h" -#include "../locale/langs.h" -#include "../gui/gui_util.h" -#include "../screens.h" + +#include "../../coders/png.h" +#include "../../content/ContentLUT.h" #include "../../engine.h" +#include "../../files/WorldFiles.h" +#include "../../graphics/ui/gui_util.h" +#include "../../logic/LevelController.h" +#include "../../util/stringutil.h" #include "../../world/Level.h" #include "../../world/World.h" -#include "../../coders/png.h" -#include "../../util/stringutil.h" -#include "../../files/WorldFiles.h" -#include "../../content/ContentLUT.h" -#include "../../logic/LevelController.h" +#include "../locale/langs.h" +#include "../screens.h" #include diff --git a/src/frontend/menu/menu_settings.cpp b/src/frontend/menu/menu_settings.cpp index d2529f14..94e6db94 100644 --- a/src/frontend/menu/menu_settings.cpp +++ b/src/frontend/menu/menu_settings.cpp @@ -2,8 +2,8 @@ #include "menu_commons.h" #include "../locale/langs.h" -#include "../gui/GUI.h" -#include "../gui/gui_util.h" +#include "../../graphics/ui/GUI.h" +#include "../../graphics/ui/gui_util.h" #include "../../engine.h" #include "../../util/stringutil.h" #include "../../window/Events.h" diff --git a/src/frontend/screens.cpp b/src/frontend/screens.cpp index 874b1003..c9cb6af7 100644 --- a/src/frontend/screens.cpp +++ b/src/frontend/screens.cpp @@ -1,46 +1,46 @@ #include "screens.h" +#include "../assets/Assets.h" +#include "../audio/audio.h" +#include "../content/Content.h" +#include "../core_defs.h" +#include "../engine.h" +#include "../graphics/core/Batch2D.h" +#include "../graphics/core/GfxContext.h" +#include "../graphics/core/Shader.h" +#include "../graphics/core/TextureAnimation.h" +#include "../graphics/ui/elements/containers.h" +#include "../graphics/ui/GUI.h" +#include "../logic/ChunksController.h" +#include "../logic/LevelController.h" +#include "../logic/scripting/scripting_frontend.h" +#include "../logic/scripting/scripting.h" +#include "../objects/Player.h" +#include "../physics/Hitbox.h" +#include "../util/stringutil.h" +#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 "../world/Level.h" +#include "../world/World.h" + +#include "ContentGfxCache.h" +#include "hud.h" +#include "LevelFrontend.h" +#include "menu/menu.h" +#include "WorldRenderer.h" + +#include +#include #include #include #include #include -#include -#include #include -#include "../audio/audio.h" -#include "../window/Camera.h" -#include "../window/Events.h" -#include "../window/input.h" -#include "../graphics/core/Shader.h" -#include "../graphics/core/Batch2D.h" -#include "../graphics/core/GfxContext.h" -#include "../graphics/core/TextureAnimation.h" -#include "../assets/Assets.h" -#include "../world/Level.h" -#include "../world/World.h" -#include "../objects/Player.h" -#include "../physics/Hitbox.h" -#include "../logic/ChunksController.h" -#include "../logic/LevelController.h" -#include "../logic/scripting/scripting.h" -#include "../logic/scripting/scripting_frontend.h" -#include "../voxels/Chunks.h" -#include "../voxels/Chunk.h" -#include "../engine.h" -#include "../util/stringutil.h" -#include "../core_defs.h" -#include "WorldRenderer.h" -#include "hud.h" -#include "ContentGfxCache.h" -#include "LevelFrontend.h" -#include "gui/GUI.h" -#include "gui/containers.h" -#include "menu/menu.h" - -#include "../content/Content.h" -#include "../voxels/Block.h" - Screen::Screen(Engine* engine) : engine(engine), batch(new Batch2D(1024)) { } diff --git a/src/frontend/gui/GUI.cpp b/src/graphics/ui/GUI.cpp similarity index 95% rename from src/frontend/gui/GUI.cpp rename to src/graphics/ui/GUI.cpp index b4b915cf..5da55ee6 100644 --- a/src/frontend/gui/GUI.cpp +++ b/src/graphics/ui/GUI.cpp @@ -1,6 +1,6 @@ #include "GUI.h" -#include "UINode.h" -#include "containers.h" +#include "elements/UINode.h" +#include "elements/containers.h" #include #include diff --git a/src/frontend/gui/GUI.h b/src/graphics/ui/GUI.h similarity index 100% rename from src/frontend/gui/GUI.h rename to src/graphics/ui/GUI.h diff --git a/src/frontend/gui/UINode.cpp b/src/graphics/ui/elements/UINode.cpp similarity index 94% rename from src/frontend/gui/UINode.cpp rename to src/graphics/ui/elements/UINode.cpp index 0079b514..867524fb 100644 --- a/src/frontend/gui/UINode.cpp +++ b/src/graphics/ui/elements/UINode.cpp @@ -1,6 +1,6 @@ #include "UINode.h" -#include "../../graphics/core/Batch2D.h" +#include "../../core/Batch2D.h" using gui::UINode; using gui::Align; diff --git a/src/frontend/gui/UINode.h b/src/graphics/ui/elements/UINode.h similarity index 94% rename from src/frontend/gui/UINode.h rename to src/graphics/ui/elements/UINode.h index 9389a667..00eeb58b 100644 --- a/src/frontend/gui/UINode.h +++ b/src/graphics/ui/elements/UINode.h @@ -1,13 +1,13 @@ -#ifndef FRONTEND_GUI_UINODE_H_ -#define FRONTEND_GUI_UINODE_H_ +#ifndef GRAPHICS_UI_ELEMENTS_UINODE_H_ +#define GRAPHICS_UI_ELEMENTS_UINODE_H_ #include #include #include #include #include -#include "../../delegates.h" -#include "../../window/input.h" +#include "../../../delegates.h" +#include "../../../window/input.h" class GfxContext; class Assets; @@ -182,4 +182,4 @@ namespace gui { }; } -#endif // FRONTEND_GUI_UINODE_H_ \ No newline at end of file +#endif // GRAPHICS_UI_ELEMENTS_UINODE_H_ diff --git a/src/frontend/gui/containers.cpp b/src/graphics/ui/elements/containers.cpp similarity index 94% rename from src/frontend/gui/containers.cpp rename to src/graphics/ui/elements/containers.cpp index 3a77a819..9216d68a 100644 --- a/src/frontend/gui/containers.cpp +++ b/src/graphics/ui/elements/containers.cpp @@ -3,10 +3,10 @@ #include #include -#include "../../window/Window.h" -#include "../../assets/Assets.h" -#include "../../graphics/core/Batch2D.h" -#include "../../graphics/core/GfxContext.h" +#include "../../../window/Window.h" +#include "../../../assets/Assets.h" +#include "../../core/Batch2D.h" +#include "../../core/GfxContext.h" using namespace gui; diff --git a/src/frontend/gui/containers.h b/src/graphics/ui/elements/containers.h similarity index 92% rename from src/frontend/gui/containers.h rename to src/graphics/ui/elements/containers.h index 3dcf80c8..04102358 100644 --- a/src/frontend/gui/containers.h +++ b/src/graphics/ui/elements/containers.h @@ -1,5 +1,5 @@ -#ifndef FRONTEND_GUI_CONTAINERS_H_ -#define FRONTEND_GUI_CONTAINERS_H_ +#ifndef GRAPHICS_UI_ELEMENTS_CONTAINERS_H_ +#define GRAPHICS_UI_ELEMENTS_CONTAINERS_H_ #include #include @@ -109,4 +109,4 @@ namespace gui { Page& getCurrent(); }; } -#endif // FRONTEND_GUI_CONTAINERS_H_ +#endif // GRAPHICS_UI_ELEMENTS_CONTAINERS_H_ diff --git a/src/frontend/gui/controls.cpp b/src/graphics/ui/elements/controls.cpp similarity index 95% rename from src/frontend/gui/controls.cpp rename to src/graphics/ui/elements/controls.cpp index 9a1d1790..1090c3a0 100644 --- a/src/frontend/gui/controls.cpp +++ b/src/graphics/ui/elements/controls.cpp @@ -5,14 +5,14 @@ #include #include -#include "../../window/Events.h" -#include "../../assets/Assets.h" -#include "../../graphics/core/Batch2D.h" -#include "../../graphics/core/Font.h" -#include "../../graphics/core/Texture.h" -#include "../../graphics/core/GfxContext.h" -#include "../../util/stringutil.h" -#include "GUI.h" +#include "../../../window/Events.h" +#include "../../../assets/Assets.h" +#include "../../core/Batch2D.h" +#include "../../core/Font.h" +#include "../../core/Texture.h" +#include "../../core/GfxContext.h" +#include "../../../util/stringutil.h" +#include "../GUI.h" using namespace gui; diff --git a/src/frontend/gui/controls.h b/src/graphics/ui/elements/controls.h similarity index 95% rename from src/frontend/gui/controls.h rename to src/graphics/ui/elements/controls.h index 79cacf38..96d26b11 100644 --- a/src/frontend/gui/controls.h +++ b/src/graphics/ui/elements/controls.h @@ -1,5 +1,5 @@ -#ifndef FRONTEND_GUI_CONTROLS_H_ -#define FRONTEND_GUI_CONTROLS_H_ +#ifndef GRAPHICS_UI_ELEMENTS_CONTROLS_H_ +#define GRAPHICS_UI_ELEMENTS_CONTROLS_H_ #include #include @@ -7,12 +7,12 @@ #include #include -#include "GUI.h" +#include "../GUI.h" #include "UINode.h" #include "containers.h" -#include "../../window/input.h" -#include "../../delegates.h" -#include "../../typedefs.h" +#include "../../../window/input.h" +#include "../../../delegates.h" +#include "../../../typedefs.h" class Batch2D; class Assets; @@ -387,4 +387,4 @@ namespace gui { }; } -#endif // FRONTEND_GUI_CONTROLS_H_ +#endif // GRAPHICS_UI_ELEMENTS_CONTROLS_H_ diff --git a/src/frontend/gui/gui_util.cpp b/src/graphics/ui/gui_util.cpp similarity index 93% rename from src/frontend/gui/gui_util.cpp rename to src/graphics/ui/gui_util.cpp index 24971bc2..1b542075 100644 --- a/src/frontend/gui/gui_util.cpp +++ b/src/graphics/ui/gui_util.cpp @@ -1,10 +1,10 @@ #include "gui_util.h" -#include "controls.h" -#include "containers.h" +#include "elements/controls.h" +#include "elements/containers.h" #include -#include "../locale/langs.h" +#include "../../frontend/locale/langs.h" #include "../../delegates.h" using namespace gui; diff --git a/src/frontend/gui/gui_util.h b/src/graphics/ui/gui_util.h similarity index 100% rename from src/frontend/gui/gui_util.h rename to src/graphics/ui/gui_util.h diff --git a/src/frontend/gui/gui_xml.cpp b/src/graphics/ui/gui_xml.cpp similarity index 99% rename from src/frontend/gui/gui_xml.cpp rename to src/graphics/ui/gui_xml.cpp index 2370b922..e8371d26 100644 --- a/src/frontend/gui/gui_xml.cpp +++ b/src/graphics/ui/gui_xml.cpp @@ -3,10 +3,10 @@ #include #include -#include "containers.h" -#include "controls.h" +#include "elements/containers.h" +#include "elements/controls.h" -#include "../locale/langs.h" +#include "../../frontend/locale/langs.h" #include "../../logic/scripting/scripting.h" #include "../../util/stringutil.h" diff --git a/src/frontend/gui/gui_xml.h b/src/graphics/ui/gui_xml.h similarity index 100% rename from src/frontend/gui/gui_xml.h rename to src/graphics/ui/gui_xml.h diff --git a/src/logic/scripting/lua/libgui.cpp b/src/logic/scripting/lua/libgui.cpp index e25e6af8..7f981c11 100644 --- a/src/logic/scripting/lua/libgui.cpp +++ b/src/logic/scripting/lua/libgui.cpp @@ -8,8 +8,8 @@ #include "../../../engine.h" #include "../../../assets/Assets.h" -#include "../../../frontend/gui/UINode.h" -#include "../../../frontend/gui/controls.h" +#include "../../../graphics/ui/elements/UINode.h" +#include "../../../graphics/ui/elements/controls.h" #include "../../../frontend/UiDocument.h" #include "../../../util/stringutil.h"