Merge branch 'master' into room-management-lio

osu.Game.Rulesets.Mania/Skinning/Argon/ArgonJudgementPiece.cs

@@ -3,6 +3,7 @@
 
 using System;
 using osu.Framework.Allocation;
+using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Shapes;
@@ -12,6 +13,7 @@ using osu.Game.Graphics;
 using osu.Game.Graphics.Sprites;
 using osu.Game.Rulesets.Judgements;
 using osu.Game.Rulesets.Scoring;
+using osu.Game.Rulesets.UI.Scrolling;
 using osuTK;
 using osuTK.Graphics;
 
@@ -26,18 +28,22 @@ namespace osu.Game.Rulesets.Mania.Skinning.Argon
         [Resolved]
         private OsuColour colours { get; set; } = null!;
 
+        private IBindable<ScrollingDirection> direction = null!;
+
         public ArgonJudgementPiece(HitResult result)
             : base(result)
         {
             AutoSizeAxes = Axes.Both;
 
             Origin = Anchor.Centre;
-            Y = judgement_y_position;
         }
 
         [BackgroundDependencyLoader]
-        private void load()
+        private void load(IScrollingInfo scrollingInfo)
         {
+            direction = scrollingInfo.Direction.GetBoundCopy();
+            direction.BindValueChanged(_ => onDirectionChanged(), true);
+
             if (Result.IsHit())
             {
                 AddInternal(ringExplosion = new RingExplosion(Result)
@@ -47,6 +53,8 @@ namespace osu.Game.Rulesets.Mania.Skinning.Argon
             }
         }
 
+        private void onDirectionChanged() => Y = direction.Value == ScrollingDirection.Up ? -judgement_y_position : judgement_y_position;
+
         protected override SpriteText CreateJudgementText() =>
             new OsuSpriteText
             {
@@ -78,7 +86,7 @@ namespace osu.Game.Rulesets.Mania.Skinning.Argon
                     this.ScaleTo(1.6f);
                     this.ScaleTo(1, 100, Easing.In);
 
-                    this.MoveToY(judgement_y_position);
+                    this.MoveToY(direction.Value == ScrollingDirection.Up ? -judgement_y_position : judgement_y_position);
                     this.MoveToOffset(new Vector2(0, 100), 800, Easing.InQuint);
 
                     this.RotateTo(0);

osu.Game.Rulesets.Mania/Skinning/Legacy/LegacyManiaJudgementPiece.cs

@@ -2,12 +2,14 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using osu.Framework.Allocation;
+using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Animations;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Utils;
 using osu.Game.Rulesets.Judgements;
 using osu.Game.Rulesets.Scoring;
+using osu.Game.Rulesets.UI.Scrolling;
 using osu.Game.Skinning;
 
 namespace osu.Game.Rulesets.Mania.Skinning.Legacy
@@ -28,14 +30,16 @@ namespace osu.Game.Rulesets.Mania.Skinning.Legacy
             AutoSizeAxes = Axes.Both;
         }
 
-        [BackgroundDependencyLoader]
+        private IBindable<ScrollingDirection> direction = null!;
-        private void load(ISkinSource skin)
-        {
-            float hitPosition = skin.GetManiaSkinConfig<float>(LegacyManiaSkinConfigurationLookups.HitPosition)?.Value ?? 0;
-            float scorePosition = skin.GetManiaSkinConfig<float>(LegacyManiaSkinConfigurationLookups.ScorePosition)?.Value ?? 0;
 
-            float absoluteHitPosition = 480f * LegacyManiaSkinConfiguration.POSITION_SCALE_FACTOR - hitPosition;
+        [Resolved]
-            Y = scorePosition - absoluteHitPosition;
+        private ISkinSource skin { get; set; } = null!;
+
+        [BackgroundDependencyLoader]
+        private void load(IScrollingInfo scrollingInfo)
+        {
+            direction = scrollingInfo.Direction.GetBoundCopy();
+            direction.BindValueChanged(_ => onDirectionChanged(), true);
 
             InternalChild = animation.With(d =>
             {
@@ -44,6 +48,17 @@ namespace osu.Game.Rulesets.Mania.Skinning.Legacy
             });
         }
 
+        private void onDirectionChanged()
+        {
+            float hitPosition = skin.GetManiaSkinConfig<float>(LegacyManiaSkinConfigurationLookups.HitPosition)?.Value ?? 0;
+            float scorePosition = skin.GetManiaSkinConfig<float>(LegacyManiaSkinConfigurationLookups.ScorePosition)?.Value ?? 0;
+
+            float absoluteHitPosition = 480f * LegacyManiaSkinConfiguration.POSITION_SCALE_FACTOR - hitPosition;
+            float finalPosition = scorePosition - absoluteHitPosition;
+
+            Y = direction.Value == ScrollingDirection.Up ? -finalPosition : finalPosition;
+        }
+
         public void PlayAnimation()
         {
             (animation as IFramedAnimation)?.GotoFrame(0);

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

@@ -0,0 +1,75 @@
+// 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.Bindables;
+using osu.Framework.Graphics;
+using osu.Game.Rulesets.Judgements;
+using osu.Game.Rulesets.Scoring;
+using osu.Game.Rulesets.UI.Scrolling;
+using osuTK;
+
+namespace osu.Game.Rulesets.Mania.UI
+{
+    public partial class DefaultManiaJudgementPiece : DefaultJudgementPiece
+    {
+        private const float judgement_y_position = -180f;
+
+        private IBindable<ScrollingDirection> direction = null!;
+
+        public DefaultManiaJudgementPiece(HitResult result)
+            : base(result)
+        {
+        }
+
+        [BackgroundDependencyLoader]
+        private void load(IScrollingInfo scrollingInfo)
+        {
+            direction = scrollingInfo.Direction.GetBoundCopy();
+            direction.BindValueChanged(_ => onDirectionChanged(), true);
+        }
+
+        private void onDirectionChanged() => Y = direction.Value == ScrollingDirection.Up ? -judgement_y_position : judgement_y_position;
+
+        protected override void LoadComplete()
+        {
+            base.LoadComplete();
+
+            JudgementText.Font = JudgementText.Font.With(size: 25);
+        }
+
+        public override void PlayAnimation()
+        {
+            switch (Result)
+            {
+                case HitResult.None:
+                    this.FadeOutFromOne(800);
+                    break;
+
+                case HitResult.Miss:
+                    this.ScaleTo(1.6f);
+                    this.ScaleTo(1, 100, Easing.In);
+
+                    this.MoveToY(direction.Value == ScrollingDirection.Up ? -judgement_y_position : judgement_y_position);
+                    this.MoveToOffset(new Vector2(0, 100), 800, Easing.InQuint);
+
+                    this.RotateTo(0);
+                    this.RotateTo(40, 800, Easing.InQuint);
+
+                    this.FadeOutFromOne(800);
+                    break;
+
+                default:
+                    this.ScaleTo(0.8f);
+                    this.ScaleTo(1, 250, Easing.OutElastic);
+
+                    this.Delay(50)
+                        .ScaleTo(0.75f, 250)
+                        .FadeOut(200);
+
+                    // osu!mania uses a custom fade length, so the base call is intentionally omitted.
+                    break;
+            }
+        }
+    }
+}

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

@@ -3,65 +3,32 @@
 
 #nullable disable
 
+using osu.Framework.Allocation;
+using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Game.Rulesets.Judgements;
 using osu.Game.Rulesets.Scoring;
-using osuTK;
+using osu.Game.Rulesets.UI.Scrolling;
 
 namespace osu.Game.Rulesets.Mania.UI
 {
     public partial class DrawableManiaJudgement : DrawableJudgement
     {
-        protected override Drawable CreateDefaultJudgement(HitResult result) => new DefaultManiaJudgementPiece(result);
+        private IBindable<ScrollingDirection> direction;
 
-        private partial class DefaultManiaJudgementPiece : DefaultJudgementPiece
+        [BackgroundDependencyLoader]
+        private void load(IScrollingInfo scrollingInfo)
         {
-            private const float judgement_y_position = -180f;
+            direction = scrollingInfo.Direction.GetBoundCopy();
-
+            direction.BindValueChanged(_ => onDirectionChanged(), true);
-            public DefaultManiaJudgementPiece(HitResult result)
-                : base(result)
-            {
-                Y = judgement_y_position;
-            }
-
-            protected override void LoadComplete()
-            {
-                base.LoadComplete();
-
-                JudgementText.Font = JudgementText.Font.With(size: 25);
-            }
-
-            public override void PlayAnimation()
-            {
-                switch (Result)
-                {
-                    case HitResult.None:
-                        this.FadeOutFromOne(800);
-                        break;
-
-                    case HitResult.Miss:
-                        this.ScaleTo(1.6f);
-                        this.ScaleTo(1, 100, Easing.In);
-
-                        this.MoveToY(judgement_y_position);
-                        this.MoveToOffset(new Vector2(0, 100), 800, Easing.InQuint);
-
-                        this.RotateTo(0);
-                        this.RotateTo(40, 800, Easing.InQuint);
-
-                        this.FadeOutFromOne(800);
-                        break;
-
-                    default:
-                        this.ScaleTo(0.8f);
-                        this.ScaleTo(1, 250, Easing.OutElastic);
-
-                        this.Delay(50)
-                            .ScaleTo(0.75f, 250)
-                            .FadeOut(200);
-                        break;
-                }
-            }
         }
+
+        private void onDirectionChanged()
+        {
+            Anchor = direction.Value == ScrollingDirection.Up ? Anchor.TopCentre : Anchor.BottomCentre;
+            Origin = Anchor.Centre;
+        }
+
+        protected override Drawable CreateDefaultJudgement(HitResult result) => new DefaultManiaJudgementPiece(result);
     }
 }

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

@@ -216,13 +216,7 @@ namespace osu.Game.Rulesets.Mania.UI
                 return;
 
             judgements.Clear(false);
-            judgements.Add(judgementPooler.Get(result.Type, j =>
+            judgements.Add(judgementPooler.Get(result.Type, j => j.Apply(result, judgedObject))!);
-            {
-                j.Apply(result, judgedObject);
-
-                j.Anchor = Anchor.BottomCentre;
-                j.Origin = Anchor.Centre;
-            })!);
         }
 
         protected override void Update()

osu.Game/Screens/Ranking/SoloResultsScreen.cs

@@ -4,7 +4,6 @@
 using System;
 using System.Collections.Generic;
 using System.Diagnostics;
-using System.Linq;
 using osu.Framework.Allocation;
 using osu.Game.Beatmaps;
 using osu.Game.Extensions;
@@ -35,7 +34,32 @@ namespace osu.Game.Screens.Ranking
                 return null;
 
             getScoreRequest = new GetScoresRequest(Score.BeatmapInfo, Score.Ruleset);
-            getScoreRequest.Success += r => scoresCallback.Invoke(r.Scores.Where(s => !s.MatchesOnlineID(Score)).Select(s => s.ToScoreInfo(rulesets, Beatmap.Value.BeatmapInfo)));
+            getScoreRequest.Success += r =>
+            {
+                var toDisplay = new List<ScoreInfo>();
+
+                for (int i = 0; i < r.Scores.Count; ++i)
+                {
+                    var score = r.Scores[i];
+                    int position = i + 1;
+
+                    if (score.MatchesOnlineID(Score))
+                    {
+                        // we don't want to add the same score twice, but also setting any properties of `Score` this late will have no visible effect,
+                        // so we have to fish out the actual drawable panel and set the position to it directly.
+                        var panel = ScorePanelList.GetPanelForScore(Score);
+                        Score.Position = panel.ScorePosition.Value = position;
+                    }
+                    else
+                    {
+                        var converted = score.ToScoreInfo(rulesets, Beatmap.Value.BeatmapInfo);
+                        converted.Position = position;
+                        toDisplay.Add(converted);
+                    }
+                }
+
+                scoresCallback.Invoke(toDisplay);
+            };
             return getScoreRequest;
         }