elias/strudel-docker
1
0
Fork 0
mirror of https://github.com/eliasstepanik/strudel-docker.git synced 2026-01-11 13:48:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'main' into reset

Browse Source
This commit is contained in:
alex 2022-05-01 16:08:42 +01:00
commit 68c63cca7e
22 changed files with 132 additions and 106 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
docs/asset-manifest.json
View File

@ -1,16 +1,16 @@
{
"files": {
"main.css": "/static/css/main.0d689283.css",
"main.js": "/static/js/main.7e790d7f.js",
"main.css": "/static/css/main.13bac14b.css",
"main.js": "/static/js/main.289a0f18.js",
"static/js/787.1c52cb78.chunk.js": "/static/js/787.1c52cb78.chunk.js",
"static/media/logo.svg": "/static/media/logo.ac95051720b3dccfe511e0e02d8e1029.svg",
"index.html": "/index.html",
"main.0d689283.css.map": "/static/css/main.0d689283.css.map",
"main.7e790d7f.js.map": "/static/js/main.7e790d7f.js.map",
"main.13bac14b.css.map": "/static/css/main.13bac14b.css.map",
"main.289a0f18.js.map": "/static/js/main.289a0f18.js.map",
"787.1c52cb78.chunk.js.map": "/static/js/787.1c52cb78.chunk.js.map"
},
"entrypoints": [
"static/css/main.0d689283.css",
"static/js/main.7e790d7f.js"
"static/css/main.13bac14b.css",
"static/js/main.289a0f18.js"
]
}

2
docs/index.html
View File

@ -1 +1 @@
<!doctype html><html lang="en"><head><meta charset="utf-8"/><link rel="icon" href="/favicon.ico"/><meta name="viewport" content="width=device-width,initial-scale=1"/><meta name="theme-color" content="#000000"/><meta name="description" content="Strudel REPL"/><title>Strudel REPL</title><script defer="defer" src="/static/js/main.7e790d7f.js"></script><link href="/static/css/main.0d689283.css" rel="stylesheet"></head><body><noscript>You need to enable JavaScript to run this app.</noscript><div id="root"></div></body></html>
<!doctype html><html lang="en"><head><meta charset="utf-8"/><link rel="icon" href="/favicon.ico"/><meta name="viewport" content="width=device-width,initial-scale=1"/><meta name="theme-color" content="#000000"/><meta name="description" content="Strudel REPL"/><title>Strudel REPL</title><script defer="defer" src="/static/js/main.289a0f18.js"></script><link href="/static/css/main.13bac14b.css" rel="stylesheet"></head><body><noscript>You need to enable JavaScript to run this app.</noscript><div id="root"></div></body></html>

1
docs/static/css/main.0d689283.css.map vendored
View File

File diff suppressed because one or more lines are too long

6
docs/static/css/main.0d689283.css → docs/static/css/main.13bac14b.css vendored
View File

File diff suppressed because one or more lines are too long

1
docs/static/css/main.13bac14b.css.map vendored Normal file
View File

File diff suppressed because one or more lines are too long

3
docs/static/js/main.289a0f18.js vendored Normal file
View File

File diff suppressed because one or more lines are too long

17
docs/static/js/main.7e790d7f.js.LICENSE.txt → docs/static/js/main.289a0f18.js.LICENSE.txt vendored
View File

