fix: setting the timingchanges wrong

reflektone-games · Nov 12, 2023 · ab6b07d · ab6b07d
1 parent 7317683
commit ab6b07d
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 12 deletions.
diff --git a/src/internal/syntacticAnalysis/deserializer.ts b/src/internal/syntacticAnalysis/deserializer.ts
@@ -41,7 +41,7 @@ export class Deserializer {
 
     constructor(sequence: Iterable<Token>) {
         this.enumerator = new Enumerator<Token>(sequence);
-        this.timingChanges.push(new TimingChange(0, 4));
+        this.timingChanges.push(new TimingChange());
         this.currentNoteCollection = undefined;
         this.currentTime = 0;
         this.endOfFile = false;

diff --git a/src/internal/syntacticAnalysis/states/noteReader.ts b/src/internal/syntacticAnalysis/states/noteReader.ts
@@ -26,7 +26,8 @@ export class NoteReader {
         const currentNote = new Note(parent.currentNoteCollection!);
         currentNote.location = noteLocation;
 
-        const overrideTiming = new TimingChange(parent.currentNoteCollection!.time);
+        const overrideTiming = new TimingChange();
+        overrideTiming.tempo = parent.timingChanges[parent.timingChanges.length - 1].tempo;
 
         if (noteLocation.group !== NoteGroup.Tap) currentNote.type = NoteType.Touch;
 

diff --git a/src/internal/syntacticAnalysis/states/subdivisionReader.ts b/src/internal/syntacticAnalysis/states/subdivisionReader.ts
@@ -17,7 +17,9 @@ export class SubdivisionReader {
             let newTimingChange;
             {
                 const oldTimingChange = parent.timingChanges[parent.timingChanges.length - 1];
-                newTimingChange = new TimingChange(oldTimingChange.tempo, oldTimingChange.subdivisions);
+                newTimingChange = new TimingChange();
+                newTimingChange.tempo = oldTimingChange.tempo;
+                newTimingChange.subdivisions = oldTimingChange.subdivisions;
             }
 
             newTimingChange.setSeconds(explicitTempo);
@@ -40,7 +42,9 @@ export class SubdivisionReader {
         let newTimingChange;
         {
             const oldTimingChange = parent.timingChanges[parent.timingChanges.length - 1];
-            newTimingChange = new TimingChange(oldTimingChange.tempo, oldTimingChange.subdivisions);
+            newTimingChange = new TimingChange();
+            newTimingChange.tempo = oldTimingChange.tempo;
+            newTimingChange.subdivisions = oldTimingChange.subdivisions;
         }
 
         newTimingChange.subdivisions = subdivision;

diff --git a/src/internal/syntacticAnalysis/states/tempoReader.ts b/src/internal/syntacticAnalysis/states/tempoReader.ts
@@ -15,7 +15,9 @@ export class TempoReader {
         let newTimingChange;
         {
             const oldTimingChange = parent.timingChanges[parent.timingChanges.length - 1];
-            newTimingChange = new TimingChange(oldTimingChange.tempo, oldTimingChange.subdivisions);
+            newTimingChange = new TimingChange();
+            newTimingChange.tempo = oldTimingChange.tempo;
+            newTimingChange.subdivisions = oldTimingChange.subdivisions;
         }
 
         newTimingChange.tempo = tempo;

diff --git a/src/internal/syntacticAnalysis/timingChange.ts b/src/internal/syntacticAnalysis/timingChange.ts
@@ -1,7 +1,7 @@
 export class TimingChange {
     public time: number = 0;
-    public tempo: number;
-    public subdivisions: number;
+    public tempo: number = 0;
+    public subdivisions: number = 0;
 
     get secondsPerBar(): number {
         // could use || here since number is falsy if 0
@@ -13,11 +13,6 @@ export class TimingChange {
         return this.secondsPerBar / ((this.subdivisions === 0 ? 4 : this.subdivisions) / 4);
     }
 
-    constructor(tempo: number, subdivisions: number = 4) {
-        this.tempo = tempo;
-        this.subdivisions = subdivisions;
-    }
-
     public setSeconds(value: number) {
         this.tempo = 60 / value;
         this.subdivisions = 4;