Add BananaShower models and representations

(cherry picked from commit e12e095)

osu.Game.Rulesets.Catch/Objects/BananaShower.cs

@@ -0,0 +1,61 @@
+// 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.MathUtils;
+using osu.Game.Rulesets.Objects.Types;
+using OpenTK.Graphics;
+
+namespace osu.Game.Rulesets.Catch.Objects
+{
+    public class BananaShower : CatchHitObject, IHasEndTime
+    {
+        public override FruitVisualRepresentation VisualRepresentation => FruitVisualRepresentation.Banana;
+
+        protected override void CreateNestedHitObjects()
+        {
+            base.CreateNestedHitObjects();
+            createBananas();
+        }
+
+        private void createBananas()
+        {
+            double spacing = Duration;
+            while (spacing > 100)
+                spacing /= 2;
+
+            if (spacing <= 0)
+                return;
+
+            for (double i = StartTime; i <= EndTime; i += spacing)
+                AddNested(new Banana
+                {
+                    Samples = Samples,
+                    ComboColour = getNextComboColour(),
+                    StartTime = i,
+                    X = RNG.NextSingle()
+                });
+        }
+
+        private Color4 getNextComboColour()
+        {
+            switch (RNG.Next(0, 3))
+            {
+                default:
+                    return new Color4(255, 240, 0, 255);
+                case 1:
+                    return new Color4(255, 192, 0, 255);
+                case 2:
+                    return new Color4(214, 221, 28, 255);
+            }
+        }
+
+        public double EndTime => StartTime + Duration;
+
+        public double Duration { get; set; }
+
+        public class Banana : Fruit
+        {
+            public override FruitVisualRepresentation VisualRepresentation => FruitVisualRepresentation.Banana;
+        }
+    }
+}

osu.Game.Rulesets.Catch/Objects/Drawable/DrawableBananaShower.cs

@@ -0,0 +1,40 @@
+// 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.Linq;
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers;
+using OpenTK;
+using osu.Game.Rulesets.Objects.Drawables;
+
+namespace osu.Game.Rulesets.Catch.Objects.Drawable
+{
+    public class DrawableBananaShower : DrawableCatchHitObject<BananaShower>
+    {
+        private readonly Container dropletContainer;
+
+        public DrawableBananaShower(BananaShower s) : base(s)
+        {
+            RelativeSizeAxes = Axes.Both;
+            Height = (float)HitObject.Duration;
+            X = 0;
+
+            Child = dropletContainer = new Container
+            {
+                RelativeSizeAxes = Axes.Both,
+                RelativeChildOffset = new Vector2(0, (float)HitObject.StartTime),
+                RelativeChildSize = new Vector2(1, (float)HitObject.Duration)
+            };
+
+            foreach (var b in s.NestedHitObjects.OfType<BananaShower.Banana>())
+                    AddNested(new DrawableFruit(b));
+        }
+
+        protected override void AddNested(DrawableHitObject<CatchHitObject> h)
+        {
+            ((DrawableCatchHitObject)h).CheckPosition = o => CheckPosition?.Invoke(o) ?? false;
+            dropletContainer.Add(h);
+            base.AddNested(h);
+        }
+    }
+}

osu.Game.Rulesets.Catch/Tests/TestCaseBananaShower.cs

@@ -0,0 +1,38 @@
+// Copyright (c) 2007-2018 ppy Pty Ltd <contact@ppy.sh>.
+// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
+
+using NUnit.Framework;
+using osu.Game.Beatmaps;
+using osu.Game.Rulesets.Catch.Objects;
+
+namespace osu.Game.Rulesets.Catch.Tests
+{
+    [TestFixture]
+    [Ignore("getting CI working")]
+    public class TestCaseBananaShower : Game.Tests.Visual.TestCasePlayer
+    {
+        public TestCaseBananaShower()
+            : base(typeof(CatchRuleset))
+        {
+        }
+
+        protected override Beatmap CreateBeatmap()
+        {
+            var beatmap = new Beatmap
+            {
+                BeatmapInfo = new BeatmapInfo
+                {
+                    BaseDifficulty = new BeatmapDifficulty
+                    {
+                        CircleSize = 6,
+                    }
+                }
+            };
+
+            for (int i = 0; i < 10; i++)
+                beatmap.HitObjects.Add(new BananaShower { StartTime = i * 1200, Duration = 1000, NewCombo = i % 2 == 0 });
+
+            return beatmap;
+        }
+    }
+}

osu.Game.Rulesets.Catch/UI/CatchRulesetContainer.cs

@@ -33,13 +33,15 @@ public CatchRulesetContainer(Ruleset ruleset, WorkingBeatmap beatmap, bool isFor
 
         protected override DrawableHitObject<CatchHitObject> GetVisualRepresentation(CatchHitObject h)
         {
-            var fruit = h as Fruit;
-            if (fruit != null)
-                return new DrawableFruit(fruit);
-
-            var stream = h as JuiceStream;
-            if (stream != null)
-                return new DrawableJuiceStream(stream);
+            switch (h)
+            {
+                case Fruit fruit:
+                    return new DrawableFruit(fruit);
+                case JuiceStream stream:
+                    return new DrawableJuiceStream(stream);
+                case BananaShower banana:
+                    return new DrawableBananaShower(banana);
+            }
 
             return null;
         }

osu.Game.Rulesets.Catch/osu.Game.Rulesets.Catch.csproj

@@ -60,6 +60,8 @@
     <Compile Include="Mods\CatchModPerfect.cs" />
     <Compile Include="Mods\CatchModRelax.cs" />
     <Compile Include="Mods\CatchModSuddenDeath.cs" />
+    <Compile Include="Objects\BananaShower.cs" />
+    <Compile Include="Objects\Drawable\DrawableBananaShower.cs" />
     <Compile Include="Objects\Drawable\DrawableCatchHitObject.cs" />
     <Compile Include="Objects\Drawable\DrawableDroplet.cs" />
     <Compile Include="Objects\Drawable\DrawableJuiceStream.cs" />
@@ -73,6 +75,7 @@
     <Compile Include="Objects\Fruit.cs" />
     <Compile Include="Objects\TinyDroplet.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
+    <Compile Include="Tests\TestCaseBananaShower.cs" />
     <Compile Include="Tests\TestCaseCatcherArea.cs" />
     <Compile Include="Tests\TestCaseCatchStacker.cs" />
     <Compile Include="Tests\TestCaseFruitObjects.cs" />