Parker2991/Funkin
1
0
Fork 0
mirror of https://github.com/FunkinCrew/Funkin.git synced 2024-11-27 18:15:38 -05:00
Code Issues Projects Releases Packages Wiki Activity

Merge a87615ff7c into 0d8e4a5330

Browse source
This commit is contained in:
Kade 2024-11-15 20:14:34 +00:00 committed by GitHub
commit b094810eaf
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 10 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -404,11 +404,18 @@ class ChartEditorState extends UIState // UIState derives from MusicBeatState
{ {
gridTiledSprite.y = -scrollPositionInPixels + (GRID_INITIAL_Y_POS); gridTiledSprite.y = -scrollPositionInPixels + (GRID_INITIAL_Y_POS);
measureTicks.y = gridTiledSprite.y; measureTicks.y = gridTiledSprite.y;
var id = 0;
for (member in audioWaveforms.members) for (member in audioWaveforms.members)
{ {
member.time = scrollPositionInMs / Constants.MS_PER_SEC; if (id == 1)
{
member.time = ((scrollPositionInMs - currentVocalOffsetOpponent) - currentInstrumentalOffset) / Constants.MS_PER_SEC;
}
else
{
member.time = ((scrollPositionInMs - currentVocalOffsetOpponent) - currentInstrumentalOffset) / Constants.MS_PER_SEC;
}
id++;
// Doing this desyncs the waveforms from the grid. // Doing this desyncs the waveforms from the grid.
// member.y = Math.max(this.gridTiledSprite?.y ?? 0.0, ChartEditorState.GRID_INITIAL_Y_POS - ChartEditorState.GRID_TOP_PAD); // member.y = Math.max(this.gridTiledSprite?.y ?? 0.0, ChartEditorState.GRID_INITIAL_Y_POS - ChartEditorState.GRID_TOP_PAD);
} }