Merge remote-tracking branch 'refs/remotes/ppy/master' into rankings-title

osu.Game.Rulesets.Mania.Tests/TestSceneHitExplosion.cs

@@ -0,0 +1,62 @@
+// 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 System;
+using System.Collections.Generic;
+using NUnit.Framework;
+using osu.Framework.Graphics;
+using osu.Game.Rulesets.Mania.Objects.Drawables;
+using osu.Game.Rulesets.Mania.Objects.Drawables.Pieces;
+using osu.Game.Rulesets.Mania.UI;
+using osu.Game.Rulesets.UI.Scrolling;
+using osu.Game.Tests.Visual;
+using osuTK;
+using osuTK.Graphics;
+
+namespace osu.Game.Rulesets.Mania.Tests
+{
+    [TestFixture]
+    public class TestSceneHitExplosion : OsuTestScene
+    {
+        private ScrollingTestContainer scrolling;
+
+        public override IReadOnlyList<Type> RequiredTypes => new[]
+        {
+            typeof(DrawableNote),
+            typeof(DrawableManiaHitObject),
+        };
+
+        protected override void LoadComplete()
+        {
+            base.LoadComplete();
+
+            Child = scrolling = new ScrollingTestContainer(ScrollingDirection.Down)
+            {
+                Anchor = Anchor.Centre,
+                Origin = Anchor.Centre,
+                RelativePositionAxes = Axes.Y,
+                Y = -0.25f,
+                Size = new Vector2(Column.COLUMN_WIDTH, NotePiece.NOTE_HEIGHT),
+            };
+
+            int runcount = 0;
+
+            AddRepeatStep("explode", () =>
+            {
+                runcount++;
+
+                if (runcount % 15 > 12)
+                    return;
+
+                scrolling.AddRange(new Drawable[]
+                {
+                    new HitExplosion((runcount / 15) % 2 == 0 ? new Color4(94, 0, 57, 255) : new Color4(6, 84, 0, 255), runcount % 6 != 0)
+                    {
+                        Anchor = Anchor.Centre,
+                        Origin = Anchor.Centre,
+                    }
+                });
+            }, 100);
+        }
+    }
+}

osu.Game.Rulesets.Mania/Objects/Drawables/DrawableNote.cs

@@ -18,6 +18,8 @@ namespace osu.Game.Rulesets.Mania.Objects.Drawables
     /// </summary>
     public class DrawableNote : DrawableManiaHitObject<Note>, IKeyBindingHandler<ManiaAction>
     {
+        public const float CORNER_RADIUS = NotePiece.NOTE_HEIGHT / 2;
+
         private readonly NotePiece headPiece;
 
         public DrawableNote(Note hitObject)
@@ -38,7 +40,7 @@ namespace osu.Game.Rulesets.Mania.Objects.Drawables
                 EdgeEffect = new EdgeEffectParameters
                 {
                     Type = EdgeEffectType.Glow,
-                    Colour = colour.NewValue.Lighten(1f).Opacity(0.6f),
+                    Colour = colour.NewValue.Lighten(1f).Opacity(0.2f),
                     Radius = 10,
                 };
             }, true);

osu.Game.Rulesets.Mania/Objects/Drawables/Pieces/NotePiece.cs

@@ -18,8 +18,7 @@ namespace osu.Game.Rulesets.Mania.Objects.Drawables.Pieces
     /// </summary>
     internal class NotePiece : Container, IHasAccentColour
     {
-        public const float NOTE_HEIGHT = 10;
+        public const float NOTE_HEIGHT = 12;
-        private const float head_colour_height = 6;
 
         private readonly IBindable<ScrollingDirection> direction = new Bindable<ScrollingDirection>();
 
@@ -39,8 +38,8 @@ namespace osu.Game.Rulesets.Mania.Objects.Drawables.Pieces
                 colouredBox = new Box
                 {
                     RelativeSizeAxes = Axes.X,
-                    Height = head_colour_height,
+                    Height = NOTE_HEIGHT / 2,
-                    Alpha = 0.2f
+                    Alpha = 0.1f
                 }
             };
         }

osu.Game.Rulesets.Mania/UI/Column.cs

@@ -1,4 +1,4 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// 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 System.Linq;
@@ -11,6 +11,8 @@ using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Input.Bindings;
 using osu.Game.Rulesets.Judgements;
