AirDog46/Kade-Engine
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

decimal bpm for real!!

Browse Source
This commit is contained in:
M&M 2021-05-28 19:28:39 -07:00
parent 993360d618
commit 4d3914228f
4 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
source/ChartingState.hx
View File

@ -83,7 +83,7 @@ class ChartingState extends MusicBeatState
**/ **/
var curSelectedNote:Array<Dynamic>; var curSelectedNote:Array<Dynamic>;
var tempBpm:Int = 0; var tempBpm:Float = 0;
var gridBlackLine:FlxSprite; var gridBlackLine:FlxSprite;
var vocals:FlxSound; var vocals:FlxSound;
@ -646,7 +646,7 @@ class ChartingState extends MusicBeatState
function sectionStartTime():Float function sectionStartTime():Float
{ {
var daBPM:Int = _song.bpm; var daBPM:Float = _song.bpm;
var daPos:Float = 0; var daPos:Float = 0;
for (i in 0...curSection) for (i in 0...curSection)
{ {
@ -1187,7 +1187,7 @@ class ChartingState extends MusicBeatState
else else
{ {
// get last bpm // get last bpm
var daBPM:Int = _song.bpm; var daBPM:Float = _song.bpm;
for (i in 0...curSection) for (i in 0...curSection)
if (_song.notes[i].changeBPM) if (_song.notes[i].changeBPM)
daBPM = _song.notes[i].bpm; daBPM = _song.notes[i].bpm;

8
source/Conductor.hx
View File

@ -12,12 +12,12 @@ typedef BPMChangeEvent =
{ {
var stepTime:Int; var stepTime:Int;
var songTime:Float; var songTime:Float;
var bpm:Int; var bpm:Float;
} }
class Conductor class Conductor
{ {
public static var bpm:Int = 100; public static var bpm:Float = 100;
public static var crochet:Float = ((60 / bpm) * 1000); // beats in milliseconds public static var crochet:Float = ((60 / bpm) * 1000); // beats in milliseconds
public static var stepCrochet:Float = crochet / 4; // steps in milliseconds public static var stepCrochet:Float = crochet / 4; // steps in milliseconds
public static var songPosition:Float; public static var songPosition:Float;
@ -45,7 +45,7 @@ class Conductor
{ {
bpmChangeMap = []; bpmChangeMap = [];
var curBPM:Int = song.bpm; var curBPM:Float = song.bpm;
var totalSteps:Int = 0; var totalSteps:Int = 0;
var totalPos:Float = 0; var totalPos:Float = 0;
for (i in 0...song.notes.length) for (i in 0...song.notes.length)
@ -68,7 +68,7 @@ class Conductor
trace("new BPM map BUDDY " + bpmChangeMap); trace("new BPM map BUDDY " + bpmChangeMap);
} }
public static function changeBPM(newBpm:Int) public static function changeBPM(newBpm:Float)
{ {
bpm = newBpm; bpm = newBpm;

2
source/Section.hx
View File

@ -6,7 +6,7 @@ typedef SwagSection =
var lengthInSteps:Int; var lengthInSteps:Int;
var typeOfSection:Int; var typeOfSection:Int;
var mustHitSection:Bool; var mustHitSection:Bool;
var bpm:Int; var bpm:Float;
var changeBPM:Bool; var changeBPM:Bool;
var altAnim:Bool; var altAnim:Bool;
} }

4
source/Song.hx
View File

@ -11,7 +11,7 @@ typedef SwagSong =
{ {
var song:String; var song:String;
var notes:Array<SwagSection>; var notes:Array<SwagSection>;
var bpm:Int; var bpm:Float;
var needsVoices:Bool; var needsVoices:Bool;
var speed:Float; var speed:Float;
@ -27,7 +27,7 @@ class Song
{ {
public var song:String; public var song:String;
public var notes:Array<SwagSection>; public var notes:Array<SwagSection>;
public var bpm:Int; public var bpm:Float;
public var needsVoices:Bool = true; public var needsVoices:Bool = true;
public var speed:Float = 1; public var speed:Float = 1;