Merge pull request #9003 from peppy/fix-taiko-scroller-time-control

Fix taiko scroller not correctly adhering to gameplay time movement

osu.Android.props

@@ -51,7 +51,7 @@
     <Reference Include="Java.Interop" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="ppy.osu.Game.Resources" Version="2020.427.0" />
+    <PackageReference Include="ppy.osu.Game.Resources" Version="2020.512.0" />
     <PackageReference Include="ppy.osu.Framework.Android" Version="2020.511.0" />
   </ItemGroup>
 </Project>

osu.Game.Rulesets.Taiko.Tests/Skinning/TestSceneTaikoScroller.cs

@@ -3,6 +3,7 @@
 
 using osu.Framework.Extensions.IEnumerableExtensions;
 using osu.Framework.Testing;
+using osu.Framework.Timing;
 using osu.Game.Rulesets.Judgements;
 using osu.Game.Rulesets.Scoring;
 using osu.Game.Rulesets.Taiko.Skinning;
@@ -12,11 +13,30 @@ namespace osu.Game.Rulesets.Taiko.Tests.Skinning
 {
     public class TestSceneTaikoScroller : TaikoSkinnableTestScene
     {
+        private readonly ManualClock clock = new ManualClock();
+
+        private bool reversed;
+
         public TestSceneTaikoScroller()
         {
-            AddStep("Load scroller", () => SetContents(() => new SkinnableDrawable(new TaikoSkinComponent(TaikoSkinComponents.Scroller), _ => Empty())));
+            AddStep("Load scroller", () => SetContents(() =>
+                new SkinnableDrawable(new TaikoSkinComponent(TaikoSkinComponents.Scroller), _ => Empty())
+                {
+                    Clock = new FramedClock(clock),
+                    Height = 0.4f,
+                }));
+
             AddToggleStep("Toggle passing", passing => this.ChildrenOfType<LegacyTaikoScroller>().ForEach(s => s.LastResult.Value =
                 new JudgementResult(null, new Judgement()) { Type = passing ? HitResult.Perfect : HitResult.Miss }));
+
+            AddToggleStep("toggle playback direction", reversed => this.reversed = reversed);
+        }
+
+        protected override void Update()
+        {
+            base.Update();
+
+            clock.CurrentTime += (reversed ? -1 : 1) * Clock.ElapsedFrameTime;
         }
     }
 }

osu.Game.Rulesets.Taiko/Skinning/LegacyTaikoScroller.cs

@@ -17,6 +17,8 @@ namespace osu.Game.Rulesets.Taiko.Skinning
 {
     public class LegacyTaikoScroller : CompositeDrawable
     {
+        public Bindable<JudgementResult> LastResult = new Bindable<JudgementResult>();
+
         public LegacyTaikoScroller()
         {
             RelativeSizeAxes = Axes.Both;
@@ -50,37 +52,38 @@ namespace osu.Game.Rulesets.Taiko.Skinning
             }, true);
         }
 
-        public Bindable<JudgementResult> LastResult = new Bindable<JudgementResult>();
-
         protected override void Update()
         {
             base.Update();
 
-            while (true)
+            // store X before checking wide enough so if we perform layout there is no positional discrepancy.
+            float currentX = (InternalChildren?.FirstOrDefault()?.X ?? 0) - (float)Clock.ElapsedFrameTime * 0.1f;
+
+            // ensure we have enough sprites
+            if (!InternalChildren.Any()
+                || InternalChildren.First().ScreenSpaceDrawQuad.Width * InternalChildren.Count < ScreenSpaceDrawQuad.Width * 2)
+                AddInternal(new ScrollerSprite { Passing = passing });
+
+            var first = InternalChildren.First();
+            var last = InternalChildren.Last();
+
+            foreach (var sprite in InternalChildren)
             {
-                float? additiveX = null;
+                // add the x coordinates and perform re-layout on all sprites as spacing may change with gameplay scale.
+                sprite.X = currentX;
+                currentX += sprite.DrawWidth;
+            }
 
-                foreach (var sprite in InternalChildren)
+            if (first.ScreenSpaceDrawQuad.TopLeft.X >= ScreenSpaceDrawQuad.TopLeft.X)
-                {
+            {
-                    // add the x coordinates and perform re-layout on all sprites as spacing may change with gameplay scale.
+                foreach (var internalChild in InternalChildren)
-                    sprite.X = additiveX ??= sprite.X - (float)Time.Elapsed * 0.1f;
+                    internalChild.X -= first.DrawWidth;
+            }
 
-                    additiveX += sprite.DrawWidth - 1;
+            if (last.ScreenSpaceDrawQuad.TopRight.X <= ScreenSpaceDrawQuad.TopRight.X)
-
+            {
-                    if (sprite.X + sprite.DrawWidth < 0)
+                foreach (var internalChild in InternalChildren)
-                        sprite.Expire();
+                    internalChild.X += first.DrawWidth;
-                }
-
-                var last = InternalChildren.LastOrDefault();
-
-                // only break from this loop once we have saturated horizontal space completely.
-                if (last != null && last.ScreenSpaceDrawQuad.TopRight.X >= ScreenSpaceDrawQuad.TopRight.X)
-                    break;
-
-                AddInternal(new ScrollerSprite
-                {
-                    Passing = passing
-                });
             }
         }
 

osu.Game.Rulesets.Taiko/UI/DrawableTaikoRuleset.cs

@@ -42,7 +42,7 @@ namespace osu.Game.Rulesets.Taiko.UI
         {
             new BarLineGenerator<BarLine>(Beatmap).BarLines.ForEach(bar => Playfield.Add(bar.Major ? new DrawableBarLineMajor(bar) : new DrawableBarLine(bar)));
 
-            AddInternal(scroller = new SkinnableDrawable(new TaikoSkinComponent(TaikoSkinComponents.Scroller), _ => Empty())
+            FrameStableComponents.Add(scroller = new SkinnableDrawable(new TaikoSkinComponent(TaikoSkinComponents.Scroller), _ => Empty())
             {
                 RelativeSizeAxes = Axes.X,
                 Depth = float.MaxValue

osu.Game/osu.Game.csproj

@@ -25,7 +25,7 @@
     <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite.Core" Version="2.2.6" />
     <PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
     <PackageReference Include="ppy.osu.Framework" Version="2020.511.0" />
-    <PackageReference Include="ppy.osu.Game.Resources" Version="2020.427.0" />
+    <PackageReference Include="ppy.osu.Game.Resources" Version="2020.512.0" />
     <PackageReference Include="Sentry" Version="2.1.1" />
     <PackageReference Include="SharpCompress" Version="0.25.0" />
     <PackageReference Include="NUnit" Version="3.12.0" />

osu.iOS.props

@@ -71,7 +71,7 @@
   </ItemGroup>
   <ItemGroup Label="Package References">
     <PackageReference Include="ppy.osu.Framework.iOS" Version="2020.511.0" />
-    <PackageReference Include="ppy.osu.Game.Resources" Version="2020.427.0" />
+    <PackageReference Include="ppy.osu.Game.Resources" Version="2020.512.0" />
   </ItemGroup>
   <!-- Xamarin.iOS does not automatically handle transitive dependencies from NuGet packages. -->
   <ItemGroup Label="Transitive Dependencies">