diff --git a/library/js-big-code.json b/library/big-js.json
similarity index 100%
rename from library/js-big-code.json
rename to library/big-js.json
diff --git a/library/classic.json b/library/classic.json
index 599d5810..a9ff598b 100644
--- a/library/classic.json
+++ b/library/classic.json
@@ -256,8 +256,8 @@
"url": "http://www.pouet.net/topic.php?which=8357&page=8#c388898",
"date": "2011-10-04",
"sampleRate": 44100,
- "codeMinified": "(((t>>1)*(15&(0x234568a0>>((t>>8)&28))))|((t>>1)>>(t>>11))^(t>>12))+((t>>4)&(t&24))",
- "codeOriginal": "((t>>1)*(15&0x234568a0>>(t>>8&28))|t>>1>>(t>>11)^t>>12)+(t>>4&t&24)",
+ "codeOriginal": "(((t>>1)*(15&(0x234568a0>>((t>>8)&28))))|((t>>1)>>(t>>11))^(t>>12))+((t>>4)&(t&24))",
+ "codeMinified": "((t>>1)*(15&0x234568a0>>(t>>8&28))|t>>1>>(t>>11)^t>>12)+(t>>4&t&24)",
"starred": 1
}, {
"description": "CA98",
diff --git a/library/js-code.json b/library/compact-js.json
similarity index 99%
rename from library/js-code.json
rename to library/compact-js.json
index 55cc9571..d198ad49 100644
--- a/library/js-code.json
+++ b/library/compact-js.json
@@ -453,7 +453,7 @@
"codeOriginal": "c='charCodeAt',l=9+!(t&(1<<16)),c[c]((t>>c[c](((t>>9)%l&t>>12)%l))%l)+(t&(1<<12))*.9",
"codeMinified": "c='charCodeAt',l=9+!(t&65536),c[c]((t>>c[c](((t>>9)%l&t>>12)%l))%l)+(t&4096)*.9"
}, {
- "description": "Experiment with
\"Running man\" [
t*(3+(1^5&t>>10))*(5+(3&t>>14))>>(3&t>>8)] and
\"Street Surfer\" [
t&4096?(t*(t^t%255)|t>>4)>>1:t>>3|(t&8192?t<<2:t)]",
+ "description": "Experiment with
\"Running man\" t*(3+(1^5&t>>10))*(5+(3&t>>14))>>(3&t>>8) and
\"Street Surfer\" t&4096?(t*(t^t%255)|t>>4)>>1:t>>3|(t&8192?t<<2:t) ",
"date": "2021-10-07",
"children": [{
"description": "Isolated and edited drums",
@@ -1351,6 +1351,3 @@
}]
}
]
-
-
-
diff --git a/library/sthephanshi.json b/library/sthephanshi.json
index bcd15e9c..4922cd50 100644
--- a/library/sthephanshi.json
+++ b/library/sthephanshi.json
@@ -1,6 +1,6 @@
[
{
- "description": "\"Explosive beat\". Formulas family discovered by experimenting with \"Explosions\" [
(t>>2)*(t>>5)|t>>5]",
+ "description": "\"Explosive beat\". Formulas family discovered by experimenting with \"Explosions\"
(t>>2)*(t>>5)|t>>5 ",
"children": [{
"codeOriginal": "(t>>4)*(t>>3)|t>>2"
}, {
@@ -19,7 +19,7 @@
"codeOriginal": "(t>>5)*(t>>5)|t>>2"
}]
}, {
- "description": "\"Robocop\". Cool beat discovered by experimenting with [
(t>>2)*(t&16)|t>>2]",
+ "description": "\"Robocop\". Cool beat discovered by experimenting with
(t>>2)*(t&16)|t>>2 ",
"children": [{
"description": "Very cool sound with biting blows",
"codeOriginal": "(t>>2)*(t&(t&32768?16:24)|t>>(t>>8&28))|t>>2",
@@ -99,7 +99,7 @@
"codeOriginal": "t%((t&-16|t>>11)&42)<<2|t>>4"
}]
}, {
- "description": "\"Game levels\"
Series of formulas discovered by experimenting with
\"Running man\" [
t*(3+(1^5&t>>10))*(5+(3&t>>14))>>(3&t>>8)]
Allows to get different interesting chiptune sounds!
",
+ "description": "\"Game levels\"
Series of formulas discovered by experimenting with
\"Running man\" t*(3+(1^5&t>>10))*(5+(3&t>>14))>>(3&t>>8) Allows to get different interesting chiptune sounds!
",
"children": [{
"description": "Let replace (3+(1^5&t>>10)) with (2-(1&-t>>11))",
"codeOriginal": "t*(2-(1&-t>>11))*(5+(3&t>>14))>>(3&t>>8)"
diff --git a/scripts/bytebeat.mjs b/scripts/bytebeat.mjs
index 3d994fd5..1561feb1 100644
--- a/scripts/bytebeat.mjs
+++ b/scripts/bytebeat.mjs
@@ -223,48 +223,50 @@ globalThis.bytebeat = new class {
entry += `
(${ date }) `;
}
if(sampleRate) {
- entry += `
${ (sampleRate / 1000) | 0 }kHz `;
+ entry += `
${ sampleRate }Hz `;
}
if(mode) {
entry += `
${ mode } `;
}
const songData = codeOriginal || codeMinified || file ? JSON.stringify({ sampleRate, mode }) : '';
+ if(codeMinified) {
+ if(codeOriginal) {
+ entry += `
${
+ codeMinified.length }c + ';
+ }
+ } else if(codeOriginal) {
+ entry += `
${ codeOriginal.length }c `;
+ }
if(file) {
if(fileFormatted) {
- entry += `
► formatted `;
+ }" title="Click to load and play the formatted code">► formatted`;
}
if(fileOriginal) {
- entry += `
► original `;
+ }" title="Click to load and play the original code">► original`;
}
if(fileMinified) {
- entry += `
► minified `;
+ }" title="Click to load and play the minified code">► minified`;
}
}
if(codeOriginal) {
if(Array.isArray(codeOriginal)) {
codeOriginal = codeOriginal.join('\r\n');
}
- const btn = codeMinified ? '
original ' : '';
- entry += `
- ${ this.escapeHTML(codeOriginal) }
- ${ codeOriginal.length }c ${ btn }
-
`;
+ entry += `
${ this.escapeHTML(codeOriginal) }`;
}
if(codeMinified) {
- const btn = 'minified `;
- entry += `
- ${ this.escapeHTML(codeMinified) }
- ${ codeMinified.length }c ${ btn }
-
`;
+ entry += `${ codeOriginal ? '' : '${
+ this.escapeHTML(codeMinified) }`;
}
if(children) {
let childrenStr = '';
@@ -281,7 +283,7 @@ globalThis.bytebeat = new class {
}
handleEvent({ target: el, type }) {
if(type === 'click') {
- if(el.tagName === 'CODE') {
+ if(el.classList.contains('code-text')) {
this.loadCode(Object.assign({ code: el.innerText },
el.hasAttribute('data-songdata') ? JSON.parse(el.dataset.songdata) : {}));
} else if(el.classList.contains('code-load')) {
@@ -290,10 +292,12 @@ globalThis.bytebeat = new class {
this.onclickCodeToggleButton(el);
} else if(el.classList.contains('library-header')) {
this.onclickLibraryHeader(el);
+ } else if(el.parentNode.classList.contains('library-header')) {
+ this.onclickLibraryHeader(el.parentNode);
}
return;
}
- if(type === 'mouseover' && el.tagName === 'CODE') {
+ if(type === 'mouseover' && el.classList.contains('code-text')) {
el.title = 'Click to play this code';
}
}
@@ -348,8 +352,8 @@ globalThis.bytebeat = new class {
// Containers
this.containerFixed = document.getElementById('container-fixed');
this.containerScroll = document.getElementById('container-scroll');
- this.containerScroll.addEventListener('click', this, true);
- this.containerScroll.addEventListener('mouseover', this, true);
+ this.containerScroll.addEventListener('click', this);
+ this.containerScroll.addEventListener('mouseover', this);
this.cachedElemParent = document.createElement('div');
this.cachedTextNode = document.createTextNode('');
this.cachedElemParent.appendChild(this.cachedTextNode);
@@ -452,18 +456,21 @@ globalThis.bytebeat = new class {
}
onclickCodeToggleButton(el) {
const parentEl = el.parentNode;
- parentEl.classList.toggle('disabled');
- if(el.classList.contains('code-toggle-original')) {
- parentEl.previousElementSibling.classList.toggle('disabled');
- } else if(el.classList.contains('code-toggle-minified')) {
- parentEl.nextElementSibling.classList.toggle('disabled');
- }
+ const origEl = parentEl.querySelector('.code-text-original');
+ const minEl = parentEl.querySelector('.code-text-minified');
+ origEl?.classList.toggle('disabled');
+ minEl?.classList.toggle('disabled');
+ const isMinified = el.textContent === '–';
+ parentEl.querySelector('.code-length').textContent =
+ `${ (isMinified ? minEl : origEl).getAttribute('code-length') }c`;
+ el.title = isMinified ? 'Minified version shown. Click to view the original version.' :
+ 'Original version shown. Click to view the minified version.';
+ el.textContent = isMinified ? '+' : '–';
}
onclickLibraryHeader(el) {
const containerEl = el.nextElementSibling;
- containerEl.classList.toggle('disabled');
const state = containerEl.classList;
- if(state.contains('loaded') || state.contains('disabled')) {
+ if(state.contains('loaded') || el.parentNode.open) {
return;
}
state.add('loaded');
@@ -533,7 +540,7 @@ globalThis.bytebeat = new class {
console.error(`Couldn't load data from url: ${ err }`);
}
} else {
- console.error(`Couldn't load data from url: unrecognized url data`);
+ console.error('Couldn\'t load data from url: unrecognized url data');
}
this.loadCode(songData ||
{ code: this.editorView ? this.editorView.state.doc.toString() : this.editorElem.value }, false);