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

lua suppliers update + label supplier XML attribute

Browse Source
This commit is contained in:
MihailRis 2024-03-19 14:04:06 +03:00
parent d5c39a05fb
commit f89c252ddf
4 changed files with 30 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/frontend/gui/gui_xml.cpp
View File

@ -170,6 +170,14 @@ static std::shared_ptr<UINode> readLabel(UiXmlReader& reader, xml::xmlelement el
align_from_string(element->attr("valign").getText(), label->getVerticalAlign())
);
}
if (element->has("supplier")) {
auto supplier = scripting::create_wstring_supplier(
reader.getEnvironment().getId(),
element->attr("supplier").getText(),
reader.getFilename()
);
label->textSupplier(supplier);
}
return label;
}

8
src/logic/scripting/lua/LuaState.cpp
View File

@ -247,6 +247,14 @@ const char* lua::LuaState::tostring(int idx) {
return lua_tostring(L, idx);
}
bool lua::LuaState::isstring(int idx) {
return lua_isstring(L, idx);
}
bool lua::LuaState::isfunction(int idx) {
return lua_isfunction(L, idx);
}
void lua::LuaState::openlib(const std::string& name, const luaL_Reg* libfuncs, int nup) {
lua_newtable(L);
luaL_setfuncs(L, libfuncs, nup);

2
src/logic/scripting/lua/LuaState.h
View File

@ -45,6 +45,8 @@ namespace lua {
luaint tointeger(int idx);
luanumber tonumber(int idx);
const char* tostring(int idx);
bool isstring(int idx);
bool isfunction(int idx);
int call(int argc);
int callNoThrow(int argc);
int execute(int env, const std::string& src, const std::string& file="<string>");

16
src/logic/scripting/scripting_functional.cpp
View File

@ -58,7 +58,9 @@ wstringsupplier scripting::create_wstring_supplier(
) {
return [=](){
if (processCallback(env, src, file)) {
state->callNoThrow(0);
if (state->isfunction(-1)) {
state->callNoThrow(0);
}
auto str = state->tostring(-1); state->pop();
return util::str2wstr_utf8(str);
}
@ -101,7 +103,9 @@ boolsupplier scripting::create_bool_supplier(
) {
return [=](){
if (processCallback(env, src, file)) {
state->callNoThrow(0);
if (state->isfunction(-1)) {
state->callNoThrow(0);
}
bool x = state->toboolean(-1); state->pop();
return x;
}
@ -129,7 +133,9 @@ doublesupplier scripting::create_number_supplier(
) {
return [=](){
if (processCallback(env, src, file)) {
state->callNoThrow(0);
if (state->isfunction(-1)) {
state->callNoThrow(0);
}
lua::luanumber x = state->tonumber(-1); state->pop();
return x;
}
@ -159,7 +165,9 @@ vec2supplier scripting::create_vec2_supplier(
) {
return [=](){
if (processCallback(env, src, file)) {
state->callNoThrow(0);
if (state->isfunction(-1)) {
state->callNoThrow(0);
}
lua::luanumber y = state->tonumber(-1); state->pop();
lua::luanumber x = state->tonumber(-1); state->pop();
return glm::vec2(x, y);