From 503c97adeb65994bb4b1a661df8f8bbb23fc8b15 Mon Sep 17 00:00:00 2001
From: Rezmason <jeremysachs@rezmason.net>
Date: Tue, 2 Aug 2022 03:39:57 -0700
Subject: [PATCH] Ripples pass now supports five simultaneous clicks; the
 ripples are circular, accounting for the aspect ratio; click event is handled
 within the ripples pass module.

---
 js/regl/main.js                    |  9 --------
 js/regl/ripplesPass.js             | 35 +++++++++++++++---------------
 shaders/glsl/ripplesPass.frag.glsl | 33 +++++++++++++++-------------
 3 files changed, 35 insertions(+), 42 deletions(-)

diff --git a/js/regl/main.js b/js/regl/main.js
index 7df1d14..eb47144 100644
--- a/js/regl/main.js
+++ b/js/regl/main.js
@@ -58,15 +58,6 @@ export default async (canvas, config) => {
 	// }
 	resize();
 
-	window.ripples = [0,0,0]
-	window.onclick = (e) => { // ripple init
-		console.log(e)
-		window.ripples = [Date.now(), (e.clientX/e.srcElement.clientWidth*2)-1, (e.clientY/e.srcElement.clientHeight*2)-1]
-		// console.log(ripples)
-
-	}
-
-
 	const regl = createREGL({
 		canvas,
 		extensions: ["OES_texture_half_float", "OES_texture_half_float_linear"],
diff --git a/js/regl/ripplesPass.js b/js/regl/ripplesPass.js
index deab724..ac31795 100644
--- a/js/regl/ripplesPass.js
+++ b/js/regl/ripplesPass.js
@@ -1,33 +1,29 @@
 import { loadImage, loadText, makePassFBO, makePass } from "./utils.js";
 
+const start = Date.now();
+const numClicks = 5;
+const clicks = Array(numClicks).fill([0, 0, -Infinity]).flat();
+let aspectRatio = 1;
 
+let index = 0;
+window.onclick = (e) => {
+	clicks[index * 3 + 0] = 0 + e.clientX / e.srcElement.clientWidth;
+	clicks[index * 3 + 1] = 1 - e.clientY / e.srcElement.clientHeight;
+	clicks[index * 3 + 2] = (Date.now() - start) / 1000;
+	index = (index + 1) % numClicks;
+}
 
 export default ({ regl, config }, inputs) => {
-    console.log('ripples');
-    
 	const output = makePassFBO(regl, config.useHalfFloat);
-	// const bgURL = "bgURL" in config ? config.bgURL : defaultBGURL;
-	// const bloomStrength = config.bloomStrength;
-	// const background = loadImage(regl, bgURL);
 	const ripplesPassFrag = loadText("shaders/glsl/ripplesPass.frag.glsl");
 	const render = regl({
 		frag: regl.prop("frag"),
 		uniforms: {
-			// bloomStrength,
 			time: regl.context("time"),
 			tex: inputs.primary,
 			bloomTex: inputs.bloom,
-			intensity: ()=>{
-				let inten = 1 - (Date.now() - window.ripples[0])/4000 
-				if (inten < 0) inten = 0
-				return inten / 10
-			},
-			height: regl.context("viewportWidth"),
-			width: regl.context("viewportHeight"),
-			centerW: ()=> {
-				return window.ripples[1]
-			},
-			centerH: ()=> window.ripples[2]
+			clicks: () => clicks,
+			aspectRatio: () => aspectRatio
 		},
 		framebuffer: output,
 	});
@@ -36,7 +32,10 @@ export default ({ regl, config }, inputs) => {
 			primary: output,
 		},
 		Promise.all([ripplesPassFrag.loaded]),
-		(w, h) => output.resize(w, h),
+		(w, h) => {
+			output.resize(w, h);
+			aspectRatio = w / h;
+		},
 		() => render({ frag: ripplesPassFrag.text() })
 	);
 };
diff --git a/shaders/glsl/ripplesPass.frag.glsl b/shaders/glsl/ripplesPass.frag.glsl
index e76dce0..ee217a9 100644
--- a/shaders/glsl/ripplesPass.frag.glsl
+++ b/shaders/glsl/ripplesPass.frag.glsl
@@ -1,22 +1,25 @@
 precision mediump float;
 varying vec2 vUV;
-uniform float width, height;
+uniform float aspectRatio;
 uniform float time;
-uniform float intensity;
-uniform float centerW;
-uniform float centerH;
+uniform vec3 clicks[5];
+
 uniform sampler2D tex;
 uniform sampler2D bloomTex;
 
 void main() {
-	vec2 iResolution = vec2(height,width);
-	vec2 cp = vec2(
-		-1. + 2.* gl_FragCoord.x /iResolution.x - centerW,
-		-1. + 2.* gl_FragCoord.y /iResolution.y + centerH
-	);
-	float cl = length(cp);//*(intensity+1.)*.9;
-    vec2 uv = gl_FragCoord.xy / iResolution.xy + (cp / cl / 2. ) * sin(cl*15. - time * 10.) * intensity*.5;
-	vec3 col = texture2D(tex, uv).xyz + texture2D(bloomTex, uv).xyz;;
-	col.y = col.x; col.x = 0.; col.z = 0.;
-	gl_FragColor = vec4(col,1.0);
-}
\ No newline at end of file
+
+	float total = 0.0;
+	for (int i = 0; i < 5; i++) {
+		vec3 click = clicks[i];
+		float distanceToClick = length((click.xy - vUV) * vec2(aspectRatio, 1.0));
+		total += (1.0 - distanceToClick)
+		* sin(distanceToClick * 50.0 - time * 12.0)
+		* pow(1.0 - min(1.0, (time - click.z) / 3.0), 2.0);
+	}
+	total *= 0.2;
+
+	vec2 uv = vUV + total * 0.03;
+	gl_FragColor = vec4(mix(vec3(0.0), vec3(0.3, 1.0, 0.2), texture2D(tex, uv).r + texture2D(bloomTex, uv).r * 0.5), 1.0);
+	// gl_FragColor = vec4(uv, 0.5, 1.0);
+}