update interaction

yiwenl · Jan 20, 2024 · 32279c3 · 32279c3
1 parent eebb791
commit 32279c3
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 6 deletions.
diff --git a/experiments/ribbon01/dist/bundle.js b/experiments/ribbon01/dist/bundle.js
diff --git a/experiments/ribbon01/src/SceneApp.js b/experiments/ribbon01/src/SceneApp.js
@@ -156,7 +156,7 @@ class SceneApp extends Scene {
       this.lengthScale.value = 1.0;
     }, 2200 + delay);
 
-    setTimeout(() => this.pulse(), 2500 + delay);
+    setTimeout(() => this.pulse(), 3000 + delay);
   }
 
   _initTextures() {
@@ -245,7 +245,7 @@ class SceneApp extends Scene {
   }
 
   _initHit() {
-    const r = 12.5;
+    const r = 15;
     const mesh = Geom.plane(r, r / GL.aspectRatio, 1);
     // this._hitTestor = new HitTestor(Geom.sphere(3, 24), this.camera);
     this._hitTestor = new HitTestor(mesh, this.camera);

diff --git a/experiments/ribbon01/src/shaders/sim.frag b/experiments/ribbon01/src/shaders/sim.frag
@@ -65,13 +65,16 @@ void main(void) {
 
     // repel to touch
     d = distance(pos, uTouch);
-    f = smoothstep(5.0, 3.0, d);
+    f = smoothstep(6.0, 3.0, d);
     dir = normalize(pos - uTouch);
 
-    float t = extra.z + mix(1.0, 3.0, extra.x) * uTime * 0.1;
+    float t = extra.z + mix(1.0, 3.0, extra.x) * uTime * 0.2;
     t = sin(t * PI);
     t = smoothstep(-0.5, 1.0, t);
-    acc -= dir * f * 4.0/uSpeed * t;
+    // acc -= dir * f * 6.0/uSpeed * t * step(uSpeed, 2.0);
+    float fSpeed = smoothstep(4.0, 1.0, uSpeed);
+    fSpeed = mix(0.2, 1.0, fSpeed);
+    acc -= dir * f * 4.0/uSpeed * t * fSpeed;
 
     float speed = mix(2.0, 3.0, extra.x);
     // float speed = mix(2.0, 4.0, extra.x);