Skip to content
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.

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

New tools for long-form compositions: setLoop() and cyclecounter() #1139

Open
wants to merge 3 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
5 changes: 5 additions & 0 deletions packages/codemirror/widget.mjs
Original file line number Diff line number Diff line change
Expand Up @@ -133,3 +133,8 @@ registerWidget('_pitchwheel', (id, options = {}, pat) => {
const ctx = getCanvasWidget(id, options).getContext('2d');
return pat.pitchwheel({ ...options, ctx, id });
});

registerWidget('_cyclecounter', (id, options = {}, pat) => {
const ctx = getCanvasWidget(id, options).getContext('2d');
return pat.cyclecounter({ ...options, ctx, id });
});
21 changes: 20 additions & 1 deletion packages/core/cyclist.mjs
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,8 @@ export class Cyclist {
this.beforeStart = beforeStart;
this.cps = 0.5;
this.num_ticks_since_cps_change = 0;
this.loopStart = 0;
this.loopLength = 0;
this.lastTick = 0; // absolute time when last tick (clock callback) happened
this.lastBegin = 0; // query begin of last tick
this.lastEnd = 0; // query end of last tick
Expand All @@ -48,6 +50,10 @@ export class Cyclist {
this.lastBegin = begin;
const end = this.num_cycles_at_cps_change + num_cycles_since_cps_change;
this.lastEnd = end;
if (this.loopLength > 0 && this.lastEnd >= this.loopStart + this.loopLength) {
this.lastEnd = this.loopStart + (this.lastEnd % 1);
this.num_ticks_since_cps_change = 0;
}
this.lastTick = phase;

if (phase < t) {
Expand Down Expand Up @@ -112,7 +118,7 @@ export class Cyclist {
stop() {
logger('[cyclist] stop');
this.clock.stop();
this.lastEnd = 0;
this.lastEnd = this.loopStart;
this.setStarted(false);
}
async setPattern(pat, autostart = false) {
Expand All @@ -128,6 +134,19 @@ export class Cyclist {
this.cps = cps;
this.num_ticks_since_cps_change = 0;
}
setLoop(start = 0, length = 0) {
if (start >= 0 && length >= 0) {
start = Math.floor(start);
length = Math.floor(length);

if (start != this.loopStart || length != this.loopLength) {
this.loopStart = Math.floor(start);
this.loopLength = Math.floor(length);
this.lastEnd = this.loopStart + (this.lastEnd % 1);
this.num_ticks_since_cps_change = 0;
}
}
}
log(begin, end, haps) {
const onsets = haps.filter((h) => h.hasOnset());
console.log(`${begin.toFixed(4)} - ${end.toFixed(4)} ${Array(onsets.length).fill('I').join('')}`);
Expand Down
3 changes: 3 additions & 0 deletions packages/core/repl.mjs
Original file line number Diff line number Diff line change
Expand Up @@ -84,6 +84,7 @@ export function repl({
const toggle = () => scheduler.toggle();
const setCps = (cps) => scheduler.setCps(cps);
const setCpm = (cpm) => scheduler.setCps(cpm / 60);
const setLoop = (start, length) => scheduler.setLoop(start, length);
const all = function (transform) {
allTransform = transform;
return silence;
Expand Down Expand Up @@ -137,6 +138,8 @@ export function repl({
setcps: setCps,
setCpm,
setcpm: setCpm,
setLoop,
setloop: setLoop,
});
};

Expand Down
16 changes: 16 additions & 0 deletions packages/draw/cyclecounter.mjs
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
import { Pattern } from '@strudel/core';

Pattern.prototype.cyclecounter = function (options = {}) {
return this.onPaint((ctx, time, haps, drawTime) => {
ctx.clearRect(0, 0, ctx.canvas.width, ctx.canvas.height);

ctx.font = options.font || '2em monospace';
ctx.fillStyle = options.color || 'red';
ctx.textBaseline = 'bottom';
ctx.textAlign = 'right';

const div = options.div || 1;

ctx.fillText('Cycle' + (div > 1 ? '/' + div : '') + ' ' + ((time / div) >> 0), ctx.canvas.width, ctx.canvas.height);
});
};
1 change: 1 addition & 0 deletions packages/draw/index.mjs
Original file line number Diff line number Diff line change
Expand Up @@ -4,3 +4,4 @@ export * from './draw.mjs';
export * from './pianoroll.mjs';
export * from './spiral.mjs';
export * from './pitchwheel.mjs';
export * from './cyclecounter.mjs';
Loading