Resolve merge conflicts

osu.Game.Rulesets.Taiko.Tests/TestSceneTaikoPlayfield.cs

@@ -247,10 +247,6 @@ namespace osu.Game.Rulesets.Taiko.Tests
                 : base(hitObject)
             {
             }
-
-            protected override void UpdateState(ArmedState state)
-            {
-            }
         }
     }
 }

osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableBarLine.cs

@@ -53,9 +53,5 @@ namespace osu.Game.Rulesets.Taiko.Objects.Drawables
                 Alpha = 0.75f
             });
         }
-
-        protected override void UpdateState(ArmedState state)
-        {
-        }
     }
 }

osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableDrumRoll.cs

@@ -88,13 +88,13 @@ namespace osu.Game.Rulesets.Taiko.Objects.Drawables
                 ApplyResult(r => r.Type = HitResult.Miss);
         }
 
-        protected override void UpdateState(ArmedState state)
+        protected override void UpdateStateTransforms(ArmedState state)
         {
             switch (state)
             {
                 case ArmedState.Hit:
                 case ArmedState.Miss:
-                    this.FadeOut(100).Expire();
+                    this.Delay(HitObject.Duration).FadeOut(100).Expire();
                     break;
             }
         }

osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableDrumRollTick.cs

@@ -39,7 +39,7 @@ namespace osu.Game.Rulesets.Taiko.Objects.Drawables
             ApplyResult(r => r.Type = HitResult.Great);
         }
 
-        protected override void UpdateState(ArmedState state)
+        protected override void UpdateStateTransforms(ArmedState state)
         {
             switch (state)
             {

osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableHit.cs

@@ -92,17 +92,9 @@ namespace osu.Game.Rulesets.Taiko.Objects.Drawables
             Size = BaseSize * Parent.RelativeChildSize;
         }
 
-        protected override void UpdateState(ArmedState state)
+        protected override void UpdateStateTransforms(ArmedState state)
         {
-            // TODO: update to use new state management.
+            switch (state)
-            var circlePiece = MainPiece as CirclePiece;
-            circlePiece?.FlashBox.FinishTransforms();
-
-            var offset = !AllJudged ? 0 : Time.Current - HitObject.StartTime;
-
-            using (BeginDelayedSequence(HitObject.StartTime - Time.Current + offset, true))
-            {
-                switch (State.Value)
             {
                 case ArmedState.Idle:
                     validActionPressed = false;
@@ -120,13 +112,8 @@ namespace osu.Game.Rulesets.Taiko.Objects.Drawables
                     // If we're far enough away from the left stage, we should bring outselves in front of it
                     ProxyContent();
 
-                        var flash = circlePiece?.FlashBox;
+                    var flash = (MainPiece as CirclePiece)?.FlashBox;
-
+                    flash?.FadeTo(0.9f).FadeOut(300);
-                        if (flash != null)
-                        {
-                            flash.FadeTo(0.9f);
-                            flash.FadeOut(300);
-                        }
 
                     const float gravity_time = 300;
                     const float gravity_travel_height = 200;
@@ -143,7 +130,6 @@ namespace osu.Game.Rulesets.Taiko.Objects.Drawables
                     break;
             }
         }
-        }
 
         protected override DrawableStrongNestedHit CreateStrongHit(StrongHitObject hitObject) => new StrongNestedHit(hitObject, this);
 

osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableStrongNestedHit.cs

@@ -18,9 +18,5 @@ namespace osu.Game.Rulesets.Taiko.Objects.Drawables
         {
             MainObject = mainObject;
         }
-
-        protected override void UpdateState(ArmedState state)
-        {
-        }
     }
 }

osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableSwell.cs

@@ -25,6 +25,11 @@ namespace osu.Game.Rulesets.Taiko.Objects.Drawables
         private const float target_ring_scale = 5f;
         private const float inner_ring_alpha = 0.65f;
 
+        /// <summary>
+        /// Offset away from the start time of the swell at which the ring starts appearing.
+        /// </summary>
+        private const double ring_appear_offset = 100;
+
         private readonly List<DrawableSwellTick> ticks = new List<DrawableSwellTick>();
 
         private readonly Container bodyContainer;
@@ -179,26 +184,34 @@ namespace osu.Game.Rulesets.Taiko.Objects.Drawables
             }
         }
 
