From 7f75c454c8a519f7e7aed289aa45db962edcb9e4 Mon Sep 17 00:00:00 2001 From: InfiniteCoder Date: Mon, 5 Aug 2024 23:23:28 +0300 Subject: [PATCH] logic/ --- src/assets/AssetsLoader.cpp | 2 +- src/content/Content.cpp | 2 +- src/content/ContentLoader.cpp | 2 +- src/engine.cpp | 6 +++--- src/frontend/LevelFrontend.cpp | 4 ++-- src/frontend/UiDocument.cpp | 2 +- src/frontend/debug_panel.cpp | 2 +- src/frontend/hud.cpp | 2 +- src/frontend/menu.cpp | 2 +- src/frontend/screens/LevelScreen.cpp | 4 ++-- src/graphics/render/WorldRenderer.cpp | 4 ++-- src/graphics/ui/elements/InventoryView.cpp | 2 +- src/graphics/ui/gui_util.cpp | 2 +- src/graphics/ui/gui_xml.cpp | 2 +- src/logic/scripting/lua/libblock.cpp | 4 ++-- src/logic/scripting/lua/libconsole.cpp | 2 +- src/logic/scripting/lua/libcore.cpp | 4 ++-- src/logic/scripting/lua/libentity.hpp | 2 +- src/logic/scripting/lua/libhud.cpp | 2 +- src/logic/scripting/lua/libinventory.cpp | 2 +- src/logic/scripting/scripting.cpp | 4 ++-- src/objects/Entities.cpp | 2 +- 22 files changed, 30 insertions(+), 30 deletions(-) diff --git a/src/assets/AssetsLoader.cpp b/src/assets/AssetsLoader.cpp index e7389ac6..b3e42f12 100644 --- a/src/assets/AssetsLoader.cpp +++ b/src/assets/AssetsLoader.cpp @@ -13,7 +13,7 @@ #include #include #include -#include "../logic/scripting/scripting.hpp" +#include #include #include #include diff --git a/src/content/Content.cpp b/src/content/Content.cpp index ab3de75f..3f3cf32e 100644 --- a/src/content/Content.cpp +++ b/src/content/Content.cpp @@ -6,7 +6,7 @@ #include #include -#include "../logic/scripting/scripting.hpp" +#include #include #include #include diff --git a/src/content/ContentLoader.cpp b/src/content/ContentLoader.cpp index a34f13fd..1f1a68cc 100644 --- a/src/content/ContentLoader.cpp +++ b/src/content/ContentLoader.cpp @@ -12,7 +12,7 @@ #include #include #include -#include "../logic/scripting/scripting.hpp" +#include #include #include #include diff --git a/src/engine.cpp b/src/engine.cpp index 74fdc23d..a1bdbad6 100644 --- a/src/engine.cpp +++ b/src/engine.cpp @@ -25,9 +25,9 @@ #include #include #include -#include "logic/EngineController.hpp" -#include "logic/CommandsInterpreter.hpp" -#include "logic/scripting/scripting.hpp" +#include +#include +#include #include #include #include diff --git a/src/frontend/LevelFrontend.cpp b/src/frontend/LevelFrontend.cpp index f8145d61..f761bac1 100644 --- a/src/frontend/LevelFrontend.cpp +++ b/src/frontend/LevelFrontend.cpp @@ -7,8 +7,8 @@ #include #include #include -#include "../logic/LevelController.hpp" -#include "../logic/PlayerController.hpp" +#include +#include #include #include #include "../world/Level.hpp" diff --git a/src/frontend/UiDocument.cpp b/src/frontend/UiDocument.cpp index b51cf23f..06e6029c 100644 --- a/src/frontend/UiDocument.cpp +++ b/src/frontend/UiDocument.cpp @@ -6,7 +6,7 @@ #include #include #include -#include "../logic/scripting/scripting.hpp" +#include UiDocument::UiDocument( std::string id, diff --git a/src/frontend/debug_panel.cpp b/src/frontend/debug_panel.cpp index 48c01cd8..c88ae69d 100644 --- a/src/frontend/debug_panel.cpp +++ b/src/frontend/debug_panel.cpp @@ -9,7 +9,7 @@ #include #include #include -#include "../logic/scripting/scripting.hpp" +#include #include #include #include diff --git a/src/frontend/hud.cpp b/src/frontend/hud.cpp index 10317fa2..84e86c41 100644 --- a/src/frontend/hud.cpp +++ b/src/frontend/hud.cpp @@ -28,7 +28,7 @@ #include #include #include -#include "../logic/scripting/scripting.hpp" +#include #include "../maths/voxmaths.hpp" #include #include "../physics/Hitbox.hpp" diff --git a/src/frontend/menu.cpp b/src/frontend/menu.cpp index 40e0988f..0c285061 100644 --- a/src/frontend/menu.cpp +++ b/src/frontend/menu.cpp @@ -12,7 +12,7 @@ #include #include #include -#include "../logic/scripting/scripting.hpp" +#include #include #include #include diff --git a/src/frontend/screens/LevelScreen.cpp b/src/frontend/screens/LevelScreen.cpp index 4a253b8f..56c13a5b 100644 --- a/src/frontend/screens/LevelScreen.cpp +++ b/src/frontend/screens/LevelScreen.cpp @@ -16,8 +16,8 @@ #include #include #include -#include "../../logic/LevelController.hpp" -#include "../../logic/scripting/scripting_hud.hpp" +#include +#include #include #include "../../physics/Hitbox.hpp" #include diff --git a/src/graphics/render/WorldRenderer.cpp b/src/graphics/render/WorldRenderer.cpp index 894b5f9b..f2c81a04 100644 --- a/src/graphics/render/WorldRenderer.cpp +++ b/src/graphics/render/WorldRenderer.cpp @@ -15,8 +15,8 @@ #include #include #include -#include "../../logic/PlayerController.hpp" -#include "../../logic/scripting/scripting_hud.hpp" +#include +#include #include "../../maths/FrustumCulling.hpp" #include "../../maths/voxmaths.hpp" #include diff --git a/src/graphics/ui/elements/InventoryView.cpp b/src/graphics/ui/elements/InventoryView.cpp index 10fdce52..bce128e3 100644 --- a/src/graphics/ui/elements/InventoryView.cpp +++ b/src/graphics/ui/elements/InventoryView.cpp @@ -8,7 +8,7 @@ #include #include #include -#include "../../../logic/scripting/scripting.hpp" +#include #include "../../../maths/voxmaths.hpp" #include #include diff --git a/src/graphics/ui/gui_util.cpp b/src/graphics/ui/gui_util.cpp index 452be7ef..9bc2dad0 100644 --- a/src/graphics/ui/gui_util.cpp +++ b/src/graphics/ui/gui_util.cpp @@ -5,7 +5,7 @@ #include "elements/Button.hpp" #include "gui_xml.hpp" -#include "../../logic/scripting/scripting.hpp" +#include #include "../../frontend/locale.hpp" #include #include diff --git a/src/graphics/ui/gui_xml.cpp b/src/graphics/ui/gui_xml.cpp index cc35ae21..ebd57698 100644 --- a/src/graphics/ui/gui_xml.cpp +++ b/src/graphics/ui/gui_xml.cpp @@ -13,7 +13,7 @@ #include "../../frontend/menu.hpp" #include "../../frontend/locale.hpp" #include -#include "../../logic/scripting/scripting.hpp" +#include #include "../../maths/voxmaths.hpp" #include #include "../../window/Events.hpp" diff --git a/src/logic/scripting/lua/libblock.cpp b/src/logic/scripting/lua/libblock.cpp index 96eed6f5..31432fb4 100644 --- a/src/logic/scripting/lua/libblock.cpp +++ b/src/logic/scripting/lua/libblock.cpp @@ -1,7 +1,7 @@ #include #include "../../../lighting/Lighting.hpp" -#include "../../../logic/BlocksController.hpp" -#include "../../../logic/LevelController.hpp" +#include +#include #include #include #include diff --git a/src/logic/scripting/lua/libconsole.cpp b/src/logic/scripting/lua/libconsole.cpp index 28655f80..3202bc1d 100644 --- a/src/logic/scripting/lua/libconsole.cpp +++ b/src/logic/scripting/lua/libconsole.cpp @@ -1,6 +1,6 @@ #include #include -#include "../../CommandsInterpreter.hpp" +#include #include "api_lua.hpp" using namespace scripting; diff --git a/src/logic/scripting/lua/libcore.cpp b/src/logic/scripting/lua/libcore.cpp index b19bf539..679fe21e 100644 --- a/src/logic/scripting/lua/libcore.cpp +++ b/src/logic/scripting/lua/libcore.cpp @@ -7,8 +7,8 @@ #include #include "../../../frontend/menu.hpp" #include "../../../frontend/screens/MenuScreen.hpp" -#include "../../../logic/EngineController.hpp" -#include "../../../logic/LevelController.hpp" +#include +#include #include "../../../window/Events.hpp" #include "../../../window/Window.hpp" #include "../../../world/Level.hpp" diff --git a/src/logic/scripting/lua/libentity.hpp b/src/logic/scripting/lua/libentity.hpp index be944c2e..290febbc 100644 --- a/src/logic/scripting/lua/libentity.hpp +++ b/src/logic/scripting/lua/libentity.hpp @@ -6,7 +6,7 @@ #include "../../../frontend/hud.hpp" #include #include "../../../world/Level.hpp" -#include "../../LevelController.hpp" +#include #include "api_lua.hpp" namespace scripting { diff --git a/src/logic/scripting/lua/libhud.cpp b/src/logic/scripting/lua/libhud.cpp index 290a0fd9..4357546f 100644 --- a/src/logic/scripting/lua/libhud.cpp +++ b/src/logic/scripting/lua/libhud.cpp @@ -8,7 +8,7 @@ #include "../../../frontend/hud.hpp" #include #include -#include "../../../logic/BlocksController.hpp" +#include #include #include #include diff --git a/src/logic/scripting/lua/libinventory.cpp b/src/logic/scripting/lua/libinventory.cpp index df37daa6..79269bc9 100644 --- a/src/logic/scripting/lua/libinventory.cpp +++ b/src/logic/scripting/lua/libinventory.cpp @@ -1,7 +1,7 @@ #include #include #include -#include "../../../logic/BlocksController.hpp" +#include #include "../../../world/Level.hpp" #include "api_lua.hpp" diff --git a/src/logic/scripting/scripting.cpp b/src/logic/scripting/scripting.cpp index 30f93c63..64355e19 100644 --- a/src/logic/scripting/scripting.cpp +++ b/src/logic/scripting/scripting.cpp @@ -12,8 +12,8 @@ #include "../../frontend/UiDocument.hpp" #include #include -#include "../../logic/BlocksController.hpp" -#include "../../logic/LevelController.hpp" +#include "../BlocksController.hpp" +#include "../LevelController.hpp" #include #include #include diff --git a/src/objects/Entities.cpp b/src/objects/Entities.cpp index f7c13d87..9e3f65d5 100644 --- a/src/objects/Entities.cpp +++ b/src/objects/Entities.cpp @@ -12,7 +12,7 @@ #include #include #include -#include "../logic/scripting/scripting.hpp" +#include #include "../maths/FrustumCulling.hpp" #include "../maths/rays.hpp" #include "EntityDef.hpp"