From e024ae2142797ea8a31aa4dea229003514640b5b Mon Sep 17 00:00:00 2001
From: "Jade (Rose) Rowland" <jaderowlanddev@gmail.com>
Date: Mon, 13 May 2024 20:42:59 -0400
Subject: [PATCH] almost figured it out

---
 packages/core/cyclist.mjs | 17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)

diff --git a/packages/core/cyclist.mjs b/packages/core/cyclist.mjs
index 046b6ff7d..75f92090c 100644
--- a/packages/core/cyclist.mjs
+++ b/packages/core/cyclist.mjs
@@ -36,11 +36,13 @@ export class Cyclist {
           const begin = this.lastEnd;
 
           const end = this.num_cycles_at_cps_change + num_cycles_since_cps_change;
-          let cycle = this.now();
+          let cycle2 = this.now();
           //magic number that fixes cycle calcuation, cycle is probably not being calculated correctly
           const modifier = this.cps * -interval;
-          cycle = cycle + modifier;
-
+          cycle2 = cycle2 + modifier;
+          // let cycle = begin + (phase - t) * this.cps;
+          // cycle = begin t
+          // console.log({ phase, t, cycle2 });
           if (phase < t) {
             // avoid querying haps that are in the past anyway
             console.log(`skip query: too late`);
@@ -49,7 +51,9 @@ export class Cyclist {
 
           // query the pattern for events
           const haps = this.pattern.queryArc(begin, end, { _cps: this.cps });
-
+          let mod2 = t - phase - this.latency;
+          mod2 = mod2 * this.cps;
+          console.log(this.clock.duration);
           haps.forEach((hap) => {
             if (hap.hasOnset()) {
               const targetTime =
@@ -59,9 +63,14 @@ export class Cyclist {
               // see https://github.com/tidalcycles/strudel/pull/1004
 
               const deadline = targetTime - phase;
+              // console.log();
+              let cycle = hap.whole.begin.valueOf() + mod2;
+
+              // console.log({ cycle, cycle2, mod2 });
               onTrigger?.(hap, deadline, duration, this.cps, targetTime, cycle);
             }
           });
+
           this.lastBegin = begin;
           this.lastEnd = end;
           this.lastTick = phase;