From 21ff65d78160cd295a6f43f329120d345bd32de8 Mon Sep 17 00:00:00 2001 From: InfiniteCoder Date: Sun, 4 Aug 2024 11:08:07 +0300 Subject: [PATCH] assets/ --- src/engine.cpp | 2 +- src/engine.hpp | 2 +- src/frontend/ContentGfxCache.cpp | 2 +- src/frontend/LevelFrontend.cpp | 2 +- src/frontend/hud.cpp | 2 +- src/graphics/render/BlocksPreview.cpp | 2 +- src/graphics/render/ModelBatch.cpp | 2 +- src/graphics/render/Skybox.cpp | 2 +- src/graphics/render/WorldRenderer.cpp | 2 +- src/graphics/ui/GUI.cpp | 2 +- src/graphics/ui/elements/Image.cpp | 2 +- src/graphics/ui/elements/InventoryView.cpp | 2 +- src/graphics/ui/elements/Label.cpp | 2 +- src/graphics/ui/elements/Plotter.cpp | 2 +- src/graphics/ui/elements/TextBox.cpp | 2 +- src/graphics/ui/elements/TrackBar.cpp | 2 +- src/logic/scripting/lua/libgui.cpp | 2 +- src/logic/scripting/lua/libhud.cpp | 2 +- src/logic/scripting/lua/libpack.cpp | 2 +- src/logic/scripting/lua/libworld.cpp | 4 ++-- src/objects/Entities.cpp | 2 +- src/objects/rigging.cpp | 2 +- 22 files changed, 23 insertions(+), 23 deletions(-) diff --git a/src/engine.cpp b/src/engine.cpp index dbe894ad..b48a9c2e 100644 --- a/src/engine.cpp +++ b/src/engine.cpp @@ -3,7 +3,7 @@ #define GLEW_STATIC #include "debug/Logger.hpp" -#include "assets/AssetsLoader.hpp" +#include #include "audio/audio.hpp" #include "coders/GLSLExtension.hpp" #include "coders/imageio.hpp" diff --git a/src/engine.hpp b/src/engine.hpp index 4ed26867..49c92312 100644 --- a/src/engine.hpp +++ b/src/engine.hpp @@ -4,7 +4,7 @@ #include #include -#include "assets/Assets.hpp" +#include #include "content/content_fwd.hpp" #include "content/ContentPack.hpp" #include "content/PacksManager.hpp" diff --git a/src/frontend/ContentGfxCache.cpp b/src/frontend/ContentGfxCache.cpp index d434db2b..71ffe006 100644 --- a/src/frontend/ContentGfxCache.cpp +++ b/src/frontend/ContentGfxCache.cpp @@ -2,7 +2,7 @@ #include "UiDocument.hpp" -#include "../assets/Assets.hpp" +#include #include "../content/Content.hpp" #include "../content/ContentPack.hpp" #include diff --git a/src/frontend/LevelFrontend.cpp b/src/frontend/LevelFrontend.cpp index d67c9261..c41d39b2 100644 --- a/src/frontend/LevelFrontend.cpp +++ b/src/frontend/LevelFrontend.cpp @@ -2,7 +2,7 @@ #include "ContentGfxCache.hpp" -#include "../assets/Assets.hpp" +#include #include "../audio/audio.hpp" #include "../content/Content.hpp" #include "../graphics/core/Atlas.hpp" diff --git a/src/frontend/hud.cpp b/src/frontend/hud.cpp index 7c0ad0f7..9bc7a758 100644 --- a/src/frontend/hud.cpp +++ b/src/frontend/hud.cpp @@ -4,7 +4,7 @@ #include "LevelFrontend.hpp" #include "UiDocument.hpp" -#include "../assets/Assets.hpp" +#include #include "../content/Content.hpp" #include #include diff --git a/src/graphics/render/BlocksPreview.cpp b/src/graphics/render/BlocksPreview.cpp index e02daf52..c9a89eb9 100644 --- a/src/graphics/render/BlocksPreview.cpp +++ b/src/graphics/render/BlocksPreview.cpp @@ -1,6 +1,6 @@ #include "BlocksPreview.hpp" -#include "../../assets/Assets.hpp" +#include #include #include "../../content/Content.hpp" #include "../../frontend/ContentGfxCache.hpp" diff --git a/src/graphics/render/ModelBatch.cpp b/src/graphics/render/ModelBatch.cpp index 468fcbd5..c3723dba 100644 --- a/src/graphics/render/ModelBatch.cpp +++ b/src/graphics/render/ModelBatch.cpp @@ -4,7 +4,7 @@ #include "../core/Model.hpp" #include "../core/Atlas.hpp" #include "../core/Texture.hpp" -#include "../../assets/Assets.hpp" +#include #include "../../window/Window.hpp" #include "../../voxels/Chunks.hpp" #include "../../lighting/Lightmap.hpp" diff --git a/src/graphics/render/Skybox.cpp b/src/graphics/render/Skybox.cpp index a7aa3c46..b2a6843a 100644 --- a/src/graphics/render/Skybox.cpp +++ b/src/graphics/render/Skybox.cpp @@ -1,5 +1,5 @@ #include "Skybox.hpp" -#include "../../assets/Assets.hpp" +#include #include "../../graphics/core/Shader.hpp" #include "../../graphics/core/Mesh.hpp" #include "../../graphics/core/Batch3D.hpp" diff --git a/src/graphics/render/WorldRenderer.cpp b/src/graphics/render/WorldRenderer.cpp index 7a64267c..f7d0c387 100644 --- a/src/graphics/render/WorldRenderer.cpp +++ b/src/graphics/render/WorldRenderer.cpp @@ -8,7 +8,7 @@ #include #include -#include "../../assets/Assets.hpp" +#include #include "../../content/Content.hpp" #include #include "../../frontend/LevelFrontend.hpp" diff --git a/src/graphics/ui/GUI.cpp b/src/graphics/ui/GUI.cpp index 40ae9bf5..946301a0 100644 --- a/src/graphics/ui/GUI.cpp +++ b/src/graphics/ui/GUI.cpp @@ -6,7 +6,7 @@ #include "elements/Label.hpp" #include "elements/Menu.hpp" -#include "../../assets/Assets.hpp" +#include #include "../../frontend/UiDocument.hpp" #include "../../frontend/locale.hpp" #include "../../graphics/core/Batch2D.hpp" diff --git a/src/graphics/ui/elements/Image.cpp b/src/graphics/ui/elements/Image.cpp index b6006c72..b2d448b9 100644 --- a/src/graphics/ui/elements/Image.cpp +++ b/src/graphics/ui/elements/Image.cpp @@ -6,7 +6,7 @@ #include "../../core/Batch2D.hpp" #include "../../core/Texture.hpp" #include "../../core/Atlas.hpp" -#include "../../../assets/Assets.hpp" +#include #include "../../../maths/UVRegion.hpp" using namespace gui; diff --git a/src/graphics/ui/elements/InventoryView.cpp b/src/graphics/ui/elements/InventoryView.cpp index 3b64bbb1..7a6fda31 100644 --- a/src/graphics/ui/elements/InventoryView.cpp +++ b/src/graphics/ui/elements/InventoryView.cpp @@ -1,6 +1,6 @@ #include "InventoryView.hpp" -#include "../../../assets/Assets.hpp" +#include #include "../../../content/Content.hpp" #include "../../../frontend/LevelFrontend.hpp" #include "../../../frontend/locale.hpp" diff --git a/src/graphics/ui/elements/Label.cpp b/src/graphics/ui/elements/Label.cpp index e2fd44db..131b3ad9 100644 --- a/src/graphics/ui/elements/Label.cpp +++ b/src/graphics/ui/elements/Label.cpp @@ -4,7 +4,7 @@ #include "../../core/DrawContext.hpp" #include "../../core/Batch2D.hpp" #include "../../core/Font.hpp" -#include "../../../assets/Assets.hpp" +#include #include "../../../util/stringutil.hpp" using namespace gui; diff --git a/src/graphics/ui/elements/Plotter.cpp b/src/graphics/ui/elements/Plotter.cpp index 28057ae5..d574f360 100644 --- a/src/graphics/ui/elements/Plotter.cpp +++ b/src/graphics/ui/elements/Plotter.cpp @@ -3,7 +3,7 @@ #include "../../core/Batch2D.hpp" #include "../../core/Font.hpp" #include "../../core/DrawContext.hpp" -#include "../../../assets/Assets.hpp" +#include #include "../../../util/stringutil.hpp" using namespace gui; diff --git a/src/graphics/ui/elements/TextBox.cpp b/src/graphics/ui/elements/TextBox.cpp index 26eaae96..f9b5545e 100644 --- a/src/graphics/ui/elements/TextBox.cpp +++ b/src/graphics/ui/elements/TextBox.cpp @@ -7,7 +7,7 @@ #include "../../core/DrawContext.hpp" #include "../../core/Batch2D.hpp" #include "../../core/Font.hpp" -#include "../../../assets/Assets.hpp" +#include #include "../../../util/stringutil.hpp" #include "../../../window/Events.hpp" #include "../../../window/Window.hpp" diff --git a/src/graphics/ui/elements/TrackBar.cpp b/src/graphics/ui/elements/TrackBar.cpp index ab90b763..c06566da 100644 --- a/src/graphics/ui/elements/TrackBar.cpp +++ b/src/graphics/ui/elements/TrackBar.cpp @@ -4,7 +4,7 @@ #include "../../core/DrawContext.hpp" #include "../../core/Batch2D.hpp" -#include "../../../assets/Assets.hpp" +#include using namespace gui; diff --git a/src/logic/scripting/lua/libgui.cpp b/src/logic/scripting/lua/libgui.cpp index ce572113..55af846d 100644 --- a/src/logic/scripting/lua/libgui.cpp +++ b/src/logic/scripting/lua/libgui.cpp @@ -1,4 +1,4 @@ -#include "../../../assets/Assets.hpp" +#include #include #include "../../../frontend/UiDocument.hpp" #include "../../../frontend/locale.hpp" diff --git a/src/logic/scripting/lua/libhud.cpp b/src/logic/scripting/lua/libhud.cpp index 8ad6b6e6..5c32c8a0 100644 --- a/src/logic/scripting/lua/libhud.cpp +++ b/src/logic/scripting/lua/libhud.cpp @@ -1,7 +1,7 @@ #include #include -#include "../../../assets/Assets.hpp" +#include #include "../../../content/Content.hpp" #include #include "../../../frontend/UiDocument.hpp" diff --git a/src/logic/scripting/lua/libpack.cpp b/src/logic/scripting/lua/libpack.cpp index 901cce9f..59d66e10 100644 --- a/src/logic/scripting/lua/libpack.cpp +++ b/src/logic/scripting/lua/libpack.cpp @@ -3,7 +3,7 @@ #include #include -#include "../../../assets/AssetsLoader.hpp" +#include #include "../../../content/Content.hpp" #include #include "../../../files/WorldFiles.hpp" diff --git a/src/logic/scripting/lua/libworld.cpp b/src/logic/scripting/lua/libworld.cpp index a1736f57..0e8cda6f 100644 --- a/src/logic/scripting/lua/libworld.cpp +++ b/src/logic/scripting/lua/libworld.cpp @@ -1,8 +1,8 @@ #include #include -#include "../../../assets/Assets.hpp" -#include "../../../assets/AssetsLoader.hpp" +#include +#include #include #include "../../../files/engine_paths.hpp" #include "../../../world/Level.hpp" diff --git a/src/objects/Entities.cpp b/src/objects/Entities.cpp index 83a09ca2..3404d957 100644 --- a/src/objects/Entities.cpp +++ b/src/objects/Entities.cpp @@ -3,7 +3,7 @@ #include #include -#include "../assets/Assets.hpp" +#include #include "../content/Content.hpp" #include "../data/dynamic_util.hpp" #include "../debug/Logger.hpp" diff --git a/src/objects/rigging.cpp b/src/objects/rigging.cpp index c592e104..c93523be 100644 --- a/src/objects/rigging.cpp +++ b/src/objects/rigging.cpp @@ -1,6 +1,6 @@ #include "rigging.hpp" -#include "../assets/Assets.hpp" +#include #include "../coders/json.hpp" #include "../data/dynamic_util.hpp" #include "../graphics/core/Model.hpp"