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

Rewrite MusicBeatState stuff

Browse Source
This commit is contained in:
CuckyDev 2021-07-11 17:22:06 -04:00
parent f67d0e4d92
commit 910105b852
2 changed files with 31 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
source/MusicBeatState.hx
View File

@ -51,13 +51,17 @@ class MusicBeatState extends FlxUIState
override function update(elapsed:Float)
{
//everyStep();
var oldStep:Int = curStep;
var nextStep:Int = updateCurStep();
updateCurStep();
updateBeat();
if (oldStep != curStep && curStep > 0)
stepHit();
if (nextStep > curStep && curStep >= 0)
{
for (i in curStep...nextStep)
{
curStep++;
updateBeat();
stepHit();
}
}
if (FlxG.save.data.fpsRain && skippedFrames >= 6)
{
@ -78,13 +82,13 @@ class MusicBeatState extends FlxUIState
private function updateBeat():Void
{
lastBeat = curStep;
lastBeat = curBeat;
curBeat = Math.floor(curStep / 4);
}
public static var currentColor = 0;
private function updateCurStep():Void
private function updateCurStep():Int
{
var lastChange:BPMChangeEvent = {
stepTime: 0,
@ -97,12 +101,11 @@ class MusicBeatState extends FlxUIState
lastChange = Conductor.bpmChangeMap[i];
}
curStep = lastChange.stepTime + Math.floor((Conductor.songPosition - lastChange.songTime) / Conductor.stepCrochet);
return lastChange.stepTime + Math.floor((Conductor.songPosition - lastChange.songTime) / Conductor.stepCrochet);
}
public function stepHit():Void
{
if (curStep % 4 == 0)
beatHit();
}

27
source/MusicBeatSubstate.hx
View File

@ -24,19 +24,28 @@ class MusicBeatSubstate extends FlxSubState
override function update(elapsed:Float)
{
//everyStep();
var oldStep:Int = curStep;
updateCurStep();
curBeat = Math.floor(curStep / 4);
if (oldStep != curStep && curStep > 0)
stepHit();
var nextStep = updateCurStep();
if (nextStep > curStep && curStep >= 0)
{
for (i in curStep...nextStep)
{
curStep++;
updateBeat();
stepHit();
}
}
super.update(elapsed);
}
private function updateCurStep():Void
private function updateBeat():Void
{
lastBeat = curBeat;
curBeat = Math.floor(curStep / 4);
}
private function updateCurStep():Int
{
var lastChange:BPMChangeEvent = {
stepTime: 0,
@ -49,7 +58,7 @@ class MusicBeatSubstate extends FlxSubState
lastChange = Conductor.bpmChangeMap[i];
}
curStep = lastChange.stepTime + Math.floor((Conductor.songPosition - lastChange.songTime) / Conductor.stepCrochet);
return lastChange.stepTime + Math.floor((Conductor.songPosition - lastChange.songTime) / Conductor.stepCrochet);
}
public function stepHit():Void