Merge pull request #510 from smoogipooo/remove_type_enums

Remove hit object types solution-wide.

osu.Desktop.VisualTests/Tests/TestCaseHitObjects.cs

@@ -144,5 +144,12 @@ namespace osu.Desktop.VisualTests.Tests
             if (proxyable != null)
                 approachContainer.Add(proxyable.ProxiedLayer.CreateProxy());
         }
+
+        private enum HitObjectType
+        {
+            Circle,
+            Slider,
+            Spinner
+        }
     }
 }

osu.Game.Modes.Osu/Objects/HitCircle.cs

@@ -5,6 +5,5 @@ namespace osu.Game.Modes.Osu.Objects
 {
     public class HitCircle : OsuHitObject
     {
-        public override HitObjectType Type => HitObjectType.Circle;
     }
 }

osu.Game.Modes.Osu/Objects/HitObjectType.cs

@@ -1,13 +0,0 @@
-// Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
-// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
-
-namespace osu.Game.Modes.Osu.Objects
-{
-    public enum HitObjectType
-    {
-        Circle,
-        Slider,
-        Spinner,
-        SliderTick
-    }
-}

osu.Game.Modes.Osu/Objects/OsuHitObject.cs

@@ -36,8 +36,6 @@ namespace osu.Game.Modes.Osu.Objects
 
         public float Scale { get; set; } = 1;
 
-        public abstract HitObjectType Type { get; }
-
         public Color4 ComboColour { get; set; }
         public virtual bool NewCombo { get; set; }
         public int ComboIndex { get; set; }

osu.Game.Modes.Osu/Objects/OsuHitObjectDifficulty.cs

@@ -148,11 +148,11 @@ namespace osu.Game.Modes.Osu.Objects
             double timeElapsed = (BaseHitObject.StartTime - previousHitObject.BaseHitObject.StartTime) / timeRate;
             double decay = Math.Pow(DECAY_BASE[(int)type], timeElapsed / 1000);
 
-            if (BaseHitObject.Type == HitObjectType.Spinner)
+            if (BaseHitObject is Spinner)
             {
                 // Do nothing for spinners
             }
-            else if (BaseHitObject.Type == HitObjectType.Slider)
+            else if (BaseHitObject is Slider)
             {
                 switch (type)
                 {
@@ -180,7 +180,7 @@ namespace osu.Game.Modes.Osu.Objects
                         break;
                 }
             }
-            else if (BaseHitObject.Type == HitObjectType.Circle)
+            else if (BaseHitObject is HitCircle)
             {
                 addition = spacingWeight(DistanceTo(previousHitObject), type) * spacing_weight_scaling[(int)type];
             }

osu.Game.Modes.Osu/Objects/Slider.cs

@@ -103,7 +103,5 @@ namespace osu.Game.Modes.Osu.Objects
                 }
             }
         }
-
-        public override HitObjectType Type => HitObjectType.Slider;
     }
 }

osu.Game.Modes.Osu/Objects/SliderTick.cs

@@ -6,7 +6,5 @@ namespace osu.Game.Modes.Osu.Objects
     public class SliderTick : OsuHitObject
     {
         public int RepeatIndex { get; set; }
-
-        public override HitObjectType Type => HitObjectType.SliderTick;
     }
 }

osu.Game.Modes.Osu/Objects/Spinner.cs

@@ -10,8 +10,6 @@ namespace osu.Game.Modes.Osu.Objects
         public double EndTime { get; set; }
         public double Duration => EndTime - StartTime;
 
-        public override HitObjectType Type => HitObjectType.Spinner;
-
         public override bool NewCombo => true;
     }
 }

osu.Game.Modes.Osu/OsuDifficultyCalculator.cs

@@ -2,6 +2,7 @@
 // Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
 
 using osu.Game.Beatmaps;
+using osu.Game.Modes.Objects.Types;
 using osu.Game.Modes.Osu.Beatmaps;
 using osu.Game.Modes.Osu.Objects;
 using System;
@@ -26,8 +27,7 @@ namespace osu.Game.Modes.Osu
         protected override void PreprocessHitObjects()
         {
             foreach (var h in Objects)
-                if (h.Type == HitObjectType.Slider)
+                (h as IHasCurve)?.Curve?.Calculate();
-                    ((Slider)h).Curve.Calculate();
         }
 
         protected override double CalculateInternal(Dictionary<string, string> categoryDifficulty)

osu.Game.Modes.Osu/osu.Game.Modes.Osu.csproj

@@ -67,7 +67,6 @@
     <Compile Include="Objects\Drawables\Pieces\TrianglesPiece.cs" />
     <Compile Include="Objects\Drawables\Pieces\SliderBall.cs" />
     <Compile Include="Objects\Drawables\Pieces\SliderBody.cs" />
-    <Compile Include="Objects\HitObjectType.cs" />
     <Compile Include="Objects\OsuHitObjectDifficulty.cs" />
     <Compile Include="Objects\SliderTick.cs" />
     <Compile Include="OsuAutoReplay.cs" />

osu.Game.Modes.Taiko/Objects/TaikoHitType.cs

@@ -1,21 +0,0 @@
-// Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
-// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
-
-using System;
-
-namespace osu.Game.Modes.Taiko.Objects
-{
-    [Flags]
-    public enum TaikoHitType
-    {
-        None = 0,
-        CentreHit = 1 << 0,
-        RimHit = 1 << 1,
-        DrumRoll = 1 << 2,
-        DrumRollTick = 1 << 3,
-        Bash = 1 << 4,
-        Finisher = 1 << 5,
-
-        Hit = CentreHit | RimHit
-    }
-}

osu.Game.Modes.Taiko/osu.Game.Modes.Taiko.csproj

@@ -50,7 +50,6 @@
     <Compile Include="Beatmaps\TaikoBeatmapConverter.cs" />
     <Compile Include="Beatmaps\TaikoBeatmapProcessor.cs" />
     <Compile Include="Judgements\TaikoJudgementInfo.cs" />
-    <Compile Include="Objects\TaikoHitType.cs" />
     <Compile Include="TaikoDifficultyCalculator.cs" />
     <Compile Include="Objects\Drawable\DrawableTaikoHit.cs" />
     <Compile Include="Objects\TaikoHitObject.cs" />