Merge branch 'master' into fix-duplicate-judgements

osu-framework

@@ -1 +1 @@
-Subproject commit 6915954abdba64e72f698aa58698b00159f3678d
+Subproject commit 59004b46f2c96ac02fec712e66f9f96fe252f2fa

osu.Game.Tests/Visual/TestCaseBreakOverlay.cs

@@ -3,9 +3,9 @@
 
 using osu.Framework.Timing;
 using osu.Game.Beatmaps.Timing;
-using osu.Game.Screens.Play.BreaksOverlay;
 using System.Collections.Generic;
 using NUnit.Framework;
+using osu.Game.Screens.Play;
 
 namespace osu.Game.Tests.Visual
 {

osu.Game/Screens/Play/Break/BlurredIcon.cs

@@ -1,13 +1,13 @@
 // Copyright (c) 2007-2018 ppy Pty Ltd <contact@ppy.sh>.
 // Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
 
-using OpenTK;
-using osu.Framework.Graphics.Containers;
-using osu.Framework.Graphics;
-using osu.Game.Graphics;
 using osu.Framework.Allocation;
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers;
+using osu.Game.Graphics;
+using OpenTK;
 
-namespace osu.Game.Screens.Play.BreaksOverlay
+namespace osu.Game.Screens.Play.Break
 {
     public class BlurredIcon : BufferedContainer
     {

osu.Game/Screens/Play/Break/BreakArrows.cs

@@ -1,18 +1,15 @@
 // Copyright (c) 2007-2018 ppy Pty Ltd <contact@ppy.sh>.
 // Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
 
-using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics;
-using OpenTK;
+using osu.Framework.Graphics.Containers;
 using osu.Game.Graphics.Containers;
-using osu.Game.Beatmaps.Timing;
+using OpenTK;
 
-namespace osu.Game.Screens.Play.BreaksOverlay
+namespace osu.Game.Screens.Play.Break
 {
-    public class ArrowsOverlay : VisibilityContainer
+    public class BreakArrows : CompositeDrawable
     {
-        private const double fade_duration = BreakPeriod.MIN_BREAK_DURATION / 2;
-
         private const int glow_icon_size = 60;
         private const int glow_icon_blur_sigma = 10;
         private const float glow_icon_final_offset = 0.22f;
@@ -29,10 +26,10 @@ namespace osu.Game.Screens.Play.BreaksOverlay
         private readonly BlurredIcon leftBlurredIcon;
         private readonly BlurredIcon rightBlurredIcon;
 
-        public ArrowsOverlay()
+        public BreakArrows()
         {
             RelativeSizeAxes = Axes.Both;
-            Children = new Drawable[]
+            InternalChildren = new Drawable[]
             {
                 leftGlowIcon = new GlowIcon
                 {
@@ -82,22 +79,22 @@ namespace osu.Game.Screens.Play.BreaksOverlay
             };
         }
 
-        protected override void PopIn()
+        public void Show(double duration)
         {
-            leftGlowIcon.MoveToX(-glow_icon_final_offset, fade_duration, Easing.OutQuint);
+            leftGlowIcon.MoveToX(-glow_icon_final_offset, duration, Easing.OutQuint);
-            rightGlowIcon.MoveToX(glow_icon_final_offset, fade_duration, Easing.OutQuint);
+            rightGlowIcon.MoveToX(glow_icon_final_offset, duration, Easing.OutQuint);
 
-            leftBlurredIcon.MoveToX(-blurred_icon_final_offset, fade_duration, Easing.OutQuint);
+            leftBlurredIcon.MoveToX(-blurred_icon_final_offset, duration, Easing.OutQuint);
-            rightBlurredIcon.MoveToX(blurred_icon_final_offset, fade_duration, Easing.OutQuint);
+            rightBlurredIcon.MoveToX(blurred_icon_final_offset, duration, Easing.OutQuint);
         }
 
-        protected override void PopOut()
+        public void Hide(double duration)
         {
-            leftGlowIcon.MoveToX(-glow_icon_offscreen_offset, fade_duration, Easing.OutQuint);
+            leftGlowIcon.MoveToX(-glow_icon_offscreen_offset, duration, Easing.OutQuint);
-            rightGlowIcon.MoveToX(glow_icon_offscreen_offset, fade_duration, Easing.OutQuint);
+            rightGlowIcon.MoveToX(glow_icon_offscreen_offset, duration, Easing.OutQuint);
 
-            leftBlurredIcon.MoveToX(-blurred_icon_offscreen_offset, fade_duration, Easing.OutQuint);
+            leftBlurredIcon.MoveToX(-blurred_icon_offscreen_offset, duration, Easing.OutQuint);
-            rightBlurredIcon.MoveToX(blurred_icon_offscreen_offset, fade_duration, Easing.OutQuint);
+            rightBlurredIcon.MoveToX(blurred_icon_offscreen_offset, duration, Easing.OutQuint);
         }
     }
 }

osu.Game/Screens/Play/Break/BreakInfo.cs

@@ -1,24 +1,21 @@
 // Copyright (c) 2007-2018 ppy Pty Ltd <contact@ppy.sh>.
 // Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
 
-using OpenTK;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Game.Graphics.Sprites;
 using osu.Game.Rulesets.Scoring;
-using osu.Game.Beatmaps.Timing;
+using OpenTK;
 
-namespace osu.Game.Screens.Play.BreaksOverlay
+namespace osu.Game.Screens.Play.Break
 {
-    public class InfoContainer : VisibilityContainer
+    public class BreakInfo : Container
     {
-        private const double fade_duration = BreakPeriod.MIN_BREAK_DURATION / 2;
+        public PercentageBreakInfoLine AccuracyDisplay;
+        public BreakInfoLine<int> RankDisplay;
+        public BreakInfoLine<ScoreRank> GradeDisplay;
 
-        public PercentageInfoLine AccuracyDisplay;
+        public BreakInfo()
-        public InfoLine<int> RankDisplay;
-        public InfoLine<ScoreRank> GradeDisplay;
-
-        public InfoContainer()
         {
             AutoSizeAxes = Axes.Both;
             Child = new FillFlowContainer
@@ -43,16 +40,13 @@ namespace osu.Game.Screens.Play.BreaksOverlay
                         Direction = FillDirection.Vertical,
                         Children = new Drawable[]
                         {
-                            AccuracyDisplay = new PercentageInfoLine("Accuracy"),
+                            AccuracyDisplay = new PercentageBreakInfoLine("Accuracy"),
-                            RankDisplay = new InfoLine<int>("Rank"),
+                            RankDisplay = new BreakInfoLine<int>("Rank"),
-                            GradeDisplay = new InfoLine<ScoreRank>("Grade"),
+                            GradeDisplay = new BreakInfoLine<ScoreRank>("Grade"),
                         },
                     }
                 },
             };
         }
-
-        protected override void PopIn() => this.FadeIn(fade_duration);
-        protected override void PopOut() => this.FadeOut(fade_duration);
     }
 }

osu.Game/Screens/Play/Break/BreakInfoLine.cs

@@ -8,9 +8,9 @@ using osu.Framework.Graphics.Containers;
 using osu.Game.Graphics;
 using osu.Game.Graphics.Sprites;
 
-namespace osu.Game.Screens.Play.BreaksOverlay
+namespace osu.Game.Screens.Play.Break
 {
-    public class InfoLine<T> : Container
+    public class BreakInfoLine<T> : Container
         where T : struct
     {
         private const int margin = 2;
@@ -22,7 +22,7 @@ namespace osu.Game.Screens.Play.BreaksOverlay
 
         private readonly string prefix;
 
-        public InfoLine(string name, string prefix = @"")
+        public BreakInfoLine(string name, string prefix = @"")
         {
             this.prefix = prefix;
 
@@ -71,9 +71,9 @@ namespace osu.Game.Screens.Play.BreaksOverlay
         }
     }
 
-    public class PercentageInfoLine : InfoLine<double>
+    public class PercentageBreakInfoLine : BreakInfoLine<double>
     {
-        public PercentageInfoLine(string name, string prefix = "") : base(name, prefix)
+        public PercentageBreakInfoLine(string name, string prefix = "") : base(name, prefix)
         {
         }
 

osu.Game/Screens/Play/Break/GlowIcon.cs

@@ -1,13 +1,13 @@
 // Copyright (c) 2007-2018 ppy Pty Ltd <contact@ppy.sh>.
 // Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
 
-using osu.Framework.Graphics.Containers;
+using osu.Framework.Allocation;
 using osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers;
 using osu.Game.Graphics;
 using OpenTK;
-using osu.Framework.Allocation;
 
-namespace osu.Game.Screens.Play.BreaksOverlay
+namespace osu.Game.Screens.Play.Break
 {
     public class GlowIcon : Container
     {
@@ -16,24 +16,24 @@ namespace osu.Game.Screens.Play.BreaksOverlay
 
         public override Vector2 Size
         {
+            get { return base.Size; }
             set
             {
                 blurredIcon.Size = spriteIcon.Size = value;
                 blurredIcon.ForceRedraw();
             }
-            get { return base.Size; }
         }
 
         public Vector2 BlurSigma
         {
-            set { blurredIcon.BlurSigma = value; }
             get { return blurredIcon.BlurSigma; }
+            set { blurredIcon.BlurSigma = value; }
         }
 
         public FontAwesome Icon
         {
-            set { spriteIcon.Icon = blurredIcon.Icon = value; }
             get { return spriteIcon.Icon; }
+            set { spriteIcon.Icon = blurredIcon.Icon = value; }
         }
 
         public GlowIcon()

osu.Game/Screens/Play/Break/LetterboxOverlay.cs

@@ -1,18 +1,16 @@
 // Copyright (c) 2007-2018 ppy Pty Ltd <contact@ppy.sh>.
 // Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
 
-using OpenTK.Graphics;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Colour;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Shapes;
-using osu.Game.Beatmaps.Timing;
+using OpenTK.Graphics;
 
-namespace osu.Game.Screens.Play.BreaksOverlay
+namespace osu.Game.Screens.Play.Break
 {
-    public class LetterboxOverlay : VisibilityContainer
+    public class LetterboxOverlay : CompositeDrawable
     {
-        private const double fade_duration = BreakPeriod.MIN_BREAK_DURATION / 2;
         private const int height = 350;
 
         private static readonly Color4 transparent_black = new Color4(0, 0, 0, 0);
@@ -20,7 +18,7 @@ namespace osu.Game.Screens.Play.BreaksOverlay
         public LetterboxOverlay()
         {
             RelativeSizeAxes = Axes.Both;
-            Children = new Drawable[]
+            InternalChildren = new Drawable[]
             {
                 new Container
                 {
@@ -48,8 +46,5 @@ namespace osu.Game.Screens.Play.BreaksOverlay
                 }
             };
         }
-
-        protected override void PopIn() => this.FadeIn(fade_duration);
-        protected override void PopOut() => this.FadeOut(fade_duration);
     }
 }

osu.Game/Screens/Play/Break/RemainingTimeCounter.cs

@@ -1,18 +1,15 @@
 // Copyright (c) 2007-2018 ppy Pty Ltd <contact@ppy.sh>.
 // Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
 
-using osu.Game.Graphics.Sprites;
-using osu.Framework.Graphics;
 using System;
-using osu.Game.Beatmaps.Timing;
+using osu.Framework.Graphics;
 using osu.Framework.Graphics.UserInterface;
+using osu.Game.Graphics.Sprites;
 
-namespace osu.Game.Screens.Play.BreaksOverlay
+namespace osu.Game.Screens.Play.Break
 {
     public class RemainingTimeCounter : Counter
     {
-        private const double fade_duration = BreakPeriod.MIN_BREAK_DURATION / 2;
-
         private readonly OsuSpriteText counter;
 
         public RemainingTimeCounter()
@@ -25,13 +22,8 @@ namespace osu.Game.Screens.Play.BreaksOverlay
                 TextSize = 33,
                 Font = "Venera",
             };
-
-            Alpha = 0;
         }
 
         protected override void OnCountChanged(double count) => counter.Text = ((int)Math.Ceiling(count / 1000)).ToString();
-
-        public override void Show() => this.FadeIn(fade_duration);
-        public override void Hide() => this.FadeOut(fade_duration);
     }
 }

osu.Game/Screens/Play/BreakOverlay.cs

@@ -1,15 +1,16 @@
 // Copyright (c) 2007-2018 ppy Pty Ltd <contact@ppy.sh>.
 // Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
 
+using System.Collections.Generic;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Shapes;
+using osu.Framework.Graphics.UserInterface;
 using osu.Game.Beatmaps.Timing;
 using osu.Game.Rulesets.Scoring;
-using System.Collections.Generic;
+using osu.Game.Screens.Play.Break;
-using osu.Framework.Graphics.UserInterface;
 
-namespace osu.Game.Screens.Play.BreaksOverlay
+namespace osu.Game.Screens.Play
 {
     public class BreakOverlay : Container
     {
@@ -18,28 +19,26 @@ namespace osu.Game.Screens.Play.BreaksOverlay
         private const int vertical_margin = 25;
 
         private List<BreakPeriod> breaks;
+
+        private readonly Container fadeContainer;
+
         public List<BreakPeriod> Breaks
         {
+            get => breaks;
             set
             {
                 breaks = value;
                 initializeBreaks();
             }
-            get
-            {
-                return breaks;
-            }
         }
 
         public override bool RemoveCompletedTransforms => false;
 
-        private readonly bool letterboxing;
-        private readonly LetterboxOverlay letterboxOverlay;
         private readonly Container remainingTimeAdjustmentBox;
         private readonly Container remainingTimeBox;
         private readonly RemainingTimeCounter remainingTimeCounter;
-        private readonly InfoContainer info;
+        private readonly BreakInfo info;
-        private readonly ArrowsOverlay arrowsOverlay;
+        private readonly BreakArrows breakArrows;
 
         public BreakOverlay(bool letterboxing, ScoreProcessor scoreProcessor)
             : this(letterboxing)
@@ -49,13 +48,16 @@ namespace osu.Game.Screens.Play.BreaksOverlay
 
         public BreakOverlay(bool letterboxing)
         {
-            this.letterboxing = letterboxing;
-
             RelativeSizeAxes = Axes.Both;
+            Child = fadeContainer = new Container
+            {
+                Alpha = 0,
+                RelativeSizeAxes = Axes.Both,
                 Children = new Drawable[]
                 {
-                letterboxOverlay = new LetterboxOverlay
+                    new LetterboxOverlay
                     {
+                        Alpha = letterboxing ? 1 : 0,
                         Anchor = Anchor.Centre,
                         Origin = Anchor.Centre,
                     },
@@ -83,27 +85,35 @@ namespace osu.Game.Screens.Play.BreaksOverlay
                         Origin = Anchor.BottomCentre,
                         Margin = new MarginPadding { Bottom = vertical_margin },
                     },
-                info = new InfoContainer
+                    info = new BreakInfo
                     {
                         Anchor = Anchor.Centre,
                         Origin = Anchor.TopCentre,
                         Margin = new MarginPadding { Top = vertical_margin },
                     },
-                arrowsOverlay = new ArrowsOverlay
+                    breakArrows = new BreakArrows
                     {
                         Anchor = Anchor.Centre,
                         Origin = Anchor.Centre,
                     }
+                }
             };
         }
 
+        protected override void LoadComplete()
+        {
+            base.LoadComplete();
+            initializeBreaks();
+        }
+
         private void initializeBreaks()
         {
+            if (!IsLoaded) return; // we need a clock.
+
             FinishTransforms(true);
             Scheduler.CancelDelayedTasks();
 
-            if (breaks == null)
+            if (breaks == null) return; //we need breaks.
-                return;
 
             foreach (var b in breaks)
             {
@@ -112,6 +122,9 @@ namespace osu.Game.Screens.Play.BreaksOverlay
 
                 using (BeginAbsoluteSequence(b.StartTime, true))
                 {
+                    fadeContainer.FadeIn(fade_duration);
+                    breakArrows.Show(fade_duration);
+
                     remainingTimeAdjustmentBox
                         .ResizeWidthTo(remaining_time_container_max_size, fade_duration, Easing.OutQuint)
                         .Delay(b.Duration - fade_duration)
@@ -123,35 +136,14 @@ namespace osu.Game.Screens.Play.BreaksOverlay
                         .ResizeWidthTo(1);
 
                     remainingTimeCounter.CountTo(b.Duration).CountTo(0, b.Duration);
-                }
 
-                using (BeginAbsoluteSequence(b.StartTime))
+                    using (BeginDelayedSequence(b.Duration - fade_duration, true))
                     {
-                    Schedule(showBreak);
+                        fadeContainer.FadeOut(fade_duration);
-                    using (BeginDelayedSequence(b.Duration - fade_duration))
+                        breakArrows.Hide(fade_duration);
-                        Schedule(hideBreak);
                     }
                 }
             }
-
-        private void showBreak()
-        {
-            if (letterboxing)
-                letterboxOverlay.Show();
-
-            remainingTimeCounter.Show();
-            info.Show();
-            arrowsOverlay.Show();
-        }
-
-        private void hideBreak()
-        {
-            if (letterboxing)
-                letterboxOverlay.Hide();
-
-            remainingTimeCounter.Hide();
-            info.Hide();
-            arrowsOverlay.Hide();
         }
 
         private void bindProcessor(ScoreProcessor processor)

osu.Game/Screens/Play/Player.cs

@@ -25,7 +25,6 @@ using osu.Game.Rulesets;
 using osu.Game.Rulesets.Mods;
 using osu.Game.Rulesets.Scoring;
 using osu.Game.Rulesets.UI;
-using osu.Game.Screens.Play.BreaksOverlay;
 using osu.Game.Screens.Ranking;
 using osu.Game.Storyboards.Drawables;
 

osu.Game/osu.Game.csproj

@@ -410,14 +410,14 @@
     <Compile Include="Screens\Edit\Screens\Compose\RadioButtons\RadioButtonCollection.cs" />
     <Compile Include="Screens\Edit\Screens\Compose\Timeline\BeatmapWaveformGraph.cs" />
     <Compile Include="Screens\Edit\Screens\Compose\Timeline\TimelineButton.cs" />
-    <Compile Include="Screens\Play\BreaksOverlay\ArrowsOverlay.cs" />
+    <Compile Include="Screens\Play\Break\BreakArrows.cs" />
-    <Compile Include="Screens\Play\BreaksOverlay\BlurredIcon.cs" />
+    <Compile Include="Screens\Play\Break\BlurredIcon.cs" />
-    <Compile Include="Screens\Play\BreaksOverlay\BreakOverlay.cs" />
+    <Compile Include="Screens\Play\BreakOverlay.cs" />
-    <Compile Include="Screens\Play\BreaksOverlay\GlowIcon.cs" />
+    <Compile Include="Screens\Play\Break\GlowIcon.cs" />
-    <Compile Include="Screens\Play\BreaksOverlay\InfoContainer.cs" />
+    <Compile Include="Screens\Play\Break\BreakInfo.cs" />
-    <Compile Include="Screens\Play\BreaksOverlay\InfoLine.cs" />
+    <Compile Include="Screens\Play\Break\BreakInfoLine.cs" />
-    <Compile Include="Screens\Play\BreaksOverlay\LetterboxOverlay.cs" />
+    <Compile Include="Screens\Play\Break\LetterboxOverlay.cs" />
-    <Compile Include="Screens\Play\BreaksOverlay\RemainingTimeCounter.cs" />
+    <Compile Include="Screens\Play\Break\RemainingTimeCounter.cs" />
     <Compile Include="Beatmaps\Legacy\LegacyBeatmap.cs" />
     <Compile Include="Beatmaps\RankStatus.cs" />
     <Compile Include="Beatmaps\Timing\BreakPeriod.cs" />