update startup min size

Hispeed setting now mostly matches wacca hispeed.
hispeed gimmicks also show up in visual
hispeed setting also saves between launches

BAKKA-Editor/BAKKA-Editor.csproj

@@ -7,9 +7,9 @@
     <Nullable>enable</Nullable>
     <UseWindowsForms>true</UseWindowsForms>
     <ImplicitUsings>enable</ImplicitUsings>
-    <Version>$(VersionPrefix)2.0.0</Version>
+    <Version>$(VersionPrefix)2.1.6</Version>
     <AssemblyVersion>1.0.0.0</AssemblyVersion>
-    <FileVersion>2.0.0</FileVersion>
+    <FileVersion>2.1.6</FileVersion>
     <Company>Goatgarien</Company>
     <Copyright>2022</Copyright>
     <StartupObject>BAKKA_Editor.Program</StartupObject>

BAKKA-Editor/Chart.cs

@@ -257,10 +257,14 @@ namespace BAKKA_Editor
             TimeEvents[0].StartTime = Offset * 1000.0;
             for (int i = 1; i < TimeEvents.Count; i++)
             {
-                TimeEvents[i].StartTime = ((TimeEvents[i].Measure - TimeEvents[i - 1].Measure) * 4 * TimeEvents[i - 1].TimeSig.Ratio * 60000.0 / TimeEvents[i].BPM) + TimeEvents[i - 1].StartTime;
+                TimeEvents[i].StartTime = ((TimeEvents[i].Measure - TimeEvents[i - 1].Measure) * (4.0f * TimeEvents[i - 1].TimeSig.Ratio * (60000.0 / TimeEvents[i - 1].BPM))) + TimeEvents[i - 1].StartTime;
             }
         }
-
+        /*
+        ((60000.0 / evt.BPM) * 4.0 * evt.TimeSig.Ratio) * measure = time
+        time / ((60000.0 / evt.BPM) * 4.0 * evt.TimeSig.Ratio) = measure
+        */
+        
         /// <summary>
         /// Translate clock time to beats
         /// </summary>
@@ -274,7 +278,7 @@ namespace BAKKA_Editor
             var evt = TimeEvents.Where(x => time >= x.StartTime).LastOrDefault();
             if (evt == null)
                 evt = TimeEvents[0];
-            return new BeatInfo((float)(evt.BPM * (time - evt.StartTime) / (60000.0f * evt.TimeSig.Ratio * 4)) + evt.Measure);
+            return new BeatInfo((float)((time - evt.StartTime) / ((60000.0 / evt.BPM) * 4.0f * evt.TimeSig.Ratio) + evt.Measure));
         }
 
         /// <summary>
@@ -290,7 +294,7 @@ namespace BAKKA_Editor
             var evt = TimeEvents.Where(x => beat.MeasureDecimal >= x.Measure).LastOrDefault();
             if (evt == null)
                 evt = TimeEvents[0];
-            return (int)((60000.0 * 4.0 * evt.TimeSig.Ratio / evt.BPM) * (beat.MeasureDecimal - evt.Measure) + evt.StartTime);
+            return (int)(((60000.0 / evt.BPM) * 4.0f * evt.TimeSig.Ratio) * (beat.MeasureDecimal - evt.Measure) + evt.StartTime);
         }
     }
-}
+}

BAKKA-Editor/CircleView.cs

@@ -4,6 +4,8 @@ using System.Linq;
 using System.Text;
 using System.Drawing.Drawing2D;
 using System.Threading.Tasks;
+using static System.Windows.Forms.VisualStyles.VisualStyleElement.TaskbarClock;
+using System.ComponentModel;
 
 namespace BAKKA_Editor
 {
@@ -15,10 +17,7 @@ namespace BAKKA_Editor
         public PointF CenterPoint { get; private set; }
         public float Radius { get; private set; }
         public float CurrentMeasure { get; set; }
-        /// <summary>
-        /// Number of measures in the future that are visible
-        /// </summary>
-        public float TotalMeasureShowNotes { get; set; } = 0.5f;
+        public float Hispeed { get; set; } = 1.5f;
 
         // Pens and Brushes
         public Pen BasePen { get; set; }
@@ -74,11 +73,103 @@ namespace BAKKA_Editor
             FlairPen = new Pen(Color.FromArgb(FlairTransparency, Color.Yellow), PanelSize.Width * 8.0f / 600.0f);
         }
 
