From: Ruben Beltran del Rio Date: Fri, 16 Feb 2024 23:02:51 +0000 (+0100) Subject: Get rid of the function keywords X-Git-Url: https://git.r.bdr.sh/rbdr/r.bdr.sh/commitdiff_plain/0fe938a50ab660bbe145aeacd6f4283c163cd31d Get rid of the function keywords --- diff --git a/js/animation.js b/js/animation.js index 07b8d34..9793601 100644 --- a/js/animation.js +++ b/js/animation.js @@ -2,6 +2,83 @@ var K = document.querySelector('canvas'), { random: R, PI, cos: C, sin: S, floor, atan2: A } = Math, + r = x => floor(R() * x), + 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() + }, + id = p => p, + spn = rad => (p => ({ + x: p.x + rad * C(l), + y: p.y + rad * S(l) + })), + 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, @@ -18,116 +95,8 @@ S = [sqr, crc, hrt, chs, lch], P = [id, spn(5), spn(15)], draw = S[r(S.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 id(p) { - - return p; - } - - function spn(rad) { - return (p) => ({ - x: p.x + rad * C(l), - y: p.y + rad * S(l) - }) - } - - 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 = c + 5; - return c > 255 ? 0 : c; - }) - } - - 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; - } - } + pos = P[r(P.length)] - frm(); + frm() } -)(); +)()