-        protected override void UpdateState(ArmedState state)
+        protected override void UpdateInitialTransforms()
         {
-            const float preempt = 100;
+            base.UpdateInitialTransforms();
-            const float out_transition_time = 300;
+
+            using (BeginAbsoluteSequence(HitObject.StartTime - ring_appear_offset, true))
+                targetRing.ScaleTo(target_ring_scale, 400, Easing.OutQuint);
+        }
+
+        protected override void UpdateStateTransforms(ArmedState state)
+        {
+            const double transition_duration = 300;
 
             switch (state)
             {
                 case ArmedState.Idle:
-                    UnproxyContent();
                     expandingRing.FadeTo(0);
-                    using (BeginAbsoluteSequence(HitObject.StartTime - preempt, true))
-                        targetRing.ScaleTo(target_ring_scale, preempt * 4, Easing.OutQuint);
                     break;
 
                 case ArmedState.Miss:
                 case ArmedState.Hit:
-                    this.FadeOut(out_transition_time, Easing.Out);
+                    using (BeginAbsoluteSequence(Time.Current, true))
-                    bodyContainer.ScaleTo(1.4f, out_transition_time);
+                    {
+                        this.FadeOut(transition_duration, Easing.Out);
+                        bodyContainer.ScaleTo(1.4f, transition_duration);
 
                         Expire();
+                    }
+
                     break;
             }
         }
@@ -212,9 +225,10 @@ namespace osu.Game.Rulesets.Taiko.Objects.Drawables
             // Make the swell stop at the hit target
             X = Math.Max(0, X);
 
-            double t = Math.Min(HitObject.StartTime, Time.Current);
+            if (Time.Current >= HitObject.StartTime - ring_appear_offset)
-            if (t == HitObject.StartTime)
                 ProxyContent();
+            else
+                UnproxyContent();
         }
 
         private bool? lastWasCentre;

osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableSwellTick.cs

@@ -1,7 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-using osu.Game.Rulesets.Objects.Drawables;
 using osu.Game.Rulesets.Scoring;
 
 namespace osu.Game.Rulesets.Taiko.Objects.Drawables
@@ -21,10 +20,6 @@ namespace osu.Game.Rulesets.Taiko.Objects.Drawables
         {
         }
 
-        protected override void UpdateState(ArmedState state)
-        {
-        }
-
         public override bool OnPressed(TaikoAction action) => false;
     }
 }

osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableTaikoHitObject.cs

@@ -78,10 +78,31 @@ namespace osu.Game.Rulesets.Taiko.Objects.Drawables
         public abstract bool OnPressed(TaikoAction action);
         public virtual bool OnReleased(TaikoAction action) => false;
 
+        protected override void UpdateInitialTransforms() => this.FadeIn();
+
+        public override double LifetimeStart
+        {
+            get => base.LifetimeStart;
+            set
+            {
+                base.LifetimeStart = value;
+                proxiedContent.LifetimeStart = value;
+            }
+        }
+
+        public override double LifetimeEnd
+        {
+            get => base.LifetimeEnd;
+            set
+            {
+                base.LifetimeEnd = value;
+                proxiedContent.LifetimeEnd = value;
+            }
+        }
+
         private class ProxiedContentContainer : Container
         {
-            public override double LifetimeStart => Parent?.LifetimeStart ?? base.LifetimeStart;
+            public override bool RemoveWhenNotAlive => false;
-            public override double LifetimeEnd => Parent?.LifetimeEnd ?? base.LifetimeEnd;
         }
     }
 
@@ -121,8 +142,6 @@ namespace osu.Game.Rulesets.Taiko.Objects.Drawables
             }
         }
 
-        protected override bool UseTransformStateManagement => false;
-
         // Normal and clap samples are handled by the drum
         protected override IEnumerable<HitSampleInfo> GetSamples() => HitObject.Samples.Where(s => s.Name != HitSampleInfo.HIT_NORMAL && s.Name != HitSampleInfo.HIT_CLAP);
 

osu.Game.Tests/Visual/Gameplay/TestSceneScrollingHitObjects.cs

@@ -200,10 +200,6 @@ namespace osu.Game.Tests.Visual.Gameplay
                         break;
                 }
             }
-
-            protected override void UpdateState(ArmedState state)
-            {
-            }
         }
 
         private class TestDrawableHitObject : DrawableHitObject<HitObject>
@@ -216,10 +212,6 @@ namespace osu.Game.Tests.Visual.Gameplay
 
                 AddInternal(new Box { Size = new Vector2(75) });
             }
-
-            protected override void UpdateState(ArmedState state)
-            {
-            }
         }
     }
 }

osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs

@@ -132,6 +132,8 @@ namespace osu.Game.Rulesets.Objects.Drawables
         /// </summary>
         public event Action<DrawableHitObject, ArmedState> ApplyCustomUpdateState;
 