-        private ArcInfo GetScaledRect(float objectTime)
+        private float GetTotalMeasureShowNotes(Chart chart)
+        {
+            //Convert hispeed to frames
+            float displayFrames = 73.0f - ((Hispeed - 1.5f) * 10.0f);
+            //Account for hispeed gimmick
+            List<Gimmick> HispeedChanges = new List<Gimmick>();
+            Gimmick InitialSpeed = chart.Gimmicks.Where(x => x.GimmickType == GimmickType.HiSpeedChange && CurrentMeasure > x.Measure).LastOrDefault();
+            //Add initial hispeed to list
+            if (InitialSpeed == null)
+            {
+                InitialSpeed = new Gimmick();
+                InitialSpeed.HiSpeed = 1.0;
+            }
+            HispeedChanges.Add(InitialSpeed);
+            //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));
+            float tempEndTime = currentTime + tempTotalTime;
+            HispeedChanges.AddRange(chart.Gimmicks.Where(
+                x => x.Measure >= CurrentMeasure
+                && chart.GetTime(new BeatInfo(x.Measure)) < tempEndTime
+                && x.GimmickType == GimmickType.HiSpeedChange).ToList());
+            if (HispeedChanges.Count > 1)
+            {
+                for (int i = 0; i < HispeedChanges.Count; i++)
+                {
+                    float timeDiff;
+                    float itemTime;
+                    float modifiedTime;
+                    if (chart.GetTime(HispeedChanges[i].BeatInfo) <= (tempTotalTime + currentTime))
+                    {
+                        if (i == 0)
+                            itemTime = currentTime;
+                        else
+                            itemTime = chart.GetTime(HispeedChanges[i].BeatInfo);
+                        if (i != HispeedChanges.Count - 1)
+                        {
+                            float tempTestITimeDiff = (currentTime + tempTotalTime) - itemTime;
+                            float tempTestIModifiedTime = (tempTestITimeDiff) / (float)(HispeedChanges[i].HiSpeed);
+                            if ((currentTime + tempTotalTime - tempTestITimeDiff + tempTestIModifiedTime) < chart.GetTime(HispeedChanges[i + 1].BeatInfo))
+                            {
+                                timeDiff = (currentTime + tempTotalTime) - itemTime;
+                                modifiedTime = timeDiff / (float)HispeedChanges[i].HiSpeed;
+                            }
+                            else
+                            {
+                                timeDiff = chart.GetTime(HispeedChanges[i + 1].BeatInfo) - itemTime;
+                                modifiedTime = timeDiff / (float)HispeedChanges[i].HiSpeed;
+                            }
+                        }
+                        else
+                        {
+                            timeDiff = (currentTime + tempTotalTime) - itemTime;
+                            modifiedTime = timeDiff / (float)HispeedChanges[i].HiSpeed;
+                        }
+                        tempTotalTime = tempTotalTime - timeDiff + modifiedTime;
+                    }
+                }
+            }
+            else
+            {
+                tempTotalTime /= (float)HispeedChanges[0].HiSpeed;
+            }
+            //convert total time to total measure
+            tempEndTime = currentTime + tempTotalTime;
+            BeatInfo EndMeasure = chart.GetBeat(tempEndTime);
+            return EndMeasure.MeasureDecimal - CurrentMeasure;
+        }
+
+        private float GetNoteScaleFromMeasure(Chart chart, float objectTime)
+        {
+            // Scale from 0-1
+            float objectTimeAsTime      = chart.GetTime(new BeatInfo(objectTime));
+            float currentTime           = chart.GetTime(new BeatInfo(CurrentMeasure));
+            float EndTimeShowNotes    = chart.GetTime(new BeatInfo(CurrentMeasure + GetTotalMeasureShowNotes(chart)));
+            float notescaleInit;
+            var LatestHispeedChange = chart.Gimmicks.Where(x => x.GimmickType == GimmickType.HiSpeedChange && CurrentMeasure >= x.Measure).LastOrDefault();
+            if (LatestHispeedChange != null && LatestHispeedChange.HiSpeed < 0.0)
+            {
+                //Reverse
+                notescaleInit = (objectTimeAsTime - currentTime) / (EndTimeShowNotes - currentTime);
+            }
+            else
+            {
+                //Normal
+                notescaleInit = 1 - ((objectTimeAsTime - currentTime) / (EndTimeShowNotes - currentTime));
+            }
+            //Scale math
+            notescaleInit = 0.001f + (float)Math.Pow(notescaleInit, 3.0f) - (0.501f * (float)Math.Pow(notescaleInit, 2.0f)) + (0.5f * notescaleInit);
+            return notescaleInit;
+        }
+
+        private ArcInfo GetScaledRect(Chart chart, float objectTime)
         {
             ArcInfo info = new();
-            float notescaleInit = 1 - ((objectTime - CurrentMeasure) * (1 / TotalMeasureShowNotes));  // Scale from 0-1
-            info.NoteScale = (float)Math.Pow(10.0f, notescaleInit) / 10.0f;
+
+            info.NoteScale = GetNoteScaleFromMeasure(chart, objectTime);
             float scaledRectSize = DrawRect.Width * info.NoteScale;
             float scaledRadius = scaledRectSize / 2.0f;
             info.Rect = new RectangleF(
@@ -89,9 +180,9 @@ namespace BAKKA_Editor
             return info;
         }
 
-        private ArcInfo GetArcInfo(Note note)
+        private ArcInfo GetArcInfo(Chart chart, Note note)
         {
-            ArcInfo info = GetScaledRect(note.Measure);
+            ArcInfo info = GetScaledRect(chart, note.Measure);
             info.StartAngle = -note.Position * 6;
             info.ArcLength = -note.Size * 6;
             if(info.ArcLength != -360)
@@ -191,15 +282,15 @@ namespace BAKKA_Editor
             }
         }
 
