implement note painting

Author: flustix

fluXis/Screens/Edit/Tabs/Charting/Blueprints/ChartingBlueprintContainer.cs

@@ -15,6 +15,7 @@
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Input.Events;
 using osuTK;
+using osuTK.Input;
 
 namespace fluXis.Screens.Edit.Tabs.Charting.Blueprints;
 
@@ -134,6 +135,18 @@ private void removePlacement()
         currentPlacement = null;
     }
 
+    protected override bool OnMouseMove(MouseMoveEvent e)
+    {
+        if (currentPlacement is null
+            || !currentPlacement.AllowPainting
+            || !InputManager.CurrentState.Keyboard.ShiftPressed
+            || !InputManager.CurrentState.Mouse.Buttons.Contains(MouseButton.Left))
+            return base.OnMouseMove(e);
+
+        currentPlacement.FinishPlacement(true);
+        return true;
+    }
+
     protected override SelectionBlueprint<ITimedObject> CreateBlueprint(ITimedObject obj)
     {
         SelectionBlueprint<ITimedObject> blueprint = null!;

fluXis/Screens/Edit/Tabs/Charting/Blueprints/Placement/NotePlacementBlueprint.cs

@@ -5,7 +5,6 @@
 using fluXis.Utils;
 using osu.Framework.Allocation;
 using osu.Framework.Input;
-using osu.Framework.Logging;
 
 namespace fluXis.Screens.Edit.Tabs.Charting.Blueprints.Placement;
 
@@ -60,9 +59,6 @@ protected override void OnPlacementFinished(bool commit)
             else
                 clone.Lane += Map.RealmMap.KeyCount;
 
-            Logger.Log(Hit.Serialize());
-            Logger.Log(clone.Serialize());
-
             Actions.Add(new NoteMultiPlaceAction(new[] { Hit, clone }));
             return;
         }

fluXis/Screens/Edit/Tabs/Charting/Blueprints/Placement/PlacementBlueprint.cs

@@ -23,6 +23,8 @@ public partial class PlacementBlueprint : Container
 
     protected virtual ITimePositionProvider PositionProvider => ChartingContainer.Playfields[0];
 
+    public virtual bool AllowPainting => false;
+
     public PlacementState State { get; set; }
     public ITimedObject Object { get; }
 

fluXis/Screens/Edit/Tabs/Charting/Blueprints/Placement/SingleNotePlacementBlueprint.cs

@@ -1,3 +1,4 @@
+using System;
 using System.Linq;
 using fluXis.Screens.Edit.Tabs.Charting.Playfield;
 using osu.Framework.Graphics;
@@ -8,6 +9,8 @@ namespace fluXis.Screens.Edit.Tabs.Charting.Blueprints.Placement;
 
 public partial class SingleNotePlacementBlueprint : NotePlacementBlueprint
 {
+    public override bool AllowPainting => true;
+
     private readonly BlueprintNotePiece piece;
 
     public SingleNotePlacementBlueprint()
@@ -40,7 +43,7 @@ protected override bool OnMouseDown(MouseDownEvent e)
 
     protected override void OnPlacementFinished(bool commit)
     {
-        if (Map.MapInfo.HitObjects.Any(h => (int)h.Time == (int)Hit.Time && h.Lane == Hit.Lane))
+        if (Map.MapInfo.HitObjects.Where(x => x.Lane == Hit.Lane).Any(x => Math.Abs(x.Time - Hit.Time) < 10))
             return;
 
         base.OnPlacementFinished(commit);

fluXis/Screens/Edit/Tabs/Charting/Blueprints/Placement/TickNotePlacementBlueprint.cs

@@ -1,3 +1,4 @@
+using System;
 using System.Linq;
 using fluXis.Screens.Edit.Tabs.Charting.Playfield;
 using osu.Framework.Graphics;
@@ -8,6 +9,7 @@ namespace fluXis.Screens.Edit.Tabs.Charting.Blueprints.Placement;
 
 public partial class TickNotePlacementBlueprint : NotePlacementBlueprint
 {
+    public override bool AllowPainting => true;
     private readonly BlueprintNotePiece piece;
 
     public TickNotePlacementBlueprint()
@@ -42,10 +44,9 @@ protected override bool OnMouseDown(MouseDownEvent e)
 
     protected override void OnPlacementFinished(bool commit)
     {
-        if (Map.MapInfo.HitObjects.Any(h => (int)h.Time == (int)Hit.Time && h.Lane == Hit.Lane))
+        if (Map.MapInfo.HitObjects.Where(x => x.Lane == Hit.Lane).Any(x => Math.Abs(x.Time - Hit.Time) < 10))
             return;
 
         base.OnPlacementFinished(commit);
     }
 }
-