PulseStudio/VoxelEngine
PulseStudio/VoxelEngine
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

frontend/gui moved to graphics/ui

Browse Source
This commit is contained in:
MihailRis 2024-03-19 00:08:46 +03:00
parent b56408a202
commit 5393977e57
26 changed files with 139 additions and 140 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/engine.cpp
View File

@ -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"

32
src/frontend/InventoryView.cpp
View File

@ -3,28 +3,28 @@
#include <iostream>
#include <glm/glm.hpp>
#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> 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(

6
src/frontend/InventoryView.h
View File

@ -5,9 +5,9 @@
#include <functional>
#include <glm/glm.hpp>
#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"

11
src/frontend/UiDocument.cpp
View File

@ -1,12 +1,11 @@
#include "UiDocument.h"
#include <iostream>
#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,

18
src/frontend/debug_panel.cpp
View File

@ -2,18 +2,18 @@
#include <memory>
#include <sstream>
#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"

8
src/frontend/hud.cpp
View File

@ -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"

9
src/frontend/menu/menu.cpp
View File

@ -8,9 +8,10 @@
#include <filesystem>
#include <glm/glm.hpp>
#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"

2
src/frontend/menu/menu_commons.cpp
View File

@ -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;

2
src/frontend/menu/menu_commons.h
View File

@ -5,7 +5,7 @@
#include <memory>
#include <glm/glm.hpp>
#include "../gui/controls.h"
#include "../../graphics/ui/elements/controls.h"
class Engine;

22
src/frontend/menu/menu_create_world.cpp
View File

@ -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 <iostream>

17
src/frontend/menu/menu_pause.cpp
View File

@ -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 <glm/glm.hpp>

4
src/frontend/menu/menu_settings.cpp
View File

@ -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"

70
src/frontend/screens.cpp
View File

@ -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 <filesystem>
#include <glm/glm.hpp>
#include <iomanip>
#include <iostream>
#include <memory>
#include <sstream>
#include <glm/glm.hpp>
#include <filesystem>
#include <stdexcept>
#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)) {
}

4
src/frontend/gui/GUI.cpp → src/graphics/ui/GUI.cpp
View File

@ -1,6 +1,6 @@
#include "GUI.h"
#include "UINode.h"
#include "containers.h"
#include "elements/UINode.h"
#include "elements/containers.h"
#include <iostream>
#include <algorithm>

0
src/frontend/gui/GUI.h → src/graphics/ui/GUI.h
View File

2
src/frontend/gui/UINode.cpp → src/graphics/ui/elements/UINode.cpp
View File

@ -1,6 +1,6 @@
#include "UINode.h"
#include "../../graphics/core/Batch2D.h"
#include "../../core/Batch2D.h"
using gui::UINode;
using gui::Align;

10
src/frontend/gui/UINode.h → src/graphics/ui/elements/UINode.h
View File

@ -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 <glm/glm.hpp>
#include <vector>
#include <memory>
#include <string>
#include <functional>
#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_
#endif // GRAPHICS_UI_ELEMENTS_UINODE_H_

8
src/frontend/gui/containers.cpp → src/graphics/ui/elements/containers.cpp
View File

@ -3,10 +3,10 @@
#include <stdexcept>
#include <algorithm>
#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;

6
src/frontend/gui/containers.h → src/graphics/ui/elements/containers.h
View File

@ -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 <glm/glm.hpp>
#include <vector>
@ -109,4 +109,4 @@ namespace gui {
Page& getCurrent();
};
}
#endif // FRONTEND_GUI_CONTAINERS_H_
#endif // GRAPHICS_UI_ELEMENTS_CONTAINERS_H_

16
src/frontend/gui/controls.cpp → src/graphics/ui/elements/controls.cpp
View File

@ -5,14 +5,14 @@
#include <iostream>
#include <algorithm>
#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;

14
src/frontend/gui/controls.h → src/graphics/ui/elements/controls.h
View File

@ -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 <string>
#include <memory>
@ -7,12 +7,12 @@
#include <functional>
#include <glm/glm.hpp>
#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_

6
src/frontend/gui/gui_util.cpp → src/graphics/ui/gui_util.cpp
View File

@ -1,10 +1,10 @@
#include "gui_util.h"
#include "controls.h"
#include "containers.h"
#include "elements/controls.h"
#include "elements/containers.h"
#include <glm/glm.hpp>
#include "../locale/langs.h"
#include "../../frontend/locale/langs.h"
#include "../../delegates.h"
using namespace gui;

0
src/frontend/gui/gui_util.h → src/graphics/ui/gui_util.h
View File

6
src/frontend/gui/gui_xml.cpp → src/graphics/ui/gui_xml.cpp
View File

@ -3,10 +3,10 @@
#include <charconv>
#include <stdexcept>
#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"

0
src/frontend/gui/gui_xml.h → src/graphics/ui/gui_xml.h
View File

4
src/logic/scripting/lua/libgui.cpp
View File

@ -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"