voxelcoreprojects/voxelcore
1
0
Fork 0
mirror of https://github.com/MihailRis/voxelcore.git synced 2026-10-12 14:31:50 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 9

revert "remove rotation-order (use original directives order)"

Browse source 
Keeping VCA directives unordered is seems more preferred
This reverts commit 3b1ab36ac1.
This commit is contained in:
MihailRis 2026-09-06 00:53:44 +03:00
parent 3b1ab36ac1
commit 49e4b1f519
2 changed files with 6 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

13
res/modules/animation.lua
View file

@ -187,17 +187,14 @@ local function codegen_track(raw_track, lineset, memoised, keysets, use_tsf)
end end
local axis_names = {"X", "Y", "Z"} local axis_names = {"X", "Y", "Z"}
local axes = {1, 2, 3} local axis_indices = {X=1, Y=2, Z=3}
local rotation_order = raw_track.rotation_order
table.sort(axes, function(a, b) for i=1,3 do
return rotation[a] < rotation[b] local axis = axis_indices[rotation_order[i]]
end)
for _, axis in ipairs(axes) do
local var = rotation[axis] local var = rotation[axis]
if var then if var then
code = code .. "\n mat4.rotate(dst, " .. axis_names[axis] .. code = code .. "\n mat4.rotate(dst, " .. axis_names[axis] ..
", l" .. var .. ", dst)" ", l" .. var .. ", dst)"
end end
end end

1
res/modules/internal/formats/vca.lua
View file

@ -25,6 +25,7 @@ local function parse_configure(raw_track, node)
elseif node.duration then elseif node.duration then
raw_track.duration = node.duration raw_track.duration = node.duration
end end
raw_track.rotation_order = string.upper(node["rotation-order"]) or "XYZ"
end end
local function parse_curve(line, node) local function parse_curve(line, node)