voxelcoreprojects/voxelcore
1
0
Fork 0
mirror of https://github.com/MihailRis/voxelcore.git synced 2026-10-08 20:41:49 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 9

feat: allow passing rgba color to entity skeletons and block wraps

Browse source
This commit is contained in:
MihailRis 2026-09-16 23:28:03 +03:00
parent 85cc55c63b
commit ae082abaa2
12 changed files with 55 additions and 40 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/logic/scripting/lua/libs/lib__skeleton.cpp
View file

@ -156,7 +156,9 @@ static int l_get_color(lua::State* L) {
static int l_set_color(lua::State* L) {
if (auto skeleton = get_skeleton(L)) {
skeleton->tint = lua::tovec3(L, 2);
skeleton->tint = lua::objlen(L, 2) > 3
? lua::tovec4(L, 2)
: glm::vec4(lua::tovec3(L, 2), 1.0f);
}
return 0;
}

13
src/logic/scripting/lua/libs/libblockwraps.cpp
View file

@ -10,7 +10,11 @@ static int l_wrap(lua::State* L) {
auto position = lua::tovec3(L, 1);
std::string texture = lua::require_string(L, 2);
float emission = lua::isnumber(L, 3) ? lua::tonumber(L, 3) : 1.0f;
glm::vec3 tint = lua::istable(L, 4) ? lua::tovec3(L, 4) : glm::vec3(1.0f);
glm::vec4 tint =
lua::istable(L, 4)
? (lua::objlen(L, 4) > 3 ? lua::tovec4(L, 4)
: glm::vec4(lua::tovec3(L, 4), 1.0f))
: glm::vec4(1.0f);
return lua::pushinteger(
L,
@ -72,9 +76,12 @@ static int l_set_tints(lua::State* L) {
if (auto wrapper = renderer->blockWraps->get(lua::tointeger(L, 1))) {
for (int i = 0; i < wrapper->textureFaces.size(); i++) {
if (lua::isnil(L, 2 + i)) {
wrapper->tints[i] = glm::vec3(1.0f);
wrapper->tints[i] = glm::vec4(1.0f);
} else {
wrapper->tints[i] = lua::tovec3(L, 2 + i);
wrapper->tints[i] =
lua::objlen(L, 2 + i) > 3
? lua::tovec4(L, 2 + i)
: glm::vec4(lua::tovec3(L, 2 + i), 1.0f);
}
}
}