-        public void DrawCircle()
+        public void DrawCircle(Chart chart)
         {
             // Switch drawing modes
             bufGraphics.Graphics.SmoothingMode = System.Drawing.Drawing2D.SmoothingMode.AntiAlias;
 
             // Draw measure circle
-            for (float meas = (float)Math.Ceiling(CurrentMeasure); (meas - CurrentMeasure) < TotalMeasureShowNotes; meas += 1.0f)
+            for (float meas = (float)Math.Ceiling(CurrentMeasure); (meas - CurrentMeasure) < GetTotalMeasureShowNotes(chart); meas += 1.0f)
             {
-                var info = GetScaledRect(meas);
+                var info = GetScaledRect(chart, meas);
                 if (info.Rect.Width >= 1)
                 {
                     bufGraphics.Graphics.DrawEllipse(BeatPen, info.Rect);
@@ -248,11 +339,11 @@ namespace BAKKA_Editor
             {
                 List<Gimmick> drawGimmicks = chart.Gimmicks.Where(
                 x => x.Measure >= CurrentMeasure
-                && x.Measure <= (CurrentMeasure + TotalMeasureShowNotes)).ToList();
+                && x.Measure <= (CurrentMeasure + GetTotalMeasureShowNotes(chart))).ToList();
 
                 foreach (var gimmick in drawGimmicks)
                 {
-                    var info = GetScaledRect(gimmick.Measure);
+                    var info = GetScaledRect(chart, gimmick.Measure);
 
                     if (info.Rect.Width >= 1)
                     {
@@ -264,19 +355,19 @@ namespace BAKKA_Editor
 
         public void DrawHolds(Chart chart, bool highlightSelectedNote, int selectedNoteIndex)
         {
-            ArcInfo currentInfo = GetScaledRect(CurrentMeasure);
-            ArcInfo endInfo = GetScaledRect(CurrentMeasure + TotalMeasureShowNotes);
+            ArcInfo currentInfo = GetScaledRect(chart, CurrentMeasure);
+            ArcInfo endInfo = GetScaledRect(chart, CurrentMeasure + GetTotalMeasureShowNotes(chart));
 
             // First, draw holes that start before the viewpoint and have nodes that end after
             List<Note> holdNotes = chart.Notes.Where(
                 x => x.Measure < CurrentMeasure
                 && x.NextNote != null
-                && x.NextNote.Measure > (CurrentMeasure + TotalMeasureShowNotes)
+                && x.NextNote.Measure > (CurrentMeasure + GetTotalMeasureShowNotes(chart))
                 && x.IsHold).ToList();
             foreach (var note in holdNotes)
             {
-                ArcInfo info = GetArcInfo(note);
-                ArcInfo nextInfo = GetArcInfo((Note)note.NextNote);
+                ArcInfo info = GetArcInfo(chart, note);
+                ArcInfo nextInfo = GetArcInfo(chart, (Note)note.NextNote);
                 //GraphicsPath path = new GraphicsPath();
                 //path.AddArc(endInfo.Rect, info.StartAngle, info.ArcLength);
                 //path.AddArc(currentInfo.Rect, info.StartAngle + info.ArcLength, -info.ArcLength);
@@ -323,16 +414,16 @@ namespace BAKKA_Editor
             // Second, draw all the notes on-screen
             holdNotes = chart.Notes.Where(
             x => x.Measure >= CurrentMeasure
-               && x.Measure <= (CurrentMeasure + TotalMeasureShowNotes)
+               && x.Measure <= (CurrentMeasure + GetTotalMeasureShowNotes(chart))
                && x.IsHold).ToList();
             foreach (var note in holdNotes)
             {
-                ArcInfo info = GetArcInfo(note);
+                ArcInfo info = GetArcInfo(chart, note);
 
                 // If the previous note is off-screen, this case handles that
                 if (note.PrevNote != null && note.PrevNote.Measure < CurrentMeasure)
                 {
-                    ArcInfo prevInfo = GetArcInfo((Note)note.PrevNote);
+                    ArcInfo prevInfo = GetArcInfo(chart, (Note)note.PrevNote);
                     float ratio = (currentInfo.Rect.Width - info.Rect.Width) / (prevInfo.Rect.Width - info.Rect.Width);
                     float startNoteAngle = info.StartAngle;
                     float endNoteAngle = prevInfo.StartAngle;
@@ -356,9 +447,9 @@ namespace BAKKA_Editor
                 }
 
                 // If the next note is on-screen, this case handles that
-                if (note.NextNote != null && note.NextNote.Measure <= (CurrentMeasure + TotalMeasureShowNotes))
+                if (note.NextNote != null && note.NextNote.Measure <= (CurrentMeasure + GetTotalMeasureShowNotes(chart)))
                 {
-                    ArcInfo nextInfo = GetArcInfo((Note)note.NextNote);
+                    ArcInfo nextInfo = GetArcInfo(chart, (Note)note.NextNote);
                     GraphicsPath path = new GraphicsPath();
                     path.AddArc(info.Rect, info.StartAngle, info.ArcLength);
                     path.AddArc(nextInfo.Rect, nextInfo.StartAngle + nextInfo.ArcLength, -nextInfo.ArcLength);
@@ -366,9 +457,9 @@ namespace BAKKA_Editor
                 }
 
                 // If the next note is off-screen, this case handles that
-                if (note.NextNote != null && note.NextNote.Measure > (CurrentMeasure + TotalMeasureShowNotes))
+                if (note.NextNote != null && note.NextNote.Measure > (CurrentMeasure + GetTotalMeasureShowNotes(chart)))
                 {
-                    ArcInfo nextInfo = GetArcInfo((Note)note.NextNote);
+                    ArcInfo nextInfo = GetArcInfo(chart, (Note)note.NextNote);
                     float ratio = (endInfo.Rect.Width - nextInfo.Rect.Width) / (info.Rect.Width - nextInfo.Rect.Width);
                     float startNoteAngle = nextInfo.StartAngle;
                     float endNoteAngle = info.StartAngle;
@@ -416,11 +507,11 @@ namespace BAKKA_Editor
         {
             List<Note> drawNotes = chart.Notes.Where(
             x => x.Measure >= CurrentMeasure
-            && x.Measure <= (CurrentMeasure + TotalMeasureShowNotes)
+            && x.Measure <= (CurrentMeasure + GetTotalMeasureShowNotes(chart))
             && !x.IsHold && !x.IsMask).ToList();
             foreach (var note in drawNotes)
             {
-                ArcInfo info = GetArcInfo(note);
+                ArcInfo info = GetArcInfo(chart, note);
 
                 if (info.Rect.Width >= 1)
                 {

BAKKA-Editor/GimmickForm.cs

@@ -36,7 +36,7 @@ namespace BAKKA_Editor
         internal DialogResult Show(
             Gimmick baseGimmick, FormReason reason, Gimmick? gim1 = null, Gimmick? gim2 = null)
         {
-            var quant = Utils.GetQuantization(baseGimmick.BeatInfo.Beat, 16);
+            var quant = Utils.GetQuantization(baseGimmick.BeatInfo.Beat, 12);
 
             gimmick = new Gimmick();
             gimmick.BeatInfo = new BeatInfo(baseGimmick.BeatInfo);
@@ -46,15 +46,15 @@ namespace BAKKA_Editor
             {
                 case GimmickType.BpmChange:
                     startMeasureNumeric.Value = gimmick.BeatInfo.Measure;
-                    startBeat1Numeric.Value = quant.Item1;
                     startBeat2Numeric.Value = quant.Item2;
+                    startBeat1Numeric.Value = quant.Item1;
                     if (reason == FormReason.Edit)
                         gimmickBpmNumeric.Value = (decimal)baseGimmick.BPM;
                     break;
                 case GimmickType.TimeSignatureChange:
                     startMeasureNumeric.Value = gimmick.BeatInfo.Measure;
-                    startBeat1Numeric.Value = quant.Item1;
                     startBeat2Numeric.Value = quant.Item2;
+                    startBeat1Numeric.Value = quant.Item1;
                     if (reason == FormReason.Edit)
                     {
                         timeSig1Numeric.Value = baseGimmick.TimeSig.Upper;
@@ -63,73 +63,73 @@ namespace BAKKA_Editor
                     break;
                 case GimmickType.HiSpeedChange:
                     startMeasureNumeric.Value = gimmick.BeatInfo.Measure;
-                    startBeat1Numeric.Value = quant.Item1;
                     startBeat2Numeric.Value = quant.Item2;
+                    startBeat1Numeric.Value = quant.Item1;
                     if (reason == FormReason.Edit)
                         hiSpeedNumeric.Value = (decimal)baseGimmick.HiSpeed;
                     break;
                 case GimmickType.ReverseStart:
                     startMeasureNumeric.Value = gimmick.BeatInfo.Measure;
-                    startBeat1Numeric.Value = quant.Item1;
                     startBeat2Numeric.Value = quant.Item2;
+                    startBeat1Numeric.Value = quant.Item1;
                     if (reason == FormReason.Edit && gim1 != null && gim2 != null)
                     {
-                        var quantMid1 = Utils.GetQuantization(gim1.BeatInfo.Beat, 16);
-                        var quantEnd1 = Utils.GetQuantization(gim2.BeatInfo.Beat, 16);
+                        var quantMid1 = Utils.GetQuantization(gim1.BeatInfo.Beat, 12);
+                        var quantEnd1 = Utils.GetQuantization(gim2.BeatInfo.Beat, 12);
                         revEnd1MeasureNumeric.Value = gim1.BeatInfo.Measure;
-                        revEnd1Beat1Numeric.Value = quantMid1.Item1;
                         revEnd1Beat2Numeric.Value = quantMid1.Item2;
+                        revEnd1Beat1Numeric.Value = quantMid1.Item1;
                         revEnd2MeasureNumeric.Value = gim2.BeatInfo.Measure;
-                        revEnd2Beat1Numeric.Value = quantEnd1.Item1;
                         revEnd2Beat2Numeric.Value = quantEnd1.Item2;
+                        revEnd2Beat1Numeric.Value = quantEnd1.Item1;
                     }
                     break;
                 case GimmickType.ReverseMiddle:
-                    var quantStart2 = Utils.GetQuantization(gim1.BeatInfo.Beat, 16);
-                    var quantEnd2 = Utils.GetQuantization(gim2.BeatInfo.Beat, 16);
-                    startMeasureNumeric.Value = gim1.BeatInfo.Measure; 
-                    startBeat1Numeric.Value = quantStart2.Item1;
+                    var quantStart2 = Utils.GetQuantization(gim1.BeatInfo.Beat, 12);
+                    var quantEnd2 = Utils.GetQuantization(gim2.BeatInfo.Beat, 12);
+                    startMeasureNumeric.Value = gim1.BeatInfo.Measure;
                     startBeat2Numeric.Value = quantStart2.Item2;
+                    startBeat1Numeric.Value = quantStart2.Item1;
                     revEnd1MeasureNumeric.Value = gimmick.BeatInfo.Measure;
-                    revEnd1Beat1Numeric.Value = quant.Item1;
                     revEnd1Beat2Numeric.Value = quant.Item2;
+                    revEnd1Beat1Numeric.Value = quant.Item1;
                     revEnd2MeasureNumeric.Value = gim2.BeatInfo.Measure;
-                    revEnd2Beat1Numeric.Value = quantEnd2.Item1;
                     revEnd2Beat2Numeric.Value = quantEnd2.Item2;
+                    revEnd2Beat1Numeric.Value = quantEnd2.Item1;
                     break;
                 case GimmickType.ReverseEnd:
-                    var quantStart3 = Utils.GetQuantization(gim1.BeatInfo.Beat, 16);
-                    var quantMid3 = Utils.GetQuantization(gim2.BeatInfo.Beat, 16);
+                    var quantStart3 = Utils.GetQuantization(gim1.BeatInfo.Beat, 12);
+                    var quantMid3 = Utils.GetQuantization(gim2.BeatInfo.Beat, 12);
                     startMeasureNumeric.Value = gim1.BeatInfo.Measure;
-                    startBeat1Numeric.Value = quantStart3.Item1;
                     startBeat2Numeric.Value = quantStart3.Item2;
-                    revEnd1MeasureNumeric.Value = gim2.BeatInfo.Measure; 
-                    revEnd1Beat1Numeric.Value = quantMid3.Item1;
+                    startBeat1Numeric.Value = quantStart3.Item1;
+                    revEnd1MeasureNumeric.Value = gim2.BeatInfo.Measure;
                     revEnd1Beat2Numeric.Value = quantMid3.Item2;
+                    revEnd1Beat1Numeric.Value = quantMid3.Item1;
                     revEnd2MeasureNumeric.Value = gimmick.BeatInfo.Measure;
-                    revEnd2Beat1Numeric.Value = quant.Item1;
                     revEnd2Beat2Numeric.Value = quant.Item2;
+                    revEnd2Beat1Numeric.Value = quant.Item1;
                     break;
                 case GimmickType.StopStart:
                     startMeasureNumeric.Value = gimmick.BeatInfo.Measure;
-                    startBeat1Numeric.Value = quant.Item1;
                     startBeat2Numeric.Value = quant.Item2;
+                    startBeat1Numeric.Value = quant.Item1;
                     if (reason == FormReason.Edit)
                     {
-                        var stopEnd = Utils.GetQuantization(gim1.BeatInfo.Beat, 16);
+                        var stopEnd = Utils.GetQuantization(gim1.BeatInfo.Beat, 12);
                         stopEndMeasureNumeric.Value = gim1.BeatInfo.Measure;
-                        stopEndBeat1Numeric.Value = stopEnd.Item1;
                         stopEndBeat2Numeric.Value = stopEnd.Item2;
+                        stopEndBeat1Numeric.Value = stopEnd.Item1;
                     }
                     break;
                 case GimmickType.StopEnd:
-                    var stopStart = Utils.GetQuantization(gim1.BeatInfo.Beat, 16);
+                    var stopStart = Utils.GetQuantization(gim1.BeatInfo.Beat, 12);
                     startMeasureNumeric.Value = gim1.BeatInfo.Measure;
-                    startBeat1Numeric.Value = stopStart.Item1;
                     startBeat2Numeric.Value = stopStart.Item2;
+                    startBeat1Numeric.Value = stopStart.Item1;
                     stopEndMeasureNumeric.Value = gimmick.BeatInfo.Measure;
-                    stopEndBeat1Numeric.Value = quant.Item1;
                     stopEndBeat2Numeric.Value = quant.Item2;
+                    stopEndBeat1Numeric.Value = quant.Item1;
                     break;
                 default:
                     break;

BAKKA-Editor/InitChartSettingsForm.Designer.cs

@@ -96,6 +96,11 @@
             0,
             0,
             0});
+            this.initOffsetNumeric.Minimum = new decimal(new int[] {
+            9999,
+            0,
+            0,
+            -2147483648});
             this.initOffsetNumeric.Name = "initOffsetNumeric";
             this.initOffsetNumeric.Size = new System.Drawing.Size(100, 23);
             this.initOffsetNumeric.TabIndex = 26;

BAKKA-Editor/MainForm.Designer.cs

@@ -100,6 +100,7 @@
             this.showCursorDuringPlaybackToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
             this.highlightViewedNoteToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
             this.selectLastInsertedNoteToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+            this.showGimmicksInCircleViewToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
             this.chartToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
             this.initialChartSettingsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
             this.aboutToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
@@ -140,7 +141,6 @@
             this.noteNextButton = new System.Windows.Forms.Button();
             this.notePrevButton = new System.Windows.Forms.Button();
             this.autoSaveTimer = new System.Windows.Forms.Timer(this.components);
-            this.showGimmicksInCircleViewToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
             this.groupBox1.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)(this.beat2Numeric)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.beat1Numeric)).BeginInit();
@@ -290,12 +290,12 @@
             | System.Windows.Forms.AnchorStyles.Right)));
             this.sizeTrackBar.Location = new System.Drawing.Point(50, 81);
             this.sizeTrackBar.Maximum = 60;
-            this.sizeTrackBar.Minimum = 1;
+            this.sizeTrackBar.Minimum = 4;
             this.sizeTrackBar.Name = "sizeTrackBar";
             this.sizeTrackBar.Size = new System.Drawing.Size(183, 45);
             this.sizeTrackBar.TabIndex = 5;
             this.sizeTrackBar.TickStyle = System.Windows.Forms.TickStyle.None;
-            this.sizeTrackBar.Value = 1;
+            this.sizeTrackBar.Value = 4;
             this.sizeTrackBar.ValueChanged += new System.EventHandler(this.sizeTrackBar_ValueChanged);
             // 
             // sizeNumeric
@@ -307,7 +307,7 @@
             0,
             0});
             this.sizeNumeric.Minimum = new decimal(new int[] {
-            1,
+            4,
             0,
             0,
             0});
@@ -315,7 +315,7 @@
             this.sizeNumeric.Size = new System.Drawing.Size(38, 23);
             this.sizeNumeric.TabIndex = 4;
             this.sizeNumeric.Value = new decimal(new int[] {
-            1,
+            4,
             0,
             0,
             0});
@@ -846,12 +846,13 @@
             // 
             this.visualHispeedNumeric.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
             | System.Windows.Forms.AnchorStyles.Right)));
-            this.visualHispeedNumeric.DecimalPlaces = 2;
+            this.visualHispeedNumeric.DecimalPlaces = 1;
+            this.visualHispeedNumeric.Font = new System.Drawing.Font("Segoe UI", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point);
             this.visualHispeedNumeric.Increment = new decimal(new int[] {
-            5,
+            1,
             0,
             0,
-            131072});
+            65536});
             this.visualHispeedNumeric.Location = new System.Drawing.Point(6, 37);
             this.visualHispeedNumeric.Maximum = new decimal(new int[] {
             500,
@@ -862,12 +863,13 @@
             1,
             0,
             0,
-            196608});
+            65536});
             this.visualHispeedNumeric.Name = "visualHispeedNumeric";