+#pragma warning disable 618 // (legacy state management) - can be removed 20200227
+
         /// <summary>
         /// Enables automatic transform management of this hitobject. Implementation of transforms should be done in <see cref="UpdateInitialTransforms"/> and <see cref="UpdateStateTransforms"/> only. Rewinding and removing previous states is done automatically.
         /// </summary>
@@ -139,6 +141,7 @@ namespace osu.Game.Rulesets.Objects.Drawables
         /// Going forward, this is the preferred way of implementing <see cref="DrawableHitObject"/>s. Previous functionality
         /// is offered as a compatibility layer until all rulesets have been migrated across.
         /// </remarks>
+        [Obsolete("Use UpdateInitialTransforms()/UpdateStateTransforms() instead")] // can be removed 20200227
         protected virtual bool UseTransformStateManagement => true;
 
         protected override void ClearInternal(bool disposeChildren = true) => throw new InvalidOperationException($"Should never clear a {nameof(DrawableHitObject)}");
@@ -219,10 +222,13 @@ namespace osu.Game.Rulesets.Objects.Drawables
         /// Should generally not be used when <see cref="UseTransformStateManagement"/> is true; use <see cref="UpdateStateTransforms"/> instead.
         /// </summary>
         /// <param name="state">The new armed state.</param>
+        [Obsolete("Use UpdateInitialTransforms()/UpdateStateTransforms() instead")] // can be removed 20200227
         protected virtual void UpdateState(ArmedState state)
         {
         }
 
+#pragma warning restore 618
+
         #endregion
 
         protected override void SkinChanged(ISkinSource skin, bool allowFallback)

osu.Game/Skinning/LegacySkin.cs

@@ -156,16 +156,55 @@ namespace osu.Game.Skinning
                             // Spacing value was reverse-engineered from the ratio of the rendered sprite size in the visual inspector vs the actual texture size
                             Spacing = new Vector2(-Configuration.HitCircleOverlap * 0.89f, 0)
                         };
-
-                default:
-                    string lastPiece = componentName.Split('/').Last();
-                    componentName = componentName.StartsWith("Gameplay/taiko/") ? "taiko-" + lastPiece : lastPiece;
-                    break;
             }
 
             return getAnimation(componentName, animatable, looping);
         }
 
+        public override Texture GetTexture(string componentName)
+        {
+            componentName = getFallbackName(componentName);
+
+            float ratio = 2;
+            var texture = Textures.Get($"{componentName}@2x");
+
+            if (texture == null)
+            {
+                ratio = 1;
+                texture = Textures.Get(componentName);
+            }
+
+            if (texture != null)
+                texture.ScaleAdjust = ratio;
+
+            return texture;
+        }
+
+        public override SampleChannel GetSample(ISampleInfo sampleInfo)
+        {
+            foreach (var lookup in sampleInfo.LookupNames)
+            {
+                var sample = Samples.Get(getFallbackName(lookup));
+
+                if (sample != null)
+                    return sample;
+            }
+
+            if (sampleInfo is HitSampleInfo hsi)
+                // Try fallback to non-bank samples.
+                return Samples.Get(hsi.Name);
+
+            return null;
+        }
+
+        private bool hasFont(string fontName) => GetTexture($"{fontName}-0") != null;
+
+        private string getFallbackName(string componentName)
+        {
+            string lastPiece = componentName.Split('/').Last();
+            return componentName.StartsWith("Gameplay/taiko/") ? "taiko-" + lastPiece : lastPiece;
+        }
+
         private Drawable getAnimation(string componentName, bool animatable, bool looping, string animationSeparator = "-")
         {
             Texture texture;
@@ -201,42 +240,6 @@ namespace osu.Game.Skinning
             return null;
         }
 
-        public override Texture GetTexture(string componentName)
-        {
-            float ratio = 2;
-            var texture = Textures.Get($"{componentName}@2x");
-
-            if (texture == null)
-            {
-                ratio = 1;
-                texture = Textures.Get(componentName);
-            }
-
-            if (texture != null)
-                texture.ScaleAdjust = ratio;
-
-            return texture;
-        }
-
-        public override SampleChannel GetSample(ISampleInfo sampleInfo)
-        {
-            foreach (var lookup in sampleInfo.LookupNames)
-            {
-                var sample = Samples.Get(lookup);
-
-                if (sample != null)
-                    return sample;
-            }
-
-            if (sampleInfo is HitSampleInfo hsi)
-                // Try fallback to non-bank samples.
-                return Samples.Get(hsi.Name);
-
-            return null;
-        }
-
-        private bool hasFont(string fontName) => GetTexture($"{fontName}-0") != null;
-
         protected class LegacySkinResourceStore<T> : IResourceStore<byte[]>
             where T : INamedFileInfo
         {