cowarin/Funkin
1
0
Fork 0
mirror of https://github.com/ninjamuffin99/Funkin.git synced 2024-09-11 20:57:20 +00:00
Code Issues Releases Wiki Activity

Few more conductor tweaks

Browse source
This commit is contained in:
EliteMasterEric 2023-07-02 16:46:49 -04:00
parent bb8b0b59b1
commit 36898a8c04
1 changed files with 5 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
source/funkin/Conductor.hx
View file

@ -113,13 +113,6 @@ class Conductor
return currentTimeChange.timeSignatureDen; return currentTimeChange.timeSignatureDen;
} }
public static var beatsPerMeasure(get, null):Float;
static function get_beatsPerMeasure():Float
{
return timeSignatureNumerator / timeSignatureDenominator * 4;
}
/** /**
* Current position in the song, in measures. * Current position in the song, in measures.
*/ */
@ -158,10 +151,11 @@ class Conductor
public static var audioOffset:Float = 0; public static var audioOffset:Float = 0;
public static var offset:Float = 0; public static var offset:Float = 0;
public static var beatsPerMeasure(get, null):Int; public static var beatsPerMeasure(get, null):Float;
static function get_beatsPerMeasure():Int static function get_beatsPerMeasure():Float
{ {
// NOTE: Not always an integer, for example 7/8 is 3.5 beats per measure
return stepsPerMeasure / Constants.STEPS_PER_BEAT; return stepsPerMeasure / Constants.STEPS_PER_BEAT;
} }
@ -169,8 +163,8 @@ class Conductor
static function get_stepsPerMeasure():Int static function get_stepsPerMeasure():Int
{ {
// Is this always x4? // TODO: Is this always an integer?
return timeSignatureNumerator / timeSignatureDenominator * Constants.STEPS_PER_BEAT * Constants.STEPS_PER_BEAT; return Std.int(timeSignatureNumerator / timeSignatureDenominator * Constants.STEPS_PER_BEAT * Constants.STEPS_PER_BEAT);
} }
function new() {} function new() {}