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

rename item.get_model_name and item.get_placing_block

Browse Source
This commit is contained in:
MihailRis 2024-10-31 21:53:56 +03:00
parent e217476e84
commit e0624b11d0
5 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
doc/en/scripting/builtins/libitem.md
View File

@ -20,8 +20,8 @@ item.defs_count() -> int
item.icon(itemid: int) -> str item.icon(itemid: int) -> str
-- Returns the integer id 'placing-block' or 0 -- Returns the integer id 'placing-block' or 0
item.get_placing_block(itemid: int) -> int item.placing_block(itemid: int) -> int
-- Returns the value of the `model-name` property -- Returns the value of the `model-name` property
item.get_model_name(itemid: int) -> str item.model_name(itemid: int) -> str
``` ```

4
doc/ru/scripting/builtins/libitem.md
View File

@ -20,10 +20,10 @@ item.defs_count() -> int
item.icon(itemid: int) -> str item.icon(itemid: int) -> str
-- Возвращает числовой id блока, назначенного как 'placing-block' или 0 -- Возвращает числовой id блока, назначенного как 'placing-block' или 0
item.get_placing_block(itemid: int) -> int item.placing_block(itemid: int) -> int
-- Возвращает значение свойства `model-name` -- Возвращает значение свойства `model-name`
item.get_model_name(itemid: int) -> str item.model_name(itemid: int) -> str
``` ```

2
res/content/base/scripts/components/drop.lua
View File

@ -25,7 +25,7 @@ end
do -- setup visuals do -- setup visuals
local matrix = mat4.idt() local matrix = mat4.idt()
rig:set_model(0, item.get_model_name(dropitem.id)) rig:set_model(0, item.model_name(dropitem.id))
local bodysize = math.min(scale[1], scale[2], scale[3]) * DROP_SCALE local bodysize = math.min(scale[1], scale[2], scale[3]) * DROP_SCALE
body:set_size({scale[1] * DROP_SCALE, bodysize, scale[3] * DROP_SCALE}) body:set_size({scale[1] * DROP_SCALE, bodysize, scale[3] * DROP_SCALE})
mat4.mul(matrix, rotation, matrix) mat4.mul(matrix, rotation, matrix)

2
res/content/base/scripts/components/player_animator.lua
View File

@ -7,7 +7,7 @@ local itemIndex = rig:index("item")
local function refresh_model(id) local function refresh_model(id)
itemid = id itemid = id
rig:set_model(itemIndex, item.get_model_name(itemid)) rig:set_model(itemIndex, item.model_name(itemid))
rig:set_matrix(itemIndex, mat4.rotate({0, 1, 0}, -80)) rig:set_matrix(itemIndex, mat4.rotate({0, 1, 0}, -80))
end end

8
src/logic/scripting/lua/libs/libitem.cpp
View File

@ -54,14 +54,14 @@ static int l_caption(lua::State* L) {
return 0; return 0;
} }
static int l_get_placing_block(lua::State* L) { static int l_placing_block(lua::State* L) {
if (auto def = get_item_def(L, 1)) { if (auto def = get_item_def(L, 1)) {
return lua::pushinteger(L, def->rt.placingBlock); return lua::pushinteger(L, def->rt.placingBlock);
} }
return 0; return 0;
} }
static int l_get_model_name(lua::State* L) { static int l_model_name(lua::State* L) {
if (auto def = get_item_def(L, 1)) { if (auto def = get_item_def(L, 1)) {
return lua::pushstring(L, def->modelName); return lua::pushstring(L, def->modelName);
} }
@ -75,6 +75,6 @@ const luaL_Reg itemlib[] = {
{"defs_count", lua::wrap<l_defs_count>}, {"defs_count", lua::wrap<l_defs_count>},
{"icon", lua::wrap<l_get_icon>}, {"icon", lua::wrap<l_get_icon>},
{"caption", lua::wrap<l_caption>}, {"caption", lua::wrap<l_caption>},
{"get_placing_block", lua::wrap<l_get_placing_block>}, {"placing_block", lua::wrap<l_placing_block>},
{"get_model_name", lua::wrap<l_get_model_name>}, {"model_name", lua::wrap<l_model_name>},
{NULL, NULL}}; {NULL, NULL}};