block ui test

This commit is contained in:
MihailRis
2024-02-16 14:45:46 +03:00
parent 7e553efdec
commit af7c828d73
17 changed files with 84 additions and 30 deletions
-20
View File
@@ -1,20 +0,0 @@
#include "libhud.h"
#include <iostream>
#include "../scripting.h"
#include "../../../frontend/hud.h"
namespace scripting {
extern Hud* hud;
}
int l_hud_open_inventory(lua_State* L) {
scripting::hud->openInventory();
return 0;
}
int l_hud_close_inventory(lua_State* L) {
scripting::hud->closeInventory();
return 0;
}
@@ -2,9 +2,9 @@
#include <iostream>
#include "lua_util.h"
#include "api/api_lua.h"
#include "api/libgui.h"
#include "../../util/stringutil.h"
#include "api_lua.h"
#include "libgui.h"
#include "../../../util/stringutil.h"
lua::luaerror::luaerror(const std::string& message) : std::runtime_error(message) {
}
@@ -1,7 +1,7 @@
#include "api_lua.h"
#include "../scripting.h"
#include "../lua_util.h"
#include "lua_util.h"
#include <glm/glm.hpp>
#include <iostream>
@@ -2,7 +2,7 @@
#include <iostream>
#include "../scripting.h"
#include "../lua_util.h"
#include "lua_util.h"
#include "../../../engine.h"
#include "../../../assets/Assets.h"
+65
View File
@@ -0,0 +1,65 @@
#include "libhud.h"
#include "LuaState.h"
#include <iostream>
#include <glm/glm.hpp>
#include "../scripting.h"
#include "../../../assets/Assets.h"
#include "../../../frontend/hud.h"
#include "../../../world/Level.h"
#include "../../../voxels/Chunks.h"
#include "../../../voxels/voxel.h"
#include "../../../voxels/Block.h"
#include "../../../content/Content.h"
#include "../../../logic/BlocksController.h"
#include "../../../items/Inventories.h"
#include "../../../engine.h"
namespace scripting {
extern Hud* hud;
}
int l_hud_open_inventory(lua_State* L) {
scripting::hud->openInventory();
return 0;
}
int l_hud_close_inventory(lua_State* L) {
scripting::hud->closeInventory();
return 0;
}
int l_hud_open_block(lua_State* L) {
lua::luaint x = lua_tointeger(L, 1);
lua::luaint y = lua_tointeger(L, 2);
lua::luaint z = lua_tointeger(L, 3);
voxel* vox = scripting::level->chunks->get(x, y, z);
if (vox == nullptr) {
luaL_error(L, "block does not exists at %d %d %d", x, y, z);
}
auto def = scripting::content->getIndices()->getBlockDef(vox->id);
auto assets = scripting::engine->getAssets();
auto layout = assets->getLayout(def->uiLayout);
if (layout == nullptr) {
luaL_error(L, "block '%s' has no ui layout", def->name.c_str());
}
auto id = scripting::blocks->createBlockInventory(x, y, z);
if (id == 0) {
luaL_error(L,
"block '%s' at %d %d %d has no inventory",
def->name.c_str(),
x, y, z
);
}
scripting::hud->openInventory(
glm::ivec3(x, y, z), layout, scripting::level->inventories->get(id)
);
lua_pushinteger(L, id);
lua_pushstring(L, def->uiLayout.c_str());
return 2;
}
@@ -5,10 +5,12 @@
extern int l_hud_open_inventory(lua_State* L);
extern int l_hud_close_inventory(lua_State* L);
extern int l_hud_open_block(lua_State* L);
static const luaL_Reg hudlib [] = {
{"open_inventory", l_hud_open_inventory},
{"close_inventory", l_hud_close_inventory},
{"open_block", l_hud_open_block},
{NULL, NULL}
};
+1 -1
View File
@@ -14,7 +14,7 @@
#include "../../logic/BlocksController.h"
#include "../../frontend/UiDocument.h"
#include "../../engine.h"
#include "LuaState.h"
#include "lua/LuaState.h"
#include "../../util/stringutil.h"
#include "../../util/timeutil.h"
+2 -2
View File
@@ -1,8 +1,8 @@
#include "scripting_frontend.h"
#include "scripting.h"
#include "api/libhud.h"
#include "LuaState.h"
#include "lua/libhud.h"
#include "lua/LuaState.h"
namespace scripting {
extern lua::LuaState* state;
+1 -1
View File
@@ -2,7 +2,7 @@
#include <iostream>
#include "LuaState.h"
#include "lua/LuaState.h"
#include "../../util/stringutil.h"
namespace scripting {