h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2024-09-21 20:07:25 +08:00
Code Issues Releases Wiki Activity

Fix osu! and catch hitobjects no longer scaled to 1 by default

Browse Source
This commit is contained in:
Salman Ahmed 2022-07-19 06:57:31 +03:00
parent 1051009827
commit 8f80a22ef9
3 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -130,7 +130,7 @@ namespace osu.Game.Rulesets.Catch.Objects
set => lastInCombo.Value = value; set => lastInCombo.Value = value;
} }
private HitObjectProperty<float> scale; private HitObjectProperty<float> scale = new HitObjectProperty<float>(1);
public Bindable<float> ScaleBindable => scale.Bindable; public Bindable<float> ScaleBindable => scale.Bindable;

2
osu.Game.Rulesets.Osu/Objects/OsuHitObject.cs
View File

@ -69,7 +69,7 @@ namespace osu.Game.Rulesets.Osu.Objects
public double Radius => OBJECT_RADIUS * Scale; public double Radius => OBJECT_RADIUS * Scale;
private HitObjectProperty<float> scaleProperty; private HitObjectProperty<float> scaleProperty = new HitObjectProperty<float>(1);
public Bindable<float> ScaleBindable => scaleProperty.Bindable; public Bindable<float> ScaleBindable => scaleProperty.Bindable;

10
osu.Game/Rulesets/Objects/HitObjectProperty.cs
View File

@ -24,7 +24,7 @@ namespace osu.Game.Rulesets.Objects
/// <summary> /// <summary>
/// The underlying <see cref="Bindable{T}"/>, only initialised on first access. /// The underlying <see cref="Bindable{T}"/>, only initialised on first access.
/// </summary> /// </summary>
public Bindable<T> Bindable => backingBindable ??= new Bindable<T> { Value = backingValue }; public Bindable<T> Bindable => backingBindable ??= new Bindable<T>(defaultValue) { Value = backingValue };
/// <summary> /// <summary>
/// The current value, derived from and delegated to <see cref="Bindable"/> if initialised, or a temporary field otherwise. /// The current value, derived from and delegated to <see cref="Bindable"/> if initialised, or a temporary field otherwise.
@ -40,5 +40,13 @@ namespace osu.Game.Rulesets.Objects
backingValue = value; backingValue = value;
} }
} }
private readonly T defaultValue;
public HitObjectProperty(T value = default)
{
backingValue = defaultValue = value;
backingBindable = null;
}
} }
} }