From 59b2a55ac75fc3d16c4548ee4aa868b91a169fca Mon Sep 17 00:00:00 2001 From: andy840119 Date: Tue, 25 Jun 2024 22:53:06 +0800 Subject: [PATCH] Fix the test case failed. --- .../Beatmaps/KaraokeBeatmapProcessor.cs | 30 ++++++++++++++----- 1 file changed, 22 insertions(+), 8 deletions(-) diff --git a/osu.Game.Rulesets.Karaoke/Beatmaps/KaraokeBeatmapProcessor.cs b/osu.Game.Rulesets.Karaoke/Beatmaps/KaraokeBeatmapProcessor.cs index 487a4dfd7..f631e52a1 100644 --- a/osu.Game.Rulesets.Karaoke/Beatmaps/KaraokeBeatmapProcessor.cs +++ b/osu.Game.Rulesets.Karaoke/Beatmaps/KaraokeBeatmapProcessor.cs @@ -1,6 +1,7 @@ // Copyright (c) andy840119 . Licensed under the GPL Licence. // See the LICENCE file in the repository root for full licence text. +using System; using System.Linq; using osu.Framework.Extensions.IEnumerableExtensions; using osu.Game.Beatmaps; @@ -10,13 +11,12 @@ using osu.Game.Rulesets.Karaoke.Stages; using osu.Game.Rulesets.Karaoke.Stages.Preview; using osu.Game.Rulesets.Karaoke.Stages.Types; +using osu.Game.Screens.Edit; namespace osu.Game.Rulesets.Karaoke.Beatmaps; public class KaraokeBeatmapProcessor : BeatmapProcessor { - public new KaraokeBeatmap Beatmap => (KaraokeBeatmap)base.Beatmap; - public KaraokeBeatmapProcessor(IBeatmap beatmap) : base(beatmap) { @@ -24,10 +24,24 @@ public KaraokeBeatmapProcessor(IBeatmap beatmap) public override void PreProcess() { - applyStage(Beatmap); + var karaokeBeatmap = getKaraokeBeatmap(Beatmap); + applyStage(karaokeBeatmap); base.PreProcess(); - applyInvalidProperty(Beatmap); + applyInvalidProperty(karaokeBeatmap); + + static KaraokeBeatmap getKaraokeBeatmap(IBeatmap beatmap) + { + // goes to there while parsing the beatmap. + if (beatmap is KaraokeBeatmap karaokeBeatmap) + return karaokeBeatmap; + + // goes to there while editing the beatmap. + if (beatmap is EditorBeatmap editorBeatmap) + return getKaraokeBeatmap(editorBeatmap.PlayableBeatmap); + + throw new InvalidCastException($"The beatmap is not a {nameof(KaraokeBeatmap)}"); + } } private void applyStage(KaraokeBeatmap beatmap) @@ -36,7 +50,7 @@ private void applyStage(KaraokeBeatmap beatmap) // trying to load the first stage or create a default one. if (beatmap.CurrentStageInfo == null) { - beatmap.CurrentStageInfo = getWorkingStage() ?? createDefaultWorkingStage(); + beatmap.CurrentStageInfo = getWorkingStage(beatmap) ?? createDefaultWorkingStage(); // should invalidate the working property here because the stage info is changed. beatmap.HitObjects.OfType().ForEach(x => @@ -50,10 +64,10 @@ private void applyStage(KaraokeBeatmap beatmap) if (beatmap.CurrentStageInfo is IHasCalculatedProperty calculatedProperty) calculatedProperty.ValidateCalculatedProperty(beatmap); - StageInfo? getWorkingStage() - => Beatmap.StageInfos.FirstOrDefault(); + static StageInfo? getWorkingStage(KaraokeBeatmap beatmap) + => beatmap.StageInfos.FirstOrDefault(); - StageInfo createDefaultWorkingStage() => new PreviewStageInfo(); + static StageInfo createDefaultWorkingStage() => new PreviewStageInfo(); } private void applyInvalidProperty(KaraokeBeatmap beatmap)