Use new working property invalidator.

karaoke-dev · Mar 26, 2023 · bd55c98 · bd55c98
1 parent c79e612
commit bd55c98
Show file tree

Hide file tree

Showing 5 changed files with 32 additions and 30 deletions.
diff --git a/osu.Game.Rulesets.Karaoke/Beatmaps/KaraokeBeatmapProcessor.cs b/osu.Game.Rulesets.Karaoke/Beatmaps/KaraokeBeatmapProcessor.cs
@@ -33,19 +33,19 @@ private void applyInvalidProperty(IBeatmap beatmap)
                 switch (hitObject)
                 {
                     case Lyric lyric:
-                        foreach (var flag in lyric.Validator.GetAllInvalidFlags())
+                        foreach (var flag in lyric.WorkingPropertyValidator.GetAllInvalidFlags())
                         {
                             applyInvalidProperty(lyric, flag);
-                            lyric.Validator.Validate(flag);
+                            lyric.WorkingPropertyValidator.Validate(flag);
                         }
 
                         break;
 
                     case Note note:
-                        foreach (var flag in note.Validator.GetAllInvalidFlags())
+                        foreach (var flag in note.WorkingPropertyValidator.GetAllInvalidFlags())
                         {
                             applyInvalidProperty(note, flag);
-                            note.Validator.Validate(flag);
+                            note.WorkingPropertyValidator.Validate(flag);
                         }
 
                         break;

diff --git a/osu.Game.Rulesets.Karaoke/Objects/Lyric.cs b/osu.Game.Rulesets.Karaoke/Objects/Lyric.cs
@@ -179,12 +179,7 @@ public int? ReferenceLyricId
             set
             {
                 referenceLyricId = value;
-
-                if (referenceLyricId == ReferenceLyric?.ID)
-                    return;
-
-                // should trying to reload the reference lyric.
-                Validator.Invalidate(LyricWorkingProperty.ReferenceLyric);
+                WorkingPropertyValidator.Invalidate(LyricWorkingProperty.ReferenceLyric);
             }
         }
 
@@ -214,6 +209,7 @@ public Lyric()
         {
             initInternalBindingEvent();
             initReferenceLyricEvent();
+            initWorkingPropertyValidator();
         }
 
         public override Judgement CreateJudgement() => new KaraokeLyricJudgement();

diff --git a/osu.Game.Rulesets.Karaoke/Objects/Lyric_Working.cs b/osu.Game.Rulesets.Karaoke/Objects/Lyric_Working.cs
@@ -14,8 +14,13 @@ namespace osu.Game.Rulesets.Karaoke.Objects;
 /// </summary>
 public partial class Lyric
 {
+    private void initWorkingPropertyValidator()
+    {
+        WorkingPropertyValidator = new LyricWorkingPropertyValidator(this);
+    }
+
     [JsonIgnore]
-    public HitObjectWorkingPropertyValidator<LyricWorkingProperty> Validator { get; } = new();
+    public LyricWorkingPropertyValidator WorkingPropertyValidator { get; private set; } = null!;
 
     [JsonIgnore]
     public double LyricStartTime { get; private set; }
@@ -58,7 +63,11 @@ public override double StartTime
     public int? PageIndex
     {
         get => PageIndexBindable.Value;
-        set => PageIndexBindable.Value = value;
+        set
+        {
+            PageIndexBindable.Value = value;
+            WorkingPropertyValidator.Validate(LyricWorkingProperty.Page);
+        }
     }
 
     [JsonIgnore]
@@ -75,11 +84,7 @@ public Lyric? ReferenceLyric
         set
         {
             ReferenceLyricBindable.Value = value;
-
-            if (value?.ID != ReferenceLyricId)
-            {
-                throw new InvalidWorkingPropertyAssignException();
-            }
+            WorkingPropertyValidator.Validate(LyricWorkingProperty.ReferenceLyric);
         }
     }
 }
diff --git a/osu.Game.Rulesets.Karaoke/Objects/Note.cs b/osu.Game.Rulesets.Karaoke/Objects/Note.cs
@@ -107,12 +107,7 @@ public int? ReferenceLyricId
             set
             {
                 referenceLyricId = value;
-
-                if (referenceLyricId == ReferenceLyric?.ID)
-                    return;
-
-                // should trying to reload the reference lyric.
-                Validator.Invalidate(NoteWorkingProperty.ReferenceLyric);
+                WorkingPropertyValidator.Invalidate(NoteWorkingProperty.ReferenceLyric);
             }
         }
 
@@ -129,6 +124,7 @@ public Note()
         {
             initInternalBindingEvent();
             initReferenceLyricEvent();
+            initWorkingPropertyValidator();
         }
 
         public override Judgement CreateJudgement() => new KaraokeNoteJudgement();

diff --git a/osu.Game.Rulesets.Karaoke/Objects/Note_Working.cs b/osu.Game.Rulesets.Karaoke/Objects/Note_Working.cs
@@ -16,8 +16,13 @@ namespace osu.Game.Rulesets.Karaoke.Objects;
 /// </summary>
 public partial class Note
 {
+    private void initWorkingPropertyValidator()
+    {
+        WorkingPropertyValidator = new NoteWorkingPropertyValidator(this);
+    }
+
     [JsonIgnore]
-    public HitObjectWorkingPropertyValidator<NoteWorkingProperty> Validator { get; } = new();
+    public NoteWorkingPropertyValidator WorkingPropertyValidator { get; private set; } = null!;
 
     [JsonIgnore]
     public readonly Bindable<int?> PageIndexBindable = new();
@@ -29,7 +34,11 @@ public partial class Note
     public int? PageIndex
     {
         get => PageIndexBindable.Value;
-        set => PageIndexBindable.Value = value;
+        set
+        {
+            PageIndexBindable.Value = value;
+            WorkingPropertyValidator.Validate(NoteWorkingProperty.Page);
+        }
     }
 
     /// <summary>
@@ -78,11 +87,7 @@ public Lyric? ReferenceLyric
         set
         {
             ReferenceLyricBindable.Value = value;
-
-            if (value?.ID != ReferenceLyricId)
-            {
-                throw new InvalidWorkingPropertyAssignException();
-            }
+            WorkingPropertyValidator.Validate(NoteWorkingProperty.ReferenceLyric);
         }
     }