Revert "Should be able to get the preempt time in the stage info."

This reverts commit d3411db.
karaoke-dev · Apr 16, 2023 · b32a05b · b32a05b
1 parent 7a87084
commit b32a05b
Show file tree

Hide file tree

Showing 4 changed files with 0 additions and 45 deletions.
diff --git a/...aoke.Tests/Editor/ChangeHandlers/Beatmaps/BeatmapStageElementCategoryChangeHandlerTest.cs b/...aoke.Tests/Editor/ChangeHandlers/Beatmaps/BeatmapStageElementCategoryChangeHandlerTest.cs
@@ -277,16 +277,6 @@ protected override IStageEffectApplier ConvertToNoteStageAppliers(IEnumerable<St
             throw new NotImplementedException();
         }
 
-        protected override double GetPreemptTime(Lyric lyric)
-        {
-            throw new NotImplementedException();
-        }
-
-        protected override double GetPreemptTime(Note note)
-        {
-            throw new NotImplementedException();
-        }
-
         protected override Tuple<double?, double?> GetStartAndEndTime(Lyric lyric)
         {
             throw new NotImplementedException();

diff --git a/osu.Game.Rulesets.Karaoke/Beatmaps/Stages/Classic/ClassicStageInfo.cs b/osu.Game.Rulesets.Karaoke/Beatmaps/Stages/Classic/ClassicStageInfo.cs
@@ -67,18 +67,6 @@ protected override IStageEffectApplier ConvertToNoteStageAppliers(IEnumerable<St
         return new NoteClassicStageEffectApplier(elements, StageDefinition);
     }
 
-    protected override double GetPreemptTime(Lyric lyric)
-    {
-        // todo: should have the time if having loading effect with duration.
-        return 0;
-    }
-
-    protected override double GetPreemptTime(Note note)
-    {
-        // todo: should have the time if having loading effect with duration.
-        return 0;
-    }
-
     protected override Tuple<double?, double?> GetStartAndEndTime(Lyric lyric)
     {
         return LyricTimingInfo.GetStartAndEndTime(lyric);

diff --git a/osu.Game.Rulesets.Karaoke/Beatmaps/Stages/Preview/PreviewStageInfo.cs b/osu.Game.Rulesets.Karaoke/Beatmaps/Stages/Preview/PreviewStageInfo.cs
@@ -123,17 +123,6 @@ protected override IStageEffectApplier ConvertToNoteStageAppliers(IEnumerable<St
         return new NotePreviewStageEffectApplier(elements, StageDefinition);
     }
 
-    protected override double GetPreemptTime(Lyric lyric)
-    {
-        return StageDefinition.FadingTime;
-    }
-
-    protected override double GetPreemptTime(Note note)
-    {
-        // todo: should have the time if having loading effect with duration.
-        return 0;
-    }
-
     protected override Tuple<double?, double?> GetStartAndEndTime(Lyric lyric)
     {
         var element = layoutCategory.GetElementByItem(lyric);

diff --git a/osu.Game.Rulesets.Karaoke/Beatmaps/Stages/StageInfo.cs b/osu.Game.Rulesets.Karaoke/Beatmaps/Stages/StageInfo.cs
@@ -34,14 +34,6 @@ private IEnumerable<StageElement> getStageElements(KaraokeHitObject hitObject) =
             _ => Array.Empty<StageElement>()
         };
 
-    public double GetPreemptTime(KaraokeHitObject hitObject) =>
-        hitObject switch
-        {
-            Lyric lyric => GetPreemptTime(lyric),
-            Note note => GetPreemptTime(note),
-            _ => throw new InvalidOperationException()
-        };
-
     public Tuple<double?, double?> GetStartAndEndTime(KaraokeHitObject hitObject) =>
         hitObject switch
         {
@@ -61,10 +53,6 @@ public double GetPreemptTime(KaraokeHitObject hitObject) =>
 
     protected abstract IStageEffectApplier ConvertToNoteStageAppliers(IEnumerable<StageElement> elements);
 
-    protected abstract double GetPreemptTime(Lyric lyric);
-
-    protected abstract double GetPreemptTime(Note note);
-
     protected abstract Tuple<double?, double?> GetStartAndEndTime(Lyric lyric);
 
     #endregion