From 736fdbf96444db62916197835daee4487b0748ef Mon Sep 17 00:00:00 2001 From: MihailRis Date: Sat, 5 Oct 2024 00:53:41 +0300 Subject: [PATCH] move lua libs to /logic/scripting/lua/libs --- src/logic/scripting/lua/{ => libs}/api_lua.hpp | 2 +- src/logic/scripting/lua/{ => libs}/lib__rigidbody.cpp | 0 src/logic/scripting/lua/{ => libs}/lib__skeleton.cpp | 0 src/logic/scripting/lua/{ => libs}/lib__transform.cpp | 0 src/logic/scripting/lua/{ => libs}/libaudio.cpp | 0 src/logic/scripting/lua/{ => libs}/libblock.cpp | 0 src/logic/scripting/lua/{ => libs}/libcamera.cpp | 0 src/logic/scripting/lua/{ => libs}/libconsole.cpp | 0 src/logic/scripting/lua/{ => libs}/libcore.cpp | 0 src/logic/scripting/lua/{ => libs}/libentity.cpp | 0 src/logic/scripting/lua/{ => libs}/libentity.hpp | 0 src/logic/scripting/lua/{ => libs}/libfile.cpp | 0 src/logic/scripting/lua/{ => libs}/libgeneration.cpp | 2 +- src/logic/scripting/lua/{ => libs}/libgui.cpp | 0 src/logic/scripting/lua/{ => libs}/libhud.cpp | 0 src/logic/scripting/lua/{ => libs}/libinput.cpp | 0 src/logic/scripting/lua/{ => libs}/libinventory.cpp | 0 src/logic/scripting/lua/{ => libs}/libitem.cpp | 0 src/logic/scripting/lua/{ => libs}/libjson.cpp | 0 src/logic/scripting/lua/{ => libs}/libmat4.cpp | 0 src/logic/scripting/lua/{ => libs}/libpack.cpp | 0 src/logic/scripting/lua/{ => libs}/libplayer.cpp | 0 src/logic/scripting/lua/{ => libs}/libquat.cpp | 0 src/logic/scripting/lua/{ => libs}/libtime.cpp | 0 src/logic/scripting/lua/{ => libs}/libtoml.cpp | 0 src/logic/scripting/lua/{ => libs}/libvecn.cpp | 0 src/logic/scripting/lua/{ => libs}/libworld.cpp | 0 src/logic/scripting/lua/lua_engine.cpp | 2 +- src/logic/scripting/lua/lua_extensions.cpp | 2 +- src/logic/scripting/lua/lua_overrides.cpp | 2 +- src/logic/scripting/scripting_hud.cpp | 2 +- 31 files changed, 6 insertions(+), 6 deletions(-) rename src/logic/scripting/lua/{ => libs}/api_lua.hpp (98%) rename src/logic/scripting/lua/{ => libs}/lib__rigidbody.cpp (100%) rename src/logic/scripting/lua/{ => libs}/lib__skeleton.cpp (100%) rename src/logic/scripting/lua/{ => libs}/lib__transform.cpp (100%) rename src/logic/scripting/lua/{ => libs}/libaudio.cpp (100%) rename src/logic/scripting/lua/{ => libs}/libblock.cpp (100%) rename src/logic/scripting/lua/{ => libs}/libcamera.cpp (100%) rename src/logic/scripting/lua/{ => libs}/libconsole.cpp (100%) rename src/logic/scripting/lua/{ => libs}/libcore.cpp (100%) rename src/logic/scripting/lua/{ => libs}/libentity.cpp (100%) rename src/logic/scripting/lua/{ => libs}/libentity.hpp (100%) rename src/logic/scripting/lua/{ => libs}/libfile.cpp (100%) rename src/logic/scripting/lua/{ => libs}/libgeneration.cpp (98%) rename src/logic/scripting/lua/{ => libs}/libgui.cpp (100%) rename src/logic/scripting/lua/{ => libs}/libhud.cpp (100%) rename src/logic/scripting/lua/{ => libs}/libinput.cpp (100%) rename src/logic/scripting/lua/{ => libs}/libinventory.cpp (100%) rename src/logic/scripting/lua/{ => libs}/libitem.cpp (100%) rename src/logic/scripting/lua/{ => libs}/libjson.cpp (100%) rename src/logic/scripting/lua/{ => libs}/libmat4.cpp (100%) rename src/logic/scripting/lua/{ => libs}/libpack.cpp (100%) rename src/logic/scripting/lua/{ => libs}/libplayer.cpp (100%) rename src/logic/scripting/lua/{ => libs}/libquat.cpp (100%) rename src/logic/scripting/lua/{ => libs}/libtime.cpp (100%) rename src/logic/scripting/lua/{ => libs}/libtoml.cpp (100%) rename src/logic/scripting/lua/{ => libs}/libvecn.cpp (100%) rename src/logic/scripting/lua/{ => libs}/libworld.cpp (100%) diff --git a/src/logic/scripting/lua/api_lua.hpp b/src/logic/scripting/lua/libs/api_lua.hpp similarity index 98% rename from src/logic/scripting/lua/api_lua.hpp rename to src/logic/scripting/lua/libs/api_lua.hpp index 6a8f3dd2..f856f5f4 100644 --- a/src/logic/scripting/lua/api_lua.hpp +++ b/src/logic/scripting/lua/libs/api_lua.hpp @@ -3,7 +3,7 @@ #include #include -#include "lua_util.hpp" +#include "../lua_util.hpp" /// Definitions can be found in local .cpp files /// having same names as declarations diff --git a/src/logic/scripting/lua/lib__rigidbody.cpp b/src/logic/scripting/lua/libs/lib__rigidbody.cpp similarity index 100% rename from src/logic/scripting/lua/lib__rigidbody.cpp rename to src/logic/scripting/lua/libs/lib__rigidbody.cpp diff --git a/src/logic/scripting/lua/lib__skeleton.cpp b/src/logic/scripting/lua/libs/lib__skeleton.cpp similarity index 100% rename from src/logic/scripting/lua/lib__skeleton.cpp rename to src/logic/scripting/lua/libs/lib__skeleton.cpp diff --git a/src/logic/scripting/lua/lib__transform.cpp b/src/logic/scripting/lua/libs/lib__transform.cpp similarity index 100% rename from src/logic/scripting/lua/lib__transform.cpp rename to src/logic/scripting/lua/libs/lib__transform.cpp diff --git a/src/logic/scripting/lua/libaudio.cpp b/src/logic/scripting/lua/libs/libaudio.cpp similarity index 100% rename from src/logic/scripting/lua/libaudio.cpp rename to src/logic/scripting/lua/libs/libaudio.cpp diff --git a/src/logic/scripting/lua/libblock.cpp b/src/logic/scripting/lua/libs/libblock.cpp similarity index 100% rename from src/logic/scripting/lua/libblock.cpp rename to src/logic/scripting/lua/libs/libblock.cpp diff --git a/src/logic/scripting/lua/libcamera.cpp b/src/logic/scripting/lua/libs/libcamera.cpp similarity index 100% rename from src/logic/scripting/lua/libcamera.cpp rename to src/logic/scripting/lua/libs/libcamera.cpp diff --git a/src/logic/scripting/lua/libconsole.cpp b/src/logic/scripting/lua/libs/libconsole.cpp similarity index 100% rename from src/logic/scripting/lua/libconsole.cpp rename to src/logic/scripting/lua/libs/libconsole.cpp diff --git a/src/logic/scripting/lua/libcore.cpp b/src/logic/scripting/lua/libs/libcore.cpp similarity index 100% rename from src/logic/scripting/lua/libcore.cpp rename to src/logic/scripting/lua/libs/libcore.cpp diff --git a/src/logic/scripting/lua/libentity.cpp b/src/logic/scripting/lua/libs/libentity.cpp similarity index 100% rename from src/logic/scripting/lua/libentity.cpp rename to src/logic/scripting/lua/libs/libentity.cpp diff --git a/src/logic/scripting/lua/libentity.hpp b/src/logic/scripting/lua/libs/libentity.hpp similarity index 100% rename from src/logic/scripting/lua/libentity.hpp rename to src/logic/scripting/lua/libs/libentity.hpp diff --git a/src/logic/scripting/lua/libfile.cpp b/src/logic/scripting/lua/libs/libfile.cpp similarity index 100% rename from src/logic/scripting/lua/libfile.cpp rename to src/logic/scripting/lua/libs/libfile.cpp diff --git a/src/logic/scripting/lua/libgeneration.cpp b/src/logic/scripting/lua/libs/libgeneration.cpp similarity index 98% rename from src/logic/scripting/lua/libgeneration.cpp rename to src/logic/scripting/lua/libs/libgeneration.cpp index ec425345..d24fae0c 100644 --- a/src/logic/scripting/lua/libgeneration.cpp +++ b/src/logic/scripting/lua/libs/libgeneration.cpp @@ -7,7 +7,7 @@ #include "world/generator/VoxelFragment.hpp" #include "content/ContentLoader.hpp" #include "engine.hpp" -#include "lua_custom_types.hpp" +#include "../lua_custom_types.hpp" using namespace scripting; diff --git a/src/logic/scripting/lua/libgui.cpp b/src/logic/scripting/lua/libs/libgui.cpp similarity index 100% rename from src/logic/scripting/lua/libgui.cpp rename to src/logic/scripting/lua/libs/libgui.cpp diff --git a/src/logic/scripting/lua/libhud.cpp b/src/logic/scripting/lua/libs/libhud.cpp similarity index 100% rename from src/logic/scripting/lua/libhud.cpp rename to src/logic/scripting/lua/libs/libhud.cpp diff --git a/src/logic/scripting/lua/libinput.cpp b/src/logic/scripting/lua/libs/libinput.cpp similarity index 100% rename from src/logic/scripting/lua/libinput.cpp rename to src/logic/scripting/lua/libs/libinput.cpp diff --git a/src/logic/scripting/lua/libinventory.cpp b/src/logic/scripting/lua/libs/libinventory.cpp similarity index 100% rename from src/logic/scripting/lua/libinventory.cpp rename to src/logic/scripting/lua/libs/libinventory.cpp diff --git a/src/logic/scripting/lua/libitem.cpp b/src/logic/scripting/lua/libs/libitem.cpp similarity index 100% rename from src/logic/scripting/lua/libitem.cpp rename to src/logic/scripting/lua/libs/libitem.cpp diff --git a/src/logic/scripting/lua/libjson.cpp b/src/logic/scripting/lua/libs/libjson.cpp similarity index 100% rename from src/logic/scripting/lua/libjson.cpp rename to src/logic/scripting/lua/libs/libjson.cpp diff --git a/src/logic/scripting/lua/libmat4.cpp b/src/logic/scripting/lua/libs/libmat4.cpp similarity index 100% rename from src/logic/scripting/lua/libmat4.cpp rename to src/logic/scripting/lua/libs/libmat4.cpp diff --git a/src/logic/scripting/lua/libpack.cpp b/src/logic/scripting/lua/libs/libpack.cpp similarity index 100% rename from src/logic/scripting/lua/libpack.cpp rename to src/logic/scripting/lua/libs/libpack.cpp diff --git a/src/logic/scripting/lua/libplayer.cpp b/src/logic/scripting/lua/libs/libplayer.cpp similarity index 100% rename from src/logic/scripting/lua/libplayer.cpp rename to src/logic/scripting/lua/libs/libplayer.cpp diff --git a/src/logic/scripting/lua/libquat.cpp b/src/logic/scripting/lua/libs/libquat.cpp similarity index 100% rename from src/logic/scripting/lua/libquat.cpp rename to src/logic/scripting/lua/libs/libquat.cpp diff --git a/src/logic/scripting/lua/libtime.cpp b/src/logic/scripting/lua/libs/libtime.cpp similarity index 100% rename from src/logic/scripting/lua/libtime.cpp rename to src/logic/scripting/lua/libs/libtime.cpp diff --git a/src/logic/scripting/lua/libtoml.cpp b/src/logic/scripting/lua/libs/libtoml.cpp similarity index 100% rename from src/logic/scripting/lua/libtoml.cpp rename to src/logic/scripting/lua/libs/libtoml.cpp diff --git a/src/logic/scripting/lua/libvecn.cpp b/src/logic/scripting/lua/libs/libvecn.cpp similarity index 100% rename from src/logic/scripting/lua/libvecn.cpp rename to src/logic/scripting/lua/libs/libvecn.cpp diff --git a/src/logic/scripting/lua/libworld.cpp b/src/logic/scripting/lua/libs/libworld.cpp similarity index 100% rename from src/logic/scripting/lua/libworld.cpp rename to src/logic/scripting/lua/libs/libworld.cpp diff --git a/src/logic/scripting/lua/lua_engine.cpp b/src/logic/scripting/lua/lua_engine.cpp index 6ae427e3..8055fc54 100644 --- a/src/logic/scripting/lua/lua_engine.cpp +++ b/src/logic/scripting/lua/lua_engine.cpp @@ -5,7 +5,7 @@ #include "debug/Logger.hpp" #include "util/stringutil.hpp" -#include "api_lua.hpp" +#include "libs/api_lua.hpp" #include "lua_custom_types.hpp" static debug::Logger logger("lua-state"); diff --git a/src/logic/scripting/lua/lua_extensions.cpp b/src/logic/scripting/lua/lua_extensions.cpp index 51185898..e1d7a230 100644 --- a/src/logic/scripting/lua/lua_extensions.cpp +++ b/src/logic/scripting/lua/lua_extensions.cpp @@ -1,6 +1,6 @@ #include -#include "api_lua.hpp" +#include "libs/api_lua.hpp" #include "debug/Logger.hpp" static debug::Logger logger("lua-debug"); diff --git a/src/logic/scripting/lua/lua_overrides.cpp b/src/logic/scripting/lua/lua_overrides.cpp index 8233d95a..12b0bbff 100644 --- a/src/logic/scripting/lua/lua_overrides.cpp +++ b/src/logic/scripting/lua/lua_overrides.cpp @@ -1,6 +1,6 @@ #include -#include "api_lua.hpp" +#include "libs/api_lua.hpp" /// @brief Modified version of luaB_print from lbaselib.c int l_print(lua::State* L) { diff --git a/src/logic/scripting/scripting_hud.cpp b/src/logic/scripting/scripting_hud.cpp index f48e42da..fa1cfe12 100644 --- a/src/logic/scripting/scripting_hud.cpp +++ b/src/logic/scripting/scripting_hud.cpp @@ -5,7 +5,7 @@ #include "files/files.hpp" #include "frontend/hud.hpp" #include "objects/Player.hpp" -#include "lua/api_lua.hpp" +#include "lua/libs/api_lua.hpp" #include "lua/lua_engine.hpp" #include "scripting.hpp"