Minetest/VoxeLibre
2
0
Fork 0
mirror of https://git.minetest.land/VoxeLibre/VoxeLibre.git synced 2025-04-20 22:45:16 +02:00
Code Issues Projects Releases Packages Wiki Activity

Improve and work around bone overrides on Luanti 5.11+ ()

Browse source 
Reviewed-on: https://git.minetest.land/VoxeLibre/VoxeLibre/pulls/4944
Reviewed-by: teknomunk <teknomunk@protonmail.com>
This commit is contained in:
the-real-herowl 2025-02-27 15:04:30 +01:00
commit b2fe6d33fb
2 changed files with 41 additions and 14 deletions
mods
CORE/mcl_util
init.lua
PLAYER/mcl_playerplus
init.lua

39
mods/CORE/mcl_util/init.lua
View file

@ -526,22 +526,35 @@ function mcl_util.set_properties(obj, props)
end
end
local vector_distance, vector_zero = vector.distance, vector.zero
-- Update bones, but only when changed
function mcl_util.set_bone_position(obj, bone, pos, rot)
if core.get_bone_override then -- minetest >= 5.9
local over = obj:get_bone_override(bone)
local pos_equal = not pos or not over.position.absolute or vector.equals(vector.round(over.position.vec), vector.round(pos))
local rot_equal = not rot or not over.rotation.absolute or vector.equals(vector.round(over.rotation.vec), vector.round(rot))
if not pos_equal or not rot_equal then
if pos then over.position = { vec = pos, absolute = true, interpolation = 0.1 } end
if rot then over.rotation = { vec = rot, absolute = true, interpolation = 0.1 } end
obj:set_bone_override(bone, over)
function mcl_util.set_bone_position(obj, bone, pos, rot, scale)
local current_pos, current_rot
if obj.set_bone_override then -- Luanti >= 5.9
do
local ov = obj:get_bone_override(bone)
current_pos, current_rot = ov.position.vec, ov.rotation.vec
end
else -- minetest up to 5.8
-- Only apply when the values aren't the same:
-- Compare the distance between new and old vectors against an epsilon.
local pos_equal = vector_distance(current_pos, pos or vector_zero()) < 1
-- The epsilon is 0.1 as the new API uses radians and more precision is neccesary.
local rot_equal = vector_distance(current_rot, rot or vector_zero()) < 0.1
if not pos_equal or not rot_equal then
obj:set_bone_override(bone, {
position = pos and {vec = pos, absolute = true, interpolation = 0.1} or nil,
rotation = rot and {vec = rot, absolute = true, interpolation = 0.1} or nil,
scale = scale and {vec = scale, absolute = true, interpolation = 0.1} or nil,
})
end
else -- Luanti <= 5.8
rot = rot and rot:apply(math.deg)
local current_pos, current_rot = obj:get_bone_position(bone)
local pos_equal = not pos or vector.equals(vector.round(current_pos), vector.round(pos))
local rot_equal = not rot or vector.equals(vector.round(current_rot), vector.round(rot))
current_pos, current_rot = obj:get_bone_position(bone)
local pos_equal = vector_distance(current_pos, pos or current_pos) < 1
local rot_equal = vector_distance(current_rot, rot or current_rot) < 1
if not pos_equal or not rot_equal then
obj:set_bone_position(bone, pos or current_pos, rot or current_rot)
end

16
mods/PLAYER/mcl_playerplus/init.lua
View file

@ -114,7 +114,21 @@ end
local node_stand, node_stand_below, node_head, node_feet, node_head_top
local is_swimming
local set_bone_pos = mcl_util.set_bone_position
-- HACK work around https://github.com/luanti-org/luanti/issues/15692
-- Scales corresponding to default perfect 180° rotations in the character b3d model
local bone_workaround_scales = {
Body_Control = vector.new(-1, 1, -1),
Leg_Right = vector.new(1, -1, -1),
Leg_Left = vector.new(1, -1, -1),
Cape = vector.new(1, -1, 1),
Arm_Right_Pitch_Control = vector.new(1, -1, -1),
Arm_Left_Pitch_Control = vector.new(1, -1, -1),
}
local function set_bone_pos(player, bonename, pos, rot)
return mcl_util.set_bone_position(player, bonename, pos, rot, bone_workaround_scales[bonename])
end
local set_properties = mcl_util.set_properties
local function anglediff(a1, a2)