university/Sense_the_Rhythm
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

style: refactored time offset generation of beat inside of Simfile class

Browse source
This commit is contained in:
Orangerot 2024-12-29 16:49:42 +01:00
parent 5a763a5de2
commit f577670d75
2 changed files with 76 additions and 65 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
lib/level.dart
View file

@ -125,24 +125,13 @@ class _LevelState extends State<Level> {
simfile = Simfile(simfilePath); simfile = Simfile(simfilePath);
simfile!.load(); simfile!.load();
double bpm = simfile!.bpms.entries.first.value; simfile!.chartSimplest!.beats.forEach((time, noteData) {
for (final (measureIndex, measure)
in simfile!.chartSimplest!.measures!.indexed) {
for (final (noteIndex, noteData) in measure.indexed) {
int arrowIndex = noteData.indexOf('1'); int arrowIndex = noteData.indexOf('1');
if (arrowIndex < 0 || arrowIndex > 3) { if (arrowIndex < 0 || arrowIndex > 3) {
continue; return;
}
double beat =
measureIndex * 4.0 + (noteIndex.toDouble() / measure.length) * 4.0;
double minutesPerBeat = 1.0 / bpm;
double offsetMinutes = simfile!.offset / 60.0;
notes.add(Note(
time: beat * minutesPerBeat + offsetMinutes,
direction: ArrowDirection.values[arrowIndex]));
}
} }
notes.add(Note(time: time, direction: ArrowDirection.values[arrowIndex]));
});
print(audioPath); print(audioPath);

86
lib/simfile.dart
View file

@ -32,6 +32,8 @@ class Chart {
String? radarValues; String? radarValues;
List<List<String>>? measures; List<List<String>>? measures;
Map<double, String> beats = {};
} }
class Simfile { class Simfile {
@ -48,38 +50,7 @@ class Simfile {
Simfile(this.path); Simfile(this.path);
void load() { void _parseChart({required List<String> keys, required String value}) {
lines = File(path).readAsStringSync();
RegExp commentsRegExp = RegExp(r'//.*$');
lines = lines?.replaceAll(commentsRegExp, '');
RegExp fieldDataRegExp = RegExp(r'#([^;]+):([^;]*);');
for (final fieldData in fieldDataRegExp.allMatches(lines!)) {
List<String> keys =
fieldData[1]!.split(':').map((key) => key.trim()).toList();
String value = fieldData[2]!;
if (keys[0] == "BPMS") {
for (final pairRaw in value.split(',')) {
List<String> pair = pairRaw.split('=');
if (pair.length != 2) {
continue;
}
double time = double.parse(pair[0]);
double bpm = double.parse(pair[1]);
bpms[time] = bpm;
}
}
if (keys[0] == "OFFSET") {
offset = double.parse(value);
}
if (keys[0] != "NOTES") {
tags[keys[0]] = value;
continue;
}
Chart chart = Chart(); Chart chart = Chart();
chart.chartType = keys[1]; chart.chartType = keys[1];
chart.author = keys[2]; chart.author = keys[2];
@ -101,9 +72,60 @@ class Simfile {
} }
measures.add(measure); measures.add(measure);
} }
double bpm = bpms.entries.first.value;
for (final (measureIndex, measure) in measures.indexed) {
for (final (noteIndex, noteData) in measure.indexed) {
double beat = measureIndex * 4.0 +
(noteIndex.toDouble() / measure.length) * 4.0;
double minutesPerBeat = 1.0 / bpm;
double offsetMinutes = offset / 60.0;
chart.beats[beat * minutesPerBeat + offsetMinutes] = noteData;
}
}
chart.measures = measures; chart.measures = measures;
chartSimplest = chart; chartSimplest = chart;
} }
} }
void _parseTag(RegExpMatch fieldData) {
List<String> keys =
fieldData[1]!.split(':').map((key) => key.trim()).toList();
String value = fieldData[2]!;
if (keys[0] == "BPMS") {
for (final pairRaw in value.split(',')) {
List<String> pair = pairRaw.split('=');
if (pair.length != 2) {
continue;
}
double time = double.parse(pair[0]);
double bpm = double.parse(pair[1]);
bpms[time] = bpm;
}
}
if (keys[0] == "OFFSET") {
offset = double.parse(value);
}
if (keys[0] != "NOTES") {
tags[keys[0]] = value;
return;
}
_parseChart(keys: keys, value: value);
}
void load() {
lines = File(path).readAsStringSync();
RegExp commentsRegExp = RegExp(r'//.*$');
lines = lines?.replaceAll(commentsRegExp, '');
RegExp fieldDataRegExp = RegExp(r'#([^;]+):([^;]*);');
for (final fieldData in fieldDataRegExp.allMatches(lines!)) {
_parseTag(fieldData);
}
} }
} }