Replace rad() with math.rad()
This provides more accurate angle calculation and removes an unneeded function
This commit is contained in:
parent
dfd52fc799
commit
f3687a47a6
@ -208,7 +208,6 @@ end
|
|||||||
--- @param amp number Peak amplitude of sine wave
|
--- @param amp number Peak amplitude of sine wave
|
||||||
function wave(x, period, amp) return math.sin((2/period)*math.pi*(x%period))*amp end
|
function wave(x, period, amp) return math.sin((2/period)*math.pi*(x%period))*amp end
|
||||||
function lerp(a, b, t) return a + ((b - a) * t) end
|
function lerp(a, b, t) return a + ((b - a) * t) end
|
||||||
function rad(x) return x*math.pi/180 end
|
|
||||||
-- }}}
|
-- }}}
|
||||||
|
|
||||||
-- Master and local state variables -- {{{
|
-- Master and local state variables -- {{{
|
||||||
@ -849,10 +848,10 @@ function animateMTail(val)
|
|||||||
local chest_rot = 3
|
local chest_rot = 3
|
||||||
local per=2*math.pi
|
local per=2*math.pi
|
||||||
-- model.Body.setRot(vectors.of{wave(val, per, 3), 0, 0})
|
-- model.Body.setRot(vectors.of{wave(val, per, 3), 0, 0})
|
||||||
armor_model.CHESTPLATE.setRot(vectors.of{-wave(val, per, rad(3)), 0, 0})
|
armor_model.CHESTPLATE.setRot(vectors.of{-wave(val, per, math.rad(3)), 0, 0})
|
||||||
-- this makes it work with partial vanilla
|
-- this makes it work with partial vanilla
|
||||||
vanilla_model.TORSO.setRot(vectors.of{-wave(val, per, rad(3)), 0, 0})
|
vanilla_model.TORSO.setRot(vectors.of{-wave(val, per, math.rad(3)), 0, 0})
|
||||||
vanilla_model.JACKET.setRot(vectors.of{-wave(val, per, rad(3.25)), 0, 0})
|
vanilla_model.JACKET.setRot(vectors.of{-wave(val, per, math.rad(3)), 0, 0})
|
||||||
|
|
||||||
model.Body.LeggingsTopTrimF.setRot(vectors.of{wave(val-1, per, 4), 0, 0})
|
model.Body.LeggingsTopTrimF.setRot(vectors.of{wave(val-1, per, 4), 0, 0})
|
||||||
model.Body.LeggingsTopTrimB.setRot(vectors.of{wave(val-1, per, 4), 0, 0})
|
model.Body.LeggingsTopTrimB.setRot(vectors.of{wave(val-1, per, 4), 0, 0})
|
||||||
|
Loading…
x
Reference in New Issue
Block a user