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

Fix time calculation in Malody chart converter.

Browse Source
This commit is contained in:
PopSlime
2022-11-18 15:55:31 +08:00
parent f3549353f3
commit 3ed7e566dd
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -74,16 +74,17 @@ namespace Cryville.Crtr.Extensions.Malody {
Dictionary<MalodyChart.IEvent, StartEventState> longEvents Dictionary<MalodyChart.IEvent, StartEventState> longEvents
= new Dictionary<MalodyChart.IEvent, StartEventState>(); = new Dictionary<MalodyChart.IEvent, StartEventState>();
float? baseBpm = null; float? baseBpm = null, cbpm = null;
float pbeat = 0f, ctime = 0f; float pbeat = 0f, ctime = 0f;
int[] endbeat = new int[] { 0, 0, 1 }; int[] endbeat = new int[] { 0, 0, 1 };
foreach (var ev in events) { foreach (var ev in events) {
float cbeat = ConvertBeat(ev.beat); float cbeat = ConvertBeat(ev.beat);
ctime += baseBpm == null ? 0 : (cbeat - pbeat) / baseBpm.Value * 60f; ctime += cbpm == null ? 0 : (cbeat - pbeat) / cbpm.Value * 60f;
pbeat = cbeat; pbeat = cbeat;
if (ev is MalodyChart.Time) { if (ev is MalodyChart.Time) {
var tev = (MalodyChart.Time)ev; var tev = (MalodyChart.Time)ev;
if (baseBpm == null) baseBpm = tev.bpm; if (baseBpm == null) baseBpm = tev.bpm;
cbpm = tev.bpm;
chart.sigs.Add(new Chart.Signature { chart.sigs.Add(new Chart.Signature {
time = new BeatTime(ev.beat[0], ev.beat[1], ev.beat[2]), time = new BeatTime(ev.beat[0], ev.beat[1], ev.beat[2]),
tempo = tev.bpm, tempo = tev.bpm,
@@ -165,7 +166,7 @@ namespace Cryville.Crtr.Extensions.Malody {
} }
#pragma warning disable IDE1006 #pragma warning disable IDE1006
public struct MalodyChart { struct MalodyChart {
public interface IEvent { public interface IEvent {
int[] beat { get; set; } int[] beat { get; set; }
int[] endbeat { get; set; } int[] endbeat { get; set; }