mirror of
https://github.com/osukey/osukey.git
synced 2025-05-29 09:27:18 +09:00
More closely replicate osu!'s parsing code.
This commit is contained in:
parent
c315c8690b
commit
c2d80936cf
@ -16,91 +16,94 @@ namespace osu.Game.Modes.Objects
|
|||||||
public override HitObject Parse(string text)
|
public override HitObject Parse(string text)
|
||||||
{
|
{
|
||||||
string[] split = text.Split(',');
|
string[] split = text.Split(',');
|
||||||
var type = (HitObjectType)int.Parse(split[3]);
|
var type = (HitObjectType)int.Parse(split[3]) & ~HitObjectType.ColourHax;
|
||||||
bool combo = type.HasFlag(HitObjectType.NewCombo);
|
bool combo = type.HasFlag(HitObjectType.NewCombo);
|
||||||
type &= ~HitObjectType.NewCombo;
|
type &= ~HitObjectType.NewCombo;
|
||||||
|
|
||||||
HitObject result;
|
HitObject result;
|
||||||
switch (type)
|
|
||||||
|
if ((type & HitObjectType.Circle) > 0)
|
||||||
{
|
{
|
||||||
case HitObjectType.Circle:
|
result = new LegacyHit
|
||||||
result = new LegacyHit
|
{
|
||||||
{
|
Position = new Vector2(int.Parse(split[0]), int.Parse(split[1])),
|
||||||
Position = new Vector2(int.Parse(split[0]), int.Parse(split[1])),
|
NewCombo = combo
|
||||||
NewCombo = combo
|
};
|
||||||
};
|
}
|
||||||
break;
|
else if ((type & HitObjectType.Slider) > 0)
|
||||||
case HitObjectType.Slider:
|
{
|
||||||
CurveType curveType = CurveType.Catmull;
|
CurveType curveType = CurveType.Catmull;
|
||||||
double length = 0;
|
double length = 0;
|
||||||
List<Vector2> points = new List<Vector2> { new Vector2(int.Parse(split[0]), int.Parse(split[1])) };
|
List<Vector2> points = new List<Vector2> { new Vector2(int.Parse(split[0]), int.Parse(split[1])) };
|
||||||
|
|
||||||
string[] pointsplit = split[5].Split('|');
|
string[] pointsplit = split[5].Split('|');
|
||||||
foreach (string t in pointsplit)
|
foreach (string t in pointsplit)
|
||||||
|
{
|
||||||
|
if (t.Length == 1)
|
||||||
{
|
{
|
||||||
if (t.Length == 1)
|
switch (t)
|
||||||
{
|
{
|
||||||
switch (t)
|
case @"C":
|
||||||
{
|
curveType = CurveType.Catmull;
|
||||||
case @"C":
|
break;
|
||||||
curveType = CurveType.Catmull;
|
case @"B":
|
||||||
break;
|
curveType = CurveType.Bezier;
|
||||||
case @"B":
|
break;
|
||||||
curveType = CurveType.Bezier;
|
case @"L":
|
||||||
break;
|
curveType = CurveType.Linear;
|
||||||
case @"L":
|
break;
|
||||||
curveType = CurveType.Linear;
|
case @"P":
|
||||||
break;
|
curveType = CurveType.PerfectCurve;
|
||||||
case @"P":
|
break;
|
||||||
curveType = CurveType.PerfectCurve;
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
continue;
|
|
||||||
}
|
}
|
||||||
|
continue;
|
||||||
string[] temp = t.Split(':');
|
|
||||||
Vector2 v = new Vector2(
|
|
||||||
(int)Convert.ToDouble(temp[0], CultureInfo.InvariantCulture),
|
|
||||||
(int)Convert.ToDouble(temp[1], CultureInfo.InvariantCulture)
|
|
||||||
);
|
|
||||||
points.Add(v);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
int repeatCount = Convert.ToInt32(split[6], CultureInfo.InvariantCulture);
|
string[] temp = t.Split(':');
|
||||||
|
Vector2 v = new Vector2(
|
||||||
|
(int)Convert.ToDouble(temp[0], CultureInfo.InvariantCulture),
|
||||||
|
(int)Convert.ToDouble(temp[1], CultureInfo.InvariantCulture)
|
||||||
|
);
|
||||||
|
points.Add(v);
|
||||||
|
}
|
||||||
|
|
||||||
if (repeatCount > 9000)
|
int repeatCount = Convert.ToInt32(split[6], CultureInfo.InvariantCulture);
|
||||||
throw new ArgumentOutOfRangeException(nameof(repeatCount), @"Repeat count is way too high");
|
|
||||||
|
|
||||||
if (split.Length > 7)
|
if (repeatCount > 9000)
|
||||||
length = Convert.ToDouble(split[7], CultureInfo.InvariantCulture);
|
throw new ArgumentOutOfRangeException(nameof(repeatCount), @"Repeat count is way too high");
|
||||||
|
|
||||||
result = new LegacySlider
|
if (split.Length > 7)
|
||||||
{
|
length = Convert.ToDouble(split[7], CultureInfo.InvariantCulture);
|
||||||
ControlPoints = points,
|
|
||||||
Distance = length,
|
result = new LegacySlider
|
||||||
CurveType = curveType,
|
{
|
||||||
RepeatCount = repeatCount,
|
ControlPoints = points,
|
||||||
Position = new Vector2(int.Parse(split[0]), int.Parse(split[1])),
|
Distance = length,
|
||||||
NewCombo = combo
|
CurveType = curveType,
|
||||||
};
|
RepeatCount = repeatCount,
|
||||||
break;
|
Position = new Vector2(int.Parse(split[0]), int.Parse(split[1])),
|
||||||
case HitObjectType.Spinner:
|
NewCombo = combo
|
||||||
result = new LegacySpinner
|
};
|
||||||
{
|
|
||||||
EndTime = Convert.ToDouble(split[5], CultureInfo.InvariantCulture)
|
|
||||||
};
|
|
||||||
break;
|
|
||||||
case HitObjectType.Hold:
|
|
||||||
// Note: Hold is generated by BMS converts
|
|
||||||
result = new LegacyHold
|
|
||||||
{
|
|
||||||
Position = new Vector2(int.Parse(split[0]), int.Parse(split[1])),
|
|
||||||
NewCombo = combo
|
|
||||||
};
|
|
||||||
break;
|
|
||||||
default:
|
|
||||||
throw new InvalidOperationException($@"Unknown hit object type {type}");
|
|
||||||
}
|
}
|
||||||
|
else if ((type & HitObjectType.Spinner) > 0)
|
||||||
|
{
|
||||||
|
result = new LegacySpinner
|
||||||
|
{
|
||||||
|
EndTime = Convert.ToDouble(split[5], CultureInfo.InvariantCulture)
|
||||||
|
};
|
||||||
|
}
|
||||||
|
else if ((type & HitObjectType.Hold) > 0)
|
||||||
|
{
|
||||||
|
// Note: Hold is generated by BMS converts
|
||||||
|
result = new LegacyHold
|
||||||
|
{
|
||||||
|
Position = new Vector2(int.Parse(split[0]), int.Parse(split[1])),
|
||||||
|
NewCombo = combo
|
||||||
|
};
|
||||||
|
}
|
||||||
|
else
|
||||||
|
throw new InvalidOperationException($@"Unknown hit object type {type}");
|
||||||
|
|
||||||
result.StartTime = Convert.ToDouble(split[2], CultureInfo.InvariantCulture);
|
result.StartTime = Convert.ToDouble(split[2], CultureInfo.InvariantCulture);
|
||||||
result.Sample = new HitSampleInfo
|
result.Sample = new HitSampleInfo
|
||||||
{
|
{
|
||||||
|
Loading…
x
Reference in New Issue
Block a user