Add curve import/export, add scroll shortcuts

4yn · May 3, 2021 · 97d05e0 · 97d05e0
1 parent 31602e7
commit 97d05e0
Show file tree

Hide file tree

Showing 18 changed files with 154 additions and 18 deletions.
diff --git a/Ched.Core/Notes/Slide.cs b/Ched.Core/Notes/Slide.cs
@@ -129,6 +129,8 @@ public class StepTap : TapBase
             private int tickOffset = 1;
             [Newtonsoft.Json.JsonProperty]
             private bool isVisible = true;
+            [Newtonsoft.Json.JsonProperty]
+            private bool isCurve = false;
 
             public int TickOffset
             {
@@ -147,6 +149,12 @@ public bool IsVisible
                 set { isVisible = value; }
             }
 
+            public bool IsCurve
+            {
+                get { return isCurve; }
+                set { isCurve = value; }
+            }
+
             public override bool IsTap { get { return false; } }
 
             public override int Tick { get { return ParentNote.StartTick + TickOffset; } }

diff --git a/Ched.Drawing/ColorProfile.cs b/Ched.Drawing/ColorProfile.cs
@@ -35,6 +35,7 @@ public class ColorProfile
         public GradientColor HoldColor { get; set; }
         public GradientColor SlideBackgroundColor { get; set; }
         public GradientColor SlideColor { get; set; }
+        public GradientColor SlideCurveColor { get; set; }
         public Color SlideLineColor { get; set; }
         public GradientColor AirActionColor { get; set; }
         public Color AirUpColor { get; set; }

diff --git a/Ched.Drawing/NoteGraphics.cs b/Ched.Drawing/NoteGraphics.cs
@@ -78,6 +78,11 @@ public static void DrawSlideStep(this DrawingContext dc, RectangleF rect)
             dc.Graphics.DrawNote(rect, dc.ColorProfile.SlideColor, dc.ColorProfile.BorderColor);
         }
 
+        public static void DrawSlideCurve(this DrawingContext dc, RectangleF rect)
+        {
+            dc.Graphics.DrawNote(rect, dc.ColorProfile.SlideCurveColor, dc.ColorProfile.BorderColor);
+        }
+
         /// <summary>
         /// SLIDEの背景を描画します。
         /// </summary>

diff --git a/Ched/Ched.csproj b/Ched/Ched.csproj
@@ -470,6 +470,9 @@
   <ItemGroup>
     <None Include="Resources\information.png" />
   </ItemGroup>
+  <ItemGroup>
+    <None Include="Resources\slidecurve.png" />
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <Import Project="..\packages\BASS.Native.2.4.12.2\build\BASS.Native.targets" Condition="Exists('..\packages\BASS.Native.2.4.12.2\build\BASS.Native.targets')" />
   <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">

diff --git a/Ched/Components/Exporter/SusExporter.cs b/Ched/Components/Exporter/SusExporter.cs
@@ -172,8 +172,23 @@ public void Export(Stream stream)
                             Tick = p.Tick,
                             LaneIndex = p.LaneIndex,
                             Width = p.Width,
