mirror of https://github.com/ppy/osu
Moved X clamping from X to EffectiveX
This commit is contained in:
parent
18fe37bb22
commit
4958421303
|
@ -34,7 +34,7 @@ public abstract class CatchHitObject : HitObject, IHasPosition, IHasComboInforma
|
||||||
[JsonIgnore]
|
[JsonIgnore]
|
||||||
public float X
|
public float X
|
||||||
{
|
{
|
||||||
set => originalX.Value = Math.Clamp(value, 0, CatchPlayfield.WIDTH);
|
set => originalX.Value = value;
|
||||||
}
|
}
|
||||||
|
|
||||||
private HitObjectProperty<float> xOffset;
|
private HitObjectProperty<float> xOffset;
|
||||||
|
@ -70,7 +70,7 @@ public float OriginalX
|
||||||
/// This value is the original <see cref="X"/> value plus the offset applied by the beatmap processing.
|
/// This value is the original <see cref="X"/> value plus the offset applied by the beatmap processing.
|
||||||
/// Use <see cref="OriginalX"/> if a value not affected by the offset is desired.
|
/// Use <see cref="OriginalX"/> if a value not affected by the offset is desired.
|
||||||
/// </remarks>
|
/// </remarks>
|
||||||
public float EffectiveX => OriginalX + XOffset;
|
public float EffectiveX => Math.Clamp(OriginalX + XOffset, 0, CatchPlayfield.WIDTH);
|
||||||
|
|
||||||
public double TimePreempt { get; set; } = 1000;
|
public double TimePreempt { get; set; } = 1000;
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue