anal yzerswaveform fix?

Author: Raltyro

assets/shaders/engine/editorWaveforms.frag

@@ -1,5 +1,9 @@
+// this causes issues apparently?? need to check GLSLSourceAssembler
+// but it could just be unnecessary too anyway
+// if not, put this also in editorWaveformsRainbow.frag
+//#version 120
+
 #pragma header
-#version 120 // this shader doesnt require expensive calculations
 
 const vec3 gradient1 = vec3(114.0/255.0, 81.0/255.0, 135.0/255.0);
 const vec3 gradient2 = vec3(144.0/255.0, 80.0/255.0, 186.0/255.0);

source/funkin/backend/utils/AudioAnalyzer.hx

@@ -392,7 +392,7 @@ final class AudioAnalyzer {
 			default: data.sampleRate / 1000;
 		}
 		for (i in 0...data.channels) _mins[i] = _maxs[i] = -0x7FFFFFFF;
-		if (startPos > endPos) _read(Math.floor(startPos * conversion), Math.floor(endPos * conversion), _analyzeRead);
+		if (startPos < endPos) _read(Math.floor(startPos * conversion), Math.floor(endPos * conversion), _analyzeRead);
 
 		var min = -0x7FFFFFFF, max = -0x7FFFFFFF, v = 1 / byteSize, f:Float;
 		for (i in 0...data.channels) {
@@ -485,7 +485,7 @@ final class AudioAnalyzer {
 			case SECOND: data.sampleRate;
 			default: data.sampleRate / 1000;
 		}
-		if (startPos > endPos) _read(Math.floor(startPos * conversion), Math.floor(endPos * conversion), callback);
+		if (startPos < endPos) _read(Math.floor(startPos * conversion), Math.floor(endPos * conversion), callback);
 	}
 
 	function _read(startSample:Int, endSample:Int, callback:ReadCallback) {

source/funkin/editors/charter/Charter.hx

@@ -622,8 +622,25 @@ class Charter extends UIState {
 		noteTypes = PlayState.SONG.noteTypes;
 
 		FlxG.sound.setMusic(FlxG.sound.load(Paths.inst(__song, __diff, PlayState.SONG.meta.instSuffix)));
-		if (Assets.exists(Paths.voices(__song, __diff, PlayState.SONG.meta.vocalsSuffix)))
+
+		// force full load the audio datas for waveform, maybe in the future dont do this and
+		// make it so it continously loads the only necessary waveform data in preview?
+
+		if (FlxG.sound.music.data?.buffer != null && FlxG.sound.music.data.buffer.data == null) {
+			FlxG.sound.music.data.buffer.load();
+			FlxG.sound.music.data.buffer.decoder?.dispose();
+			FlxG.sound.music.data.buffer.decoder = null;
+		}
+
+		if (Assets.exists(Paths.voices(__song, __diff, PlayState.SONG.meta.vocalsSuffix))) {
 			vocals = FlxG.sound.load(Paths.voices(__song, __diff, PlayState.SONG.meta.vocalsSuffix));
+
+			if (vocals.data?.buffer != null && vocals.data.buffer.data == null) {
+				vocals.data.buffer.load();
+				vocals.data.buffer.decoder?.dispose();
+				vocals.data.buffer.decoder = null;
+			}
+		}
 		else
 			vocals = new FlxSound();
 

source/funkin/editors/charter/CharterStrumline.hx

@@ -154,6 +154,12 @@ class CharterStrumline extends UISprite {
 		}
 		vocals.group = FlxG.sound.defaultMusicGroup;
 
+		if (vocals.data?.buffer != null && vocals.data.buffer.data == null) {
+			vocals.data.buffer.load();
+			vocals.data.buffer.decoder?.dispose();
+			vocals.data.buffer.decoder = null;
+		}
+
 		highlightColor = 0xFFFFFFFF;
 		if (icons[0] != null) {
 			var characterXML = Character.getXMLFromCharName(icons[0]);