-                            Type = p.IsVisible ? "3" : "5"
-                        }).Take(slide.Note.StepNotes.Count - 1);
+                            Type = p.IsVisible ? "3" : (p.IsCurve ? "4": "5")
+                        }).Take(slide.Note.StepNotes.Count - 1).ToArray();
+                        // Filter out consecutive curves
+                        var lastStepType = steps[0].Type;
+                        for (int i = 1; i < steps.Count(); i++)
+                        {
+                            if (lastStepType == "4" && steps[i].Type == "4")
+                            {
+                                steps[i] = new {
+                                    Tick = steps[i].Tick,
+                                    LaneIndex = slide.Note.StartLaneIndex,
+                                    Width = slide.Note.StartWidth,
+                                    Type = "5"
+                                };
+                            }
+                            lastStepType = steps[i].Type;
+                        }
                         var endNote = slide.Note.StepNotes.OrderBy(p => p.TickOffset).Last();
                         var end = new[] { new
                         {

diff --git a/Ched/Localization/MainFormStrings.Designer.cs b/Ched/Localization/MainFormStrings.Designer.cs
diff --git a/Ched/Localization/MainFormStrings.en.resx b/Ched/Localization/MainFormStrings.en.resx
@@ -321,4 +321,7 @@
   <data name="FollowWhenPlaying" xml:space="preserve">
     <value>Scroll When Playing</value>
   </data>
+  <data name="SlideCurve" xml:space="preserve">
+    <value>SLIDE (CURVE)</value>
+  </data>
 </root>
diff --git a/Ched/Localization/MainFormStrings.resx b/Ched/Localization/MainFormStrings.resx
@@ -321,4 +321,7 @@
   <data name="FollowWhenPlaying" xml:space="preserve">
     <value>再生時にスクロール</value>
   </data>
+  <data name="SlideCurve" xml:space="preserve">
+    <value>SLIDE(湾曲)</value>
+  </data>
 </root>
diff --git a/Ched/Plugins/SusImportPlugin.cs b/Ched/Plugins/SusImportPlugin.cs
@@ -109,13 +109,16 @@ private Score ConvertScore(IScoreBookImportPluginArgs args, SusScoreData raw)
                 };
                 foreach (var step in steps.Skip(1))
                 {
+                    /*
                     if (step.Type == '4')
                     {
-                        args.ReportDiagnostic(new Diagnostic(DiagnosticSeverity.Warning, $"スライド変曲点は中継点としてインポートされます。(行: {step.LineIndex + 1})"));
+                        args.ReportDiagnostic(new Diagnostic(DiagnosticSeverity.Warning, $"スライド変曲点は中継点としてインポートされます。(行: {step.LineIndex + 1
                     }
+                    */
                     var stepTap = new Slide.StepTap(slide)
                     {
                         IsVisible = step.Type == '3' || step.Type == '2',
+                        IsCurve = step.Type == '4',
                         TickOffset = step.Position.Tick - slide.StartTick
                     };
                     stepTap.SetPosition(step.Position.LaneIndex - slide.StartLaneIndex, step.Position.Width - slide.StartWidth);

diff --git a/Ched/Properties/AssemblyInfo.cs b/Ched/Properties/AssemblyInfo.cs
@@ -12,6 +12,6 @@
 [assembly: ComVisible(false)]
 [assembly: Guid("4c0c9f98-6fcf-4d2f-b821-37a66362dc75")]
 
-[assembly: AssemblyVersion("3.0.1.0")]
+[assembly: AssemblyVersion("3.0.1.1")]
 
 [assembly: DisableDpiAwareness]
diff --git a/Ched/Properties/Resources.Designer.cs b/Ched/Properties/Resources.Designer.cs
diff --git a/Ched/Properties/Resources.resx b/Ched/Properties/Resources.resx
@@ -214,4 +214,7 @@
   <data name="WarningIcon" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\exclamation.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
+  <data name="SlideCurveIcon" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\slidecurve.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
 </root>
diff --git a/Ched/Resources/slidecurve.png b/Ched/Resources/slidecurve.png
diff --git a/Ched/UI/MainForm.cs b/Ched/UI/MainForm.cs
@@ -923,6 +923,7 @@ private ToolStrip CreateNewNoteTypeToolStrip(NoteView noteView)
             {
                 noteView.NewNoteType = NoteType.Slide;
                 noteView.IsNewSlideStepVisible = false;
+                noteView.IsNewSlideStepCurve = false;
             })
             {
                 DisplayStyle = ToolStripItemDisplayStyle.Image
@@ -931,6 +932,16 @@ private ToolStrip CreateNewNoteTypeToolStrip(NoteView noteView)
             {
                 noteView.NewNoteType = NoteType.Slide;
                 noteView.IsNewSlideStepVisible = true;
+                noteView.IsNewSlideStepCurve = false;
+            })
+            {
+                DisplayStyle = ToolStripItemDisplayStyle.Image
+            };
+            var slideCurveButton = new ToolStripButton(MainFormStrings.SlideCurve , Resources.SlideCurveIcon, (s, e) =>
+            {
+                noteView.NewNoteType = NoteType.Slide;
+                noteView.IsNewSlideStepVisible = false;
+                noteView.IsNewSlideStepCurve = true;
             })
             {
                 DisplayStyle = ToolStripItemDisplayStyle.Image
@@ -1001,8 +1012,9 @@ private ToolStrip CreateNewNoteTypeToolStrip(NoteView noteView)
                 tapButton.Checked = noteView.NewNoteType.HasFlag(NoteType.Tap);
                 exTapButton.Checked = noteView.NewNoteType.HasFlag(NoteType.ExTap);
                 holdButton.Checked = noteView.NewNoteType.HasFlag(NoteType.Hold);
-                slideButton.Checked = noteView.NewNoteType.HasFlag(NoteType.Slide) && !noteView.IsNewSlideStepVisible;
-                slideStepButton.Checked = noteView.NewNoteType.HasFlag(NoteType.Slide) && noteView.IsNewSlideStepVisible;
+                slideButton.Checked = noteView.NewNoteType.HasFlag(NoteType.Slide) && !noteView.IsNewSlideStepVisible && !noteView.IsNewSlideStepCurve;
+                slideStepButton.Checked = noteView.NewNoteType.HasFlag(NoteType.Slide) && noteView.IsNewSlideStepVisible && !noteView.IsNewSlideStepCurve;
+                slideCurveButton.Checked = noteView.NewNoteType.HasFlag(NoteType.Slide) && !noteView.IsNewSlideStepVisible && noteView.IsNewSlideStepCurve;
                 airKind.Checked = noteView.NewNoteType.HasFlag(NoteType.Air);
                 airActionButton.Checked = noteView.NewNoteType.HasFlag(NoteType.AirAction);
                 flickButton.Checked = noteView.NewNoteType.HasFlag(NoteType.Flick);
@@ -1029,7 +1041,7 @@ private ToolStrip CreateNewNoteTypeToolStrip(NoteView noteView)
 
             return new ToolStrip(new ToolStripItem[]
             {
-                tapButton, exTapButton, holdButton, slideButton, slideStepButton, airKind, airActionButton, flickButton, damageButton,
+                tapButton, exTapButton, holdButton, slideButton, slideStepButton, slideCurveButton, airKind, airActionButton, flickButton, damageButton,
                 quantizeComboBox
             });
         }
@@ -1064,10 +1076,17 @@ private void SetupHotkeys()
                     case Keys.S:
                         NoteView.NewNoteType = NoteType.Slide;
                         NoteView.IsNewSlideStepVisible = false;
+                        NoteView.IsNewSlideStepCurve = false;
                         break;
                     case Keys.X:
                         NoteView.NewNoteType = NoteType.Slide;
                         NoteView.IsNewSlideStepVisible = true;
+                        NoteView.IsNewSlideStepCurve = false;
+                        break;
+                    case Keys.C:
+                        NoteView.NewNoteType = NoteType.Slide;
+                        NoteView.IsNewSlideStepVisible = false;
+                        NoteView.IsNewSlideStepCurve = true;
                         break;
                     case Keys.A:
                         if (NoteView.EditMode != EditMode.Edit || NoteView.NewNoteType != NoteType.Air || NoteView.AirDirection.VerticalDirection != VerticalAirDirection.Up)
@@ -1120,9 +1139,21 @@ private void SetupHotkeys()
                     case Keys.F:
                         NoteView.NewNoteType = NoteType.Flick;
                         break;
-                    case Keys.C:
+                    case Keys.V:
                         NoteView.NewNoteType = NoteType.Damage;
                         break;
+                    case Keys.D1:
+                        NoteView.ScrollRelative(-1.0);
+                        break;
+                    case Keys.D2:
+                        NoteView.ScrollRelative(-0.1);
+                        break;
+                    case Keys.D3:
+                        NoteView.ScrollRelative(0.1);
+                        break;
+                    case Keys.D4:
+                        NoteView.ScrollRelative(1.0);
+                        break;
                 }
             };
         }

