From 725a69d9736a214e46855954ca6a82f86508ff17 Mon Sep 17 00:00:00 2001 From: Dean Herbert Date: Mon, 7 Aug 2017 16:02:14 +0900 Subject: [PATCH] Begin conversion --- .../Beatmaps/CatchBeatmapConverter.cs | 13 ++++++++----- .../Objects/Drawable/DrawableFruit.cs | 5 +++++ 2 files changed, 13 insertions(+), 5 deletions(-) diff --git a/osu.Game.Rulesets.Catch/Beatmaps/CatchBeatmapConverter.cs b/osu.Game.Rulesets.Catch/Beatmaps/CatchBeatmapConverter.cs index 40180ac3a0..6a20fa525e 100644 --- a/osu.Game.Rulesets.Catch/Beatmaps/CatchBeatmapConverter.cs +++ b/osu.Game.Rulesets.Catch/Beatmaps/CatchBeatmapConverter.cs @@ -16,14 +16,17 @@ namespace osu.Game.Rulesets.Catch.Beatmaps { protected override IEnumerable ValidConversionTypes { get; } = new[] { typeof(IHasXPosition) }; - protected override IEnumerable ConvertHitObject(HitObject original, Beatmap beatmap) + protected override IEnumerable ConvertHitObject(HitObject obj, Beatmap beatmap) { - var catchHit = original as CatchBaseHit; + var distanceData = obj as IHasDistance; + var repeatsData = obj as IHasRepeats; + var endTimeData = obj as IHasEndTime; + var curveData = obj as IHasCurve; - yield return catchHit ?? new Fruit + yield return new Fruit { - StartTime = original.StartTime, - Position = ((IHasXPosition)original).X / OsuPlayfield.BASE_SIZE.X + StartTime = obj.StartTime, + Position = ((IHasXPosition)obj).X / OsuPlayfield.BASE_SIZE.X }; } } diff --git a/osu.Game.Rulesets.Catch/Objects/Drawable/DrawableFruit.cs b/osu.Game.Rulesets.Catch/Objects/Drawable/DrawableFruit.cs index be51f60c46..aa92f36d23 100644 --- a/osu.Game.Rulesets.Catch/Objects/Drawable/DrawableFruit.cs +++ b/osu.Game.Rulesets.Catch/Objects/Drawable/DrawableFruit.cs @@ -49,6 +49,11 @@ namespace osu.Game.Rulesets.Catch.Objects.Drawable { Children = new Framework.Graphics.Drawable[] { + new Box + { + RelativeSizeAxes = Axes.Both, + Colour = Color4.Red, + }, new Pulp { RelativePositionAxes = Axes.Both,