gabry/CodenameEngine
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

time signature...

Browse Source
This commit is contained in:
Yoshman29
2023-01-28 01:36:30 +01:00
parent be7856cc83
commit e6fc95d585
3 changed files with 20 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
buildnumber.txt
+1 -1
View File
@@ -1 +1 @@
2202
2204
source/funkin/game/PlayState.hx
+6
View File
@@ -1656,6 +1656,12 @@ class PlayState extends MusicBeatState
scripts.call("stepHit", [curStep]);
}
override function measureHit(curMeasure:Int)
{
super.measureHit(curMeasure);
scripts.call("measureHit", [curMeasure]);
}
override function beatHit(curBeat:Int)
{
super.beatHit(curBeat);
source/funkin/utils/CoolUtil.hx
+13 -2
View File
@@ -167,10 +167,21 @@ class CoolUtil
var infoPath = '${Path.withoutExtension(path)}.ini';
if (Assets.exists(infoPath)) {
var musicInfo = IniUtil.parseAsset(infoPath, [
"BPM" => null
"BPM" => null,
"TimeSignature" => "2/2"
]);
var timeSignParsed:Array<Null<Float>> = musicInfo["TimeSignature"] == null ? [] : [for(s in musicInfo["TimeSignature"].split("/")) Std.parseFloat(s)];
var beatsPerMesure:Float = 4;
var stepsPerBeat:Float = 4;
if (timeSignParsed.length == 2 && !timeSignParsed.contains(null)) {
beatsPerMesure = timeSignParsed[0] == null || timeSignParsed[0] <= 0 ? 4 : cast timeSignParsed[0];
stepsPerBeat = timeSignParsed[1] == null || timeSignParsed[1] <= 0 ? 4 : cast timeSignParsed[1];
}
var parsedBPM:Null<Float> = Std.parseFloat(musicInfo["BPM"]);
Conductor.changeBPM(parsedBPM == null ? DefaultBPM : parsedBPM);
Conductor.changeBPM(parsedBPM == null ? DefaultBPM : parsedBPM, beatsPerMesure, stepsPerBeat);
} else
Conductor.changeBPM(DefaultBPM);
}