gl-transitions 1.63.0 → 1.64.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "gl-transitions",
-  "version": "1.63.0",
+  "version": "1.64.0",
   "description": "The open collection of GL Transitions",
   "main": "index.js",
   "license": "MIT",

package/transitions/BowTieHorizontal.glsl

@@ -1,11 +1,11 @@
 // Author: huynx
 // License: MIT
 
-vec2 bottom_left = vec2(0.0, 1.0);
-vec2 bottom_right = vec2(1.0, 1.0);
-vec2 top_left = vec2(0.0, 0.0);
-vec2 top_right = vec2(1.0, 0.0);
-vec2 center = vec2(0.5, 0.5);
+const vec2 bottom_left = vec2(0.0, 1.0);
+const vec2 bottom_right = vec2(1.0, 1.0);
+const vec2 top_left = vec2(0.0, 0.0);
+const vec2 top_right = vec2(1.0, 0.0);
+const vec2 center = vec2(0.5, 0.5);
 
 float check(vec2 p1, vec2 p2, vec2 p3)
 {

package/transitions/ButterflyWaveScrawler.glsl

@@ -3,26 +3,28 @@
 uniform float amplitude; // = 1.0
 uniform float waves; // = 30.0
 uniform float colorSeparation; // = 0.3
-float PI = 3.14159265358979323846264;
+const float PI = 3.14159265358979323846264;
 float compute(vec2 p, float progress, vec2 center) {
 vec2 o = p*sin(progress * amplitude)-center;
 // horizontal vector
 vec2 h = vec2(1., 0.);
 // butterfly polar function (don't ask me why this one :))
 float theta = acos(dot(o, h)) * waves;
-return (exp(cos(theta)) - 2.*cos(4.*theta) + pow(sin((2.*theta - PI) / 24.), 5.)) / 10.;
+float s = sin((2.*theta - PI) / 24.);
+float s2 = s * s;
+return (exp(cos(theta)) - 2.*cos(4.*theta) + s2 * s2 * s) / 10.;
 }
 vec4 transition(vec2 uv) {
-  vec2 p = uv.xy / vec2(1.0).xy;
+  if (progress <= 0.0) return getFromColor(uv);
+  if (progress >= 1.0) return getToColor(uv);
+  vec2 p = uv;
   float inv = 1. - progress;
-  vec2 dir = p - vec2(.5);
-  float dist = length(dir);
-  float disp = compute(p, progress, vec2(0.5, 0.5)) ;
+  float disp = compute(p, progress, vec2(0.5, 0.5));
   vec4 texTo = getToColor(p + inv*disp);
   vec4 texFrom = vec4(
-  getFromColor(p + progress*disp*(1.0 - colorSeparation)).r,
-  getFromColor(p + progress*disp).g,
-  getFromColor(p + progress*disp*(1.0 + colorSeparation)).b,
-  1.0);
+    getFromColor(p + progress*disp*(1.0 - colorSeparation)).r,
+    getFromColor(p + progress*disp).g,
+    getFromColor(p + progress*disp*(1.0 + colorSeparation)).b,
+    1.0);
   return texTo*progress + texFrom*inv;
 }