hacklab/strudel
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

added .color

Browse source
This commit is contained in:
Felix Roos 2022-03-24 19:45:38 +01:00
parent cfe9cfd03c
commit 10bb347ddf
3 changed files with 25 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

10
repl/src/CodeMirror.tsx
View file

@ -30,14 +30,16 @@ export const markEvent = (editor) => (time, event) => {
if (!locs || !editor) {
return;
}
const col = event.context?.color || '#FFCA28';
// mark active event
const marks = locs.map(({ start, end }) =>
editor.getDoc().markText(
{ line: start.line - 1, ch: start.column },
{ line: end.line - 1, ch: end.column },
//{ css: 'background-color: #FFCA28; color: black' } // background-color is now used by parent marking
{ css: 'outline: 1px solid #FFCA28; box-sizing:border-box' }
)
{ css: 'outline: 1px solid ' + col + '; box-sizing:border-box' },
//{ css: `background-color: ${col};border-radius:5px` },
),
);
//Tone.Transport.schedule(() => { // problem: this can be cleared by scheduler...
setTimeout(() => {
@ -94,7 +96,7 @@ export function getCurrentParenArea(code, caretPosition) {
} else if (code[i - 1] === ')') {
open++;
}
if(open === -1) {
if (open === -1) {
break;
}
i--;
@ -109,7 +111,7 @@ export function getCurrentParenArea(code, caretPosition) {
} else if (code[i] === ')') {
open++;
}
if(open === 1) {
if (open === 1) {
break;
}
i++;

8
repl/src/pianoroll.mjs
View file

@ -19,18 +19,20 @@ Pattern.prototype.pianoroll = function ({
ctx.fillRect(0, 0, w, h);
events.forEach((event) => {
const isActive = event.whole.begin <= t && event.whole.end >= t;
ctx.fillStyle = isActive ? active : inactive;
ctx.fillStyle = event.context?.color || inactive;
ctx.strokeStyle = event.context?.color || active;
ctx.globalAlpha = event.context.velocity ?? 1;
const x = Math.round((event.whole.begin / timeframe) * w);
const width = Math.round(((event.whole.end - event.whole.begin) / timeframe) * w);
const y = Math.round(h - ((Number(event.value) - minMidi) / midiRange) * h);
const offset = (t / timeframe) * w;
const margin = 0;
ctx.fillRect(x - offset + margin + 1, y + 1, width - 2, height - 2);
const coords = [x - offset + margin + 1, y + 1, width - 2, height - 2];
isActive ? ctx.strokeRect(...coords) : ctx.fillRect(...coords);
});
},
timeframe,
2 // lookaheadCycles
2, // lookaheadCycles
);
return this;
};