From: Ruben Beltran del Rio Date: Fri, 16 Feb 2024 23:22:58 +0000 (+0100) Subject: Revert "Remove function" X-Git-Url: https://git.r.bdr.sh/rbdr/r.bdr.sh/commitdiff_plain/55ca90876437f97ea98ff9e17535c9c1fc7b4f95?ds=inline;hp=-c Revert "Remove function" This reverts commit 4fe5e0ec469be9a18e5f10c6b3118bfe242c6cce. --- 55ca90876437f97ea98ff9e17535c9c1fc7b4f95 diff --git a/js/animation.js b/js/animation.js index 38b95af..a585332 100644 --- a/js/animation.js +++ b/js/animation.js @@ -2,86 +2,11 @@ var K = document.querySelector('canvas'), { random: R, PI, cos: C, sin: S, floor, atan2: A } = Math, - r = x => floor(R() * x), id = p => p, spn = rad => p => ({ x: p.x + rad * C(l), y: p.y + rad * S(l) }), - sqr = i => { - var p = pos(i) - x.fillRect(p.x, p.y, siz, siz) - }, - crc = i => { - var p = pos(i) - x.beginPath() - x.arc(p.x, p.y, siz / 2, 0, 2 * PI) - x.fill() - }, - 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() - }, - 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() - }, - hrt = i => { - - var p = pos(i) - x.fillRect(p.x, p.y, siz, siz) - - x.beginPath() - x.arc(p.x + siz / 2, p.y, siz / 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() - }, - mov = i => { - - i.x = i.x + spd * C(i.a) - i.y = i.y + spd * S(i.a) - - if (i.x < 0 || i.x > 64) { - i.a = A(S(i.a), -C(i.a)) - } - if (i.y < 0 || i.y > 64) { - i.a = A(-S(i.a), C(i.a)) - } - }, - ucl = i => i.c = i.c.map(c => (c + 5) % 256), - frm = t => { - - window.requestAnimationFrame(frm) - - var dt = t - l - - if (dt > 1000 / f) { - clr && x.clearRect(0, 0, 64, 64) - for (var i of I) { - x.fillStyle = `rgb(${i.c.join(',')})` - draw(i) - ccl && ucl(i) - mov(i) - } - - l = t - } - }, x = K.getContext('2d'), f = 24, l = 0, @@ -100,6 +25,96 @@ draw = H[r(H.length)], pos = P[r(P.length)] + function r(x) { + return floor(R() * x) + } + + function sqr(i) { + + var p = pos(i) + x.fillRect(p.x, p.y, siz, siz) + } + + function crc(i) { + + var p = pos(i) + x.beginPath() + x.arc(p.x, p.y, siz / 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() + } + + 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() + } + + function hrt(i) { + + var p = pos(i) + x.fillRect(p.x, p.y, siz, siz) + + x.beginPath() + x.arc(p.x + siz / 2, p.y, siz / 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() + } + + function mov(i) { + + i.x = i.x + spd * C(i.a) + i.y = i.y + spd * S(i.a) + + if (i.x < 0 || i.x > 64) { + i.a = A(S(i.a), -C(i.a)) + } + if (i.y < 0 || i.y > 64) { + i.a = A(-S(i.a), C(i.a)) + } + } + + function ucl(i) { + i.c = i.c.map(c => (c + 5) % 256) + } + + function frm(t) { + + window.requestAnimationFrame(frm) + + var dt = t - l + + if (dt > 1000 / f) { + clr && x.clearRect(0, 0, 64, 64) + for (var i of I) { + x.fillStyle = `rgb(${i.c.join(',')})` + draw(i) + ccl && ucl(i) + mov(i) + } + + l = t + } + } frm() }