Slightly more correct sorting of haps for cps changes

2026-10-20 13:56:50 -04:00 · 2026-08-15 02:01:07 +02:00
parent 096e53690f
commit c8d0342ecb
1 changed files with 17 additions and 1 deletions
@@ -74,7 +74,23 @@ export class Cyclist {
              .queryArc(begin, end, { _cps: this.cps, cyclist: 'cyclist' })
              // Sort the haps based on their onset, so cps changes within the
              // tick duration happen in the correct order.
-              .sort((a, b) => a.whole.begin.valueOf() - b.whole.begin.valueOf());
+              .sort((a, b) => {
+                const aBegin = a.whole.begin.valueOf();
+                const bBegin = b.whole.begin.valueOf();
+                // If haps happen at the same time, trigger the haps that cause
+                // cps changes first, so the durations of the simultaneous haps
+                // are adjusted accordingly.
+                if (aBegin === bBegin) {
+                  if (a.value.cps !== undefined) {
+                    return b.value.cps !== undefined ? 0 : 1;
+                  }
+                  if (b.value.cps !== undefined) {
+                    return -1;
+                  }
+                  return 0;
+                }
+                return aBegin - bBegin;
+              });

            haps.forEach((hap) => {
              if (hap.hasOnset()) {