Reflection to simplify transforms + some refactoring

osu.Game/Graphics/UserInterface/AccuracyCounter.cs

@@ -18,6 +18,8 @@ namespace osu.Game.Graphics.UserInterface
     /// </summary>
     public class AccuracyCounter : RollingCounter<float>
     {
+        protected override Type transformType => typeof(TransformAccuracy);
+
         private long numerator = 0;
         public long Numerator
         {
@@ -71,11 +73,6 @@ namespace osu.Game.Graphics.UserInterface
             return count.ToString("0.00") + "%";
         }
 
-        protected override void transformCount(float currentValue, float newValue)
-        {
-            transformCount(new TransformAccuracy(Clock), currentValue, newValue);
-        }
-
         protected class TransformAccuracy : Transform<float>
         {
             public override float CurrentValue

osu.Game/Graphics/UserInterface/AlternativeComboCounter.cs

@@ -24,7 +24,7 @@ namespace osu.Game.Graphics.UserInterface
         public EasingTypes TintEasing = EasingTypes.None;
         public bool CanAnimateWhenBackwards = false;
 
-        public AlternativeComboCounter()
+        public AlternativeComboCounter() : base()
         {
             IsRollingContinuous = false;
         }
@@ -46,15 +46,15 @@ namespace osu.Game.Graphics.UserInterface
             // Animate rollover only when going backwards
             if (newValue > currentValue)
             {
-                updateTransforms(typeof(TranformULongCounter));
+                updateTransforms(typeof(TransformULongCounter));
-                removeTransforms(typeof(TranformULongCounter));
+                removeTransforms(typeof(TransformULongCounter));
                 VisibleCount = newValue;
             }
             else
-                transformCount(new TranformULongCounter(Clock), currentValue, newValue);
+                transformCount(new TransformULongCounter(Clock), currentValue, newValue);
         }
 
-        protected override ulong GetProportionalDuration(ulong currentValue, ulong newValue)
+        protected override ulong getProportionalDuration(ulong currentValue, ulong newValue)
         {
             ulong difference = currentValue > newValue ? currentValue - newValue : currentValue - newValue;
             return difference * RollingDuration;

osu.Game/Graphics/UserInterface/CatchComboCounter.cs

@@ -15,7 +15,7 @@ namespace osu.Game.Graphics.UserInterface
     /// </summary>
     public class CatchComboCounter : StandardComboCounter
     {
-        public CatchComboCounter()
+        public CatchComboCounter() : base()
         {
             CanPopOutWhenBackwards = true;
         }
@@ -30,15 +30,15 @@ namespace osu.Game.Graphics.UserInterface
             // Animate rollover only when going backwards
             if (newValue > currentValue)
             {
-                updateTransforms(typeof(TranformULongCounter));
+                updateTransforms(typeof(TransformULongCounter));
-                removeTransforms(typeof(TranformULongCounter));
+                removeTransforms(typeof(TransformULongCounter));
                 VisibleCount = newValue;
             }
             else
             {
                 // Backwards pop-up animation has no tint colour
                 popOutSpriteText.Colour = countSpriteText.Colour;
-                transformCount(new TranformULongCounter(Clock), currentValue, newValue);
+                transformCount(new TransformULongCounter(Clock), currentValue, newValue);
             }
         }
 

osu.Game/Graphics/UserInterface/RollingCounter.cs

@@ -7,6 +7,7 @@ using osu.Framework.Graphics.Sprites;
 using osu.Framework.Graphics.Transformations;
 using System;
 using System.Collections.Generic;
+using System.Diagnostics;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
@@ -19,6 +20,14 @@ namespace osu.Game.Graphics.UserInterface
     /// <typeparam name="T">Type of the actual counter.</typeparam>
     public abstract class RollingCounter<T> : Container
     {
+        /// <summary>
+        /// Type of the Transform to use.
+        /// </summary>
+        /// <remarks>
+        /// Must be a subclass of Transform<T>
+        /// </remarks>
+        protected virtual Type transformType => typeof(Transform<T>);
+
         protected SpriteText countSpriteText;
         protected ulong RollingTotalDuration = 0;
 
@@ -92,7 +101,7 @@ namespace osu.Game.Graphics.UserInterface
                 {
                     RollingTotalDuration =
                         IsRollingProportional
-                            ? GetProportionalDuration(VisibleCount, value)
+                            ? getProportionalDuration(VisibleCount, value)
                             : RollingDuration;
                     transformCount(IsRollingContinuous ? VisibleCount : count, value);
                 }
@@ -100,10 +109,15 @@ namespace osu.Game.Graphics.UserInterface
             }
         }
 
+        protected RollingCounter()
+        {
+            Debug.Assert(transformType.IsSubclassOf(typeof(Transform<T>)), @"transformType should be a subclass of Transform<T>.");
+        }
+
         public override void Load()
         {
             base.Load();
-            removeTransforms(typeof(Transform<T>));
+            removeTransforms(transformType);
             if (Count == null)
                 ResetCount();
             VisibleCount = Count;
@@ -119,32 +133,6 @@ namespace osu.Game.Graphics.UserInterface
             };
         }
 