diff --git a/Ched/UI/NoteView.cs b/Ched/UI/NoteView.cs
@@ -47,6 +47,7 @@ public partial class NoteView : Control
         private NoteType newNoteType = NoteType.Tap;
         private AirDirection airDirection = new AirDirection(VerticalAirDirection.Up, HorizontalAirDirection.Center);
         private bool isNewSlideStepVisible = true;
+        private bool isNewSlideStepCurve = true;
         private bool playing = false;
         private bool isFollowWhenPlaying = false;
 
@@ -305,6 +306,16 @@ public bool IsNewSlideStepVisible
             }
         }
 
+        public bool IsNewSlideStepCurve
+        {
+            get { return isNewSlideStepCurve; }
+            set
+            {
+                isNewSlideStepCurve = value;
+                NewNoteTypeChanged?.Invoke(this, EventArgs.Empty);
+            }
+        }
+
         public bool Playing
         {
             get { return playing; }
@@ -385,6 +396,7 @@ public NoteView(OperationManager manager)
                 HoldColor = new GradientColor(Color.FromArgb(196, 86, 0), Color.FromArgb(244, 156, 102)),
                 HoldBackgroundColor = new GradientColor(Color.FromArgb(196, 166, 44, 168), Color.FromArgb(196, 216, 216, 0)),
                 SlideColor = new GradientColor(Color.FromArgb(0, 16, 138), Color.FromArgb(86, 106, 255)),
+                SlideCurveColor = new GradientColor(Color.FromArgb(128, 128, 138), Color.FromArgb(128, 128, 255)),
                 SlideLineColor = Color.FromArgb(196, 0, 214, 192),
                 SlideBackgroundColor = new GradientColor(Color.FromArgb(196, 166, 44, 168), Color.FromArgb(196, 0, 164, 146)),
                 AirUpColor = Color.FromArgb(28, 206, 22),
@@ -1172,7 +1184,8 @@ IObservable<MouseEventArgs> addAirActionHandler()
                                                 var newStep = new Slide.StepTap(note)
                                                 {
                                                     TickOffset = tickOffset,
-                                                    IsVisible = IsNewSlideStepVisible
+                                                    IsVisible = IsNewSlideStepVisible,
+                                                    IsCurve = IsNewSlideStepCurve
                                                 };
                                                 newStep.SetPosition(laneIndex - note.StartLaneIndex, width - note.StartWidth);
                                                 note.StepNotes.Add(newStep);
@@ -1712,8 +1725,18 @@ protected override void OnPaint(PaintEventArgs pe)
                     if (!Editable && !step.IsVisible) continue;
                     if (Notes.GetReferencedAir(step).Count() > 0) break; // AIR付き終点
                     RectangleF rect = GetRectFromNotePosition(step.Tick, step.LaneIndex, step.Width);
-                    if (step.IsVisible) dc.DrawSlideStep(rect);
-                    else dc.DrawBorder(rect);
+                    if (step.IsVisible)
+                    {
+                        dc.DrawSlideStep(rect);
+                    }
+                    else if (step.IsCurve)
+                    {
+                        dc.DrawSlideCurve(rect);
+                    }
+                    else
+                    {
+                        dc.DrawBorder(rect);
+                    }
                 }
             }
 
