From 31aef6d1f97a909715ee059ef652a87f5d92c0e1 Mon Sep 17 00:00:00 2001
From: lunarcleint <88809950+lunarcleint@users.noreply.github.com>
Date: Wed, 20 Mar 2024 19:42:27 -0700
Subject: [PATCH] i forgor static + shader

---
 assets/shaders/engine/editorWaveforms.frag | 66 ++++++++++++++++++----
 source/funkin/editors/charter/Charter.hx   |  4 ++
 2 files changed, 60 insertions(+), 10 deletions(-)

diff --git a/assets/shaders/engine/editorWaveforms.frag b/assets/shaders/engine/editorWaveforms.frag
index f80c7afb..d91002fd 100644
--- a/assets/shaders/engine/editorWaveforms.frag
+++ b/assets/shaders/engine/editorWaveforms.frag
@@ -6,12 +6,19 @@
 const vec3 gradient1 = vec3(114./255., 81./255., 135./255);
 const vec3 gradient2 = vec3(144./255., 80./255., 186./255);
 
+const vec4 outlinecolor = vec4(vec3(.1), .1);
+const vec3 lowdetailcol = vec3(0., 0., 1.);
+
 uniform vec2 textureRes;
 uniform float pixelOffset;
 
+uniform float playerPosition;
+
 uniform sampler2D waveformTexture;
 uniform ivec2 waveformSize;
 
+uniform bool lowDetail;
+
 float getAmplitude(vec2 pixel) {
 	float pixelID = floor((pixel.y+pixelOffset)/3.);
 	
@@ -32,17 +39,18 @@ bool inWaveForm(vec2 pixel, float width) {
 	return pixel.x > widthdiv2 && pixel.x < textureRes.x-widthdiv2;
 }
 
-void main()
-{
-	vec2 pixel = openfl_TextureCoordv * textureRes;
-
-	float amplitude = getAmplitude(pixel);
-	float ampwidth = (1.-amplitude) * textureRes.x;
-
-	gl_FragColor = vec4(0.);
-
+void highDetailWaveform(vec2 pixel, float amplitude, float ampwidth) {
 	if (inWaveForm(pixel, ampwidth)) {
 		vec3 gradientColor = mix(gradient1, gradient2, openfl_TextureCoordv.x);
+		gradientColor *= pixel.y+pixelOffset>playerPosition ? .7 : 1.;
+
+		float ampwidthHighlightCool = (1.-(amplitude)) * textureRes.x;
+		float remapCoord = (ampwidthHighlightCool/textureRes.x)/2.;
+
+		float mappedCoord = map(openfl_TextureCoordv.x, remapCoord, 1.-remapCoord, 0., 1.);
+		float hightlightAmount = 1.-(abs(mappedCoord-0.5)*2.);
+
+		gradientColor = mix(gradientColor, gradientColor * vec3(1.8), map(hightlightAmount, 0., 1., .5, 1.));
 
 		float ampwidthHighlight = (1.-(amplitude*(1./3.))) * textureRes.x;
 		if (inWaveForm(pixel, ampwidthHighlight)) {
@@ -51,8 +59,46 @@ void main()
 			float mappedCoord = map(openfl_TextureCoordv.x, remapCoord, 1.-remapCoord, 0., 1.);
 			float hightlightAmount = 1.-(abs(mappedCoord-0.5)*2.);
 
-			gradientColor = mix(gradientColor, gradientColor * vec3(1.8), map(hightlightAmount, 0., 1., .4, 1.));
+			gradientColor = mix(gradientColor, gradientColor * vec3(1.8), map(hightlightAmount, 0., 1., .5, 1.));
 		}
+		
 		gl_FragColor = vec4(vec3(gradientColor * mix(0.5, .8, amplitude))*openfl_Alphav, openfl_Alphav);
+
+		float lastAmplitude = getAmplitude(pixel - vec2(0., -1.));
+		float lastAmpwidth = (1.-lastAmplitude) * textureRes.x;
+
+		if (!inWaveForm(pixel, lastAmpwidth))
+			gl_FragColor -= outlinecolor*mix(0.5, .8, amplitude);
+
+		float nextAmplitude = getAmplitude(pixel - vec2(0., 1.));
+		float nextAmpwidth = (1.-nextAmplitude) * textureRes.x;
+
+		if (!inWaveForm(pixel, nextAmpwidth))
+			gl_FragColor -= outlinecolor*mix(0.5, .8, amplitude);
+
+		if (!inWaveForm(pixel, ampwidth+2.) && amplitude > 0.)
+	 		gl_FragColor -= outlinecolor;
 	}
+}
+
+void lowDetailWaveform(vec2 pixel, float amplitude, float ampwidth) {
+	if (inWaveForm(pixel, ampwidth)) {
+		vec3 color = lowdetailcol;
+		color *= pixel.y+pixelOffset>playerPosition ? .6 : 1.;
+
+		gl_FragColor = vec4(color, 1.);
+	}
+}
+
+void main()
+{
+	vec2 pixel = openfl_TextureCoordv * textureRes;
+
+	float amplitude = getAmplitude(pixel);
+	float ampwidth = (1.-amplitude) * textureRes.x;
+
+	if (lowDetail)
+		lowDetailWaveform(pixel, amplitude, ampwidth);
+	else 
+		highDetailWaveform(pixel, amplitude, ampwidth);
 }
\ No newline at end of file
diff --git a/source/funkin/editors/charter/Charter.hx b/source/funkin/editors/charter/Charter.hx
index 273ec529..035e5a7a 100644
--- a/source/funkin/editors/charter/Charter.hx
+++ b/source/funkin/editors/charter/Charter.hx
@@ -1797,6 +1797,7 @@ class Charter extends UIState {
 			strumlinesDraggable: strumLines.draggable,
 			hitSounds: [for (strumLine in strumLines.members) strumLine.hitsounds],
 			mutedVocals: [for (strumLine in strumLines.members) !(strumLine.vocals.volume > 0)],
+			waveforms: [for (strumLine in strumLines.members) strumLine.selectedWaveform]
 		}
 	}
 
@@ -1813,6 +1814,8 @@ class Charter extends UIState {
 			strumLine.hitsounds = playtestInfo.hitSounds[i];
 		for (i => strumLine in strumLines.members)
 			strumLine.vocals.volume = playtestInfo.mutedVocals[i] ? 0 : 1;
+		for (i => strumLine in strumLines.members)
+			strumLine.selectedWaveform = playtestInfo.waveforms[i];
 	}
 }
 
@@ -1892,4 +1895,5 @@ typedef PlaytestInfo = {
 	var strumlinesDraggable:Bool;
 	var hitSounds:Array<Bool>;
 	var mutedVocals:Array<Bool>;
+	var waveforms:Array<Int>;
 }
\ No newline at end of file