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

Merge branch 'master' into editor-hitobject-overlays

Browse Source
This commit is contained in:
smoogipoo
2018-02-22 14:08:29 +09:00
parent e7d17b9578 cc3546f907
commit ded2644df8
10 changed files with 44 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -12,7 +12,6 @@ using osu.Framework.Graphics.Containers;
using osu.Game.Rulesets.Osu.Judgements;
using osu.Framework.Graphics.Primitives;
using osu.Game.Configuration;
using osu.Game.Rulesets.Objects.Types;
using osu.Game.Rulesets.Scoring;
namespace osu.Game.Rulesets.Osu.Objects.Drawables
@ -69,7 +68,7 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
{
var drawableTick = new DrawableSliderTick(tick)
{
Position = tick.Position
Position = tick.StackedPosition
};
ticks.Add(drawableTick);
@ -81,7 +80,7 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
{
var drawableRepeatPoint = new DrawableRepeatPoint(repeatPoint, this)
{
Position = repeatPoint.Position
Position = repeatPoint.StackedPosition
};
repeatPoints.Add(drawableRepeatPoint);
@ -97,7 +96,6 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
config.BindWith(OsuSetting.SnakingOutSliders, Body.SnakingOut);
}
private int currentSpan;
public bool Tracking;
protected override void Update()
@ -106,16 +104,13 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
Tracking = Ball.Tracking;
GetCurrentProgress(out int span, out double progress);
if (span > currentSpan)
currentSpan = span;
double completionProgress = MathHelper.Clamp((Time.Current - slider.StartTime) / slider.Duration, 0, 1);
//todo: we probably want to reconsider this before adding scoring, but it looks and feels nice.
if (!HeadCircle.IsHit)
HeadCircle.Position = slider.Curve.PositionAt(progress);
HeadCircle.Position = slider.StackedPositionAt(completionProgress);
foreach (var c in components.OfType<ISliderProgress>()) c.UpdateProgress(progress, span);
foreach (var c in components.OfType<ISliderProgress>()) c.UpdateProgress(completionProgress);
foreach (var c in components.OfType<ITrackSnaking>()) c.UpdateSnakingPosition(slider.Curve.PositionAt(Body.SnakedStart ?? 0), slider.Curve.PositionAt(Body.SnakedEnd ?? 0));
foreach (var t in components.OfType<IRequireTracking>()) t.Tracking = Ball.Tracking;
}