Skip to content

Refactor #2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 12 commits into
base: master
Choose a base branch
from
Open

Refactor #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
0c157f8
Update donut.js
Rudxain Oct 5, 2022
17d03c9
Update donut.js
Rudxain Oct 5, 2022
3be5d6a
immutability
Rudxain Oct 5, 2022
1d97b7a
semicolons
Rudxain Oct 5, 2022
74233ad
encapsulation
Rudxain Oct 5, 2022
d65fdbc
Update donut.js
Rudxain Oct 5, 2022
4eb287e
Update donut.js
Rudxain Oct 5, 2022
4bea86c
Update donut.js
Rudxain Oct 5, 2022
15e65b8
using RAF instead of `setInterval`
Rudxain Oct 5, 2022
6f02f54
Update donut.js
Rudxain Oct 5, 2022
bef6e99
Using `sin_cos` destructuring for conciseness
Rudxain Oct 14, 2022
6b53bff
CRLF -> LF. And better JSdoc
Rudxain Oct 14, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
140 changes: 88 additions & 52 deletions donut.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,52 +1,88 @@
var pretag = document.getElementById("d");

var tmr1 = undefined,
tmr2 = undefined;
var A = 1,
B = 1;

var asciiframe = () => {
var b = [];
var z = [];
A += 0.07;
B += 0.03;
var cA = Math.cos(A),
sA = Math.sin(A),
cB = Math.cos(B),
sB = Math.sin(B);
for (var k = 0; k < 1760; k++) {
b[k] = k % 80 == 79 ? "\n" : " ";
z[k] = 0;
}
for (var j = 0; j < 6.28; j += 0.07) {
// j <=> theta
var ct = Math.cos(j),
st = Math.sin(j);
for (i = 0; i < 6.28; i += 0.02) {
// i <=> phi
var sp = Math.sin(i),
cp = Math.cos(i),
h = ct + 2, // R1 + R2*cos(theta)
D = 1 / (sp * h * sA + st * cA + 5), // this is 1/z
t = sp * h * cA - st * sA; // this is a clever factoring of some of the terms in x' and y'

var x = 0 | (40 + 30 * D * (cp * h * cB - t * sB)),
y = 0 | (12 + 15 * D * (cp * h * sB + t * cB)),
o = x + 80 * y,
N =
0 |
(8 *
((st * sA - sp * ct * cA) * cB -
sp * ct * sA -
st * cA -
cp * ct * sB));
if (y < 22 && y >= 0 && x >= 0 && x < 79 && D > z[o]) {
z[o] = D;
b[o] = ".,-~:;=!*#$@"[N > 0 ? N : 0];
}
}
}
pretag.innerHTML = b.join("");
};

setInterval(asciiframe, 50)
"use strict";
/**@typedef {number|bigint|string} numstr*/
{
/**
* Returns the sine and cosine of a number, as a 2-tuple.
* @param {number} x An angle measured in radians.
*/
const sin_cos = x => [Math.sin(x), Math.cos(x)];

/**
* Checks if a value is in the interval [`min`, `max`)
* @param {numstr} x
* @param {numstr} min (inclusive/closed)
* @param {numstr} max (exclusive/open)
*/
const inRange = (x, min, max) => x >= min && x < max;

const
RAF = requestAnimationFrame,
pretag = document.getElementById("d");

let
start = 0,
A = 1,
B = 1;

const base_frame = () => {
A += 0.07;
B += 0.03;

const
m = 80,
b = [],
z = [];

for (let k = 0; k < 1760; k++) {
b[k] = k % m === m - 1 ? "\n" : " ";
z[k] = 0;
}

const
[sA, cA] = sin_cos(A),
[sB, cB] = sin_cos(B),
tmp0 = 6.28;

for (let j = 0; j < tmp0; j += 0.07) {
// j <=> theta
const [st, ct] = sin_cos(j);
for (let i = 0; i < tmp0; i += 0.02) {
// i <=> phi
const
[sp, cp] = sin_cos(i),
h = ct + 2, // R1 + R2*cos(theta)
sph = sp * h,
D = 1 / (sph * sA + st * cA + 5), // this is 1/z
t = sph * cA - st * sA; // this is a clever factoring of some of the terms in x' and y'

const
cph = cp * h,
x = 0 | (40 + 30 * D * (cph * cB - t * sB)),
y = 0 | (12 + 15 * D * (cph * sB + t * cB)),
o = x + m * y,
spct = sp * ct,
N = 0 | (8 * (
(st * sA - spct * cA) * cB -
spct * sA -
st * cA -
cp * ct * sB
));

if (inRange(y, 0, 22) && inRange(x, 0, m - 1) && D > z[o]) {
z[o] = D;
b[o] = ".,-~:;=!*#$@"[Math.max(N, 0)];
}
}
}
pretag.innerHTML = b.join("");
};

const next_frame = (/**@type {number}*/ now) => {
if (now - start > 50) {
start = now;
base_frame();
}
RAF(next_frame);
}
RAF(next_frame);
};
92 changes: 46 additions & 46 deletions index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,47 +1,47 @@
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="UTF-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<title>Donut</title>
<style>
::selection {
background: #505050;
}
::-moz-selection {
background: #505050;
}
html,
body,
.container {
overflow: hidden;
background-color: black;
height: 100%;
}
.container {
color: white;
display: -webkit-flexbox;
display: -ms-flexbox;
display: -webkit-flex;
display: flex;
-webkit-flex-align: center;
-ms-flex-align: center;
-webkit-align-items: center;
align-items: center;
justify-content: center;
}
</style>
</head>
<body>
<div class="container">
<pre class="center" id="d"></pre>
</div>
<script src="donut.js"></script>
</body>
<!DOCTYPE html>
<html lang="en">

<head>
<meta charset="UTF-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<title>Donut</title>
<style>
::selection {
background: #505050;
}

::-moz-selection {
background: #505050;
}

html,
body,
.container {
overflow: hidden;
background-color: black;
height: 100%;
}

.container {
color: white;
display: -webkit-flexbox;
display: -ms-flexbox;
display: -webkit-flex;
display: flex;
-webkit-flex-align: center;
-ms-flex-align: center;
-webkit-align-items: center;
align-items: center;
justify-content: center;
}
</style>
</head>

<body>
<div class="container">
<pre class="center" id="d"></pre>
</div>
<script src="donut.js"></script>
</body>

</html>