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

Merge branch 'main' into update-gfx-pipeline

Browse Source
This commit is contained in:
MihailRis
2025-06-28 14:18:53 +03:00
parent 1b84b7df5e b3a5ea8e06
commit 9fc02d3a99
18 changed files with 409 additions and 118 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/logic/scripting/lua/libs/libgui.cpp
+63
View File
@@ -8,6 +8,7 @@
#include "graphics/ui/elements/Canvas.hpp"
#include "graphics/ui/elements/CheckBox.hpp"
#include "graphics/ui/elements/Image.hpp"
#include "graphics/ui/elements/SelectBox.hpp"
#include "graphics/ui/elements/InventoryView.hpp"
#include "graphics/ui/elements/Menu.hpp"
#include "graphics/ui/elements/Panel.hpp"
@@ -225,6 +226,8 @@ static int p_is_checked(UINode* node, lua::State* L) {
static int p_get_value(UINode* node, lua::State* L) {
if (auto bar = dynamic_cast<TrackBar*>(node)) {
return lua::pushnumber(L, bar->getValue());
} else if (auto box = dynamic_cast<SelectBox*>(node)) {
return lua::pushstring(L, box->getSelected().value);
}
return 0;
}
@@ -509,6 +512,28 @@ static int p_get_scroll(UINode* node, lua::State* L) {
return 0;
}
static int p_get_options(UINode* node, lua::State* L) {
if (auto selectbox = dynamic_cast<SelectBox*>(node)) {
const auto& options = selectbox->getOptions();
size_t size = options.size();
lua::createtable(L, size, 0);
for (size_t i = 0; i < size; i++) {
const auto& option = options[i];
lua::createtable(L, 0, 2);
lua::pushstring(L, option.value);
lua::setfield(L, "value");
lua::pushwstring(L, option.text);
lua::setfield(L, "text");
lua::rawseti(L, i + 1);
}
return 1;
}
return 0;
}
static int l_gui_getattr(lua::State* L) {
if (!lua::isstring(L, 1)) {
throw std::runtime_error("document name is not a string");
@@ -595,6 +620,7 @@ static int l_gui_getattr(lua::State* L) {
{"data", p_get_data},
{"parent", p_get_parent},
{"region", p_get_region},
{"options", p_get_options},
};
auto func = getters.find(attr);
if (func != getters.end()) {
@@ -706,9 +732,45 @@ static void p_set_region(UINode* node, lua::State* L, int idx) {
image->setRegion(UVRegion(vec.x, vec.y, vec.z, vec.w));
}
}
static void p_set_options(UINode* node, lua::State* L, int idx) {
if (auto selectbox = dynamic_cast<SelectBox*>(node)) {
if (!lua::istable(L, idx)) {
throw std::runtime_error("options table expected");
}
std::vector<SelectBox::Option> options;
size_t size = lua::objlen(L, idx);
for (size_t i = 0; i < size; i++) {
lua::rawgeti(L, i + 1, idx);
SelectBox::Option option;
lua::getfield(L, "value");
option.value = lua::require_string(L, -1);
lua::pop(L);
lua::getfield(L, "text");
option.text = lua::require_wstring(L, -1);
lua::pop(L, 2);
options.push_back(std::move(option));
}
selectbox->setOptions(std::move(options));
}
}
static void p_set_value(UINode* node, lua::State* L, int idx) {
if (auto bar = dynamic_cast<TrackBar*>(node)) {
bar->setValue(lua::tonumber(L, idx));
} else if (auto selectbox = dynamic_cast<SelectBox*>(node)) {
auto value = lua::require_lstring(L, idx);
const auto& options = selectbox->getOptions();
for (const auto& option : options) {
if (option.value == value) {
selectbox->setSelected(option);
return;
}
}
selectbox->setSelected(SelectBox::Option {
std::string(value), util::str2wstr_utf8(value)});
}
}
static void p_set_min(UINode* node, lua::State* L, int idx) {
@@ -842,6 +904,7 @@ static int l_gui_setattr(lua::State* L) {
{"cursor", p_set_cursor},
{"focused", p_set_focused},
{"region", p_set_region},
{"options", p_set_options},
};
auto func = setters.find(attr);
if (func != setters.end()) {
src/logic/scripting/scripting_functional.cpp
+51 -60
View File
@@ -3,6 +3,7 @@
#include "coders/json.hpp"
#include "debug/Logger.hpp"
#include "util/stringutil.hpp"
#include "util/type_helpers.hpp"
#include "lua/lua_engine.hpp"
using namespace scripting;
@@ -58,18 +59,44 @@ key_handler scripting::create_key_handler(
};
}
wstringconsumer scripting::create_wstring_consumer(
template<typename T, int(pushfunc)(lua::State*, remove_const_ref_if_primitive_t<const T&>)>
std::function<void(const T&)> create_consumer(
const scriptenv& env, const std::string& src, const std::string& file
) {
return [=](const std::wstring& x) {
return [=](const T& x) {
if (auto L = process_callback(env, src, file)) {
lua::pushwstring(L, x);
pushfunc(L, x);
lua::call_nothrow(L, 1);
}
};
}
wstringsupplier scripting::create_wstring_supplier(
wstringconsumer scripting::create_wstring_consumer(
const scriptenv& env, const std::string& src, const std::string& file
) {
return create_consumer<std::wstring, lua::pushwstring>(env, src, file);
}
stringconsumer scripting::create_string_consumer(
const scriptenv& env, const std::string& src, const std::string& file
) {
return create_consumer<std::string, lua::pushstring>(env, src, file);
}
boolconsumer scripting::create_bool_consumer(
const scriptenv& env, const std::string& src, const std::string& file
) {
return create_consumer<bool, lua::pushboolean>(env, src, file);
}
doubleconsumer scripting::create_number_consumer(
const scriptenv& env, const std::string& src, const std::string& file
) {
return create_consumer<number_t, lua::pushnumber>(env, src, file);
}
template <typename T, T(tovalueFunc)(lua::State*, int)>
std::function<T()> create_supplier(
const scriptenv& env, const std::string& src, const std::string& file
) {
return [=]() {
@@ -77,14 +104,32 @@ wstringsupplier scripting::create_wstring_supplier(
if (lua::isfunction(L, -1)) {
lua::call_nothrow(L, 0);
}
auto str = lua::require_wstring(L, -1);
auto str = tovalueFunc(L, -1);
lua::pop(L);
return str;
}
return std::wstring();
return T {};
};
}
wstringsupplier scripting::create_wstring_supplier(
const scriptenv& env, const std::string& src, const std::string& file
) {
return create_supplier<std::wstring, lua::require_wstring>(env, src, file);
}
boolsupplier scripting::create_bool_supplier(
const scriptenv& env, const std::string& src, const std::string& file
) {
return create_supplier<bool, lua::toboolean>(env, src, file);
}
doublesupplier scripting::create_number_supplier(
const scriptenv& env, const std::string& src, const std::string& file
) {
return create_supplier<number_t, lua::tonumber>(env, src, file);
}
wstringchecker scripting::create_wstring_validator(
const scriptenv& env, const std::string& src, const std::string& file
) {
@@ -97,60 +142,6 @@ wstringchecker scripting::create_wstring_validator(
};
}
boolconsumer scripting::create_bool_consumer(
const scriptenv& env, const std::string& src, const std::string& file
) {
return [=](bool x) {
if (auto L = process_callback(env, src, file)) {
lua::pushboolean(L, x);
lua::call_nothrow(L, 1);
}
};
}
boolsupplier scripting::create_bool_supplier(
const scriptenv& env, const std::string& src, const std::string& file
) {
return [=]() {
if (auto L = process_callback(env, src, file)) {
if (lua::isfunction(L, -1)) {
lua::call_nothrow(L, 0);
}
bool x = lua::toboolean(L, -1);
lua::pop(L);
return x;
}
return false;
};
}
doubleconsumer scripting::create_number_consumer(
const scriptenv& env, const std::string& src, const std::string& file
) {
return [=](double x) {
if (auto L = process_callback(env, src, file)) {
lua::pushnumber(L, x);
lua::call_nothrow(L, 1);
}
};
}
doublesupplier scripting::create_number_supplier(
const scriptenv& env, const std::string& src, const std::string& file
) {
return [=]() {
if (auto L = process_callback(env, src, file)) {
if (lua::isfunction(L, -1)) {
lua::call_nothrow(L, 0);
}
auto x = lua::tonumber(L, -1);
lua::pop(L);
return x;
}
return 0.0;
};
}
int_array_consumer scripting::create_int_array_consumer(
const scriptenv& env, const std::string& src, const std::string& file
) {
src/logic/scripting/scripting_functional.hpp
+6
View File
@@ -23,6 +23,12 @@ namespace scripting {
const std::string& file = "[string]"
);
stringconsumer create_string_consumer(
const scriptenv& env,
const std::string& src,
const std::string& file = "[string]"
);
wstringconsumer create_wstring_consumer(
const scriptenv& env,
const std::string& src,