mirror of
https://github.com/MihailRis/voxelcore.git
synced 2026-10-04 10:31:50 +00:00
add curves: constant, linear, bezier
This commit is contained in:
MihailRis
parent
9d3a60328f
commit
45c78609b8
2 changed files with 175 additions and 8 deletions
53
res/modules/animation.lua
Normal file
53
res/modules/animation.lua
Normal file
|
|
@ -0,0 +1,53 @@
|
|||
local this = {}
|
||||
|
||||
local function bezier(a, b, c, d, u)
|
||||
local s = 1 - u
|
||||
return s * s * s * a +
|
||||
3 * s * s * u * b +
|
||||
3 * s * u * u * c +
|
||||
u * u * u * d
|
||||
end
|
||||
|
||||
local function bezier_derivative(a, b, c, d, u)
|
||||
local s = 1 - u
|
||||
return
|
||||
3 * s * s * (b - a) +
|
||||
6 * s * u * (c - b) +
|
||||
3 * u * u * (d - c)
|
||||
end
|
||||
|
||||
function this.bezier_interpolation(k0, k1, t)
|
||||
local frame = k0.frame + t * (k1.frame - k0.frame)
|
||||
|
||||
local u = t
|
||||
|
||||
for i=1,8 do
|
||||
local x = bezier(
|
||||
k0.frame,
|
||||
k0.rx,
|
||||
k1.lx,
|
||||
k1.frame,
|
||||
u
|
||||
)
|
||||
|
||||
local dx = bezier_derivative(
|
||||
k0.frame,
|
||||
k0.rx,
|
||||
k1.lx,
|
||||
k1.frame,
|
||||
u
|
||||
)
|
||||
if math.abs(dx) < 1e-8 then
|
||||
break
|
||||
end
|
||||
|
||||
u = u - (x - frame) / dx
|
||||
|
||||
if u < 0 then u = 0 end
|
||||
if u > 1 then u = 1 end
|
||||
end
|
||||
|
||||
return bezier(k0.value, k0.ry, k1.ly, k1.value, u)
|
||||
end
|
||||
|
||||
return this
|
||||
|
|
@ -1,8 +1,10 @@
|
|||
local animation_util = require "core:animation"
|
||||
|
||||
local tsf = entity.transform
|
||||
local rig = entity.skeleton
|
||||
local body = entity.rigidbody
|
||||
|
||||
|
||||
local head_idx = rig:index("head")
|
||||
local body_idx = rig:index("body")
|
||||
|
||||
local leg_left = rig:index("leg_left")
|
||||
|
|
@ -28,6 +30,10 @@ local AX_X = 1
|
|||
local AX_Y = 2
|
||||
local AX_Z = 3
|
||||
|
||||
local INT_CONST = 1
|
||||
local INT_LINEAR = 2
|
||||
local INT_BEZIER = 3
|
||||
|
||||
local patterns = {
|
||||
{name="sint", pattern="sin(t)"},
|
||||
{name="sint2", pattern="sin(t * 2)"},
|
||||
|
|
@ -44,22 +50,64 @@ local function process_expression(src, memoised)
|
|||
return src
|
||||
end
|
||||
|
||||
local function key_neighbors(keys, frame)
|
||||
local left = 1
|
||||
local right = #keys
|
||||
|
||||
while left <= right do
|
||||
local mid = math.floor((left + right) / 2)
|
||||
|
||||
if keys[mid].frame < frame then
|
||||
left = mid + 1
|
||||
elseif keys[mid].frame > frame then
|
||||
right = mid - 1
|
||||
else
|
||||
return mid, mid
|
||||
end
|
||||
end
|
||||
if left > #keys then
|
||||
left = #keys
|
||||
end
|
||||
return right, left
|
||||
end
|
||||
|
||||
local env = {
|
||||
mat4 = mat4,
|
||||
X = {1, 0, 0},
|
||||
Y = {0, 1, 0},
|
||||
Z = {0, 0, 1},
|
||||
blank = core.blank,
|
||||
DST = mat4.idt(),
|
||||
value_at = function(keys, frame, interp)
|
||||
local left, right = key_neighbors(keys, frame)
|
||||
if left == right then
|
||||
return keys[left].value
|
||||
end
|
||||
left = keys[left]
|
||||
if interp == INT_CONST then
|
||||
return left.value
|
||||
end
|
||||
right = keys[right]
|
||||
local t = (frame - left.frame) / (right.frame - left.frame)
|
||||
if interp == INT_BEZIER then
|
||||
return animation_util.bezier_interpolation(left, right, t)
|
||||
end
|
||||
return left.value * (1.0 - t) + right.value * t
|
||||
end,
|
||||
}
|
||||
table.extend(env, math)
|
||||
|
||||
local function codegen_track(lines, memoised)
|
||||
local function codegen_track(lines, memoised, keysets)
|
||||
local code = ""
|
||||
local translation = {false, false, false}
|
||||
local rotation = {false, false, false}
|
||||
for i, line in ipairs(lines) do
|
||||
code = code .. "\n local l" .. i .. " = (" .. process_expression(line.expression, memoised) .. ")"
|
||||
if line.expression then
|
||||
code = code .. "\n local l" .. i .. " = (" .. process_expression(line.expression, memoised) .. ")"
|
||||
elseif line.keys then
|
||||
keysets[i] = line.keys
|
||||
code = code .. "\n local l" .. i .. " = value_at(keysets["..i.."], t * 3 % 60, " .. line.interp .. ")"
|
||||
end
|
||||
|
||||
if line.channel == CH_TRANSLATE then
|
||||
translation[line.axis] = i
|
||||
elseif line.channel == CH_ROTATE then
|
||||
|
|
@ -88,9 +136,10 @@ end
|
|||
local function compile_track(linesets)
|
||||
local code = ""
|
||||
local memoised = {}
|
||||
local keysets = {}
|
||||
|
||||
for i, lineset in ipairs(linesets) do
|
||||
local lineset_code = codegen_track(lineset.lines, memoised)
|
||||
local lineset_code = codegen_track(lineset.lines, memoised, keysets)
|
||||
code = code .. "\n do" .. lineset_code .. "\n end\n" ..
|
||||
" rig:set_matrix(" .. lineset.bone_index .. ", dst)\n"
|
||||
-- " blank(" .. lineset.bone_index .. ", dst)\n"
|
||||
|
|
@ -107,7 +156,7 @@ local function compile_track(linesets)
|
|||
|
||||
local src = "return function(rig, t, m)\n local dst = DST\n" .. code .. "\nend"
|
||||
print(src)
|
||||
local generator, err = load(src, "<expr>", "bt", env)
|
||||
local generator, err = load(src, "<expr>", "bt", table.extend({keysets = keysets}, env))
|
||||
if not generator then
|
||||
error(err)
|
||||
end
|
||||
|
|
@ -160,6 +209,71 @@ local linesets = {
|
|||
axis = AX_X,
|
||||
expression = "(sin(t * 2) * 45 + 45) * m"
|
||||
}}},
|
||||
|
||||
{bone_index=head_idx, lines={{
|
||||
channel = CH_TRANSLATE,
|
||||
axis = AX_X,
|
||||
interp = INT_BEZIER,
|
||||
keys = {
|
||||
{
|
||||
frame = 0,
|
||||
value = 2.37319803237915,
|
||||
lx = -18.666540145874,
|
||||
ly = 2.3008770942688,
|
||||
rx = 57.5497436523438,
|
||||
ry = 2.58115172386169,
|
||||
}, {
|
||||
frame = 60,
|
||||
value = -2.95866346359253,
|
||||
lx = 38.4764099121094,
|
||||
ly = 9.56476593017578,
|
||||
rx = 76.9985656738281,
|
||||
ry = -12.8492240905762,
|
||||
}
|
||||
}
|
||||
},{
|
||||
channel = CH_TRANSLATE,
|
||||
axis = AX_Z,
|
||||
interp = INT_BEZIER,
|
||||
keys = {
|
||||
{
|
||||
frame = 0,
|
||||
value = -0.65947163105011,
|
||||
lx = -18.6666660308838,
|
||||
ly = -0.65947163105011,
|
||||
rx = 20.6666660308838,
|
||||
ry = -0.65947163105011,
|
||||
}, {
|
||||
frame = 60,
|
||||
value = 1.03530943393707,
|
||||
lx = 38.4764099121094,
|
||||
ly = 13.5587406158447,
|
||||
rx = 76.9985809326172,
|
||||
ry = -8.85525798797607,
|
||||
}
|
||||
}
|
||||
},{
|
||||
channel = CH_TRANSLATE,
|
||||
axis = AX_Y,
|
||||
interp = INT_BEZIER,
|
||||
keys = {
|
||||
{
|
||||
frame = 0,
|
||||
value = 0.697231292724609,
|
||||
lx = -18.6666660308838,
|
||||
ly = 0.697231292724609,
|
||||
rx = 20.6666660308838,
|
||||
ry = 0.697231292724609,
|
||||
}, {
|
||||
frame = 60,
|
||||
value = -0.432764053344727,
|
||||
lx = 38.4764099121094,
|
||||
ly = 12.0906667709351,
|
||||
rx = 76.9985809326172,
|
||||
ry = -10.3233318328857,
|
||||
}
|
||||
}
|
||||
}}},
|
||||
}
|
||||
|
||||
local track = compile_track(linesets)
|
||||
|
|
@ -172,7 +286,7 @@ function on_render()
|
|||
prev_speed = prev_speed * (1.0 - delta * 10) + speed * delta * 10
|
||||
speed = prev_speed
|
||||
|
||||
local ttm = time.precise_time()
|
||||
-- local ttm = time.precise_time()
|
||||
-- local matrix = mat4.idt()
|
||||
track(rig, tm, speed)
|
||||
-- for i, track in ipairs(tracks) do
|
||||
|
|
@ -192,5 +306,5 @@ function on_render()
|
|||
|
||||
-- rig:set_matrix(hand_left_btm, mat4.rotate({1, 0, 0}, (math.sin(tm * 2) * 45 + 45) * speed))
|
||||
-- rig:set_matrix(hand_right_btm, mat4.rotate({1, 0, 0}, (math.sin(tm * 2) * 45 + 45) * speed))
|
||||
print(math.floor((time.precise_time() - ttm) * 1e6), "mcs")
|
||||
-- print(math.floor((time.precise_time() - ttm) * 1e6), "mcs")
|
||||
end
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue