sim1222/osukey
1
1
Fork 0
mirror of https://github.com/osukey/osukey.git synced 2025-04-29 10:47:22 +09:00
Code Issues Packages Projects Releases Wiki Activity

Fix OsuHitObject not using property wrapper properly

Browse Source
This commit is contained in:
Salman Ahmed 2022-07-19 07:52:12 +03:00
parent 46efce8a67
commit d8cce5fe36
1 changed files with 28 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -55,80 +55,80 @@ namespace osu.Game.Rulesets.Osu.Objects
public Vector2 StackedEndPosition => EndPosition + StackOffset; public Vector2 StackedEndPosition => EndPosition + StackOffset;
private HitObjectProperty<int> stackHeightProperty; private HitObjectProperty<int> stackHeight;
public Bindable<int> StackHeightBindable => stackHeightProperty.Bindable; public Bindable<int> StackHeightBindable => stackHeight.Bindable;
public int StackHeight public int StackHeight
{ {
get => StackHeightBindable.Value; get => stackHeight.Value;
set => StackHeightBindable.Value = value; set => stackHeight.Value = value;
} }
public virtual Vector2 StackOffset => new Vector2(StackHeight * Scale * -6.4f); public virtual Vector2 StackOffset => new Vector2(StackHeight * Scale * -6.4f);
public double Radius => OBJECT_RADIUS * Scale; public double Radius => OBJECT_RADIUS * Scale;
private HitObjectProperty<float> scaleProperty = new HitObjectProperty<float>(1); private HitObjectProperty<float> scale = new HitObjectProperty<float>(1);
public Bindable<float> ScaleBindable => scaleProperty.Bindable; public Bindable<float> ScaleBindable => scale.Bindable;
public float Scale public float Scale
{ {
get => ScaleBindable.Value; get => scale.Value;
set => ScaleBindable.Value = value; set => scale.Value = value;
} }
public virtual bool NewCombo { get; set; } public virtual bool NewCombo { get; set; }
private HitObjectProperty<int> comboOffsetProperty; private HitObjectProperty<int> comboOffset;
public Bindable<int> ComboOffsetBindable => comboOffsetProperty.Bindable; public Bindable<int> ComboOffsetBindable => comboOffset.Bindable;
public int ComboOffset public int ComboOffset
{ {
get => ComboOffsetBindable.Value; get => comboOffset.Value;
set => ComboOffsetBindable.Value = value; set => comboOffset.Value = value;
} }
private HitObjectProperty<int> indexInCurrentComboProperty; private HitObjectProperty<int> indexInCurrentCombo;
public Bindable<int> IndexInCurrentComboBindable => indexInCurrentComboProperty.Bindable; public Bindable<int> IndexInCurrentComboBindable => indexInCurrentCombo.Bindable;
public virtual int IndexInCurrentCombo public virtual int IndexInCurrentCombo
{ {
get => IndexInCurrentComboBindable.Value; get => indexInCurrentCombo.Value;
set => IndexInCurrentComboBindable.Value = value; set => indexInCurrentCombo.Value = value;
} }
private HitObjectProperty<int> comboIndexProperty; private HitObjectProperty<int> comboIndex;
public Bindable<int> ComboIndexBindable => comboIndexProperty.Bindable; public Bindable<int> ComboIndexBindable => comboIndex.Bindable;
public virtual int ComboIndex public virtual int ComboIndex
{ {
get => ComboIndexBindable.Value; get => comboIndex.Value;
set => ComboIndexBindable.Value = value; set => comboIndex.Value = value;
} }
private HitObjectProperty<int> comboIndexWithOffsetsProperty; private HitObjectProperty<int> comboIndexWithOffsets;
public Bindable<int> ComboIndexWithOffsetsBindable => comboIndexWithOffsetsProperty.Bindable; public Bindable<int> ComboIndexWithOffsetsBindable => comboIndexWithOffsets.Bindable;
public int ComboIndexWithOffsets public int ComboIndexWithOffsets
{ {
get => ComboIndexWithOffsetsBindable.Value; get => comboIndexWithOffsets.Value;
set => ComboIndexWithOffsetsBindable.Value = value; set => comboIndexWithOffsets.Value = value;
} }
private HitObjectProperty<bool> lastInComboProperty; private HitObjectProperty<bool> lastInCombo;
public Bindable<bool> LastInComboBindable => lastInComboProperty.Bindable; public Bindable<bool> LastInComboBindable => lastInCombo.Bindable;
public bool LastInCombo public bool LastInCombo
{ {
get => LastInComboBindable.Value; get => lastInCombo.Value;
set => LastInComboBindable.Value = value; set => lastInCombo.Value = value;
} }
protected OsuHitObject() protected OsuHitObject()