-        /// <summary>
-        /// Calculates the duration of the roll-up animation by using the difference between the current visible value
-        /// and the new final value.
-        /// </summary>
-        /// <remarks>
-        /// Intended to be used in conjunction with IsRollingProportional = true.
-        /// Unless a derived class needs to have a proportional rolling, it is not necessary to override this function.
-        /// </remarks>
-        /// <param name="currentValue">Current visible value.</param>
-        /// <param name="newValue">New final value.</param>
-        /// <returns>Calculated rollover duration in milliseconds.</returns>
-        protected virtual ulong GetProportionalDuration(T currentValue, T newValue)
-        {
-            return RollingDuration;
-        }
-
-        /// <summary>
-        /// Used to format counts.
-        /// </summary>
-        /// <param name="count">Count to format.</param>
-        /// <returns>Count formatted as a string.</returns>
-        protected virtual string formatCount(T count)
-        {
-            return count.ToString();
-        }
-
         /// <summary>
         /// Sets count value, bypassing rollover animation.
         /// </summary>
@@ -160,7 +148,7 @@ namespace osu.Game.Graphics.UserInterface
         /// </summary>
         public virtual void StopRolling()
         {
-            removeTransforms(typeof(Transform<T>));
+            removeTransforms(transformType);
             VisibleCount = Count;
         }
 
@@ -169,16 +157,42 @@ namespace osu.Game.Graphics.UserInterface
         /// </summary>
         public abstract void ResetCount();
 
+        /// <summary>
+        /// Calculates the duration of the roll-up animation by using the difference between the current visible value
+        /// and the new final value.
+        /// </summary>
+        /// <remarks>
+        /// To be used in conjunction with IsRollingProportional = true.
+        /// Unless a derived class needs to have a proportional rolling, it is not necessary to override this function.
+        /// </remarks>
+        /// <param name="currentValue">Current visible value.</param>
+        /// <param name="newValue">New final value.</param>
+        /// <returns>Calculated rollover duration in milliseconds.</returns>
+        protected virtual ulong getProportionalDuration(T currentValue, T newValue)
+        {
+            return RollingDuration;
+        }
+
+        /// <summary>
+        /// Used to format counts.
+        /// </summary>
+        /// <param name="count">Count to format.</param>
+        /// <returns>Count formatted as a string.</returns>
+        protected virtual string formatCount(T count)
+        {
+            return count.ToString();
+        }
+
         protected void updateTransforms(Type type)
         {
             foreach (ITransform t in Transforms.AliveItems)
-                if (t.GetType().IsAssignableFrom(type))
+                if (t.GetType() == type)
                     t.Apply(this);
         }
 
         protected void removeTransforms(Type type)
         {
-            Transforms.RemoveAll(t => t.GetType().IsSubclassOf(type));
+            Transforms.RemoveAll(t => t.GetType() == type);
         }
 
         /// <summary>
