fix: iDemo redundant with autorandom

This commit is contained in:
2025-11-12 23:41:09 +01:00
parent 3903149549
commit a3d9baf18c
4 changed files with 11 additions and 8 deletions
+2 -1
View File
@@ -12,6 +12,7 @@ out vec4 fragColor;
#include inc_magic.glsl #include inc_magic.glsl
#include inc_functions.glsl #include inc_functions.glsl
uniform int iDemo;
uniform sampler2D iTex7; uniform sampler2D iTex7;
uniform sampler2D iTex8; uniform sampler2D iTex8;
uniform int iSeed7; uniform int iSeed7;
@@ -26,7 +27,7 @@ void main() {
float k = mean(color_a); float k = mean(color_a);
mix_value = mix(mix_value * 0.9 + 0.05, mix_value, 1 - iDemo); mix_value = mix(mix_value, mix_value * 0.9 + 0.05, iDemo);
fragColor = mix(color_b, color_a, mix_type ? step(mix_value, k) : mix_value); fragColor = mix(color_b, color_a, mix_type ? step(mix_value, k) : mix_value);
} }
+2
View File
@@ -13,6 +13,7 @@ uniform vec2 iInputResolution2;
uniform int iInputFormat1; uniform int iInputFormat1;
uniform int iInputFormat2; uniform int iInputFormat2;
uniform int iDemo;
uniform int iAutoRand; uniform int iAutoRand;
uniform int iPage; uniform int iPage;
uniform int iSelected; uniform int iSelected;
@@ -99,6 +100,7 @@ vec4 debug(vec2 vUV)
float mfx_value = magic(iMidi2_3[6].xy, vec3(1, 0, 0), iSeed8); float mfx_value = magic(iMidi2_3[6].xy, vec3(1, 0, 0), iSeed8);
bool mfx_invert = magic_trigger(vec3(iMidi2_3[6].z, 0, 0), iSeed8); bool mfx_invert = magic_trigger(vec3(iMidi2_3[6].z, 0, 0), iSeed8);
float mix_value = magic(iMidi3_1[1].xy, vec3(1, 0, 0), iSeed7); float mix_value = magic(iMidi3_1[1].xy, vec3(1, 0, 0), iSeed7);
mix_value = mix(mix_value, mix_value * 0.9 + 0.05, iDemo);
bool mix_type = magic_trigger(vec3(iMidi3_1[0].x, 0, 0), iSeed7 + 10); bool mix_type = magic_trigger(vec3(iMidi3_1[0].x, 0, 0), iSeed7 + 10);
// logic // logic
+5 -7
View File
@@ -3,13 +3,11 @@
#ifndef INC_MAGIC #ifndef INC_MAGIC
#define INC_MAGIC #define INC_MAGIC
uniform int iDemo;
vec2 magic_f(vec2 F, vec3 B, float i) vec2 magic_f(vec2 F, vec3 B, float i)
{ {
return vec2( return vec2(
mix(F.x, randTime(i + 1), min(1, B.z + iDemo)), mix(F.x, randTime(i + 1), min(1, B.z)),
mix(F.y, randTime(i + 2), min(1, B.z + iDemo)) mix(F.y, randTime(i + 2), min(1, B.z))
); );
} }
@@ -21,9 +19,9 @@ vec2 magic_f(float i)
vec3 magic_b(vec3 B, float i) vec3 magic_b(vec3 B, float i)
{ {
return vec3( return vec3(
mix(B.x, step(0.2, randTime(i + 3)), min(1, B.z + iDemo)), mix(B.x, step(0.2, randTime(i + 3)), min(1, B.z)),
mix(B.y, step(0.5, randTime(i + 4)), min(1, B.z + iDemo)), mix(B.y, step(0.5, randTime(i + 4)), min(1, B.z)),
min(1, B.z + iDemo) min(1, B.z)
); );
} }
+2
View File
@@ -5,6 +5,8 @@
#ifndef INC_SRC #ifndef INC_SRC
#define INC_SRC #define INC_SRC
uniform int iDemo;
uniform sampler2D iTex0; uniform sampler2D iTex0;
uniform sampler2D iTex3; uniform sampler2D iTex3;
uniform sampler2D iTex4; uniform sampler2D iTex4;