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

new content menu (WIP)

Browse Source
This commit is contained in:
MihailRis
2024-05-02 04:07:07 +03:00
parent 690e3f54c9
commit 5915b811f2
27 changed files with 340 additions and 202 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/logic/scripting/lua/libcore.cpp
+25 -23
View File
@@ -8,6 +8,7 @@
#include "../../../frontend/screens/MenuScreen.hpp"
#include "../../../logic/LevelController.h"
#include "../../../logic/EngineController.hpp"
#include "../../../world/Level.h"
#include "../../../window/Events.h"
#include "../../../window/Window.h"
#include "../../../world/WorldGenerators.h"
@@ -37,6 +38,12 @@ static int l_open_world(lua_State* L) {
return 0;
}
static int l_reopen_world(lua_State* L) {
auto controller = scripting::engine->getController();
controller->reopenWorld(scripting::level->getWorld());
return 0;
}
static int l_close_world(lua_State* L) {
if (scripting::controller == nullptr) {
luaL_error(L, "no world open");
@@ -59,35 +66,30 @@ static int l_delete_world(lua_State* L) {
return 0;
}
static int l_remove_packs(lua_State* L) {
static int l_reconfig_packs(lua_State* L) {
if (!lua_istable(L, 1)) {
luaL_error(L, "strings array expected as an argument");
luaL_error(L, "strings array expected as the first argument");
}
std::vector<std::string> packs;
int len = lua_objlen(L, 1);
for (int i = 0; i < len; i++) {
lua_rawgeti(L, -1, i+1);
packs.push_back(lua_tostring(L, -1));
if (!lua_istable(L, 2)) {
luaL_error(L, "strings array expected as the second argument");
}
std::vector<std::string> addPacks;
int addLen = lua_objlen(L, 1);
for (int i = 0; i < addLen; i++) {
lua_rawgeti(L, 1, i+1);
addPacks.push_back(lua_tostring(L, -1));
lua_pop(L, 1);
}
auto controller = scripting::engine->getController();
controller->removePacks(scripting::controller, packs);
return 0;
}
static int l_add_packs(lua_State* L) {
if (!lua_istable(L, 1)) {
luaL_error(L, "strings array expected as an argument");
}
std::vector<std::string> packs;
int len = lua_objlen(L, 1);
for (int i = 0; i < len; i++) {
lua_rawgeti(L, -1, i+1);
packs.push_back(lua_tostring(L, -1));
std::vector<std::string> remPacks;
int remLen = lua_objlen(L, 2);
for (int i = 0; i < remLen; i++) {
lua_rawgeti(L, 2, i+1);
remPacks.push_back(lua_tostring(L, -1));
lua_pop(L, 1);
}
auto controller = scripting::engine->getController();
controller->addPacks(scripting::controller, packs);
controller->reconfigPacks(scripting::controller, addPacks, remPacks);
return 0;
}
@@ -174,10 +176,10 @@ static int l_get_generators(lua_State* L) {
const luaL_Reg corelib [] = {
{"new_world", lua_wrap_errors<l_new_world>},
{"open_world", lua_wrap_errors<l_open_world>},
{"reopen_world", lua_wrap_errors<l_reopen_world>},
{"close_world", lua_wrap_errors<l_close_world>},
{"delete_world", lua_wrap_errors<l_delete_world>},
{"add_packs", lua_wrap_errors<l_add_packs>},
{"remove_packs", lua_wrap_errors<l_remove_packs>},
{"reconfig_packs", lua_wrap_errors<l_reconfig_packs>},
{"get_bindings", lua_wrap_errors<l_get_bindings>},
{"get_setting", lua_wrap_errors<l_get_setting>},
{"set_setting", lua_wrap_errors<l_set_setting>},
src/logic/scripting/lua/libgui.cpp
+44 -23
View File
@@ -27,7 +27,7 @@ using namespace gui;
struct DocumentNode {
UiDocument* document;
UINode* node;
std::shared_ptr<UINode> node;
};
static DocumentNode getDocumentNode(lua_State* L, const std::string& name, const std::string& nodeName) {
@@ -39,7 +39,7 @@ static DocumentNode getDocumentNode(lua_State* L, const std::string& name, const
if (node == nullptr) {
luaL_error(L, "document '%s' has no element with id '%s'", name.c_str(), nodeName.c_str());
}
return {doc, node.get()};
return {doc, node};
}
static bool getattr(lua_State* L, TrackBar* bar, const std::string& attr) {
@@ -137,9 +137,9 @@ static bool getattr(lua_State* L, TextBox* box, const std::string& attr) {
return false;
}
static DocumentNode getDocumentNode(lua_State* L) {
lua_getfield(L, 1, "docname");
lua_getfield(L, 1, "name");
static DocumentNode getDocumentNode(lua_State* L, int idx=1) {
lua_getfield(L, idx, "docname");
lua_getfield(L, idx, "name");
auto docname = lua_tostring(L, -2);
auto name = lua_tostring(L, -1);
auto node = getDocumentNode(L, docname, name);
@@ -149,14 +149,14 @@ static DocumentNode getDocumentNode(lua_State* L) {
static int menu_back(lua_State* L) {
auto node = getDocumentNode(L);
auto menu = dynamic_cast<Menu*>(node.node);
auto menu = dynamic_cast<Menu*>(node.node.get());
menu->back();
return 0;
}
static int menu_reset(lua_State* L) {
auto node = getDocumentNode(L);
auto menu = dynamic_cast<Menu*>(node.node);
auto menu = dynamic_cast<Menu*>(node.node.get());
menu->reset();
return 0;
}
@@ -249,7 +249,7 @@ static bool setattr(lua_State* L, InventoryView* view, const std::string& attr)
static int container_add(lua_State* L) {
auto docnode = getDocumentNode(L);
auto node = dynamic_cast<Container*>(docnode.node);
auto node = dynamic_cast<Container*>(docnode.node.get());
auto xmlsrc = lua_tostring(L, 2);
try {
auto subnode = guiutil::create(xmlsrc, docnode.document->getEnvironment());
@@ -261,6 +261,14 @@ static int container_add(lua_State* L) {
return 0;
}
static int container_clear(lua_State* L) {
auto node = getDocumentNode(L, 1);
if (auto container = std::dynamic_pointer_cast<Container>(node.node)) {
container->clear();
}
return 0;
}
static bool getattr(lua_State* L, Container* container, const std::string& attr) {
if (container == nullptr)
return false;
@@ -268,6 +276,9 @@ static bool getattr(lua_State* L, Container* container, const std::string& attr)
if (attr == "add") {
lua_pushcfunction(L, container_add);
return true;
} else if (attr == "clear") {
lua_pushcfunction(L, container_clear);
return true;
}
return false;
}
@@ -283,6 +294,13 @@ static bool getattr(lua_State* L, InventoryView* inventory, const std::string& a
return false;
}
static int uinode_move_into(lua_State* L) {
auto node = getDocumentNode(L, 1);
auto dest = getDocumentNode(L, 2);
UINode::moveInto(node.node, std::dynamic_pointer_cast<Container>(dest.node));
return 0;
}
static int l_gui_getattr(lua_State* L) {
auto docname = lua_tostring(L, 1);
auto element = lua_tostring(L, 2);
@@ -307,23 +325,26 @@ static int l_gui_getattr(lua_State* L) {
} else if (attr == "enabled") {
lua_pushboolean(L, node->isEnabled());
return 1;
} else if (attr == "move_into") {
lua_pushcfunction(L, uinode_move_into);
return 1;
}
if (getattr(L, dynamic_cast<Container*>(node), attr))
if (getattr(L, dynamic_cast<Container*>(node.get()), attr))
return 1;
if (getattr(L, dynamic_cast<Button*>(node), attr))
if (getattr(L, dynamic_cast<Button*>(node.get()), attr))
return 1;
if (getattr(L, dynamic_cast<Label*>(node), attr))
if (getattr(L, dynamic_cast<Label*>(node.get()), attr))
return 1;
if (getattr(L, dynamic_cast<TextBox*>(node), attr))
if (getattr(L, dynamic_cast<TextBox*>(node.get()), attr))
return 1;
if (getattr(L, dynamic_cast<TrackBar*>(node), attr))
if (getattr(L, dynamic_cast<TrackBar*>(node.get()), attr))
return 1;
if (getattr(L, dynamic_cast<FullCheckBox*>(node), attr))
if (getattr(L, dynamic_cast<FullCheckBox*>(node.get()), attr))
return 1;
if (getattr(L, dynamic_cast<Menu*>(node), attr))
if (getattr(L, dynamic_cast<Menu*>(node.get()), attr))
return 1;
if (getattr(L, dynamic_cast<InventoryView*>(node), attr))
if (getattr(L, dynamic_cast<InventoryView*>(node.get()), attr))
return 1;
return 0;
@@ -356,19 +377,19 @@ static int l_gui_setattr(lua_State* L) {
} else if (attr == "enabled") {
node->setEnabled(lua_toboolean(L, 4));
} else {
if (setattr(L, dynamic_cast<Button*>(node), attr))
if (setattr(L, dynamic_cast<Button*>(node.get()), attr))
return 0;
if (setattr(L, dynamic_cast<Label*>(node), attr))
if (setattr(L, dynamic_cast<Label*>(node.get()), attr))
return 0;
if (setattr(L, dynamic_cast<TextBox*>(node), attr))
if (setattr(L, dynamic_cast<TextBox*>(node.get()), attr))
return 0;
if (setattr(L, dynamic_cast<TrackBar*>(node), attr))
if (setattr(L, dynamic_cast<TrackBar*>(node.get()), attr))
return 0;
if (setattr(L, dynamic_cast<FullCheckBox*>(node), attr))
if (setattr(L, dynamic_cast<FullCheckBox*>(node.get()), attr))
return 0;
if (setattr(L, dynamic_cast<Menu*>(node), attr))
if (setattr(L, dynamic_cast<Menu*>(node.get()), attr))
return 0;
if (setattr(L, dynamic_cast<InventoryView*>(node), attr))
if (setattr(L, dynamic_cast<InventoryView*>(node.get()), attr))
return 0;
}
return 0;