Merge branch 'release/3.0.0.0'

paralleltree · Feb 18, 2021 · 6154686 · 6154686
2 parents cc411ad + baddd43
commit 6154686
Show file tree

Hide file tree

Showing 54 changed files with 1,076 additions and 396 deletions.
diff --git a/Ched.Core/Ched.Core.csproj b/Ched.Core/Ched.Core.csproj
@@ -9,7 +9,7 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>Ched.Core</RootNamespace>
     <AssemblyName>Ched.Core</AssemblyName>
-    <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <TargetFrameworkProfile />
   </PropertyGroup>
@@ -66,7 +66,7 @@
     <Compile Include="BarIndexCalculator.cs" />
     <Compile Include="Constants.cs" />
     <Compile Include="EventCollection.cs" />
-    <Compile Include="Events\BPMChangeEvent.cs" />
+    <Compile Include="Events\BpmChangeEvent.cs" />
     <Compile Include="Events\EventBase.cs" />
     <Compile Include="Events\HighSpeedChangeEvent.cs" />
     <Compile Include="Events\InvalidTimeSignatureException.cs" />
@@ -79,14 +79,13 @@
     <Compile Include="Notes\Flick.cs" />
     <Compile Include="Notes\Hold.cs" />
     <Compile Include="Notes\LongNoteBase.cs" />
-    <Compile Include="Notes\NoteBase.cs" />
-    <Compile Include="Notes\ShortNoteBase.cs" />
     <Compile Include="Notes\Slide.cs" />
     <Compile Include="Notes\Tap.cs" />
     <Compile Include="Notes\TappableBase.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="Score.cs" />
     <Compile Include="ScoreBook.cs" />
+    <Compile Include="TimeCalculator.cs" />
     <Compile Include="UI\SelectionRange.cs" />
   </ItemGroup>
   <ItemGroup>