-            this.visualHispeedNumeric.Size = new System.Drawing.Size(102, 23);
+            this.visualHispeedNumeric.Size = new System.Drawing.Size(102, 29);
             this.visualHispeedNumeric.TabIndex = 11;
+            this.visualHispeedNumeric.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
             this.visualHispeedNumeric.Value = new decimal(new int[] {
-            5,
+            15,
             0,
             0,
             65536});
@@ -982,6 +984,16 @@
             this.selectLastInsertedNoteToolStripMenuItem.Size = new System.Drawing.Size(233, 22);
             this.selectLastInsertedNoteToolStripMenuItem.Text = "Select Last Inserted Note";
             // 
+            // showGimmicksInCircleViewToolStripMenuItem
+            // 
+            this.showGimmicksInCircleViewToolStripMenuItem.Checked = true;
+            this.showGimmicksInCircleViewToolStripMenuItem.CheckOnClick = true;
+            this.showGimmicksInCircleViewToolStripMenuItem.CheckState = System.Windows.Forms.CheckState.Checked;
+            this.showGimmicksInCircleViewToolStripMenuItem.Name = "showGimmicksInCircleViewToolStripMenuItem";
+            this.showGimmicksInCircleViewToolStripMenuItem.Size = new System.Drawing.Size(233, 22);
+            this.showGimmicksInCircleViewToolStripMenuItem.Text = "Show Gimmicks In Circle View";
+            this.showGimmicksInCircleViewToolStripMenuItem.Click += new System.EventHandler(this.showGimmicksInCircleViewToolStripMenuItem_Click);
+            // 
             // chartToolStripMenuItem
             // 
             this.chartToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