+using osu.Game.Rulesets.Mania.Objects.Drawables;
+using osu.Game.Rulesets.Mania.Objects.Drawables.Pieces;
 using osu.Game.Rulesets.Mania.UI.Components;
 using osu.Game.Rulesets.UI.Scrolling;
 using osuTK;
@@ -19,7 +21,7 @@ namespace osu.Game.Rulesets.Mania.UI
 {
     public class Column : ScrollingPlayfield, IKeyBindingHandler<ManiaAction>, IHasAccentColour
     {
-        private const float column_width = 45;
+        public const float COLUMN_WIDTH = 80;
         private const float special_column_width = 70;
 
         /// <summary>
@@ -41,10 +43,7 @@ namespace osu.Game.Rulesets.Mania.UI
             Index = index;
 
             RelativeSizeAxes = Axes.Y;
-            Width = column_width;
+            Width = COLUMN_WIDTH;
-
-            Masking = true;
-            CornerRadius = 5;
 
             background = new ColumnBackground { RelativeSizeAxes = Axes.Both };
 
@@ -67,7 +66,7 @@ namespace osu.Game.Rulesets.Mania.UI
                         explosionContainer = new Container
                         {
                             Name = "Hit explosions",
-                            RelativeSizeAxes = Axes.Both
+                            RelativeSizeAxes = Axes.Both,
                         }
                     }
                 },
@@ -90,6 +89,12 @@ namespace osu.Game.Rulesets.Mania.UI
                     Bottom = dir.NewValue == ScrollingDirection.Down ? ManiaStage.HIT_TARGET_POSITION : 0,
                 };
 
+                explosionContainer.Padding = new MarginPadding
+                {
+                    Top = dir.NewValue == ScrollingDirection.Up ? NotePiece.NOTE_HEIGHT / 2 : 0,
+                    Bottom = dir.NewValue == ScrollingDirection.Down ? NotePiece.NOTE_HEIGHT / 2 : 0
+                };
+
                 keyArea.Anchor = keyArea.Origin = dir.NewValue == ScrollingDirection.Up ? Anchor.TopLeft : Anchor.BottomLeft;
             }, true);
         }
@@ -108,7 +113,7 @@ namespace osu.Game.Rulesets.Mania.UI
 
                 isSpecial = value;
 
-                Width = isSpecial ? special_column_width : column_width;
+                Width = isSpecial ? special_column_width : COLUMN_WIDTH;
             }
         }
 
@@ -163,9 +168,10 @@ namespace osu.Game.Rulesets.Mania.UI
             if (!result.IsHit || !judgedObject.DisplayResult || !DisplayJudgements.Value)
                 return;
 
-            explosionContainer.Add(new HitExplosion(judgedObject)
+            explosionContainer.Add(new HitExplosion(judgedObject.AccentColour.Value, judgedObject is DrawableHoldNoteTick)
             {
-                Anchor = Direction.Value == ScrollingDirection.Up ? Anchor.TopCentre : Anchor.BottomCentre
+                Anchor = Direction.Value == ScrollingDirection.Up ? Anchor.TopCentre : Anchor.BottomCentre,
+                Origin = Anchor.Centre
             });
         }
 

osu.Game.Rulesets.Mania/UI/Components/ColumnBackground.cs

