h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2025-01-27 12:42:54 +08:00
Code Issues Releases Wiki Activity

Use OriginalX for CatchHitObject.X instead of EffectiveX

Browse Source 
And explicitly implement IHasXPosition interface to prevent use of the X property.
It should be preferred for beatmap conversion purpose.
This commit is contained in:
ekrctb 2020-12-14 11:25:09 +09:00
parent 089f3bebf5
commit 36529bdd1b
1 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
osu.Game.Rulesets.Catch/Objects/CatchHitObject.cs
View File

@ -1,7 +1,6 @@
// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence. // 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. // See the LICENCE file in the repository root for full licence text.
using System;
using osu.Framework.Bindables; using osu.Framework.Bindables;
using osu.Game.Beatmaps; using osu.Game.Beatmaps;
using osu.Game.Beatmaps.ControlPoints; using osu.Game.Beatmaps.ControlPoints;
@ -31,14 +30,11 @@ namespace osu.Game.Rulesets.Catch.Objects
set => OriginalXBindable.Value = value; set => OriginalXBindable.Value = value;
} }
/// <summary> float IHasXPosition.X => OriginalX;
/// The horizontal position of the fruit between 0 and <see cref="CatchPlayfield.WIDTH"/>.
/// </summary>
public float X public float X
{ {
[Obsolete("Use EffectiveX instead")] set => OriginalX = value;
get => EffectiveX;
set => OriginalXBindable.Value = value;
} }
public readonly Bindable<float> EffectiveXBindable = new Bindable<float>(); public readonly Bindable<float> EffectiveXBindable = new Bindable<float>();