cowarin/Funkin
1
0
Fork 0
mirror of https://github.com/ninjamuffin99/Funkin.git synced 2025-03-23 02:19:46 +00:00
Code Issues Releases Wiki Activity

Target the current time change rather than the first one.

Browse source
This commit is contained in:
EliteMasterEric 2023-11-28 21:44:09 -05:00
parent 21b79c0b83
commit 99ed8b94d7
3 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
source/funkin/Conductor.hx
View file

@ -35,15 +35,15 @@ class Conductor
static var timeChanges:Array<SongTimeChange> = []; static var timeChanges:Array<SongTimeChange> = [];
/** /**
* The current time change. * The most recent time change for the current song position.
*/ */
static var currentTimeChange:SongTimeChange; public static var currentTimeChange(default, null):SongTimeChange;
/** /**
* The current position in the song in milliseconds. * The current position in the song in milliseconds.
* Updated every frame based on the audio position. * Update this every frame based on the audio position using `Conductor.update()`.
*/ */
public static var songPosition:Float = 0; public static var songPosition(default, null):Float = 0;
/** /**
* Beats per minute of the current song at the current time. * Beats per minute of the current song at the current time.

6
source/funkin/ui/debug/charting/ChartEditorState.hx
View file

@ -2103,13 +2103,13 @@ class ChartEditorState extends UIState // UIState derives from MusicBeatState
} }
else else
{ {
currentSongMetadata.timeChanges[0].bpm += 1; Conductor.currentTimeChange.bpm += 1;
refreshMetadataToolbox(); refreshMetadataToolbox();
} }
} }
playbarBPM.onRightClick = _ -> { playbarBPM.onRightClick = _ -> {
currentSongMetadata.timeChanges[0].bpm -= 1; Conductor.currentTimeChange.bpm -= 1;
refreshMetadataToolbox(); refreshMetadataToolbox();
} }
@ -4001,7 +4001,7 @@ class ChartEditorState extends UIState // UIState derives from MusicBeatState
playbarNoteSnap.text = '1/${noteSnapQuant}'; playbarNoteSnap.text = '1/${noteSnapQuant}';
playbarDifficulty.text = "Difficulty: " + selectedDifficulty.toTitleCase(); playbarDifficulty.text = "Difficulty: " + selectedDifficulty.toTitleCase();
playbarBPM.text = "BPM: " + currentSongMetadata.timeChanges[0].bpm; playbarBPM.text = "BPM: " + Conductor.currentTimeChange.bpm;
} }
function handlePlayhead():Void function handlePlayhead():Void

2
source/funkin/ui/debug/latency/LatencyState.hx
View file

@ -267,7 +267,7 @@ class LatencyState extends MusicBeatSubState
function generateBeatStuff() function generateBeatStuff()
{ {
Conductor.songPosition = swagSong.getTimeWithDiff(); Conductor.update(swagSong.getTimeWithDiff());
var closestBeat:Int = Math.round(Conductor.songPosition / Conductor.beatLengthMs) % diffGrp.members.length; var closestBeat:Int = Math.round(Conductor.songPosition / Conductor.beatLengthMs) % diffGrp.members.length;
var getDiff:Float = Conductor.songPosition - (closestBeat * Conductor.beatLengthMs); var getDiff:Float = Conductor.songPosition - (closestBeat * Conductor.beatLengthMs);