From 36898a8c04ab137700c9aa72116ceda0b9e783b7 Mon Sep 17 00:00:00 2001
From: EliteMasterEric <ericmyllyoja@gmail.com>
Date: Sun, 2 Jul 2023 16:46:49 -0400
Subject: [PATCH] Few more conductor tweaks
---
source/funkin/Conductor.hx | 16 +++++-----------
1 file changed, 5 insertions(+), 11 deletions(-)
diff --git a/source/funkin/Conductor.hx b/source/funkin/Conductor.hx
index 909dd789c..4b1261d4b 100644
--- a/source/funkin/Conductor.hx
+++ b/source/funkin/Conductor.hx
@@ -113,13 +113,6 @@ class Conductor
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.
*/
@@ -158,10 +151,11 @@ class Conductor
public static var audioOffset: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;
}
@@ -169,8 +163,8 @@ class Conductor
static function get_stepsPerMeasure():Int
{
- // Is this always x4?
- return timeSignatureNumerator / timeSignatureDenominator * Constants.STEPS_PER_BEAT * Constants.STEPS_PER_BEAT;
+ // TODO: Is this always an integer?
+ return Std.int(timeSignatureNumerator / timeSignatureDenominator * Constants.STEPS_PER_BEAT * Constants.STEPS_PER_BEAT);
}
function new() {}