@@ -2215,6 +2238,11 @@ public void UpdateScore(Score score)
             Invalidate();
         }
 
+        public void ScrollRelative(double distance)
+        {
+            HeadTick = HeadTick + (int) ((TailTick - HeadTick) * distance);
+        }
+
         public class NoteCollection
         {
             public event EventHandler NoteChanged;

diff --git a/README.md b/README.md
@@ -15,6 +15,11 @@
 ![note thickness](./resources/note-thickness.png)
 
 - Pre-included .sus import from [sus2img](https://github.com/paralleltree/sus2img)
+- Added bezier curve note
+  - Import/export with .sus works
+  - Preview does not work
+  - Use at most 1 curve between every 2 slide steps
+- Added scroll up/down shortcut buttons
 
 Look in the releases panel to the right.
 

diff --git a/resources/keyboard-layout.json b/resources/keyboard-layout.json
@@ -1,10 +1,16 @@
 [
   [
     "~\n`",
-    "!\n1",
-    "@\n2",
-    "#\n3",
-    "$\n4",
+    {
+      "c": "#ce9cff"
+    },
+    "1\n⏪\n\n\n\n\nScroll",
+    "2\n◀️\n\n\n\n\nScroll",
+    "3\n▶️\n\n\n\n\nScroll",
+    "4\n⏩\n\n\n\n\nScroll",
+    {
+      "c": "#cccccc"
+    },
     "%\n5",
     "^\n6",
     "&\n7",
@@ -134,13 +140,16 @@
     },
     "X\nStep",
     {
-      "c": "#8390fc"
+      "c": "#a5afc9"
+    },
+    "C\nCurve",
+    {
+      "c": "#525ed1"
     },
-    "C\nAvoid",
+    "V\nAvoid",
     {
       "c": "#cccccc"
     },
-    "V",
     "B",
     "N",
     "M",

diff --git a/resources/keyboard-layout.png b/resources/keyboard-layout.png