@@ -190,11 +204,16 @@ namespace osu.Game.Graphics.UserInterface
         /// <remarks>
         /// Unless you need to set a custom animation according to the current or new value of the count, the
         /// recommended approach is to call transformCount(CustomTransformer(Clock), currentValue, newValue), where
-        /// CustomTransformer is a custom Transformer related to the type T of the RolloverCounter.
+        /// CustomTransformer is of type transformerType.
         /// By using this approach, there is no need to check if the Clock is not null; this validation is done before
         /// adding the transformer.
         /// </remarks>
-        protected abstract void transformCount(T currentValue, T newValue);
+        /// <seealso cref="transformType"/>
+        protected virtual void transformCount(T currentValue, T newValue)
+        {
+            object[] parameters = { Clock };
+            transformCount((Transform<T>)Activator.CreateInstance(transformType, parameters), currentValue, newValue);
+        }
 
         /// <summary>
         /// Intended to be used by transformCount().
@@ -239,7 +258,7 @@ namespace osu.Game.Graphics.UserInterface
             }
         }
 
-        protected virtual void updateTextSize()
+        protected void updateTextSize()
         {
             if (countSpriteText != null)
                 countSpriteText.TextSize = TextSize;

osu.Game/Graphics/UserInterface/StandardComboCounter.cs

@@ -25,7 +25,7 @@ namespace osu.Game.Graphics.UserInterface
         public bool CanPopOutWhenBackwards = false;
         public float PopOutInitialAlpha = 1.0f;
 
-        public StandardComboCounter()
+        public StandardComboCounter() : base()
         {
             IsRollingContinuous = false;
         }
@@ -57,15 +57,15 @@ namespace osu.Game.Graphics.UserInterface
             // Animate rollover only when going backwards
             if (newValue > currentValue)
             {
-                updateTransforms(typeof(TranformULongCounter));
+                updateTransforms(typeof(TransformULongCounter));
-                removeTransforms(typeof(TranformULongCounter));
+                removeTransforms(typeof(TransformULongCounter));
                 VisibleCount = newValue;
             }
             else
-                transformCount(new TranformULongCounter(Clock), currentValue, newValue);
+                transformCount(new TransformULongCounter(Clock), currentValue, newValue);
         }
 
-        protected override ulong GetProportionalDuration(ulong currentValue, ulong newValue)
+        protected override ulong getProportionalDuration(ulong currentValue, ulong newValue)
         {
             ulong difference = currentValue > newValue ? currentValue - newValue : currentValue - newValue;
             return difference * RollingDuration;

osu.Game/Graphics/UserInterface/ULongCounter.cs

@@ -18,10 +18,7 @@ namespace osu.Game.Graphics.UserInterface
     /// </summary>
     public class ULongCounter : RollingCounter<ulong>
     {
-        protected override void transformCount(ulong currentValue, ulong newValue)
+        protected override Type transformType => typeof(TransformULongCounter);
-        {
-            transformCount(new TranformULongCounter(Clock), currentValue, newValue);
-        }
 
         public override void ResetCount()
         {
@@ -33,7 +30,7 @@ namespace osu.Game.Graphics.UserInterface
             return count.ToString("#,0");
         }
 
-        protected class TranformULongCounter : Transform<ulong>
+        protected class TransformULongCounter : Transform<ulong>
         {
             public override ulong CurrentValue
             {
@@ -53,7 +50,7 @@ namespace osu.Game.Graphics.UserInterface
                 (d as ULongCounter).VisibleCount = CurrentValue;
             }
 
-            public TranformULongCounter(IClock clock)
+            public TransformULongCounter(IClock clock)
                 : base(clock)
             {
             }