@@ -1392,16 +1404,6 @@
             // 
             this.autoSaveTimer.Tick += new System.EventHandler(this.autoSaveTimer_Tick);
             // 
-            // showGimmicksInCircleViewToolStripMenuItem
-            // 
-            this.showGimmicksInCircleViewToolStripMenuItem.Checked = true;
-            this.showGimmicksInCircleViewToolStripMenuItem.CheckOnClick = true;
-            this.showGimmicksInCircleViewToolStripMenuItem.CheckState = System.Windows.Forms.CheckState.Checked;
-            this.showGimmicksInCircleViewToolStripMenuItem.Name = "showGimmicksInCircleViewToolStripMenuItem";
-            this.showGimmicksInCircleViewToolStripMenuItem.Size = new System.Drawing.Size(233, 22);
-            this.showGimmicksInCircleViewToolStripMenuItem.Text = "Show Gimmicks In Circle View";
-            this.showGimmicksInCircleViewToolStripMenuItem.Click += new System.EventHandler(this.showGimmicksInCircleViewToolStripMenuItem_Click);
-            // 
             // MainForm
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 15F);

BAKKA-Editor/MainForm.cs

@@ -129,6 +129,8 @@ namespace BAKKA_Editor
             highlightViewedNoteToolStripMenuItem.Checked        = userSettings.ViewSettings.HighlightViewedNote;
             showGimmicksInCircleViewToolStripMenuItem.Checked   = userSettings.ViewSettings.ShowGimmicks;
             selectLastInsertedNoteToolStripMenuItem.Checked     = userSettings.ViewSettings.SelectLastInsertedNote;