diff --git a/Ched.Core/EventCollection.cs b/Ched.Core/EventCollection.cs
@@ -15,13 +15,13 @@ namespace Ched.Core
     public class EventCollection
     {
         [Newtonsoft.Json.JsonProperty]
-        private List<BPMChangeEvent> bpmChangeEvents = new List<BPMChangeEvent>();
+        private List<BpmChangeEvent> bpmChangeEvents = new List<BpmChangeEvent>();
         [Newtonsoft.Json.JsonProperty]
         private List<TimeSignatureChangeEvent> timeSignatureChangeEvents = new List<TimeSignatureChangeEvent>();
         [Newtonsoft.Json.JsonProperty]
         private List<HighSpeedChangeEvent> highSpeedChangeEvents = new List<HighSpeedChangeEvent>();
 
-        public List<BPMChangeEvent> BPMChangeEvents
+        public List<BpmChangeEvent> BpmChangeEvents
         {
             get { return bpmChangeEvents; }
             set { bpmChangeEvents = value; }
@@ -40,13 +40,13 @@ public List<HighSpeedChangeEvent> HighSpeedChangeEvents
         }
 
         public IEnumerable<EventBase> AllEvents =>
-            BPMChangeEvents.Cast<EventBase>()
+            BpmChangeEvents.Cast<EventBase>()
             .Concat(TimeSignatureChangeEvents)
             .Concat(HighSpeedChangeEvents);
 
         public void UpdateTicksPerBeat(double factor)
         {
-            var events = BPMChangeEvents.Cast<EventBase>()
+            var events = BpmChangeEvents.Cast<EventBase>()
                  .Concat(TimeSignatureChangeEvents)
                  .Concat(HighSpeedChangeEvents);
             foreach (var e in events)

diff --git a/Ched.Core/Events/BPMChangeEvent.cs → Ched.Core/Events/BpmChangeEvent.cs b/Ched.Core/Events/BPMChangeEvent.cs → Ched.Core/Events/BpmChangeEvent.cs
@@ -11,13 +11,13 @@ namespace Ched.Core.Events
     /// BPMの変更イベントを表すクラスです。
     /// </summary>
     [Newtonsoft.Json.JsonObject(Newtonsoft.Json.MemberSerialization.OptIn)]
-    [DebuggerDisplay("Tick = {Tick}, Value = {BPM}")]
-    public class BPMChangeEvent : EventBase
+    [DebuggerDisplay("Tick = {Tick}, Value = {Bpm}")]
+    public class BpmChangeEvent : EventBase
     {
         [Newtonsoft.Json.JsonProperty]
-        private decimal bpm;
+        private double bpm;
 
-        public decimal BPM
+        public double Bpm
         {
             get { return bpm; }
             set { bpm = value; }

diff --git a/Ched.Core/Notes/Air.cs b/Ched.Core/Notes/Air.cs
@@ -7,7 +7,7 @@
 namespace Ched.Core.Notes
 {
     [Newtonsoft.Json.JsonObject(Newtonsoft.Json.MemberSerialization.OptIn)]
-    public class Air : ShortNoteBase, IAirable
+    public class Air
     {
         [Newtonsoft.Json.JsonProperty]
         private IAirable parentNote;

diff --git a/Ched.Core/Notes/AirAction.cs b/Ched.Core/Notes/AirAction.cs
@@ -7,7 +7,7 @@
 namespace Ched.Core.Notes
 {
     [Newtonsoft.Json.JsonObject(Newtonsoft.Json.MemberSerialization.OptIn)]
-    public class AirAction : LongNoteBase
+    public class AirAction : ILongNote
     {
         [Newtonsoft.Json.JsonProperty]
         private IAirable parentNote;
@@ -16,7 +16,7 @@ public class AirAction : LongNoteBase
 
         public List<ActionNote> ActionNotes { get { return actionNotes; } }
         public IAirable ParentNote { get { return parentNote; } }
-        public override int StartTick { get { return ParentNote.Tick; } }
+        public int StartTick => ParentNote.Tick;
 
         /// <summary>
         /// 親<see cref="IAirable"/>オブジェクトを持たない<see cref="AirAction"/>の新しいインスタンスを初期化します。
@@ -35,14 +35,14 @@ public AirAction(IAirable parent)
             parentNote = parent;
         }
 
-        public override int GetDuration()
+        public int GetDuration()
         {
             return ActionNotes.Max(p => p.Offset);
         }
 
 
         [Newtonsoft.Json.JsonObject(Newtonsoft.Json.MemberSerialization.OptIn)]
-        public class ActionNote : ShortNoteBase
+        public class ActionNote
         {
             [Newtonsoft.Json.JsonProperty]
             private int offset;

diff --git a/Ched.Core/Notes/LongNoteBase.cs b/Ched.Core/Notes/LongNoteBase.cs
@@ -7,26 +7,20 @@
 namespace Ched.Core.Notes
 {
     public interface ILongNote
-    {
-        int StartTick { get; }
-        int GetDuration();
-    }
-
-    public abstract class LongNoteBase : NoteBase, ILongNote
     {
         /// <summary>
         /// ノートの開始位置を表すTickを設定します。
         /// </summary>
-        public abstract int StartTick { get; }
+        int StartTick { get; }
 
         /// <summary>
         /// ノートの長さを表すTickを取得します。
         /// </summary>
-        public abstract int GetDuration();
+        int GetDuration();
     }
 
     [Newtonsoft.Json.JsonObject(Newtonsoft.Json.MemberSerialization.OptIn)]
-    public abstract class MovableLongNoteBase : NoteBase, ILongNote
+    public abstract class MovableLongNoteBase : ILongNote
     {
         [Newtonsoft.Json.JsonProperty]
         private int startTick;
@@ -51,7 +45,7 @@ public int StartTick
         public abstract int GetDuration();
     }
 
-    public abstract class LongNoteTapBase : TapBase, IAirable
+    public abstract class LongNoteTapBase : IAirable
     {
         public abstract bool IsTap { get; }
         public abstract int LaneIndex { get; }

diff --git a/Ched.Core/Notes/NoteBase.cs b/Ched.Core/Notes/NoteBase.cs
diff --git a/Ched.Core/Notes/ShortNoteBase.cs b/Ched.Core/Notes/ShortNoteBase.cs
diff --git a/Ched.Core/Notes/TappableBase.cs b/Ched.Core/Notes/TappableBase.cs
@@ -6,12 +6,8 @@
 
 namespace Ched.Core.Notes
 {
-    public abstract class TapBase : ShortNoteBase
-    {
-    }
-
     [Newtonsoft.Json.JsonObject(Newtonsoft.Json.MemberSerialization.OptIn)]
-    public abstract class TappableBase : TapBase, IAirable
+    public abstract class TappableBase : IAirable
     {
         [Newtonsoft.Json.JsonProperty]
         private int tick;

diff --git a/Ched.Core/Properties/AssemblyInfo.cs b/Ched.Core/Properties/AssemblyInfo.cs
@@ -11,4 +11,4 @@
 [assembly: ComVisible(false)]
 [assembly: Guid("5a5ff947-79dc-4352-94d5-eec14065f93a")]
 
-[assembly: AssemblyVersion("2.7.0.0")]
+[assembly: AssemblyVersion("3.0.0.0")]
diff --git a/Ched.Core/ScoreBook.cs b/Ched.Core/ScoreBook.cs
@@ -38,7 +38,7 @@ public class ScoreBook
         [Newtonsoft.Json.JsonProperty]
         private Score score = new Score();
         [Newtonsoft.Json.JsonProperty]
-        private Dictionary<string, object> exporterArgs = new Dictionary<string, object>();
+        private Dictionary<string, string> exportArgs = new Dictionary<string, string>();
 
         public string Path { get; set; }
 
@@ -90,10 +90,10 @@ public Score Score
         /// <summary>
         /// エクスポート用の設定を格納します。
         /// </summary>
-        public Dictionary<string, object> ExporterArgs
+        public Dictionary<string, string> ExportArgs
         {
-            get { return exporterArgs; }
-            set { exporterArgs = value; }
+            get { return exportArgs; }
+            set { exportArgs = value; }
         }
 
         public void Save(string path)
@@ -116,6 +116,8 @@ public void Save()
             }
         }
 
+        public ScoreBook Clone() => JsonConvert.DeserializeObject<ScoreBook>(JsonConvert.SerializeObject(this, SerializerSettings));
+
         /// <summary>
         /// 指定のファイルから<see cref="ScoreBook"/>のインスタンスを生成します。
         /// 古いバージョンのファイルは現在のバージョン用に変換されます。
@@ -149,6 +151,12 @@ public static ScoreBook LoadFile(string path)
                     type = System.Text.RegularExpressions.Regex.Replace(type, "Ched$", "Ched.Core").Replace("Components", "Core");
                     obj["$type"] = type;
                 }
+
+                var susExportArgs = doc["exporterArgs"]["sus"];
+                var exportArgs = new JObject();
+                if (susExportArgs != null) exportArgs.Add("Ched.Plugins.SusExportPlugin", susExportArgs.ToString());
+                doc.Remove("exporterArgs");
+                doc.Add("exportArgs", exportArgs);
             }
 
             doc["version"] = JObject.FromObject(CurrentVersion);

diff --git a/Ched.Core/TimeCalculator.cs b/Ched.Core/TimeCalculator.cs
@@ -0,0 +1,62 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+using Ched.Core.Events;
+
+namespace Ched.Core
+{
+    /// <summary>
+    /// BPM変更イベントからTick値に対応する時刻を求めるクラスです。
+    /// </summary>
+    public class TimeCalculator
+    {
+        protected int TicksPerBeat { get; }
+        // 時間順ソート済み
+        protected List<(int Tick, double Bpm, double Time)> BpmDefinitions { get; } = new List<(int Tick, double Bpm, double Time)>();
+
+        public TimeCalculator(int ticksPerBeat, IEnumerable<BpmChangeEvent> bpms)
+        {
+            TicksPerBeat = ticksPerBeat;
+            double time = 0;
+            var ordered = bpms.OrderBy(p => p.Tick).ToList();
+            if (ordered[0].Tick != 0) throw new ArgumentException("Initial BpmChangeEvent was not found.", "bpms");
+            BpmDefinitions.Add((0, ordered[0].Bpm, 0));
+            for (int i = 1; i < ordered.Count; i++)
+            {
+                time += GetDuration(ordered[i - 1].Bpm, ordered[i].Tick - ordered[i - 1].Tick);
+                BpmDefinitions.Add((ordered[i].Tick, ordered[i].Bpm, time));
+            }
+        }
+
+        public double GetTimeFromTick(int tick)
+        {
+            for (int i = BpmDefinitions.Count - 1; 0 <= i; i--)
+            {
+                if (tick < BpmDefinitions[i].Tick) continue;
+                return BpmDefinitions[i].Time + GetDuration(BpmDefinitions[i].Bpm, tick - BpmDefinitions[i].Tick);
+            }
+            // 負の時間は初期BPMで遡る
+            return GetDuration(BpmDefinitions[0].Bpm, tick);
+        }
+
+        public int GetTickFromTime(double time)
+        {
+            for (int i = BpmDefinitions.Count - 1; 0 <= i; i--)
+            {
+                if (time < BpmDefinitions[i].Time) continue;
+                return BpmDefinitions[i].Tick + GetDurationInTick(BpmDefinitions[i].Bpm, time - BpmDefinitions[i].Time);
+            }
+            // 負の時間は初期BPMで遡る
+            return GetDurationInTick(BpmDefinitions[0].Bpm, time);
+        }
+
+        // => durationTick * (60 / bpm) / TicksPerBeat;
+        protected double GetDuration(double bpm, int durationTick) => durationTick * 60 / bpm / TicksPerBeat;
+
+        // => TicksPerBeat * duration * (bpm / 60)
+        protected int GetDurationInTick(double bpm, double duration) => (int)(TicksPerBeat * duration * bpm / 60);
+    }
+}
diff --git a/Ched.Drawing/Ched.Drawing.csproj b/Ched.Drawing/Ched.Drawing.csproj
@@ -9,7 +9,7 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>Ched.Drawing</RootNamespace>
     <AssemblyName>Ched.Drawing</AssemblyName>
-    <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <TargetFrameworkProfile />
   </PropertyGroup>

diff --git a/Ched.Drawing/Properties/AssemblyInfo.cs b/Ched.Drawing/Properties/AssemblyInfo.cs
@@ -11,4 +11,4 @@
 [assembly: ComVisible(false)]
 [assembly: Guid("a41ea7d5-9776-421b-a338-dd662287069b")]
 
-[assembly: AssemblyVersion("2.7.0.0")]
+[assembly: AssemblyVersion("3.0.0.0")]
diff --git a/Ched.Plugins/Ched.Plugins.csproj b/Ched.Plugins/Ched.Plugins.csproj
@@ -9,7 +9,7 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>Ched.Plugins</RootNamespace>
     <AssemblyName>Ched.Plugins</AssemblyName>
-    <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <TargetFrameworkProfile />
   </PropertyGroup>
@@ -54,10 +54,13 @@
     <Reference Include="Microsoft.CSharp" />
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="Diagnostics.cs" />
+    <Compile Include="IScoreBookExportPlugin.cs" />
     <Compile Include="IScoreBookImportPlugin.cs" />
     <Compile Include="IPlugin.cs" />
     <Compile Include="IScorePlugin.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
+    <Compile Include="UserCancelledException.cs" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\Ched.Core\Ched.Core.csproj">

diff --git a/Ched.Plugins/Diagnostics.cs b/Ched.Plugins/Diagnostics.cs
@@ -0,0 +1,33 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Ched.Plugins
+{
+    public interface IDiagnosable
+    {
+        void ReportDiagnostic(Diagnostic diagnostic);
+    }
+
+    public class Diagnostic
+    {
+        public DiagnosticSeverity Severity { get; }
+        public string Message { get; }
+
+        public Diagnostic(DiagnosticSeverity severity, string message)
+        {
+            Severity = severity;
+            Message = message;
+        }
+    }
+
+    public enum DiagnosticSeverity
+    {
+        Hidden = 0,
+        Information = 1,
+        Warning = 2,
+        Error = 3
+    }
+}