Split out complex method

This commit is contained in:
Dean Herbert
2019-12-18 17:35:51 +09:00
parent fa067b8799
commit 4befabc257

View File

@ -217,32 +217,59 @@ namespace osu.Game.Beatmaps.Formats
private void handleOsuHitObject(TextWriter writer, HitObject hitObject)
{
var positionData = hitObject as IHasPosition;
var comboData = hitObject as IHasCombo;
Debug.Assert(positionData != null);
Debug.Assert(comboData != null);
LegacyHitObjectType hitObjectType = (LegacyHitObjectType)(comboData.ComboOffset << 4);
if (comboData.NewCombo)
hitObjectType |= LegacyHitObjectType.NewCombo;
if (hitObject is IHasCurve)
hitObjectType |= LegacyHitObjectType.Slider;
else if (hitObject is IHasEndTime)
hitObjectType |= LegacyHitObjectType.Spinner | LegacyHitObjectType.NewCombo;
else
hitObjectType |= LegacyHitObjectType.Circle;
var positionData = (IHasPosition)hitObject;
writer.Write(FormattableString.Invariant($"{positionData.X},"));
writer.Write(FormattableString.Invariant($"{positionData.Y},"));
writer.Write(FormattableString.Invariant($"{hitObject.StartTime},"));
writer.Write(FormattableString.Invariant($"{(int)hitObjectType},"));
writer.Write(FormattableString.Invariant($"{(int)getObjectType(hitObject)},"));
writer.Write(hitObject is IHasCurve
? FormattableString.Invariant($"0,")
: FormattableString.Invariant($"{(int)toLegacyHitSoundType(hitObject.Samples)},"));
if (hitObject is IHasCurve curveData)
{
addCurveData(writer, curveData, positionData);
writer.Write(getSampleBank(hitObject.Samples, zeroBanks: true));
}
else
{
if (hitObject is IHasEndTime endTimeData)
writer.Write(FormattableString.Invariant($"{endTimeData.EndTime},"));
writer.Write(getSampleBank(hitObject.Samples));
}
writer.WriteLine();
}
private static LegacyHitObjectType getObjectType(HitObject hitObject)
{
var comboData = (IHasCombo)hitObject;
var type = (LegacyHitObjectType)(comboData.ComboOffset << 4);
if (comboData.NewCombo) type |= LegacyHitObjectType.NewCombo;
switch (hitObject)
{
case IHasCurve _:
type |= LegacyHitObjectType.Slider;
break;
case IHasEndTime _:
type |= LegacyHitObjectType.Spinner | LegacyHitObjectType.NewCombo;
break;
default:
type |= LegacyHitObjectType.Circle;
break;
}
return type;
}
private void addCurveData(TextWriter writer, IHasCurve curveData, IHasPosition positionData)
{
PathType? lastType = null;
@ -304,15 +331,6 @@ namespace osu.Game.Beatmaps.Formats
writer.Write(i != curveData.NodeSamples.Count - 1 ? "|" : ",");
}
}
else if (hitObject is IHasEndTime endTimeData)
writer.Write(FormattableString.Invariant($"{endTimeData.EndTime},"));
writer.Write(hitObject is IHasCurve
? getSampleBank(hitObject.Samples, zeroBanks: true)
: getSampleBank(hitObject.Samples));
writer.WriteLine();
}
private void handleTaikoHitObject(TextWriter writer, HitObject hitObject) => throw new NotImplementedException();