+            visualHispeedNumeric.Value                          = (decimal)userSettings.ViewSettings.HispeedSetting;
+            trackBarVolume.Value                                = userSettings.ViewSettings.Volume;
             autoSaveTimer.Interval                              = userSettings.SaveSettings.AutoSaveInterval * 60000;
             autoSaveTimer.Enabled = true;
             // Update hotkey labels
@@ -352,6 +354,8 @@ namespace BAKKA_Editor
             userSettings.ViewSettings.HighlightViewedNote       = highlightViewedNoteToolStripMenuItem.Checked;
             userSettings.ViewSettings.ShowGimmicks              = showGimmicksInCircleViewToolStripMenuItem.Checked;
             userSettings.ViewSettings.SelectLastInsertedNote    = selectLastInsertedNoteToolStripMenuItem.Checked;
+            userSettings.ViewSettings.HispeedSetting            = circleView.Hispeed;
+            userSettings.ViewSettings.Volume                    = trackBarVolume.Value;
             userSettings.SaveSettings.AutoSaveInterval          = autoSaveTimer.Interval / 60000;
             //Update user settings.toml
             if (File.Exists("settings.toml"))
@@ -361,43 +365,57 @@ namespace BAKKA_Editor
         private void SetSelectedObject(NoteType type)
         {
             currentNoteType = type;
+            int minSize = 1;
             switch (type)
             {
                 case NoteType.TouchNoBonus:
                     updateLabel("Touch");
+                    minSize = 4;
                     break;
                 case NoteType.TouchBonus:
                     updateLabel("Touch [Bonus]");
+                    minSize = 5;
                     break;
                 case NoteType.SnapRedNoBonus:
                     updateLabel("Snap (R)");
+                    minSize = 6;
                     break;
                 case NoteType.SnapBlueNoBonus:
                     updateLabel("Snap (B)");
+                    minSize = 6;
                     break;
                 case NoteType.SlideOrangeNoBonus:
                     updateLabel("Slide (O)");
+                    minSize = 5;
                     break;
                 case NoteType.SlideOrangeBonus:
                     updateLabel("Slide (O) [Bonus]");
+                    minSize = 7;
                     break;
                 case NoteType.SlideGreenNoBonus:
                     updateLabel("Slide (G)");
+                    minSize = 5;
                     break;
                 case NoteType.SlideGreenBonus:
                     updateLabel("Slide (G) [Bonus]");
+                    minSize = 7;
                     break;
                 case NoteType.HoldStartNoBonus:
                     updateLabel("Hold Start");
+                    minSize = 2;
                     break;
                 case NoteType.HoldJoint:
                     if (endHoldCheck.Checked)
                     {
                         updateLabel("Hold End");
                         currentNoteType = NoteType.HoldEnd;
+                        minSize = 1;
                     }
                     else
+                    {
                         updateLabel("Hold Middle");
+                        minSize = 0;
+                    }
                     break;
                 case NoteType.HoldEnd:
                     endHoldCheck.Checked = true;
@@ -410,6 +428,7 @@ namespace BAKKA_Editor
                         updateLabel("Mask Add (Counter-Clockwise)");
                     else
                         updateLabel("Mask Add (From Center)");
+                    minSize = 1;
                     break;
                 case NoteType.MaskRemove:
                     if (clockwiseMaskRadio.Checked)
@@ -418,38 +437,53 @@ namespace BAKKA_Editor
                         updateLabel("Mask Remove (Counter-Clockwise)");
                     else
                         updateLabel("Mask Remove (From Center)");
+                    minSize = 1;
                     break;
                 case NoteType.EndOfChart:
                     updateLabel("End of Chart");
+                    minSize = 60;
                     break;
                 case NoteType.Chain:
                     updateLabel("Chain");
+                    minSize = 4;
                     break;
                 case NoteType.TouchBonusFlair:
                     updateLabel("Touch [R Note]");
+                    minSize = 6;
                     break;
                 case NoteType.SnapRedBonusFlair:
                     updateLabel("Snap (R) [R Note]");
+                    minSize = 8;
                     break;
                 case NoteType.SnapBlueBonusFlair:
                     updateLabel("Snap (B) [R Note]");
+                    minSize = 8;
                     break;
                 case NoteType.SlideOrangeBonusFlair:
                     updateLabel("Slide (O) [R Note]");
+                    minSize = 10;
                     break;
                 case NoteType.SlideGreenBonusFlair:
                     updateLabel("Slide (G) [R Note]");
+                    minSize = 10;
                     break;
                 case NoteType.HoldStartBonusFlair:
                     updateLabel("Hold Start [R Note]");
+                    minSize = 8;
                     break;
                 case NoteType.ChainBonusFlair:
                     updateLabel("Chain [R Note]");
+                    minSize = 10;
                     break;
                 default:
                     updateLabel("None Selected");
+                    minSize = 1;
                     break;
             }
+            if (sizeNumeric.Value < minSize)    sizeNumeric.Value = minSize;
+            if (sizeTrackBar.Value < minSize)   sizeTrackBar.Value = minSize;
+            sizeNumeric.Minimum = minSize;
+            sizeTrackBar.Minimum = minSize;
             circlePanel.Invalidate();
         }
 
