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

Rename and reuse variables

Browse Source
This commit is contained in:
Dean Herbert
2019-03-11 14:33:21 +09:00
parent 26f78b659b
commit 2029cf93fd
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
osu.Game/Rulesets/Objects/SliderEventGenerator.cs
View File

@ -80,8 +80,9 @@ namespace osu.Game.Rulesets.Objects
int finalSpanIndex = spanCount - 1; int finalSpanIndex = spanCount - 1;
double finalSpanStartTime = startTime + finalSpanIndex * spanDuration; double finalSpanStartTime = startTime + finalSpanIndex * spanDuration;
double finalSpanTime = Math.Max(startTime + totalDuration / 2, (finalSpanStartTime + spanDuration) - (legacyLastTickOffset ?? 0)); double finalSpanEndTime = Math.Max(startTime + totalDuration / 2, (finalSpanStartTime + spanDuration) - (legacyLastTickOffset ?? 0));
double finalProgress = (finalSpanTime - finalSpanStartTime) / spanDuration; double finalProgress = (finalSpanEndTime - finalSpanStartTime) / spanDuration;
if (spanCount % 2 == 0) finalProgress = 1 - finalProgress; if (spanCount % 2 == 0) finalProgress = 1 - finalProgress;
yield return new SliderEventDescriptor yield return new SliderEventDescriptor
@ -89,14 +90,14 @@ namespace osu.Game.Rulesets.Objects
Type = SliderEventType.LegacyLastTick, Type = SliderEventType.LegacyLastTick,
SpanIndex = finalSpanIndex, SpanIndex = finalSpanIndex,
SpanStartTime = finalSpanStartTime, SpanStartTime = finalSpanStartTime,
StartTime = finalSpanTime, StartTime = finalSpanEndTime,
PathProgress = finalProgress, PathProgress = finalProgress,
}; };
yield return new SliderEventDescriptor yield return new SliderEventDescriptor
{ {
Type = SliderEventType.Tail, Type = SliderEventType.Tail,
SpanIndex = spanCount - 1, SpanIndex = finalSpanIndex,
SpanStartTime = startTime + (spanCount - 1) * spanDuration, SpanStartTime = startTime + (spanCount - 1) * spanDuration,
StartTime = startTime + totalDuration, StartTime = startTime + totalDuration,
PathProgress = spanCount % 2, PathProgress = spanCount % 2,