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

Fix post-merge issues

Browse Source
This commit is contained in:
smoogipoo 2018-02-22 14:11:06 +09:00
parent ded2644df8
commit 604b0fa20a
2 changed files with 2 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
osu.Game.Rulesets.Osu/Edit/Layers/Selection/Overlays/SliderOverlay.cs
View File

@ -16,13 +16,9 @@ namespace osu.Game.Rulesets.Osu.Edit.Layers.Selection.Overlays
{ {
private readonly SliderBody body; private readonly SliderBody body;
private readonly DrawableSlider hitObject;
public SliderOverlay(DrawableSlider slider) public SliderOverlay(DrawableSlider slider)
: base(slider) : base(slider)
{ {
hitObject = slider;
var obj = (Slider)slider.HitObject; var obj = (Slider)slider.HitObject;
InternalChildren = new Drawable[] InternalChildren = new Drawable[]
@ -48,8 +44,8 @@ namespace osu.Game.Rulesets.Osu.Edit.Layers.Selection.Overlays
{ {
base.Update(); base.Update();
hitObject.GetCurrentProgress(out int span, out double progress); // Need to cause one update
body.UpdateProgress(progress, span); body.UpdateProgress(0);
} }
} }
} }

13
osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSlider.cs
View File

@ -157,19 +157,6 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
} }
} }
/// <summary>
/// Finds the progress along the slider at the current time.
/// </summary>
/// <param name="span">The current span.</param>
/// <param name="progress">The current progress in the current span.</param>
public void GetCurrentProgress(out int span, out double progress)
{
double offset = MathHelper.Clamp((Time.Current - slider.StartTime) / slider.Duration, 0, 1);
span = slider.SpanAt(offset);
progress = slider.ProgressAt(offset);
}
public Drawable ProxiedLayer => HeadCircle.ApproachCircle; public Drawable ProxiedLayer => HeadCircle.ApproachCircle;
public override bool ReceiveMouseInputAt(Vector2 screenSpacePos) => Body.ReceiveMouseInputAt(screenSpacePos); public override bool ReceiveMouseInputAt(Vector2 screenSpacePos) => Body.ReceiveMouseInputAt(screenSpacePos);