X-Git-Url: https://git.r.bdr.sh/rbdr/r.bdr.sh/blobdiff_plain/05a804d01b1fb83de89170c77799d1a43da925b1..08418543475878f3f8c8cdabbeac52478554af04:/js/animation.js diff --git a/js/animation.js b/js/animation.js index 65ee4bd..e5e73c2 100644 --- a/js/animation.js +++ b/js/animation.js @@ -5,15 +5,19 @@ fps = 30, lastFrame = 0, speed = 1, - size = 5 + rand(10); - - var clear = !!(Math.random() > 0.5); - var changeColor = !!(Math.random() > 0.5); + size = 5 + rand(10), + r = Math.random, + pi = Math.PI, + cos = Math.cos, + sin = Math.sin; + + var clear = !!(r() > 0.5); + var changeColor = !!(r() > 0.5); var items = Array(rand(10) + 6).fill(null).map(() => ({ - x: rand(100), - y: rand(100), - angle: Math.random() * 2 * Math.PI, - color: Array(3).fill(null).map(() => rand(256)) + x: rand(64), + y: rand(64), + angle: r() * 2 * pi, + color: Array(3).fill(rand(256)) })); var shapes = [square, circle, heart, chaos, lineChaos]; var positions = [identity, spin(5), spin(15)]; @@ -21,7 +25,7 @@ var position = positions[rand(positions.length)]; function rand (x) { - return Math.floor(Math.random() * x); + return Math.floor(r() * x); } function square(item) { @@ -34,7 +38,7 @@ var p = position(item); context.beginPath(); - context.arc(p.x, p.y, size / 2, 0, 2 * Math.PI); + context.arc(p.x, p.y, size / 2, 0, 2 * pi); context.fill(); } @@ -43,8 +47,8 @@ var p = position(item); context.beginPath(); context.moveTo(p.x, p.y); - context.lineTo(p.x * 10 * Math.cos(item.angle), p.y * 10 * Math.sin(item.angle)); - context.lineTo(rand(100), rand(100)); + context.lineTo(p.x * 10 * cos(item.angle), p.y * 10 * sin(item.angle)); + context.lineTo(rand(64), rand(64)); context.fill(); } @@ -55,7 +59,7 @@ context.lineWidth = 5; context.strokeStyle = `rgb(${item.color.join(',')})`; context.moveTo(p.x, p.y); - context.lineTo(p.x * 10 * Math.cos(item.angle), p.y * 10 * Math.sin(item.angle)); + context.lineTo(p.x * 10 * cos(item.angle), p.y * 10 * sin(item.angle)); context.stroke(); } @@ -71,12 +75,12 @@ context.fillRect(p.x, p.y, size, size); context.beginPath(); - context.arc(p.x + size / 2, p.y, size / 2, 0, 2 * Math.PI, false); + context.arc(p.x + size / 2, p.y, size / 2, 0, 2 * pi, false); context.fill(); context.closePath(); context.beginPath(); - context.arc(p.x + size, p.y + size / 2, size / 2, 0, 2 * Math.PI, false); + context.arc(p.x + size, p.y + size / 2, size / 2, 0, 2 * pi, false); context.fill(); context.closePath(); } @@ -90,23 +94,23 @@ return function (position) { return { - x: position.x + radius * Math.cos(lastFrame), - y: position.y + radius * Math.sin(lastFrame) + x: position.x + radius * cos(lastFrame), + y: position.y + radius * sin(lastFrame) } } } function move(item) { - item.x = item.x + speed * Math.cos(item.angle); - item.y = item.y + speed * Math.sin(item.angle); + item.x = item.x + speed * cos(item.angle); + item.y = item.y + speed * sin(item.angle); - if (item.x < 0 || item.x > 100) { - item.angle = Math.atan2(Math.sin(item.angle), -Math.cos(item.angle)) + if (item.x < 0 || item.x > 64) { + item.angle = Math.atan2(sin(item.angle), -cos(item.angle)) } - if (item.y < 0 || item.y > 100) { - item.angle = Math.atan2(-Math.sin(item.angle), Math.cos(item.angle)) + if (item.y < 0 || item.y > 64) { + item.angle = Math.atan2(-sin(item.angle), cos(item.angle)) } } @@ -125,7 +129,7 @@ var delta = time - lastFrame; if (delta > 1000 / fps) { - clear && context.clearRect(0, 0, 100, 100); + clear && context.clearRect(0, 0, 64, 64); for (var item of items) { context.fillStyle = `rgb(${item.color.join(',')})`; draw(item);