Merge pull request #361 from peppy/general-hitobject-improvements

General HitObject improvements.

osu.Game.Modes.Osu/Objects/Drawables/DrawableHitCircle.cs

@@ -49,7 +49,10 @@ public DrawableHitCircle(OsuHitObject h) : base(h)
                         return true;
                     },
                 },
-                number = new NumberPiece(),
+                number = new NumberPiece()
+                {
+                    Text = h is Spinner ? "S" : (HitObject.ComboIndex + 1).ToString(),
+                },
                 ring = new RingPiece(),
                 flash = new FlashPiece(),
                 explode = new ExplodePiece
@@ -124,6 +127,8 @@ protected override void UpdateState(ArmedState state)
             base.UpdateState(state);
 
             ApproachCircle.FadeOut();
+
+            glow.Delay(osuObject.Duration);
             glow.FadeOut(400);
 
             switch (state)

osu.Game.Modes.Osu/Objects/Drawables/DrawableSlider.cs

@@ -49,8 +49,10 @@ public DrawableSlider(Slider s) : base(s)
                 },
                 initialCircle = new DrawableHitCircle(new HitCircle
                 {
+                    //todo: avoid creating this temporary HitCircle.
                     StartTime = s.StartTime,
                     Position = s.StackedPosition,
+                    ComboIndex = s.ComboIndex,
                     Scale = s.Scale,
                     Colour = s.Colour,
                     Sample = s.Sample,

osu.Game.Modes.Osu/Objects/Drawables/DrawableSpinner.cs

@@ -3,6 +3,7 @@
 
 using System;
 using osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Transformations;
 using osu.Framework.MathUtils;
 using osu.Game.Modes.Objects.Drawables;
@@ -18,8 +19,8 @@ public class DrawableSpinner : DrawableOsuHitObject
 
         private SpinnerDisc disc;
         private SpinnerBackground background;
+        private Container circleContainer;
         private DrawableHitCircle circle;
-        private NumberPiece number;
 
         public DrawableSpinner(Spinner s) : base(s)
         {
@@ -47,16 +48,23 @@ public DrawableSpinner(Spinner s) : base(s)
                     Origin = Anchor.Centre,
                     DiscColour = s.Colour
                 },
-                circle = new DrawableHitCircle(s)
+                circleContainer = new Container
                 {
-                    Interactive = false,
-                    Position = Vector2.Zero,
+                    AutoSizeAxes = Axes.Both,
                     Anchor = Anchor.Centre,
+                    Origin = Anchor.Centre,
+                    Children = new []
+                    {
+                        circle = new DrawableHitCircle(s)
+                        {
+                            Interactive = false,
+                            Position = Vector2.Zero,
+                            Anchor = Anchor.Centre,
+                        }
+                    }
                 }
             };
 
-            circle.ApproachCircle.Colour = Color4.Transparent;
-
             background.Scale = scaleToCircle;
             disc.Scale = scaleToCircle;
         }
@@ -71,6 +79,9 @@ protected override void CheckJudgement(bool userTriggered)
 
             disc.ScaleTo(Interpolation.ValueAt(Math.Sqrt(Progress), scaleToCircle, Vector2.One, 0, 1), 100);
 
+            if (Progress >= 1)
+                disc.Complete = true;
+
             if (!userTriggered && Time.Current >= HitObject.EndTime)
             {
                 if (Progress >= 1)
@@ -91,7 +102,8 @@ protected override void CheckJudgement(bool userTriggered)
                 else
                 {
                     j.Score = OsuScoreResult.Miss;
-                    j.Result = HitResult.Miss;
+                    if (Time.Current >= HitObject.EndTime)
+                        j.Result = HitResult.Miss;
                 }
             }
         }
@@ -109,6 +121,7 @@ protected override void UpdatePreemptState()
             base.UpdatePreemptState();
 
             FadeIn(200);
+            circleContainer.ScaleTo(1, 400, EasingTypes.OutElastic);
 
             background.Delay(TIME_PREEMPT - 100);
             background.FadeIn(200);
