diff --git a/packages/core/clockworker.js b/packages/core/clockworker.js index f524e439..4c33de29 100644 --- a/packages/core/clockworker.js +++ b/packages/core/clockworker.js @@ -22,8 +22,6 @@ const sendMessage = (type, payload) => { channel.postMessage({ type, payload }); }; -//phase, num_cycles_at_cps_change, cps, seconds_at_cps_change - const sendTick = (phase, duration, tick, time) => { const num_seconds_since_cps_change = num_ticks_since_cps_change * duration; @@ -40,16 +38,12 @@ const sendTick = (phase, duration, tick, time) => { const cycle = begin + secondsSinceLastTick * cps; sendMessage('tick', { - phase, - time, begin, end, cps, tickdeadline, num_cycles_at_cps_change, num_seconds_at_cps_change, - duration, - num_ticks_since_cps_change, num_seconds_since_cps_change, cycle, }); diff --git a/packages/core/neocyclist.mjs b/packages/core/neocyclist.mjs index ebffed97..278ddc8a 100644 --- a/packages/core/neocyclist.mjs +++ b/packages/core/neocyclist.mjs @@ -50,32 +50,27 @@ export class NeoCyclist { }; const tickCallback = (payload) => { - const time = this.getTime(); - - let { - phase, + const { num_cycles_at_cps_change, cps, num_seconds_at_cps_change, - duration, num_seconds_since_cps_change, begin, end, tickdeadline, + cycle, } = payload; this.cps = cps; + this.cycle = cycle; setTimeReference(num_seconds_at_cps_change, num_seconds_since_cps_change, tickdeadline); - const lastTick = time + tickdeadline; - const secondsSinceLastTick = time - lastTick - duration; - this.cycle = begin + secondsSinceLastTick * cps; + processHaps(begin, end, num_cycles_at_cps_change, num_seconds_at_cps_change); - processHaps(begin, end, phase, num_cycles_at_cps_change, num_seconds_at_cps_change); this.time_at_last_tick_message = this.getTime(); }; - const processHaps = (begin, end, phase, num_cycles_at_cps_change, seconds_at_cps_change) => { + const processHaps = (begin, end, num_cycles_at_cps_change, seconds_at_cps_change) => { if (this.started === false) { return; }