@ -4,6 +4,23 @@ object-assign
@license MIT
*/
/*! *****************************************************************************
Copyright (c) Microsoft Corporation.
Permission to use, copy, modify, and/or distribute this software for any
purpose with or without fee is hereby granted.
THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH
REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT,
INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR
OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
PERFORMANCE OF THIS SOFTWARE.
***************************************************************************** */
/*! @license ReactCodeMirror - MIT License - Tom Golden (8162045+tbjgolden@users.noreply.github.com) */
/**
* @license Fraction.js v4.2.0 05/03/2022
* https://www.xarg.org/2014/03/rational-numbers-in-javascript/

1
docs/static/js/main.289a0f18.js.map vendored Normal file
View File

File diff suppressed because one or more lines are too long

3
docs/static/js/main.7e790d7f.js vendored
View File

File diff suppressed because one or more lines are too long

1
docs/static/js/main.7e790d7f.js.map vendored
View File

File diff suppressed because one or more lines are too long

76
docs/tutorial/index.239413ad.js Normal file
View File

File diff suppressed because one or more lines are too long

1
docs/tutorial/index.239413ad.js.map Normal file
View File

File diff suppressed because one or more lines are too long

1
docs/tutorial/index.757e9f9d.css.map
View File

File diff suppressed because one or more lines are too long

4
docs/tutorial/index.757e9f9d.css → docs/tutorial/index.912f00e3.css
View File

File diff suppressed because one or more lines are too long

1
docs/tutorial/index.912f00e3.css.map Normal file
View File

File diff suppressed because one or more lines are too long

75
docs/tutorial/index.a0cd6c24.js
View File

File diff suppressed because one or more lines are too long

1
docs/tutorial/index.a0cd6c24.js.map
View File

File diff suppressed because one or more lines are too long

2
docs/tutorial/index.html
View File

@ -1 +1 @@
<!DOCTYPE html><html lang="en"><head><meta charset="utf-8"><link rel="icon" href="/tutorial/favicon.e3ab9dd9.ico"><link rel="stylesheet" type="text/css" href="/tutorial/index.757e9f9d.css"><meta name="viewport" content="width=device-width, initial-scale=1"><meta name="description" content="Strudel REPL"><title>Strudel Tutorial</title></head><body> <div id="root"></div> <noscript>You need to enable JavaScript to run this app.</noscript> <script src="/tutorial/index.a0cd6c24.js" defer></script> </body></html>
<!DOCTYPE html><html lang="en"><head><meta charset="utf-8"><link rel="icon" href="/tutorial/favicon.e3ab9dd9.ico"><link rel="stylesheet" type="text/css" href="/tutorial/index.912f00e3.css"><meta name="viewport" content="width=device-width, initial-scale=1"><meta name="description" content="Strudel REPL"><title>Strudel Tutorial</title></head><body> <div id="root"></div> <noscript>You need to enable JavaScript to run this app.</noscript> <script src="/tutorial/index.239413ad.js" defer></script> </body></html>

2
repl/src/App.js
View File

@ -121,7 +121,7 @@ function App() {
return () => window.removeEventListener('keydown', handleKeyPress);
}, [pattern, code, activateCode, cycle]);
useHighlighting({ view, pattern, started: cycle.started });
useHighlighting({ view, pattern, active: cycle.started && !activeCode?.includes('strudel disable-highlighting') });
useWebMidi({
ready: useCallback(

2
repl/src/CodeMirror6.jsx
View File

@ -37,7 +37,7 @@ const highlightField = StateField.define({
}
return highlights;
} catch (err) {
console.warn('highlighting error', err);
// console.warn('highlighting error', err);
return highlights;
}
},

2
repl/src/tutorial/MiniRepl.jsx
View File

@ -55,7 +55,7 @@ function MiniRepl({ tune, maxHeight = 500 }) {
const [ref, isVisible] = useInView({
threshold: 0.01,
});
useHighlighting({ view, pattern, started: cycle.started });
useHighlighting({ view, pattern, active: cycle.started });
return (
<div className="rounded-md overflow-hidden bg-[#444C57]" ref={ref}>
<div className="flex justify-between bg-slate-700 border-t border-slate-500">

24
repl/src/useHighlighting.js
View File

@ -3,19 +3,27 @@ import { setHighlights } from './CodeMirror6';
import { Tone } from '@strudel.cycles/tone';
let highlights = []; // actively highlighted events
let lastEnd;
function useHighlighting({ view, pattern, started }) {
function useHighlighting({ view, pattern, active }) {
useEffect(() => {
if (view) {
if (pattern && started) {
if (pattern && active) {
let frame = requestAnimationFrame(updateHighlights);
function updateHighlights() {
const audioTime = Tone.getTransport().seconds;
highlights = highlights.filter((hap) => hap.whole.end > audioTime); // keep only highlights that are still active
const haps = pattern.queryArc(audioTime, audioTime + 1 / 60).filter((hap) => hap.hasOnset());
highlights = highlights.concat(haps); // add potential new onsets
view.dispatch({ effects: setHighlights.of(highlights) }); // highlight all still active + new active haps
try {
const audioTime = Tone.getTransport().seconds;
const span = [lastEnd || audioTime, audioTime + 1 / 60];
lastEnd = audioTime + 1 / 60;
highlights = highlights.filter((hap) => hap.whole.end > audioTime); // keep only highlights that are still active
const haps = pattern.queryArc(...span).filter((hap) => hap.hasOnset());
highlights = highlights.concat(haps); // add potential new onsets
view.dispatch({ effects: setHighlights.of(highlights) }); // highlight all still active + new active haps
} catch (err) {
// console.log('error in updateHighlights', err);
view.dispatch({ effects: setHighlights.of([]) });
}
frame = requestAnimationFrame(updateHighlights);
}
@ -27,7 +35,7 @@ function useHighlighting({ view, pattern, started }) {
view.dispatch({ effects: setHighlights.of([]) });
}
}
}, [pattern, started, view]);
}, [pattern, active, view]);
}
export default useHighlighting;