DrawHitObjectEffectHelper support hold judge

Author: MikiraSora

OngekiFumenEditor/Base/OngekiObjects/Hold.cs

@@ -118,12 +118,12 @@ public void CopyEntire(Hold from)
             }
         }
 
-        public IEnumerable<TGrid> CalculateJudgeTGrid(BpmList bpmList, int progressJudgeBpm)
+        public IEnumerable<TGrid> CalculateJudgeTGrid(BpmList bpmList, float progressJudgeBpm)
         {
             return CalculateJudgeTGrid(TGrid, EndTGrid, bpmList, progressJudgeBpm);
         }
 
-        public IEnumerable<TGrid> CalculateJudgeTGrid(TGrid minTGrid, TGrid maxTGrid, BpmList bpmList, int progressJudgeBpm)
+        public IEnumerable<TGrid> CalculateJudgeTGrid(TGrid minTGrid, TGrid maxTGrid, BpmList bpmList, float progressJudgeBpm)
         {
             int CalcHoldTickStepSize(double bpm)
             {
@@ -157,11 +157,20 @@ int CalcHoldTickStepSize(double bpm)
                 var bpm = bpmList.GetBpm(curTGrid);
                 var nextTGrid = bpmList.GetNextBpm(curTGrid)?.TGrid ?? TGrid.MaxValue;
 
+                //minTGrid is between this bpm and the next, so we could start to enumerate them from this bpm
                 if (bpm.TGrid <= minTGrid && minTGrid <= nextTGrid)
                 {
                     var tickGrid = CalcHoldTickStepSize(bpm.BPM);
-                    curTGrid = holdStartTGrid + new GridOffset(0, tickGrid);
+                    curTGrid = curTGrid + new GridOffset(0, tickGrid);
 
+                    //skip to minTGrid
+                    while (curTGrid < minTGrid)
+                    {
+                        tickGrid = CalcHoldTickStepSize(bpm.BPM);
+                        curTGrid = curTGrid + new GridOffset(0, tickGrid);
+                    }
+
+                    //enumerate until hold end or maxTGrid
                     while (curTGrid < holdEndTGrid && curTGrid < maxTGrid)
                     {
                         yield return curTGrid;
@@ -171,9 +180,11 @@ int CalcHoldTickStepSize(double bpm)
                         curTGrid = curTGrid + new GridOffset(0, tickGrid);
                     }
 
+                    //finally check if need to yield hold end
                     if (maxTGrid >= holdEndTGrid && curTGrid >= holdEndTGrid)
                         yield return holdEndTGrid;
 
+                    //done :D
                     break;
                 }
                 else

OngekiFumenEditor/Modules/FumenVisualEditor/Graphics/Drawing/Editors/DrawHitObjectEffectHelper.cs

@@ -1,4 +1,5 @@
 using OngekiFumenEditor.Base;
+using OngekiFumenEditor.Base.OngekiObjects;
 using OngekiFumenEditor.Kernel.Graphics;
 using OngekiFumenEditor.Utils;
 using System;
@@ -46,7 +47,7 @@ public void Draw(IFumenEditorDrawingContext target)
 
             var y = (float)target.ConvertToY_DefaultSoflanGroup(maxTGrid);
 
-            void drawColorCircle(float progress, Vector2 pos, Vector4 solidColor, float radius)
+            void drawColorCircle(float progress, Vector2 pos, Vector4 solidColor, float radius, bool showHollow = true)
             {
                 progress = Math.Clamp(progress, 0, 1);
 
@@ -61,7 +62,8 @@ void drawColorCircle(float progress, Vector2 pos, Vector4 solidColor, float radi
                 var hollowColor = new Vector4(solidColor.X, solidColor.Y, solidColor.Z, hollowCircleAlpha);
 
                 circleDrawing.Post(pos, solderColor, true, circleScale);
-                circleDrawing.Post(pos, hollowColor, false, circleScale, 2);
+                if (showHollow)
+                    circleDrawing.Post(pos, hollowColor, false, circleScale, 2);
             }
 
             var hitObjects = Enumerable.Empty<OngekiMovableObjectBase>()
@@ -114,6 +116,26 @@ void drawColorCircle(float progress, Vector2 pos, Vector4 solidColor, float radi
             }
             circleDrawing.End();
 
+            var holdObjects = target.Editor.Fumen.Holds.GetVisibleStartObjects(minTGrid, maxTGrid);
+            circleDrawing.Begin(target);
+            foreach (var hold in holdObjects)
+            {
+                if (hold.ReferenceLaneStart is not { } start)
+                    continue;
+
+                foreach (var judgeTGrid in hold.CalculateJudgeTGrid(minTGrid, maxTGrid, target.Editor.Fumen.BpmList, target.Editor.Fumen.MetaInfo.ProgJudgeBpm))
+                {
+                    var xGrid = start.CalulateXGrid(judgeTGrid);
+                    var x = (float)XGridCalculator.ConvertXGridToX(xGrid, target.Editor);
+                    var p = new Vector2(x, y);
+
+                    var tGrid = judgeTGrid;
+                    var progress = (maxTGrid.TotalGrid * 1.0f - tGrid.TotalGrid) / durationTotalGrid;
+
+                    drawColorCircle(progress, p, Vector4.One, 15, false);
+                }
+            }
+            circleDrawing.End();
         }
     }
 }