fix another hold rendering bug

Raymonf · Feb 12, 2024 · d92e673 · d92e673
1 parent 562fc9d
commit d92e673
Showing 1 changed file with 10 additions and 7 deletions.
diff --git a/BAKKA_Editor/Rendering/RenderEngine.cs b/BAKKA_Editor/Rendering/RenderEngine.cs
@@ -624,6 +624,14 @@ private void DrawHolds(Chart chart, bool highlightSelectedNote, int selectedNote
 
                 var currentStartAngle = currentInfo.StartAngle;
                 var previousStartAngle = previousInfo.StartAngle;
+                var previousArcAngle = previousInfo.ArcAngle;
+
+                // crop off-screen arc
+                if (note.PrevReferencedNote.Size != 60)
+                {
+                    previousStartAngle += 1.5f;
+                    previousArcAngle -= 3.0f;
+                }
 
                 // handle angles rolling over
                 if (Math.Abs(currentStartAngle - previousStartAngle) > 180)
@@ -636,7 +644,7 @@ private void DrawHolds(Chart chart, bool highlightSelectedNote, int selectedNote
 
                 // calculate new startAngle and arcAngle for intermediate arc
                 var currentEndAngle = currentStartAngle - currentInfo.ArcAngle;
-                var newEndAngle = scaleRatio * (previousStartAngle - previousInfo.ArcAngle - (currentEndAngle)) +
+                var newEndAngle = scaleRatio * (previousStartAngle - previousArcAngle - (currentEndAngle)) +
                                   (currentEndAngle);
 
                 var newStartAngle = scaleRatio * (previousStartAngle - currentStartAngle) + currentStartAngle;
@@ -648,17 +656,12 @@ private void DrawHolds(Chart chart, bool highlightSelectedNote, int selectedNote
                 var arc2StartAngle = newStartAngle + newArcLength;
                 var arc2ArcLength = -newArcLength;
 
-                // crop arcs
+                // crop visible arc
                 if (note.Size != 60)
                 {
                     arc1StartAngle += 1.5f;
                     arc1ArcLength -= 3.0f;
                 }
-                if (note.PrevReferencedNote.Size != 60)
-                {
-                    arc2StartAngle -= 1.5f;
-                    arc2ArcLength += 3.0f;
-                }
 
                 var path = new SKPath();
                 path.ArcTo(currentInfo.Rect, arc1StartAngle, arc1ArcLength, true);