From: Ruben Beltran del Rio Date: Fri, 16 Feb 2024 23:29:06 +0000 (+0100) Subject: x and y X-Git-Url: https://git.r.bdr.sh/rbdr/r.bdr.sh/commitdiff_plain/e5d21bf4f24de85f5584b6fda2cbae05ee6d4b20?ds=sidebyside;hp=-c x and y --- e5d21bf4f24de85f5584b6fda2cbae05ee6d4b20 diff --git a/js/animation.js b/js/animation.js index a585332..f7b138c 100644 --- a/js/animation.js +++ b/js/animation.js @@ -7,13 +7,13 @@ x: p.x + rad * C(l), y: p.y + rad * S(l) }), - x = K.getContext('2d'), + X = K.getContext('2d'), f = 24, l = 0, - spd = 1, - siz = 5 + r(10), - clr = R() > 0.5, - ccl = R() > 0.5, + s = 1, + z = 5 + r(10), + k = R() > 0.5, + c = R() > 0.5, I = Array(r(10) + 6).fill().map(() => ({ x: r(64), y: r(64), @@ -31,59 +31,59 @@ function sqr(i) { - var p = pos(i) - x.fillRect(p.x, p.y, siz, siz) + var {x, y} = pos(i) + X.fillRect(x, y, z, z) } function crc(i) { - var p = pos(i) - x.beginPath() - x.arc(p.x, p.y, siz / 2, 0, 2 * PI) - x.fill() + var {x, y} = pos(i) + X.beginPath() + X.arc(x, y, z / 2, 0, 2 * PI) + X.fill() } function chs(i) { - var p = pos(i) - x.beginPath() - x.moveTo(p.x, p.y) - x.lineTo(p.x * 10 * C(i.a), p.y * 10 * S(i.a)) - x.lineTo(r(64), r(64)) - x.fill() + var {x, y} = pos(i) + X.beginPath() + X.moveTo(x, y) + X.lineTo(x * 10 * C(i.a), y * 10 * S(i.a)) + X.lineTo(r(64), r(64)) + X.fill() } function lch(i) { - var p = pos(i) - x.beginPath() - x.lineWidth = 5 - x.strokeStyle = `rgb(${i.c.join(',')})` - x.moveTo(p.x, p.y) - x.lineTo(p.x * 10 * C(i.a), p.y * 10 * S(i.a)) - x.stroke() + var {x, y} = pos(i) + X.beginPath() + X.lineWidth = 5 + X.strokeStyle = `rgb(${i.c.join(',')})` + X.moveTo(x, y) + X.lineTo(x * 10 * C(i.a), y * 10 * S(i.a)) + X.stroke() } function hrt(i) { - var p = pos(i) - x.fillRect(p.x, p.y, siz, siz) + var {x, y} = pos(i) + X.fillRect(x, y, z, z) - x.beginPath() - x.arc(p.x + siz / 2, p.y, siz / 2, 0, 2 * PI, false) - x.fill() - x.closePath() + X.beginPath() + X.arc(x + z / 2, y, z / 2, 0, 2 * PI, false) + X.fill() + X.closePath() - x.beginPath() - x.arc(p.x + siz, p.y + siz / 2, siz / 2, 0, 2 * PI, false) - x.fill() - x.closePath() + X.beginPath() + X.arc(x + z, y + z / 2, z / 2, 0, 2 * PI, false) + X.fill() + X.closePath() } function mov(i) { - i.x = i.x + spd * C(i.a) - i.y = i.y + spd * S(i.a) + i.x = i.x + s * C(i.a) + i.y = i.y + s * S(i.a) if (i.x < 0 || i.x > 64) { i.a = A(S(i.a), -C(i.a)) @@ -104,11 +104,11 @@ var dt = t - l if (dt > 1000 / f) { - clr && x.clearRect(0, 0, 64, 64) + k && X.clearRect(0, 0, 64, 64) for (var i of I) { - x.fillStyle = `rgb(${i.c.join(',')})` + X.fillStyle = `rgb(${i.c.join(',')})` draw(i) - ccl && ucl(i) + c && ucl(i) mov(i) }