Revert "Add the preempt time for the lyric and the note."

This reverts commit d761810.
karaoke-dev · Apr 16, 2023 · ce5739c · ce5739c
1 parent b32a05b
commit ce5739c
Show file tree

Hide file tree

Showing 9 changed files with 10 additions and 107 deletions.
diff --git a/osu.Game.Rulesets.Karaoke.Tests/Objects/Workings/LyricWorkingPropertyValidatorTest.cs b/osu.Game.Rulesets.Karaoke.Tests/Objects/Workings/LyricWorkingPropertyValidatorTest.cs
@@ -15,16 +15,6 @@ namespace osu.Game.Rulesets.Karaoke.Tests.Objects.Workings;
 
 public class LyricWorkingPropertyValidatorTest : HitObjectWorkingPropertyValidatorTest<Lyric, LyricWorkingProperty>
 {
-    [Test]
-    public void TestPreemptTime()
-    {
-        var lyric = new Lyric();
-
-        // state is valid because assign the property.
-        Assert.DoesNotThrow(() => lyric.PreemptTime = 300);
-        AssetIsValid(lyric, LyricWorkingProperty.PreemptTime, true);
-    }
-
     [Test]
     public void TestStartTime()
     {

diff --git a/osu.Game.Rulesets.Karaoke.Tests/Objects/Workings/NoteWorkingPropertyValidatorTest.cs b/osu.Game.Rulesets.Karaoke.Tests/Objects/Workings/NoteWorkingPropertyValidatorTest.cs
@@ -13,16 +13,6 @@ namespace osu.Game.Rulesets.Karaoke.Tests.Objects.Workings;
 
 public class NoteWorkingPropertyValidatorTest : HitObjectWorkingPropertyValidatorTest<Note, NoteWorkingProperty>
 {
-    [Test]
-    public void TestPreemptTime()
-    {
-        var note = new Note();
-
-        // page state is valid because assign the property.
-        Assert.DoesNotThrow(() => note.PreemptTime = 300);
-        AssetIsValid(note, NoteWorkingProperty.PreemptTime, true);
-    }
-
     [Test]
     public void TestPage()
     {

diff --git a/osu.Game.Rulesets.Karaoke/Objects/Lyric_Working.cs b/osu.Game.Rulesets.Karaoke/Objects/Lyric_Working.cs
@@ -41,10 +41,6 @@ public void ValidateWorkingProperty(KaraokeBeatmap beatmap)
         {
             switch (flag)
             {
-                case LyricWorkingProperty.PreemptTime:
-                    PreemptTime = getPreemptTime(beatmap, this);
-                    break;
-
                 case LyricWorkingProperty.StartTime:
                     StartTime = getStartTime(beatmap, this);
                     break;
@@ -78,16 +74,6 @@ public void ValidateWorkingProperty(KaraokeBeatmap beatmap)
             }
         }
 
-        static double getPreemptTime(KaraokeBeatmap beatmap, KaraokeHitObject lyric)
-        {
-            var stageInfo = beatmap.CurrentStageInfo;
-            if (stageInfo == null)
-                throw new InvalidCastException();
-
-            double preemptTime = stageInfo.GetPreemptTime(lyric);
-            return preemptTime;
-        }
-
         static double getStartTime(KaraokeBeatmap beatmap, KaraokeHitObject lyric)
         {
             var stageInfo = beatmap.CurrentStageInfo;
@@ -136,22 +122,6 @@ static IStageEffectApplier getStageEffectApplier(KaraokeBeatmap beatmap, Karaoke
     [JsonIgnore]
     public double LyricDuration => LyricEndTime - LyricStartTime;
 
-    private double preemptTime;
-
-    /// <summary>
-    /// Lyric's preempt time is created from <see cref="StageInfo"/> and should not be saved.
-    /// </summary>
-    [JsonIgnore]
-    public double PreemptTime
-    {
-        get => preemptTime;
-        set
-        {
-            preemptTime = value;
-            updateStateByWorkingProperty(LyricWorkingProperty.PreemptTime);
-        }
-    }
-
     /// <summary>
     /// Lyric's start time is created from <see cref="StageInfo"/> and should not be saved.
     /// </summary>

diff --git a/osu.Game.Rulesets.Karaoke/Objects/Note_Working.cs b/osu.Game.Rulesets.Karaoke/Objects/Note_Working.cs
@@ -10,7 +10,6 @@
 using osu.Game.Extensions;
 using osu.Game.Rulesets.Karaoke.Beatmaps;
 using osu.Game.Rulesets.Karaoke.Beatmaps.Metadatas;
-using osu.Game.Rulesets.Karaoke.Beatmaps.Stages;
 using osu.Game.Rulesets.Karaoke.Objects.Stages;
 using osu.Game.Rulesets.Karaoke.Objects.Types;
 using osu.Game.Rulesets.Karaoke.Objects.Workings;
@@ -41,10 +40,6 @@ public void ValidateWorkingProperty(KaraokeBeatmap beatmap)
         {
             switch (flag)
             {
-                case NoteWorkingProperty.PreemptTime:
-                    PreemptTime = getPreemptTime(beatmap, this);
-                    break;
-
                 case NoteWorkingProperty.Page:
                     PageIndex = getPageIndex(beatmap, StartTime);
                     break;
@@ -62,16 +57,6 @@ public void ValidateWorkingProperty(KaraokeBeatmap beatmap)
             }
         }
 
-        static double getPreemptTime(KaraokeBeatmap beatmap, KaraokeHitObject lyric)
-        {
-            var stageInfo = beatmap.CurrentStageInfo;
-            if (stageInfo == null)
-                throw new InvalidCastException();
-
-            double preemptTime = stageInfo.GetPreemptTime(lyric);
-            return preemptTime;
-        }
-
         static int? getPageIndex(KaraokeBeatmap beatmap, double startTime)
             => beatmap.PageInfo.GetPageIndexAt(startTime);
 
@@ -105,22 +90,6 @@ public int? PageIndex
         }
     }
 
-    private double preemptTime;
-
-    /// <summary>
-    /// Note's preempt time is created from <see cref="StageInfo"/> and should not be saved.
-    /// </summary>
-    [JsonIgnore]
-    public double PreemptTime
-    {
-        get => preemptTime;
-        set
-        {
-            preemptTime = value;
-            updateStateByWorkingProperty(NoteWorkingProperty.PreemptTime);
-        }
-    }
-
     /// <summary>
     /// Start time.
     /// There's no need to save the time because it's calculated by the <see cref="TimeTag"/>

diff --git a/osu.Game.Rulesets.Karaoke/Objects/Types/IHasEffectApplier.cs b/osu.Game.Rulesets.Karaoke/Objects/Types/IHasEffectApplier.cs
@@ -7,7 +7,5 @@ namespace osu.Game.Rulesets.Karaoke.Objects.Types;
 
 public interface IHasEffectApplier
 {
-    double PreemptTime { get; }
-
     IStageEffectApplier EffectApplier { get; }
 }
diff --git a/osu.Game.Rulesets.Karaoke/Objects/Workings/LyricWorkingProperty.cs b/osu.Game.Rulesets.Karaoke/Objects/Workings/LyricWorkingProperty.cs
@@ -11,43 +11,38 @@ namespace osu.Game.Rulesets.Karaoke.Objects.Workings;
 [Flags]
 public enum LyricWorkingProperty
 {
-    /// <summary>
-    /// <see cref="Lyric.PreemptTime"/> is being invalidated.
-    /// </summary>
-    PreemptTime = 1,
-
     /// <summary>
     /// <see cref="Lyric.StartTime"/> is being invalidated.
     /// </summary>
-    StartTime = 1 << 1,
+    StartTime = 1,
 
     /// <summary>
     /// <see cref="Lyric.Duration"/> is being invalidated.
     /// </summary>
-    Duration = 1 << 2,
+    Duration = 1 << 1,
 
     /// <summary>
     /// <see cref="Lyric.StartTime"/> and <see cref="Lyric.Duration"/> is being invalidated.
     /// </summary>
-    Timing = PreemptTime | StartTime | Duration,
+    Timing = StartTime | Duration,
 
     /// <summary>
     /// <see cref="Lyric.Singers"/> is being invalidated.
     /// </summary>
-    Singers = 1 << 3,
+    Singers = 1 << 2,
 
     /// <summary>
     /// <see cref="Lyric.PageIndex"/> is being invalidated.
     /// </summary>
-    Page = 1 << 4,
+    Page = 1 << 3,
 
     /// <summary>
     /// <see cref="Lyric.ReferenceLyric"/> is being invalidated.
     /// </summary>
-    ReferenceLyric = 1 << 5,
+    ReferenceLyric = 1 << 4,
 
     /// <summary>
     /// <see cref="Lyric.EffectApplier"/> is being invalidated.
     /// </summary>
-    EffectApplier = 1 << 6,
+    EffectApplier = 1 << 5,
 }
diff --git a/osu.Game.Rulesets.Karaoke/Objects/Workings/LyricWorkingPropertyValidator.cs b/osu.Game.Rulesets.Karaoke/Objects/Workings/LyricWorkingPropertyValidator.cs
@@ -17,7 +17,6 @@ public LyricWorkingPropertyValidator(Lyric hitObject)
     protected override bool CanCheckWorkingPropertySync(Lyric hitObject, LyricWorkingProperty flags) =>
         flags switch
         {
-            LyricWorkingProperty.PreemptTime => false,
             LyricWorkingProperty.StartTime => false,
             LyricWorkingProperty.Duration => false,
             LyricWorkingProperty.Timing => false,
@@ -31,7 +30,6 @@ protected override bool CanCheckWorkingPropertySync(Lyric hitObject, LyricWorkin
     protected override bool NeedToSyncWorkingProperty(Lyric hitObject, LyricWorkingProperty flags) =>
         flags switch
         {
-            LyricWorkingProperty.PreemptTime => false,
             LyricWorkingProperty.StartTime => false,
             LyricWorkingProperty.Duration => false,
             LyricWorkingProperty.Timing => false,

diff --git a/osu.Game.Rulesets.Karaoke/Objects/Workings/NoteWorkingProperty.cs b/osu.Game.Rulesets.Karaoke/Objects/Workings/NoteWorkingProperty.cs
@@ -11,23 +11,18 @@ namespace osu.Game.Rulesets.Karaoke.Objects.Workings;
 [Flags]
 public enum NoteWorkingProperty
 {
-    /// <summary>
-    /// <see cref="Note.PreemptTime"/> is being invalidated.
-    /// </summary>
-    PreemptTime = 1,
-
     /// <summary>
     /// <see cref="Note.PageIndex"/> is being invalidated.
     /// </summary>
-    Page = 1 << 1,
+    Page = 1,
 
     /// <summary>
     /// <see cref="Note.ReferenceLyric"/> is being invalidated.
     /// </summary>
-    ReferenceLyric = 1 << 2,
+    ReferenceLyric = 1 << 1,
 
     /// <summary>
     /// <see cref="Note.EffectApplier"/> is being invalidated.
     /// </summary>
-    EffectApplier = 1 << 3,
+    EffectApplier = 1 << 2,
 }
diff --git a/osu.Game.Rulesets.Karaoke/Objects/Workings/NoteWorkingPropertyValidator.cs b/osu.Game.Rulesets.Karaoke/Objects/Workings/NoteWorkingPropertyValidator.cs
@@ -15,7 +15,6 @@ public NoteWorkingPropertyValidator(Note hitObject)
     protected override bool CanCheckWorkingPropertySync(Note hitObject, NoteWorkingProperty flags) =>
         flags switch
         {
-            NoteWorkingProperty.PreemptTime => false,
             NoteWorkingProperty.Page => false,
             NoteWorkingProperty.ReferenceLyric => true,
             NoteWorkingProperty.EffectApplier => false,
@@ -25,7 +24,6 @@ protected override bool CanCheckWorkingPropertySync(Note hitObject, NoteWorkingP
     protected override bool NeedToSyncWorkingProperty(Note hitObject, NoteWorkingProperty flags) =>
         flags switch
         {
-            NoteWorkingProperty.PreemptTime => false,
             NoteWorkingProperty.Page => false,
             NoteWorkingProperty.ReferenceLyric => hitObject.ReferenceLyric?.ID != hitObject.ReferenceLyricId,
             NoteWorkingProperty.EffectApplier => false,