@@ -120,12 +133,14 @@ protected override void UpdatePreemptState()
 
         protected override void UpdateState(ArmedState state)
         {
+            if (!IsLoaded) return;
+
             base.UpdateState(state);
 
             Delay(HitObject.Duration, true);
 
             FadeOut(160);
-            
+
             switch (state)
             {
                 case ArmedState.Hit:

osu.Game.Modes.Osu/Objects/Drawables/HitExplosion.cs

@@ -6,6 +6,7 @@
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Sprites;
 using osu.Framework.Graphics.Transformations;
+using osu.Game.Graphics.Sprites;
 using osu.Game.Modes.Objects.Drawables;
 using OpenTK;
 using OpenTK.Graphics;
@@ -30,15 +31,15 @@ public HitExplosion(OsuJudgementInfo judgement, OsuHitObject h = null)
 
             Children = new Drawable[]
             {
-                line1 = new SpriteText
+                line1 = new OsuSpriteText
                 {
                     Anchor = Anchor.TopCentre,
                     Origin = Anchor.TopCentre,
                     Text = judgement.Score.GetDescription(),
                     Font = @"Venera",
                     TextSize = 16,
                 },
-                line2 = new SpriteText
+                line2 = new OsuSpriteText
                 {
                     Text = judgement.Combo.GetDescription(),
                     Font = @"Venera",

osu.Game.Modes.Osu/Objects/Drawables/Pieces/CirclePiece.cs

@@ -14,9 +14,8 @@ namespace osu.Game.Modes.Osu.Objects.Drawables.Pieces
 {
     public class CirclePiece : Container
     {
-
         private Sprite disc;
-        private Triangles triangles;
+
 
         public Func<bool> Hit;
 
@@ -36,10 +35,11 @@ public CirclePiece()
                     Anchor = Anchor.Centre,
                     Origin = Anchor.Centre
                 },
-                triangles = new Triangles
+                new TrianglesPiece
                 {
+                    RelativeSizeAxes = Axes.Both,
                     BlendingMode = BlendingMode.Additive,
-                    RelativeSizeAxes = Axes.Both
+                    Alpha = 0.5f,
                 }
             };
         }

osu.Game.Modes.Osu/Objects/Drawables/Pieces/ExplodePiece.cs

@@ -21,10 +21,11 @@ public ExplodePiece()
 
             Children = new Drawable[]
             {
-                new Triangles
+                new TrianglesPiece
                 {
                     BlendingMode = BlendingMode.Additive,
-                    RelativeSizeAxes = Axes.Both
+                    RelativeSizeAxes = Axes.Both,
+                    Alpha = 0.1f,
                 }
             };
         }

osu.Game.Modes.Osu/Objects/Drawables/Pieces/NumberPiece.cs

@@ -6,33 +6,54 @@
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Sprites;
 using osu.Framework.Graphics.Textures;
+using osu.Game.Graphics;
+using osu.Game.Graphics.Sprites;
+using OpenTK;
+using OpenTK.Graphics;
 
 namespace osu.Game.Modes.Osu.Objects.Drawables.Pieces
 {
     public class NumberPiece : Container
     {
-        private Sprite number;
+        private SpriteText number;
+
+        public string Text
+        {
+            get { return number.Text; }
+            set { number.Text = value; }
+        }
 
         public NumberPiece()
         {
             Anchor = Anchor.Centre;
             Origin = Anchor.Centre;
 
-            Children = new[]
+            Children = new Drawable[]
             {
-                number = new Sprite
+                new CircularContainer
+                {
+                    EdgeEffect = new EdgeEffect
+                    {
+                        Type = EdgeEffectType.Glow,
+                        Radius = 60,
+                        Colour = Color4.White.Opacity(0.5f),
+                    },
+                    Children = new[]
+                    {
+                        new Box()
+                    }
+                },
+                number = new OsuSpriteText
                 {
+                    Text = @"1",
+                    Font = @"Venera",
+                    UseFullGlyphHeight = false,
                     Anchor = Anchor.Centre,
                     Origin = Anchor.Centre,
+                    TextSize = 40,
                     Alpha = 1
                 }
             };
         }
-
-        [BackgroundDependencyLoader]
-        private void load(TextureStore textures)
-        {
-            number.Texture = textures.Get(@"Play/osu/number");
-        }
     }
 }

osu.Game.Modes.Osu/Objects/Drawables/Pieces/SliderBall.cs

@@ -11,7 +11,7 @@
 
 namespace osu.Game.Modes.Osu.Objects.Drawables.Pieces
 {
-    public class SliderBall : Container, ISliderProgress
+    public class SliderBall : CircularContainer, ISliderProgress
     {
         private readonly Slider slider;
         private Box follow;
@@ -39,7 +39,7 @@ public SliderBall(Slider slider)
                     Height = width,
                     Alpha = 0,
                 },
-                new Container
+                new CircularContainer
                 {
                     Masking = true,
                     AutoSizeAxes = Axes.Both,
@@ -48,7 +48,6 @@ public SliderBall(Slider slider)
                     BorderThickness = 10,
                     BorderColour = Color4.White,
                     Alpha = 1,
-                    CornerRadius = width / 2,
                     Children = new[]
                     {
                         new Box
@@ -104,8 +103,8 @@ protected override void Update()
         {
             base.Update();
 
-            CornerRadius = DrawWidth / 2;
-            Tracking = canCurrentlyTrack && lastState != null && Contains(lastState.Mouse.NativeState.Position) && lastState.Mouse.HasMainButtonPressed;
+            if (Time.Current < slider.EndTime)
+                Tracking = canCurrentlyTrack && lastState != null && Contains(lastState.Mouse.NativeState.Position) && lastState.Mouse.HasMainButtonPressed;
         }
 
         public void UpdateProgress(double progress, int repeat)

osu.Game.Modes.Osu/Objects/Drawables/Pieces/SpinnerDisc.cs

@@ -3,13 +3,15 @@
 
 using System;
 using System.Linq;
+using osu.Framework.Allocation;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Colour;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Sprites;
 using osu.Framework.Graphics.Transformations;
 using osu.Framework.Input;
 using osu.Framework.Logging;
+using osu.Game.Graphics;
 using OpenTK;
 using OpenTK.Graphics;
 
@@ -27,6 +29,14 @@ public SRGBColour DiscColour
             set { Disc.Colour = value; }
         }
 
+        Color4 completeColour;
+
+        [BackgroundDependencyLoader]
+        private void load(OsuColour colours)
+        {
+            completeColour = colours.YellowLight.Opacity(0.8f);
+        }
+
         class SpinnerBorder : Container
         {
             public SpinnerBorder()
@@ -120,6 +130,22 @@ public bool Tracking
             }
         }
 
+        bool complete;
+        public bool Complete
+        {
+            get { return complete; }
+            set
+            {
+                if (value == complete) return;
+
+                complete = value;
+
+                Disc.FadeColour(completeColour, 200);
+
+                updateCompleteTick();
+            }
+        }
+
         protected override bool OnMouseDown(InputState state, MouseDownEventArgs args)
         {
             Tracking = true;
@@ -145,6 +171,10 @@ protected override bool OnMouseMove(InputState state)
         private float currentRotation;
         public float RotationAbsolute;
 
+        private int completeTick;
+
+        private bool updateCompleteTick() => completeTick != (completeTick = (int)(RotationAbsolute / 720));
+
         protected override void Update()
         {
             base.Update();
@@ -162,6 +192,14 @@ protected override void Update()
             }
             lastAngle = thisAngle;
 
+            if (Complete && updateCompleteTick())
+            {
+                Disc.Flush(flushType: typeof(TransformAlpha));
+                Disc.FadeTo(0.75f, 30, EasingTypes.OutExpo);
+                Disc.Delay(30);
+                Disc.FadeTo(0.5f, 250, EasingTypes.OutQuint);
+            }
+
             RotateTo(currentRotation, 100, EasingTypes.OutExpo);
         }
     }