fix/update shaders

line_in_file.sh

@@ -1,6 +1,5 @@
 #!/bin/bash
 
-set -v
 set -e
 
 LINE=$1

project/frag7.glsl

@@ -15,6 +15,6 @@ void main() {
     // vec2 uv = 1 - vUV;
     vec2 uv = vUV;
     vec3 c = texture(iTex0, uv).xyz;
-    c = mix(c, 1 - c, write_int(uv * 20, vec2(.1, .1), iFPS, 2));
+    c = mix(c, 1 - c, write_int(uv * 20, vec2(.25, .25), iFPS, 2));
     fragColor = vec4(c, 1);
 }

project/inc_fx.glsl

@@ -521,34 +521,34 @@ vec4 fx_14(vec2 vUV, sampler2D previous, sampler2D feedback, int seed, vec3 b1,
 
 vec4 fx_stage(int fx, vec2 vUV, sampler2D previous, sampler2D feedback, int seed, vec3 b1, vec2 f1, vec3 b2, vec2 f2, vec3 b3, vec2 f3, vec3 m0) {
     if (fx >= 15) {
-        fx = int(randTime(seed + 100) * 14);
+        fx = int(randTime(seed + 100) * 14) + 1;
     }
 
-    if (fx == 0) {
+    if (fx == 1) {
         return fx_1(vUV, previous, feedback, seed, b1, f1, b2, f2, b3, f3, m0);
-    } else if (fx == 1) {
-        return fx_2(vUV, previous, feedback, seed, b1, f1, b2, f2, b3, f3, m0);
     } else if (fx == 2) {
-        return fx_3(vUV, previous, feedback, seed, b1, f1, b2, f2, b3, f3, m0);
+        return fx_2(vUV, previous, feedback, seed, b1, f1, b2, f2, b3, f3, m0);
     } else if (fx == 3) {
-        return fx_4(vUV, previous, feedback, seed, b1, f1, b2, f2, b3, f3, m0);
+        return fx_3(vUV, previous, feedback, seed, b1, f1, b2, f2, b3, f3, m0);
     } else if (fx == 4) {
-        return fx_5(vUV, previous, feedback, seed, b1, f1, b2, f2, b3, f3, m0);
+        return fx_4(vUV, previous, feedback, seed, b1, f1, b2, f2, b3, f3, m0);
     } else if (fx == 5) {
-        return fx_6(vUV, previous, feedback, seed, b1, f1, b2, f2, b3, f3, m0);
+        return fx_5(vUV, previous, feedback, seed, b1, f1, b2, f2, b3, f3, m0);
     } else if (fx == 6) {
-        return fx_7(vUV, previous, feedback, seed, b1, f1, b2, f2, b3, f3, m0);
+        return fx_6(vUV, previous, feedback, seed, b1, f1, b2, f2, b3, f3, m0);
     } else if (fx == 7) {
-        return fx_8(vUV, previous, feedback, seed, b1, f1, b2, f2, b3, f3, m0);
+        return fx_7(vUV, previous, feedback, seed, b1, f1, b2, f2, b3, f3, m0);
     } else if (fx == 8) {
-        return fx_9(vUV, previous, feedback, seed, b1, f1, b2, f2, b3, f3, m0);
+        return fx_8(vUV, previous, feedback, seed, b1, f1, b2, f2, b3, f3, m0);
     } else if (fx == 9) {
-        return fx_10(vUV, previous, feedback, seed, b1, f1, b2, f2, b3, f3, m0);
+        return fx_9(vUV, previous, feedback, seed, b1, f1, b2, f2, b3, f3, m0);
     } else if (fx == 10) {
-        return fx_11(vUV, previous, feedback, seed, b1, f1, b2, f2, b3, f3, m0);
+        return fx_10(vUV, previous, feedback, seed, b1, f1, b2, f2, b3, f3, m0);
     } else if (fx == 11) {
-        return fx_12(vUV, previous, feedback, seed, b1, f1, b2, f2, b3, f3, m0);
+        return fx_11(vUV, previous, feedback, seed, b1, f1, b2, f2, b3, f3, m0);
     } else if (fx == 12) {
+        return fx_12(vUV, previous, feedback, seed, b1, f1, b2, f2, b3, f3, m0);
+    } else if (fx == 13) {
         return fx_13(vUV, previous, feedback, seed, b1, f1, b2, f2, b3, f3, m0);
     } else {
         return fx_14(vUV, previous, feedback, seed, b1, f1, b2, f2, b3, f3, m0);

project/inc_src.glsl

@@ -576,35 +576,35 @@ vec4 src_14(vec2 vUV, int seed, vec3 b1, vec2 f1, vec3 b2, vec2 f2, vec3 b3, vec
 
 vec4 src_stage(int src, vec2 vUV, int seed, vec3 b1, vec2 f1, vec3 b2, vec2 f2, vec3 b3, vec2 f3)
 {
-    if (src == 15) {
-        src = int(randTime(seed + 100) * 14);
+    if (src >= 15) {
+        src = int(randTime(seed + 100) * 14) + 1;
     }
 
-    if (src == 0) {
+    if (src == 1) {
         return src_1(vUV, seed, b1, f1, b2, f2, b3, f3);
-    } else if (src == 1) {
-        return src_2(vUV, seed, b1, f1, b2, f2, b3, f3);
     } else if (src == 2) {
-        return src_3(vUV, seed, b1, f1, b2, f2, b3, f3);
+        return src_2(vUV, seed, b1, f1, b2, f2, b3, f3);
     } else if (src == 3) {
-        return src_4(vUV, seed, b1, f1, b2, f2, b3, f3);
+        return src_3(vUV, seed, b1, f1, b2, f2, b3, f3);
     } else if (src == 4) {
-        return src_5(vUV, seed, b1, f1, b2, f2, b3, f3);
+        return src_4(vUV, seed, b1, f1, b2, f2, b3, f3);
     } else if (src == 5) {
-        return src_6(vUV, seed, b1, f1, b2, f2, b3, f3);
+        return src_5(vUV, seed, b1, f1, b2, f2, b3, f3);
     } else if (src == 6) {
-        return src_7(vUV, seed, b1, f1, b2, f2, b3, f3);
+        return src_6(vUV, seed, b1, f1, b2, f2, b3, f3);
     } else if (src == 7) {
-        return src_8(vUV, seed, b1, f1, b2, f2, b3, f3);
+        return src_7(vUV, seed, b1, f1, b2, f2, b3, f3);
     } else if (src == 8) {
-        return src_9(vUV, seed, b1, f1, b2, f2, b3, f3);
+        return src_8(vUV, seed, b1, f1, b2, f2, b3, f3);
     } else if (src == 9) {
-        return src_10(vUV, seed, b1, f1, b2, f2, b3, f3);
+        return src_9(vUV, seed, b1, f1, b2, f2, b3, f3);
     } else if (src == 10) {
-        return src_11(vUV, seed, b1, f1, b2, f2, b3, f3);
+        return src_10(vUV, seed, b1, f1, b2, f2, b3, f3);
     } else if (src == 11) {
-        return src_12(vUV, seed, b1, f1, b2, f2, b3, f3);
+        return src_11(vUV, seed, b1, f1, b2, f2, b3, f3);
     } else if (src == 12) {
+        return src_12(vUV, seed, b1, f1, b2, f2, b3, f3);
+    } else if (src == 13) {
         return src_13(vUV, seed, b1, f1, b2, f2, b3, f3);
     } else {
         return src_14(vUV, seed, b1, f1, b2, f2, b3, f3);