From bc472c02f379923f5b86bb7c3a1f8a1550e423f4 Mon Sep 17 00:00:00 2001 From: aaron <83140718+centau@users.noreply.github.com> Date: Tue, 19 Sep 2023 23:26:16 +0100 Subject: [PATCH] --- src/spring.luau | 2 +- test/spring-test.luau | 10 ++++++---- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/src/spring.luau b/src/spring.luau index 024da91..6a9ebd6 100644 --- a/src/spring.luau +++ b/src/spring.luau @@ -224,7 +224,7 @@ local function step_springs(dt: number) local ff_123 = u_123*-c local ff_456 = u_456*-c - + data.a, data.b = fs_123.X, ff_123.X --assert(math.abs(fs_123.X) >= (math.abs(ff_123.X)), "damping exceeds restoring") -- calculate acceleration step diff --git a/test/spring-test.luau b/test/spring-test.luau index 233c91c..83ecfae 100644 --- a/test/spring-test.luau +++ b/test/spring-test.luau @@ -7,8 +7,8 @@ local function step(): number local FPS = 60 local DT = 1/FPS - repeat until os.clock() - program_time >= DT - program_time += DT + repeat until os.clock() - program_time >= DT*10 + program_time += DT*10 return DT end @@ -40,7 +40,7 @@ local function main() local effect = vide.effect local value = source(MAX) - local sprung, data = (spring :: any)(value, 1, 19.16) + local sprung, data = (spring :: any)(value, 1, 19.6) effect(function() local v = sprung() @@ -49,7 +49,9 @@ local function main() local offset = string.rep("\n", MAX - fv + OFFSET) local bar = testkit.color.gray(remainder_to_block(v - fv) .. "\n" .. string.rep(BLOCK .. "\n", fv)) local num = "\n" .. v - print(reset .. offset .. bar .. num) + local test = "\n" .. (data.a or 0) + local test2 = "\n" .. (data.b or 0) + print(reset .. offset .. bar .. num .. test .. test2) end) local T = 1.5