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

Fix swells not stopping at the hit position

Browse Source
This commit is contained in:
smoogipoo
2018-01-04 21:45:29 +09:00
parent 4fee76ba0b
commit add68ff068
3 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
osu-framework

Submodule osu-framework updated: 6134dafccb...067fdb8f5b

2
osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableSwell.cs
View File

@ -192,7 +192,7 @@ namespace osu.Game.Rulesets.Taiko.Objects.Drawables
Size = BaseSize * Parent.RelativeChildSize; Size = BaseSize * Parent.RelativeChildSize;
// Make the swell stop at the hit target // Make the swell stop at the hit target
X = (float)Math.Max(Time.Current, HitObject.StartTime); X = Math.Max(0, X);
double t = Math.Min(HitObject.StartTime, Time.Current); double t = Math.Min(HitObject.StartTime, Time.Current);
if (t == HitObject.StartTime && !hasStarted) if (t == HitObject.StartTime && !hasStarted)

7
osu.Game/Rulesets/UI/Scrolling/ScrollingHitObjectContainer.cs
View File

@ -29,9 +29,12 @@ namespace osu.Game.Rulesets.UI.Scrolling
RelativeSizeAxes = Axes.Both; RelativeSizeAxes = Axes.Both;
} }
protected override void UpdateAfterChildren() protected override void UpdateAfterChildrenLife()
{ {
base.UpdateAfterChildren(); base.UpdateAfterChildrenLife();
// We need to calculate this as soon as possible so that hitobjects
// get the final say in their positions
var currentMultiplier = controlPointAt(Time.Current); var currentMultiplier = controlPointAt(Time.Current);