h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2025-03-24 07:27:29 +08:00
Code Issues Releases Wiki Activity

Merge branch 'mania-beatmap-conversion' into mania-distance-object-conversion

Browse Source 
# Conflicts:
#	osu.Game.Rulesets.Mania/Beatmaps/LegacyBeatmapConverter.cs
This commit is contained in:
smoogipooo 2017-05-18 19:06:27 +09:00
commit 78453c7ce3
2 changed files with 14 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
osu.Game.Rulesets.Mania/Beatmaps/LegacyBeatmapConverter.cs
View File

@ -41,7 +41,7 @@ namespace osu.Game.Rulesets.Mania.Beatmaps
yield break;
}
IEnumerable<ManiaHitObject> objects = null;
IEnumerable<ManiaHitObject> objects;
switch (beatmap.BeatmapInfo.RulesetID)
{
default:
@ -75,7 +75,9 @@ namespace osu.Game.Rulesets.Mania.Beatmaps
var distanceData = original as IHasDistance;
var positionData = original as IHasPosition;
Patterns.PatternGenerator conversion = null;
// Following lines currently commented out to appease resharper
//PatternGenerator conversion = null;
if (distanceData != null)
{
@ -91,13 +93,13 @@ namespace osu.Game.Rulesets.Mania.Beatmaps
// Circle
}
if (conversion == null)
return new ManiaHitObject[0];
//if (conversion == null)
return null;
Pattern newPattern = conversion.Generate();
lastPattern = newPattern;
//Pattern newPattern = conversion.Generate();
//lastPattern = newPattern;
return newPattern.HitObjects;
//return newPattern.HitObjects;
}
/// <summary>
@ -115,6 +117,8 @@ namespace osu.Game.Rulesets.Mania.Beatmaps
var endTimeData = HitObject as IHasEndTime;
var positionData = HitObject as IHasXPosition;
int column = GetColumn(positionData?.X ?? 0);
var pattern = new Pattern();
if (endTimeData != null)
@ -124,7 +128,7 @@ namespace osu.Game.Rulesets.Mania.Beatmaps
StartTime = HitObject.StartTime,
Samples = HitObject.Samples,
Duration = endTimeData.Duration,
Column = GetColumn(positionData?.X ?? 0),
Column = column,
});
}
else if (positionData != null)
@ -133,7 +137,7 @@ namespace osu.Game.Rulesets.Mania.Beatmaps
{
StartTime = HitObject.StartTime,
Samples = HitObject.Samples,
Column = GetColumn(positionData?.X ?? 0)
Column = column
});
}

2
osu.Game.Rulesets.Mania/UI/ManiaHitRenderer.cs
View File

@ -49,7 +49,7 @@ namespace osu.Game.Rulesets.Mania.UI
return t;
});
double lastObjectTime = (Objects.Last() as IHasEndTime)?.EndTime ?? Objects.Last().StartTime;
double lastObjectTime = (Objects.LastOrDefault() as IHasEndTime)?.EndTime ?? Objects.LastOrDefault()?.StartTime ?? double.MaxValue;
// Perform some post processing of the timing changes
timingChanges = timingChanges