From 7917a60e3c18c1f9f9d9c54fc7f1ae811b6cc470 Mon Sep 17 00:00:00 2001
From: vun <vunyunt@gmail.com>
Date: Thu, 21 Jul 2022 15:45:03 +0800
Subject: [PATCH] Move TaikoDifficultyHitObject creation back to
 TaikoDifficultyCalculator

---
 .../TaikoDifficultyPreprocessor.cs            | 26 +++----------------
 .../Difficulty/TaikoDifficultyCalculator.cs   | 16 +++++++++++-
 2 files changed, 18 insertions(+), 24 deletions(-)

diff --git a/osu.Game.Rulesets.Taiko/Difficulty/Preprocessing/TaikoDifficultyPreprocessor.cs b/osu.Game.Rulesets.Taiko/Difficulty/Preprocessing/TaikoDifficultyPreprocessor.cs
index fa8e6a8a26..bd703b7263 100644
--- a/osu.Game.Rulesets.Taiko/Difficulty/Preprocessing/TaikoDifficultyPreprocessor.cs
+++ b/osu.Game.Rulesets.Taiko/Difficulty/Preprocessing/TaikoDifficultyPreprocessor.cs
@@ -3,7 +3,6 @@
 
 using System.Collections.Generic;
 using osu.Game.Rulesets.Difficulty.Preprocessing;
-using osu.Game.Beatmaps;
 using osu.Game.Rulesets.Taiko.Difficulty.Preprocessing.Colour;
 
 namespace osu.Game.Rulesets.Taiko.Difficulty.Preprocessing
@@ -11,31 +10,12 @@ namespace osu.Game.Rulesets.Taiko.Difficulty.Preprocessing
     public class TaikoDifficultyPreprocessor
     {
         /// <summary>
-        /// Creates a list of <see cref="TaikoDifficultyHitObject"/>s from a <see cref="IBeatmap"/>s.
-        /// This is placed here in a separate class to avoid <see cref="TaikoDifficultyCalculator"/> having to know
-        /// too much implementation details of the preprocessing, and avoid  <see cref="TaikoDifficultyHitObject"/>
-        /// having circular dependencies with various preprocessing and evaluator classes.
+        /// Does preprocessing on a list of <see cref="TaikoDifficultyHitObject"/>s.
+        /// TODO: Review this - this is currently only a one-step process, but will potentially be expanded in the future.
         /// </summary>
-        /// <param name="beatmap">The beatmap from which the list of <see cref="TaikoDifficultyHitObject"/> is created.</param>
-        /// <param name="clockRate">The rate at which the gameplay clock is run at.</param>
-        public static List<DifficultyHitObject> CreateDifficultyHitObjects(IBeatmap beatmap, double clockRate)
+        public static List<DifficultyHitObject> Process(List<DifficultyHitObject> difficultyHitObjects)
         {
-            List<DifficultyHitObject> difficultyHitObjects = new List<DifficultyHitObject>();
-            List<TaikoDifficultyHitObject> centreObjects = new List<TaikoDifficultyHitObject>();
-            List<TaikoDifficultyHitObject> rimObjects = new List<TaikoDifficultyHitObject>();
-            List<TaikoDifficultyHitObject> noteObjects = new List<TaikoDifficultyHitObject>();
-
-            for (int i = 2; i < beatmap.HitObjects.Count; i++)
-            {
-                difficultyHitObjects.Add(
-                    new TaikoDifficultyHitObject(
-                        beatmap.HitObjects[i], beatmap.HitObjects[i - 1], beatmap.HitObjects[i - 2], clockRate, difficultyHitObjects,
-                        centreObjects, rimObjects, noteObjects, difficultyHitObjects.Count)
-                );
-            }
-
             TaikoColourDifficultyPreprocessor.ProcessAndAssign(difficultyHitObjects);
-
             return difficultyHitObjects;
         }
     }
diff --git a/osu.Game.Rulesets.Taiko/Difficulty/TaikoDifficultyCalculator.cs b/osu.Game.Rulesets.Taiko/Difficulty/TaikoDifficultyCalculator.cs
index 3a230f7b91..716a016b12 100644
--- a/osu.Game.Rulesets.Taiko/Difficulty/TaikoDifficultyCalculator.cs
+++ b/osu.Game.Rulesets.Taiko/Difficulty/TaikoDifficultyCalculator.cs
@@ -47,7 +47,21 @@ namespace osu.Game.Rulesets.Taiko.Difficulty
 
         protected override IEnumerable<DifficultyHitObject> CreateDifficultyHitObjects(IBeatmap beatmap, double clockRate)
         {
-            return TaikoDifficultyPreprocessor.CreateDifficultyHitObjects(beatmap, clockRate);
+            List<DifficultyHitObject> difficultyHitObjects = new List<DifficultyHitObject>();
+            List<TaikoDifficultyHitObject> centreObjects = new List<TaikoDifficultyHitObject>();
+            List<TaikoDifficultyHitObject> rimObjects = new List<TaikoDifficultyHitObject>();
+            List<TaikoDifficultyHitObject> noteObjects = new List<TaikoDifficultyHitObject>();
+
+            for (int i = 2; i < beatmap.HitObjects.Count; i++)
+            {
+                difficultyHitObjects.Add(
+                    new TaikoDifficultyHitObject(
+                        beatmap.HitObjects[i], beatmap.HitObjects[i - 1], beatmap.HitObjects[i - 2], clockRate, difficultyHitObjects,
+                        centreObjects, rimObjects, noteObjects, difficultyHitObjects.Count)
+                );
+            }
+
+            return TaikoDifficultyPreprocessor.Process(difficultyHitObjects);
         }
 
         protected override DifficultyAttributes CreateDifficultyAttributes(IBeatmap beatmap, Mod[] mods, Skill[] skills, double clockRate)