@@ -35,7 +35,6 @@ namespace osu.Game.Rulesets.Mania.UI.Components
                 {
                     Name = "Background",
                     RelativeSizeAxes = Axes.Both,
-                    Alpha = 0.3f
                 },
                 backgroundOverlay = new Box
                 {
@@ -82,7 +81,7 @@ namespace osu.Game.Rulesets.Mania.UI.Components
             if (!IsLoaded)
                 return;
 
-            background.Colour = AccentColour;
+            background.Colour = AccentColour.Darken(5);
 
             var brightPoint = AccentColour.Opacity(0.6f);
             var dimPoint = AccentColour.Opacity(0);

osu.Game.Rulesets.Mania/UI/Components/ColumnHitObjectArea.cs

@@ -9,6 +9,7 @@ using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Effects;
 using osu.Framework.Graphics.Shapes;
 using osu.Game.Graphics;
+using osu.Game.Rulesets.Mania.Objects.Drawables.Pieces;
 using osu.Game.Rulesets.UI;
 using osu.Game.Rulesets.UI.Scrolling;
 using osuTK.Graphics;
@@ -17,7 +18,6 @@ namespace osu.Game.Rulesets.Mania.UI.Components
 {
     public class ColumnHitObjectArea : CompositeDrawable, IHasAccentColour
     {
-        private const float hit_target_height = 10;
         private const float hit_target_bar_height = 2;
 
         private readonly IBindable<ScrollingDirection> direction = new Bindable<ScrollingDirection>();
@@ -32,7 +32,8 @@ namespace osu.Game.Rulesets.Mania.UI.Components
                 hitTargetBar = new Box
                 {
                     RelativeSizeAxes = Axes.X,
-                    Height = hit_target_height,
+                    Height = NotePiece.NOTE_HEIGHT,
+                    Alpha = 0.6f,
                     Colour = Color4.Black
                 },
                 hitTargetLine = new Container

osu.Game.Rulesets.Mania/UI/HitExplosion.cs

@@ -1,16 +1,14 @@
 // 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 osuTK.Graphics;
+using osu.Framework.Extensions.Color4Extensions;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Effects;
-using osu.Framework.Graphics.Shapes;
 using osu.Framework.MathUtils;
-using osu.Game.Rulesets.Mania.Objects.Drawables;
 using osu.Game.Rulesets.Mania.Objects.Drawables.Pieces;
-using osu.Game.Rulesets.Objects.Drawables;
 using osuTK;
+using osuTK.Graphics;
 
 namespace osu.Game.Rulesets.Mania.UI
 {
@@ -18,51 +16,112 @@ namespace osu.Game.Rulesets.Mania.UI
     {
         public override bool RemoveWhenNotAlive => true;
 
-        private readonly CircularContainer circle;
+        private readonly CircularContainer largeFaint;
+        private readonly CircularContainer mainGlow1;
 
-        public HitExplosion(DrawableHitObject judgedObject)
+        public HitExplosion(Color4 objectColour, bool isSmall = false)
         {
-            bool isTick = judgedObject is DrawableHoldNoteTick;
-
-            Origin = Anchor.Centre;
-
             RelativeSizeAxes = Axes.X;
-            Y = NotePiece.NOTE_HEIGHT / 2;
             Height = NotePiece.NOTE_HEIGHT;
 
             // scale roughly in-line with visual appearance of notes
-            Scale = new Vector2(isTick ? 0.4f : 0.8f);
+            Scale = new Vector2(1f, 0.6f);
 
-            InternalChild = circle = new CircularContainer
+            if (isSmall)
+                Scale *= 0.5f;
+
+            const float angle_variangle = 15; // should be less than 45
+
+            const float roundness = 80;
+
+            const float initial_height = 10;
+
+            var colour = Interpolation.ValueAt(0.4f, objectColour, Color4.White, 0, 1);
+
+            InternalChildren = new Drawable[]
             {
-                Anchor = Anchor.Centre,
+                largeFaint = new CircularContainer
-                Origin = Anchor.Centre,
-                RelativeSizeAxes = Axes.Both,
-                Masking = true,
-                // we want our size to be very small so the glow dominates it.
-                Size = new Vector2(0.1f),
-                EdgeEffect = new EdgeEffectParameters
                 {
-                    Type = EdgeEffectType.Glow,
+                    Anchor = Anchor.Centre,
-                    Colour = Interpolation.ValueAt(0.1f, judgedObject.AccentColour.Value, Color4.White, 0, 1),
+                    Origin = Anchor.Centre,
-                    Radius = 100,
-                },
-                Child = new Box
-                {
-                    Alpha = 0,
                     RelativeSizeAxes = Axes.Both,
-                    AlwaysPresent = true
+                    Masking = true,
+                    // we want our size to be very small so the glow dominates it.
+                    Size = new Vector2(0.8f),
+                    Blending = BlendingParameters.Additive,
+                    EdgeEffect = new EdgeEffectParameters
+                    {
+                        Type = EdgeEffectType.Glow,
+                        Colour = Interpolation.ValueAt(0.1f, objectColour, Color4.White, 0, 1).Opacity(0.3f),
+                        Roundness = 160,
+                        Radius = 200,
+                    },
+                },
+                mainGlow1 = new CircularContainer
+                {
+                    Anchor = Anchor.Centre,
+                    Origin = Anchor.Centre,
+                    RelativeSizeAxes = Axes.Both,
+                    Masking = true,
+                    Blending = BlendingParameters.Additive,
+                    EdgeEffect = new EdgeEffectParameters
+                    {
+                        Type = EdgeEffectType.Glow,
+                        Colour = Interpolation.ValueAt(0.6f, objectColour, Color4.White, 0, 1),
+                        Roundness = 20,
+                        Radius = 50,
+                    },
+                },
+                new CircularContainer
+                {
+                    Anchor = Anchor.Centre,
+                    Origin = Anchor.Centre,
+                    RelativeSizeAxes = Axes.Both,
+                    Masking = true,
+                    Size = new Vector2(0.01f, initial_height),
+                    Blending = BlendingParameters.Additive,
+                    Rotation = RNG.NextSingle(-angle_variangle, angle_variangle),
+                    EdgeEffect = new EdgeEffectParameters
+                    {
+                        Type = EdgeEffectType.Glow,
+                        Colour = colour,
+                        Roundness = roundness,
+                        Radius = 40,
+                    },
+                },
+                new CircularContainer
+                {
+                    Anchor = Anchor.Centre,
+                    Origin = Anchor.Centre,
+                    RelativeSizeAxes = Axes.Both,
+                    Masking = true,
+                    Size = new Vector2(0.01f, initial_height),
+                    Blending = BlendingParameters.Additive,
+                    Rotation = RNG.NextSingle(-angle_variangle, angle_variangle),
+                    EdgeEffect = new EdgeEffectParameters
+                    {
+                        Type = EdgeEffectType.Glow,
+                        Colour = colour,
+                        Roundness = roundness,
+                        Radius = 40,
+                    },
                 }
             };
         }
 
         protected override void LoadComplete()
         {
+            const double duration = 200;
+
             base.LoadComplete();
 
-            circle.ResizeTo(circle.Size * new Vector2(4, 20), 1000, Easing.OutQuint);
+            largeFaint
-            this.FadeIn(16).Then().FadeOut(500, Easing.OutQuint);
+                .ResizeTo(largeFaint.Size * new Vector2(5, 1), duration, Easing.OutQuint)
+                .FadeOut(duration * 2);
 
+            mainGlow1.ScaleTo(1.4f, duration, Easing.OutQuint);
+
+            this.FadeOut(duration, Easing.Out);
             Expire(true);
         }
     }

osu.Game.Tests/Visual/Online/TestSceneRankingsDismissableFlag.cs

@@ -12,16 +12,16 @@ using osuTK;
 
 namespace osu.Game.Tests.Visual.Online
 {
-    public class TestSceneRankingsHeaderFlag : OsuTestScene
+    public class TestSceneRankingsDismissableFlag : OsuTestScene
     {
         public override IReadOnlyList<Type> RequiredTypes => new[]
         {
-            typeof(HeaderFlag),
+            typeof(DismissableFlag),
         };
 
-        public TestSceneRankingsHeaderFlag()
+        public TestSceneRankingsDismissableFlag()
         {
-            HeaderFlag flag;
+            DismissableFlag flag;
             SpriteText text;
 
             var countryA = new Country
@@ -38,7 +38,7 @@ namespace osu.Game.Tests.Visual.Online
 
             AddRange(new Drawable[]
             {
-                flag = new HeaderFlag
+                flag = new DismissableFlag
                 {
                     Anchor = Anchor.Centre,
                     Origin = Anchor.Centre,

osu.Game.Tests/Visual/Online/TestSceneRankingsRulesetSelector.cs

@@ -0,0 +1,41 @@
+// 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 System;
+using System.Collections.Generic;
+using osu.Game.Overlays.Rankings;
+using osu.Framework.Graphics;
+using osu.Game.Rulesets;
+using osu.Framework.Bindables;
+using osu.Game.Rulesets.Osu;
+using osu.Game.Rulesets.Mania;
+using osu.Game.Rulesets.Taiko;
+using osu.Game.Rulesets.Catch;
+
+namespace osu.Game.Tests.Visual.Online
+{
+    public class TestSceneRankingsRulesetSelector : OsuTestScene
+    {
+        public override IReadOnlyList<Type> RequiredTypes => new[]
+        {
+            typeof(RankingsRulesetSelector),
+        };
+
+        public TestSceneRankingsRulesetSelector()
+        {
+            var current = new Bindable<RulesetInfo>();
+
+            Add(new RankingsRulesetSelector
+            {
+                Anchor = Anchor.Centre,
+                Origin = Anchor.Centre,
+                Current = { BindTarget = current }
+            });
+
+            AddStep("Select osu!", () => current.Value = new OsuRuleset().RulesetInfo);
+            AddStep("Select mania", () => current.Value = new ManiaRuleset().RulesetInfo);
+            AddStep("Select taiko", () => current.Value = new TaikoRuleset().RulesetInfo);
+            AddStep("Select catch", () => current.Value = new CatchRuleset().RulesetInfo);
+        }
+    }
+}

osu.Game/Graphics/UserInterface/PageTabControl.cs

@@ -63,7 +63,7 @@ namespace osu.Game.Graphics.UserInterface
                         Margin = new MarginPadding { Top = 8, Bottom = 8 },
                         Origin = Anchor.BottomLeft,
                         Anchor = Anchor.BottomLeft,
-                        Text = (value as Enum)?.GetDescription() ?? value.ToString(),
+                        Text = CreateText(),
                         Font = OsuFont.GetFont(size: 14)
                     },
                     box = new Box
@@ -81,6 +81,8 @@ namespace osu.Game.Graphics.UserInterface
                 Active.BindValueChanged(active => Text.Font = Text.Font.With(Typeface.Exo, weight: active.NewValue ? FontWeight.Bold : FontWeight.Medium), true);
             }
 
+            protected virtual string CreateText() => (Value as Enum)?.GetDescription() ?? Value.ToString();
+
             protected override bool OnHover(HoverEvent e)
             {
                 if (!Active.Value)

osu.Game/Overlays/Rankings/DismissableFlag.cs

@@ -11,7 +11,7 @@ using System;
 
 namespace osu.Game.Overlays.Rankings
 {
-    public class HeaderFlag : UpdateableFlag
+    public class DismissableFlag : UpdateableFlag
     {
         private const int duration = 200;
 
@@ -19,7 +19,7 @@ namespace osu.Game.Overlays.Rankings
 
         private readonly SpriteIcon hoverIcon;
 
-        public HeaderFlag()
+        public DismissableFlag()
         {
             AddInternal(hoverIcon = new SpriteIcon
             {

osu.Game/Overlays/Rankings/RankingsRulesetSelector.cs

@@ -0,0 +1,56 @@
+// 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.Framework.Allocation;
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers;
+using osu.Framework.Graphics.UserInterface;
+using osu.Game.Graphics;
+using osu.Game.Graphics.UserInterface;
+using osu.Game.Rulesets;
+using osuTK;
+using System.Linq;
+
+namespace osu.Game.Overlays.Rankings
+{
+    public class RankingsRulesetSelector : PageTabControl<RulesetInfo>
+    {
+        protected override TabItem<RulesetInfo> CreateTabItem(RulesetInfo value) => new RankingsTabItem(value);
+
+        protected override Dropdown<RulesetInfo> CreateDropdown() => null;
+
+        public RankingsRulesetSelector()
+        {
+            AutoSizeAxes = Axes.X;
+        }
+
+        [BackgroundDependencyLoader]
+        private void load(OsuColour colours, RulesetStore rulesets)
+        {
+            foreach (var r in rulesets.AvailableRulesets)
+                AddItem(r);
+
+            AccentColour = colours.Lime;
+
+            SelectTab(TabContainer.FirstOrDefault());
+        }
+
+        protected override TabFillFlowContainer CreateTabFlow() => new TabFillFlowContainer
+        {
+            AutoSizeAxes = Axes.X,
+            RelativeSizeAxes = Axes.Y,
+            Direction = FillDirection.Horizontal,
+            Spacing = new Vector2(20, 0),
+        };
+
+        private class RankingsTabItem : PageTabItem
+        {
+            public RankingsTabItem(RulesetInfo value)
+                : base(value)
+            {
+            }
+
+            protected override string CreateText() => $"{Value.Name}";
+        }
+    }
+}