Fixed mask CW/CCW

Goatgarien · Apr 28, 2023 · 8ee60be · 8ee60be
1 parent 3a2854f
commit 8ee60be
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 6 deletions.
diff --git a/BAKKA-Editor/CircleView.cs b/BAKKA-Editor/CircleView.cs
@@ -87,6 +87,11 @@ private float GetTotalMeasureShowNotes(Chart chart)
                 InitialSpeed.HiSpeed = 1.0;
             }
             HispeedChanges.Add(InitialSpeed);
+            //Random todos that im too lazy to put in applicable locations
+            //TODO: Add option to disable hispeed gimmick in visual
+            //TODO: add "time" to notes so we can compare against it every time instead of always calculating what time a note is at
+            //TODO: add function to reevaluate the time of every note when bpm or TS is added/removed.
+
             //add all hispeed changes to list that happen within the current total time to show notes
             float tempTotalTime = ((displayFrames / 60.0f) * 1000.0f);
             float currentTime = chart.GetTime(new BeatInfo(CurrentMeasure));
@@ -100,14 +105,13 @@ private float GetTotalMeasureShowNotes(Chart chart)
                 for (int i = 0; i < HispeedChanges.Count; i++)
                 {
                     float timeDiff;
-                    float itemTime;
+                    float itemTime = chart.GetTime(HispeedChanges[i].BeatInfo);
                     float modifiedTime;
-                    if (chart.GetTime(HispeedChanges[i].BeatInfo) <= (tempTotalTime + currentTime))
+                    if (itemTime <= (tempTotalTime + currentTime))
                     {
                         if (i == 0)
                             itemTime = currentTime;
-                        else
-                            itemTime = chart.GetTime(HispeedChanges[i].BeatInfo);
+
                         if (i != HispeedChanges.Count - 1)
                         {
                             float tempTestITimeDiff = (currentTime + tempTotalTime) - itemTime;

diff --git a/BAKKA-Editor/Enums.cs b/BAKKA-Editor/Enums.cs
@@ -52,8 +52,8 @@ internal enum GimmickType
 
 	internal enum MaskType
     {
-		Clockwise = 0,
-		CounterClockwise = 1,
+		Clockwise = 1,
+		CounterClockwise = 0,
 		Center = 2
     }