aecw/Ez2Lazer
1
0
Fork 0
mirror of https://github.com/SK-la/Ez2Lazer.git synced 2026-03-15 03:20:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

Handle non-legacy types

Browse Source 
Also used in some tests (e.g. beatmaps containing `HitCircle`s).
This commit is contained in:
Dan Balasescu
2024-12-06 17:45:19 +09:00
parent 8dda5aada8
commit ec8b320e21
1 changed files with 26 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
osu.Game.Rulesets.Mania/Beatmaps/ManiaBeatmapConverter.cs
View File

@@ -126,23 +126,41 @@ namespace osu.Game.Rulesets.Mania.Beatmaps
protected override IEnumerable<ManiaHitObject> ConvertHitObject(HitObject original, IBeatmap beatmap, CancellationToken cancellationToken)
{
if (original is ManiaHitObject maniaObj)
LegacyHitObjectType legacyType;
switch (original)
{
yield return maniaObj;
case ManiaHitObject maniaObj:
{
yield return maniaObj;
yield break;
yield break;
}
case IHasLegacyHitObjectType legacy:
legacyType = legacy.LegacyType & LegacyHitObjectType.ObjectTypes;
break;
case IHasPath:
legacyType = LegacyHitObjectType.Slider;
break;
case IHasDuration:
legacyType = LegacyHitObjectType.Hold;
break;
default:
legacyType = LegacyHitObjectType.Circle;
break;
}
if (original is not IHasLegacyHitObjectType legacy)
yield break;
double startTime = original.StartTime;
double endTime = (original as IHasDuration)?.EndTime ?? startTime;
Vector2 position = (original as IHasPosition)?.Position ?? Vector2.Zero;
PatternGenerator conversion;
switch (legacy.LegacyType & LegacyHitObjectType.ObjectTypes)
switch (legacyType)
{
case LegacyHitObjectType.Circle:
if (IsForCurrentRuleset)
@@ -197,7 +215,7 @@ namespace osu.Game.Rulesets.Mania.Beatmaps
break;
default:
throw new ArgumentException($"Invalid legacy object type: {legacy.LegacyType}", nameof(original));
throw new ArgumentException($"Invalid legacy object type: {legacyType}", nameof(original));
}
foreach (var newPattern in conversion.Generate())