@@ -540,7 +574,7 @@ namespace BAKKA_Editor
             circleView.DrawMasks(chart);
 
             // Draw base and measure circle.
-            circleView.DrawCircle();
+            circleView.DrawCircle(chart);
 
             // Draw degree lines
             circleView.DrawDegreeLines();
@@ -597,7 +631,13 @@ namespace BAKKA_Editor
             }
             updateTime();
             if (currentSong != null && !IsSongPlaying() && valueTriggerEvent != EventSource.TrackBar)
-                songTrackBar.Value = chart.GetTime(new BeatInfo((int)measureNumeric.Value, (int)beat1Numeric.Value * 1920 / (int)beat2Numeric.Value));
+            {
+                int time = chart.GetTime(new BeatInfo((int)measureNumeric.Value, (int)beat1Numeric.Value * 1920 / (int)beat2Numeric.Value));
+                if (time < 0)
+                    songTrackBar.Value = 0;
+                else
+                    songTrackBar.Value = time;
+            }
 
             valueTriggerEvent = EventSource.None;
         }
@@ -975,6 +1015,8 @@ namespace BAKKA_Editor
                     songTrackBar.Value = 0;
                     songTrackBar.Maximum = (int)currentSong.PlayLength;
                     playButton.Enabled = true;
+                    measureNumeric.Value = 0;
+                    beat1Numeric.Value = 0;
                 }
             }
         }
@@ -1022,14 +1064,6 @@ namespace BAKKA_Editor
                 measureNumeric.Value = info.Measure;
                 beat1Numeric.Value = (int)((float)info.Beat / 1920.0f * (float)beat2Numeric.Value);
                 circleView.CurrentMeasure = info.MeasureDecimal;
