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

fix model overrides

Browse Source
This commit is contained in:
MihailRis 2024-07-17 10:47:03 +03:00
parent 1b99a48849
commit 4653c4c8a8
3 changed files with 3 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -30,8 +30,8 @@ do -- setup visuals
local bid = block.index(icon:sub(16)) local bid = block.index(icon:sub(16))
model = block.get_model(bid) model = block.get_model(bid)
if model == "X" then if model == "X" then
entity:set_skeleton("base:drop-item")
body:set_size(vec3.mul(body:get_size(), {1.0, 0.3, 1.0})) body:set_size(vec3.mul(body:get_size(), {1.0, 0.3, 1.0}))
rig:set_model(0, "drop-item")
rig:set_texture("$0", icon) rig:set_texture("$0", icon)
else else
if model == "aabb" then if model == "aabb" then
@ -46,8 +46,8 @@ do -- setup visuals
end end
end end
else else
entity:set_skeleton("base:drop-item")
body:set_size(vec3.mul(body:get_size(), {1.0, 0.3, 1.0})) body:set_size(vec3.mul(body:get_size(), {1.0, 0.3, 1.0}))
rig:set_model(0, "drop-item")
rig:set_texture("$0", icon) rig:set_texture("$0", icon)
end end
mat4.mul(matrix, rotation, matrix) mat4.mul(matrix, rotation, matrix)

5
res/content/base/skeletons/drop-item.json
View File

@ -1,5 +0,0 @@
{
"root": {
"model": "drop-item"
}
}

2
src/objects/rigging.cpp
View File

@ -94,7 +94,7 @@ void SkeletonConfig::render(
node->model.refresh(assets); node->model.refresh(assets);
auto model = node->model.model; auto model = node->model.model;
auto& modelOverride = skeleton.modelOverrides.at(i); auto& modelOverride = skeleton.modelOverrides.at(i);
if (!modelOverride.updateFlag) { if (modelOverride.updateFlag) {
modelOverride.refresh(assets); modelOverride.refresh(assets);
} }
model = modelOverride.model ? modelOverride.model : model; model = modelOverride.model ? modelOverride.model : model;