Pop_Slime/crtr
1
0
Fork 0
Code Issues 6 Pull Requests Projects 1 Releases Activity

Code cleanup.

Browse Source
This commit is contained in:
PopSlime
2022-11-15 11:05:10 +08:00
parent 74b1a5485b
commit ea856f3339
2 changed files with 26 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
Assets/Cryville/Crtr/Extensions/Malody/MalodyChartConverter.cs
View File

@@ -21,6 +21,7 @@ namespace Cryville.Crtr.Extensions.Malody {
src = JsonConvert.DeserializeObject<MalodyChart>(reader.ReadToEnd());
}
if (src.meta.mode != 0) throw new NotImplementedException("The chart mode is not supported");
if (src.meta.mode_ext.column != 4) throw new NotImplementedException("The key count is not supported");
ChartMeta meta = new ChartMeta() {
song = new ChartMeta.MetaInfo() {
@@ -68,7 +69,7 @@ namespace Cryville.Crtr.Extensions.Malody {
float pbeat = 0f, ctime = 0f;
int[] endbeat = new int[] { 0, 0, 1 };
foreach (var ev in events) {
float cbeat = bp(ev.beat);
float cbeat = ConvertBeat(ev.beat);
ctime += baseBpm == null ? 0 : (cbeat - pbeat) / baseBpm.Value * 60f;
pbeat = cbeat;
if (ev is MalodyChart.Time) {
@@ -105,7 +106,7 @@ namespace Cryville.Crtr.Extensions.Malody {
else throw new NotImplementedException();
}
else {
if (bp(tev.beat) > bp(endbeat)) endbeat = tev.beat;
if (ConvertBeat(tev.beat) > ConvertBeat(endbeat)) endbeat = tev.beat;
var rn = new Chart.Note() {
time = new BeatTime(tev.beat[0], tev.beat[1], tev.beat[2]),
motions = new List<Chart.Motion> {
@@ -113,7 +114,7 @@ namespace Cryville.Crtr.Extensions.Malody {
},
};
if (tev.endbeat != null) {
if (bp(tev.endbeat) > bp(endbeat)) endbeat = tev.endbeat;
if (ConvertBeat(tev.endbeat) > ConvertBeat(endbeat)) endbeat = tev.endbeat;
rn.endtime = new BeatTime(tev.endbeat[0], tev.endbeat[1], tev.endbeat[2]);
longEvents.Add(ev, new StartEventState {
Destination = rn,
@@ -152,7 +153,7 @@ namespace Cryville.Crtr.Extensions.Malody {
public ChartEvent Destination { get; set; }
}
float bp(int[] beat) {
float ConvertBeat(int[] beat) {
return beat[0] + (float)beat[1] / beat[2];
}
}