cowarin/Funkin
1
0
Fork 0
mirror of https://github.com/ninjamuffin99/Funkin.git synced 2025-02-11 05:52:52 +00:00
Code Issues Releases Wiki Activity

Work in progress on Conductor signal rework

Browse source
This commit is contained in:
EliteMasterEric 2024-03-27 02:55:53 -04:00
parent bb98c710a3
commit 77cf96716e
2 changed files with 1 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
assets

@ -1 +1 @@
Subproject commit 8013845e331015b40c4cc35230f6d02bd2148d52 Subproject commit 82b8d637fb402a4c69001fd3c4fb435b56a1b4f1

20
source/funkin/Conductor.hx
View file

@ -267,18 +267,6 @@ class Conductor
set_instance(new Conductor()); set_instance(new Conductor());
} }
/**
* Add values of the current main Conductor instance to the `FlxG.watch`.
*/
public static function watchQuick():Void
{
FlxG.watch.addQuick("songPosition", Conductor.instance.songPosition);
FlxG.watch.addQuick("bpm", Conductor.instance.bpm);
FlxG.watch.addQuick("currentMeasureTime", Conductor.instance.currentMeasureTime);
FlxG.watch.addQuick("currentBeatTime", Conductor.instance.currentBeatTime);
FlxG.watch.addQuick("currentStepTime", Conductor.instance.currentStepTime);
}
static function dispatchMeasureHit():Void static function dispatchMeasureHit():Void
{ {
Conductor.measureHit.dispatch(); Conductor.measureHit.dispatch();
@ -611,12 +599,4 @@ class Conductor
FlxG.watch.addQuick('currentBeatTime', target.currentBeatTime); FlxG.watch.addQuick('currentBeatTime', target.currentBeatTime);
FlxG.watch.addQuick('currentStepTime', target.currentStepTime); FlxG.watch.addQuick('currentStepTime', target.currentStepTime);
} }
/**
* Reset the Conductor, replacing the current instance with a fresh one.
*/
public static function reset():Void
{
_instance = new Conductor();
}
} }