diff --git a/assets b/assets index fb7120cf3..3b05b0fdd 160000 --- a/assets +++ b/assets @@ -1 +1 @@ -Subproject commit fb7120cf30d7accda049409b68d8daa0e1e7650f +Subproject commit 3b05b0fdd8e3b2cd09b9e4e415c186bae8e3b7d3 diff --git a/source/funkin/data/song/SongData.hx b/source/funkin/data/song/SongData.hx index e79e1a3f4..6fd54b8b6 100644 --- a/source/funkin/data/song/SongData.hx +++ b/source/funkin/data/song/SongData.hx @@ -674,6 +674,22 @@ class SongNoteDataRaw this.kind = kind; } + /** + * The direction of the note, if applicable. + * Strips the strumline index from the data. + * + * 0 = left, 1 = down, 2 = up, 3 = right + */ + public inline function getDirection(strumlineSize:Int = 4):Int + { + return this.data % strumlineSize; + } + + public function getDirectionName(strumlineSize:Int = 4):String + { + return SongNoteData.buildDirectionName(this.data, strumlineSize); + } + @:jignored var _stepTime:Null = null; @@ -730,22 +746,6 @@ abstract SongNoteData(SongNoteDataRaw) from SongNoteDataRaw to SongNoteDataRaw this = new SongNoteDataRaw(time, data, length, kind); } - /** - * The direction of the note, if applicable. - * Strips the strumline index from the data. - * - * 0 = left, 1 = down, 2 = up, 3 = right - */ - public inline function getDirection(strumlineSize:Int = 4):Int - { - return this.data % strumlineSize; - } - - public function getDirectionName(strumlineSize:Int = 4):String - { - return SongNoteData.buildDirectionName(this.data, strumlineSize); - } - public static function buildDirectionName(data:Int, strumlineSize:Int = 4):String { switch (data % strumlineSize) diff --git a/source/funkin/ui/debug/charting/ChartEditorState.hx b/source/funkin/ui/debug/charting/ChartEditorState.hx index aaf871f5b..95f92075d 100644 --- a/source/funkin/ui/debug/charting/ChartEditorState.hx +++ b/source/funkin/ui/debug/charting/ChartEditorState.hx @@ -1237,11 +1237,6 @@ class ChartEditorState extends HaxeUIState */ var gridGhostEvent:Null = null; - /** - * The waveform which (optionally) displays over the grid, underneath the notes and playhead. - */ - var gridSpectrogram:Null = null; - /** * The sprite used to display the note preview area. * We move this up and down to scroll the preview. @@ -1480,7 +1475,6 @@ class ChartEditorState extends HaxeUIState this.updateTheme(); buildGrid(); - // buildSpectrogram(audioInstTrack); buildNotePreview(); buildSelectionBox(); @@ -1881,16 +1875,6 @@ class ChartEditorState extends HaxeUIState } } - function buildSpectrogram(target:FlxSound):Void - { - gridSpectrogram = new PolygonSpectogram(FlxG.sound.music, FlxColor.RED, FlxG.height / 2, Math.floor(FlxG.height / 2)); - gridSpectrogram.x += 170; - gridSpectrogram.scrollFactor.set(); - gridSpectrogram.waveAmplitude = 50; - gridSpectrogram.visType = UPDATED; - add(gridSpectrogram); - } - /** * Builds the group that will hold all the notes. */ @@ -4867,8 +4851,6 @@ class ChartEditorState extends HaxeUIState gridPlayheadScrollArea.setGraphicSize(Std.int(gridPlayheadScrollArea.width), songLengthInPixels); gridPlayheadScrollArea.updateHitbox(); } - - buildSpectrogram(audioInstTrack); } else {