BuboBubo/topos
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

adding ebeat function

Browse Source
This commit is contained in:
Raphaël Forment
2023-08-16 13:44:09 +02:00
parent fd0f5bdb8b
commit d3c864ff5c
2 changed files with 16 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/API.ts
View File

@ -23,7 +23,6 @@ interface Pattern<T> {
}; };
} }
/** /**
* This is an override of the basic "includes" method. * This is an override of the basic "includes" method.
*/ */
@ -806,11 +805,17 @@ export class UserAPI {
get ebeat(): number { get ebeat(): number {
/** /**
* Returns the current beat number since the origin of time * Returns the current beat number since the origin of time
* TODO: fix! Why is this not working?
*/ */
return this.app.clock.beats_since_origin; return this.app.clock.beats_since_origin;
} }
get epulse(): number {
/**
* Returns the current number of pulses elapsed since origin of time
*/
return this.app.clock.pulses_since_origin;
}
onbar(n: number, ...bar: number[]): boolean { onbar(n: number, ...bar: number[]): boolean {
// n is acting as a modulo on the bar number // n is acting as a modulo on the bar number
const bar_list = [...Array(n).keys()].map((i) => i + 1); const bar_list = [...Array(n).keys()].map((i) => i + 1);

15
src/Clock.ts
View File

@ -41,13 +41,13 @@ export class Clock {
tick: number tick: number
constructor(public app: Editor, ctx: AudioContext) { constructor(public app: Editor, ctx: AudioContext) {
this.time_position = { bar: 0, beat: 0, pulse: 0 }
this.time_signature = [4, 4];
this.tick = 0;
this.bpm = 120;
this.ppqn = 48;
this.transportNode = null; this.transportNode = null;
this.ctx = ctx; this.ctx = ctx;
this.tick = 0;
this.time_position = { bar: 0, beat: 0, pulse: 0 }
this.bpm = 120;
this.time_signature = [4, 4];
this.ppqn = 48;
ctx.audioWorklet.addModule(TransportProcessor).then((e) => { ctx.audioWorklet.addModule(TransportProcessor).then((e) => {
this.transportNode = new TransportNode(ctx, {}, this.app); this.transportNode = new TransportNode(ctx, {}, this.app);
this.transportNode.connect(ctx.destination); this.transportNode.connect(ctx.destination);
@ -70,7 +70,6 @@ export class Clock {
return nextBarinTicks - currentBeatInTicks return nextBarinTicks - currentBeatInTicks
} }
get beats_per_bar(): number { get beats_per_bar(): number {
/** /**
* Returns the number of beats per bar. * Returns the number of beats per bar.
@ -82,6 +81,10 @@ export class Clock {
return (this.time_position.bar - 1) * this.beats_per_bar + this.time_position.beat; return (this.time_position.bar - 1) * this.beats_per_bar + this.time_position.beat;
} }
get pulses_since_origin(): number {
return (this.beats_since_origin * this.ppqn) + this.time_position.pulse
}
get pulse_duration(): number { get pulse_duration(): number {
/** /**
* Returns the duration of a pulse in seconds. * Returns the duration of a pulse in seconds.