-
-                // TODO Fix hi-speed (it needs to be able to display multiple hi-speeds in the circle view at once)
-                //// Change hi-speed, if applicable
-                //var hispeed = chart.Gimmicks.Where(x => x.Measure <= info.Measure && x.GimmickType == GimmickType.HiSpeedChange).LastOrDefault();
-                //if (hispeed != null && hispeed.HiSpeed != circleView.TotalMeasureShowNotes)
-                //{
-                //    visualHispeedNumeric.Value = (decimal)hispeed.HiSpeed;
-                //}
             }
             circlePanel.Invalidate();
         }
@@ -1093,6 +1127,8 @@ namespace BAKKA_Editor
                 return;
             }
 
+            int initialSize = (int)sizeNumeric.Value;
+
             // X and Y are relative to the upper left of the panel
             float xCen = e.X - (circlePanel.Width / 2);
             float yCen = -(e.Y - (circlePanel.Height / 2));
@@ -1102,31 +1138,35 @@ namespace BAKKA_Editor
             if (theta == circleView.mouseDownPos)
             {
                 positionNumeric.Value = circleView.mouseDownPos;
-                sizeNumeric.Value = 1;
+                initialSize = 1;
             }
             else if ((theta > circleView.mouseDownPos || circleView.rolloverPos) && !circleView.rolloverNeg)
             {
                 positionNumeric.Value = circleView.mouseDownPos;
                 if (circleView.rolloverPos)
-                    sizeNumeric.Value = (int)Math.Min(theta + 60 - circleView.mouseDownPos + 1, 60);
+                    initialSize = (int)Math.Min(theta + 60 - circleView.mouseDownPos + 1, 60);
                 else
-                    sizeNumeric.Value = theta - circleView.mouseDownPos + 1;
+                    initialSize = theta - circleView.mouseDownPos + 1;
             }
             else if (theta < circleView.mouseDownPos || circleView.rolloverNeg)
             {
                 positionNumeric.Value = theta;
                 if (circleView.rolloverNeg)
-                    sizeNumeric.Value = (int)Math.Min(circleView.mouseDownPos + 60 - theta + 1, 60);
+                    initialSize = (int)Math.Min(circleView.mouseDownPos + 60 - theta + 1, 60);
                 else
-                    sizeNumeric.Value = circleView.mouseDownPos - theta + 1;
+                    initialSize = circleView.mouseDownPos - theta + 1;
             }
 
+            if (initialSize < sizeNumeric.Minimum) sizeNumeric.Value = sizeNumeric.Minimum;
+            else if (initialSize > 60) sizeNumeric.Value = 60;
+            else sizeNumeric.Value = initialSize;
+
             circlePanel.Invalidate();
         }
 
         private void visualHispeedNumeric_ValueChanged(object sender, EventArgs e)
         {
-            circleView.TotalMeasureShowNotes = (float)visualHispeedNumeric.Value;
+            circleView.Hispeed = (float)visualHispeedNumeric.Value;
             circlePanel.Invalidate();
         }
 
@@ -1584,7 +1624,7 @@ namespace BAKKA_Editor
             var gimmick = chart.Gimmicks[selectedGimmickIndex];
 
             gimmickMeasureLabel.Text = gimmick.BeatInfo.Measure.ToString();
-            var quant = Utils.GetQuantization(gimmick.BeatInfo.Beat, 16);
+            var quant = Utils.GetQuantization(gimmick.BeatInfo.Beat, 12);
             gimmickBeatLabel.Text = $"{quant.Item1} / {quant.Item2}";
             gimmickTypeLabel.Text = gimmick.GimmickType.ToLabel();
             switch (gimmick.GimmickType)
@@ -1639,7 +1679,7 @@ namespace BAKKA_Editor
             var note = chart.Notes[selectedNoteIndex];
 
             noteMeasureLabel.Text = note.BeatInfo.Measure.ToString();
-            var quant = Utils.GetQuantization(note.BeatInfo.Beat, 16);
+            var quant = Utils.GetQuantization(note.BeatInfo.Beat, 12);
             noteBeatLabel.Text = $"{quant.Item1} / {quant.Item2}";
             noteTypeLabel.Text = note.NoteType.ToLabel();
             notePositionLabel.Text = note.Position.ToString();

BAKKA-Editor/UserSettings.cs

@@ -20,6 +20,8 @@ namespace BAKKA_Editor
         public bool HighlightViewedNote { get; set; } = true;
         public bool SelectLastInsertedNote { get; set; } = true;
         public bool ShowGimmicks { get; set; } = true;
+        public float HispeedSetting { get; set; } = 1.5f;
+        public int Volume { get; set; } = 100;
     }
 
     internal class SaveSettings

BAKKA-Editor/Utils.cs

@@ -193,11 +193,28 @@ namespace BAKKA_Editor
 
         internal static Tuple<int, int> GetQuantization(int val, int min)
         {
-            while (!HasDecimal((double)(val * min) / 1920.0))
+            int numerator = val;
+            int denominator = 1920;
+
+            int gcd = GetGcd(numerator, denominator);
+
+            numerator /= gcd;
+            denominator /= gcd;
+
+            while (denominator < min)
             {
-                min *= 2;
+                numerator *= 2;
+                denominator *= 2;
             }
-            return new Tuple<int, int>((int)(val * min / 1920.0), min);
+
+            return Tuple.Create(numerator, denominator);
+        }
+
+        private static int GetGcd(int a, int b)
+        {
+            if (b == 0)
+                return a;
+            return GetGcd(b, (int)a % (int)b);
         }
 
         internal static float GetDist(Point a, Point b)