mirror of
https://github.com/ppy/osu.git
synced 2025-02-13 18:32:55 +08:00
Parse time signature from legacy beatmap control points.
This commit is contained in:
parent
7cbc5b24c8
commit
a272675705
@ -207,7 +207,8 @@ namespace osu.Game.Beatmaps.Formats
|
|||||||
VelocityAdjustment = beatLength < 0 ? -beatLength / 100.0 : 1,
|
VelocityAdjustment = beatLength < 0 ? -beatLength / 100.0 : 1,
|
||||||
TimingChange = split.Length <= 6 || split[6][0] == '1',
|
TimingChange = split.Length <= 6 || split[6][0] == '1',
|
||||||
KiaiMode = (effectFlags & 1) > 0,
|
KiaiMode = (effectFlags & 1) > 0,
|
||||||
OmitFirstBarLine = (effectFlags & 8) > 0
|
OmitFirstBarLine = (effectFlags & 8) > 0,
|
||||||
|
TimeSignature = (TimeSignatures)int.Parse(split[2])
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -11,18 +11,12 @@ namespace osu.Game.Beatmaps.Timing
|
|||||||
TimingChange = true,
|
TimingChange = true,
|
||||||
};
|
};
|
||||||
|
|
||||||
|
public TimeSignatures TimeSignature;
|
||||||
public double Time;
|
public double Time;
|
||||||
public double BeatLength;
|
public double BeatLength;
|
||||||
public double VelocityAdjustment;
|
public double VelocityAdjustment;
|
||||||
public bool TimingChange;
|
public bool TimingChange;
|
||||||
public bool KiaiMode;
|
public bool KiaiMode;
|
||||||
public bool OmitFirstBarLine;
|
public bool OmitFirstBarLine;
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
internal enum TimeSignatures
|
|
||||||
{
|
|
||||||
SimpleQuadruple = 4,
|
|
||||||
SimpleTriple = 3
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
11
osu.Game/Beatmaps/Timing/TimeSignatures.cs
Normal file
11
osu.Game/Beatmaps/Timing/TimeSignatures.cs
Normal file
@ -0,0 +1,11 @@
|
|||||||
|
// Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
|
||||||
|
// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
|
||||||
|
|
||||||
|
namespace osu.Game.Beatmaps.Timing
|
||||||
|
{
|
||||||
|
public enum TimeSignatures
|
||||||
|
{
|
||||||
|
SimpleQuadruple = 4,
|
||||||
|
SimpleTriple = 3
|
||||||
|
}
|
||||||
|
}
|
@ -76,6 +76,7 @@
|
|||||||
<Compile Include="Beatmaps\IBeatmapCoverter.cs" />
|
<Compile Include="Beatmaps\IBeatmapCoverter.cs" />
|
||||||
<Compile Include="Beatmaps\IBeatmapProcessor.cs" />
|
<Compile Include="Beatmaps\IBeatmapProcessor.cs" />
|
||||||
<Compile Include="Beatmaps\Legacy\LegacyBeatmap.cs" />
|
<Compile Include="Beatmaps\Legacy\LegacyBeatmap.cs" />
|
||||||
|
<Compile Include="Beatmaps\Timing\TimeSignatures.cs" />
|
||||||
<Compile Include="Beatmaps\Timing\TimingInfo.cs" />
|
<Compile Include="Beatmaps\Timing\TimingInfo.cs" />
|
||||||
<Compile Include="Database\ScoreDatabase.cs" />
|
<Compile Include="Database\ScoreDatabase.cs" />
|
||||||
<Compile Include="Graphics\Backgrounds\Triangles.cs" />
|
<Compile Include="Graphics\Backgrounds\Triangles.cs" />
|
||||||
|
Loading…
Reference in New Issue
Block a user