sim1222/osukey
1
1
Fork 0
mirror of https://github.com/osukey/osukey.git synced 2025-07-01 16:29:58 +09:00
Code Issues Packages Projects Releases Wiki Activity

Add HitObject to DefaultsApplied event

Browse Source
This commit is contained in:
smoogipoo
2020-05-08 18:49:19 +09:00
parent dcfef6b443
commit efff2bf15d
4 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
osu.Game.Rulesets.Osu.Tests/TestSceneOutOfOrderHits.cs
View File

@ -399,7 +399,7 @@ namespace osu.Game.Rulesets.Osu.Tests
{ {
public TestSlider() public TestSlider()
{ {
DefaultsApplied += () => DefaultsApplied += _ =>
{ {
HeadCircle.HitWindows = new TestHitWindows(); HeadCircle.HitWindows = new TestHitWindows();
TailCircle.HitWindows = new TestHitWindows(); TailCircle.HitWindows = new TestHitWindows();

2
osu.Game.Rulesets.Osu/Objects/Drawables/Connections/FollowPointConnection.cs
View File

@ -78,7 +78,7 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables.Connections
private void bindEvents(DrawableOsuHitObject drawableObject) private void bindEvents(DrawableOsuHitObject drawableObject)
{ {
drawableObject.HitObject.PositionBindable.BindValueChanged(_ => scheduleRefresh()); drawableObject.HitObject.PositionBindable.BindValueChanged(_ => scheduleRefresh());
drawableObject.HitObject.DefaultsApplied += scheduleRefresh; drawableObject.HitObject.DefaultsApplied += _ => scheduleRefresh();
} }
private void scheduleRefresh() private void scheduleRefresh()

7
osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs
View File

@ -148,7 +148,7 @@ namespace osu.Game.Rulesets.Objects.Drawables
samplesBindable.CollectionChanged += (_, __) => loadSamples(); samplesBindable.CollectionChanged += (_, __) => loadSamples();
updateState(ArmedState.Idle, true); updateState(ArmedState.Idle, true);
onDefaultsApplied(); apply(HitObject);
} }
private void loadSamples() private void loadSamples()
@ -175,7 +175,10 @@ namespace osu.Game.Rulesets.Objects.Drawables
AddInternal(Samples); AddInternal(Samples);
} }
private void onDefaultsApplied() => apply(HitObject); private void onDefaultsApplied(HitObject hitObject)
{
apply(hitObject);
}
private void apply(HitObject hitObject) private void apply(HitObject hitObject)
{ {

4
osu.Game/Rulesets/Objects/HitObject.cs
View File

@ -32,7 +32,7 @@ namespace osu.Game.Rulesets.Objects
/// <summary> /// <summary>
/// Invoked after <see cref="ApplyDefaults"/> has completed on this <see cref="HitObject"/>. /// Invoked after <see cref="ApplyDefaults"/> has completed on this <see cref="HitObject"/>.
/// </summary> /// </summary>
public event Action DefaultsApplied; public event Action<HitObject> DefaultsApplied;
public readonly Bindable<double> StartTimeBindable = new BindableDouble(); public readonly Bindable<double> StartTimeBindable = new BindableDouble();
@ -124,7 +124,7 @@ namespace osu.Game.Rulesets.Objects
foreach (var h in nestedHitObjects) foreach (var h in nestedHitObjects)
h.ApplyDefaults(controlPointInfo, difficulty); h.ApplyDefaults(controlPointInfo, difficulty);
DefaultsApplied?.Invoke(); DefaultsApplied?.Invoke(this);
} }
protected virtual void ApplyDefaultsToSelf(ControlPointInfo controlPointInfo, BeatmapDifficulty difficulty) protected virtual void ApplyDefaultsToSelf(ControlPointInfo controlPointInfo, BeatmapDifficulty difficulty)