refactor: rename src/fx to not consider their position

This commit is contained in:
2026-11-11 16:41:24 +01:00
parent fd89383034
commit 19ec7f721f
2 changed files with 56 additions and 99 deletions
+28 -52
View File
@@ -17,8 +17,7 @@ vec4 fx_master(vec3 c0, vec3 c, int seed, vec3 m0) {
return vec4(c_out, 1.);
}
// FX 1 : thru
vec4 fx_1(vec2 vUV, sampler2D previous, sampler2D feedback, int seed, vec3 b1, vec2 f1, vec3 b2, vec2 f2, vec3 b3, vec2 f3, vec3 m0)
vec4 fx_thru(vec2 vUV, sampler2D previous, int seed, vec3 b1, vec2 f1, vec3 b2, vec2 f2, vec3 b3, vec2 f3, vec3 m0)
{
// start
@@ -41,7 +40,6 @@ vec4 fx_1(vec2 vUV, sampler2D previous, sampler2D feedback, int seed, vec3 b1, v
return fx_master(c0, c, seed, m0);
}
// FX 2 : feedback + shift
vec4 fx_shift(vec2 vUV, sampler2D src0, sampler2D src1, int seed, vec3 b1, vec2 f1, vec3 b2, vec2 f2, vec3 b3, vec2 f3, vec3 m0)
{
// start
@@ -68,19 +66,7 @@ vec4 fx_shift(vec2 vUV, sampler2D src0, sampler2D src1, int seed, vec3 b1, vec2
return fx_master(c0, c, seed, m0);
}
vec4 fx_2(vec2 vUV, sampler2D previous, sampler2D feedback, int seed, vec3 b1, vec2 f1, vec3 b2, vec2 f2, vec3 b3, vec2 f3, vec3 m0)
{
return fx_shift(vUV, previous, feedback, seed, b1, f1, b2, f2, b3, f3, m0);
}
// FX 3 : shift
vec4 fx_3(vec2 vUV, sampler2D previous, sampler2D feedback, int seed, vec3 b1, vec2 f1, vec3 b2, vec2 f2, vec3 b3, vec2 f3, vec3 m0)
{
return fx_shift(vUV, previous, previous, seed, b1, f1, b2, f2, b3, f3, m0);
}
// FX 4 : colorize
vec4 fx_4(vec2 vUV, sampler2D previous, sampler2D feedback, int seed, vec3 b1, vec2 f1, vec3 b2, vec2 f2, vec3 b3, vec2 f3, vec3 m0)
vec4 fx_colorize(vec2 vUV, sampler2D previous, int seed, vec3 b1, vec2 f1, vec3 b2, vec2 f2, vec3 b3, vec2 f3, vec3 m0)
{
// start
@@ -105,8 +91,7 @@ vec4 fx_4(vec2 vUV, sampler2D previous, sampler2D feedback, int seed, vec3 b1, v
return fx_master(c0, c, seed, m0);
}
// FX 5 : quantize
vec4 fx_5(vec2 vUV, sampler2D previous, sampler2D feedback, int seed, vec3 b1, vec2 f1, vec3 b2, vec2 f2, vec3 b3, vec2 f3, vec3 m0)
vec4 fx_quantize(vec2 vUV, sampler2D previous, int seed, vec3 b1, vec2 f1, vec3 b2, vec2 f2, vec3 b3, vec2 f3, vec3 m0)
{
// start
@@ -138,8 +123,7 @@ vec4 fx_5(vec2 vUV, sampler2D previous, sampler2D feedback, int seed, vec3 b1, v
return fx_master(c0, c, seed, m0);
}
// FX 6 : dithering
vec4 fx_6(vec2 vUV, sampler2D previous, sampler2D feedback, int seed, vec3 b1, vec2 f1, vec3 b2, vec2 f2, vec3 b3, vec2 f3, vec3 m0)
vec4 fx_dithering(vec2 vUV, sampler2D previous, int seed, vec3 b1, vec2 f1, vec3 b2, vec2 f2, vec3 b3, vec2 f3, vec3 m0)
{
// start
@@ -180,8 +164,7 @@ vec4 fx_6(vec2 vUV, sampler2D previous, sampler2D feedback, int seed, vec3 b1, v
return fx_master(c0, c, seed, m0);
}
// FX 7 : tv
vec4 fx_7(vec2 vUV, sampler2D previous, sampler2D feedback, int seed, vec3 b1, vec2 f1, vec3 b2, vec2 f2, vec3 b3, vec2 f3, vec3 m0)
vec4 fx_tv(vec2 vUV, sampler2D previous, int seed, vec3 b1, vec2 f1, vec3 b2, vec2 f2, vec3 b3, vec2 f3, vec3 m0)
{
// start
@@ -213,8 +196,7 @@ vec4 fx_7(vec2 vUV, sampler2D previous, sampler2D feedback, int seed, vec3 b1, v
return fx_master(c0, c, seed, m0);
}
// FX 8 : kaleidoscope
vec4 fx_8(vec2 vUV, sampler2D previous, sampler2D feedback, int seed, vec3 b1, vec2 f1, vec3 b2, vec2 f2, vec3 b3, vec2 f3, vec3 m0)
vec4 fx_kaleidoscope(vec2 vUV, sampler2D previous, int seed, vec3 b1, vec2 f1, vec3 b2, vec2 f2, vec3 b3, vec2 f3, vec3 m0)
{
// start
@@ -242,8 +224,7 @@ vec4 fx_8(vec2 vUV, sampler2D previous, sampler2D feedback, int seed, vec3 b1, v
return fx_master(c0, c, seed, m0);
}
// FX 9 : cp437
vec4 fx_9(vec2 vUV, sampler2D previous, sampler2D feedback, int seed, vec3 b1, vec2 f1, vec3 b2, vec2 f2, vec3 b3, vec2 f3, vec3 m0)
vec4 fx_cp437(vec2 vUV, sampler2D previous, int seed, vec3 b1, vec2 f1, vec3 b2, vec2 f2, vec3 b3, vec2 f3, vec3 m0)
{
// start
@@ -283,8 +264,7 @@ vec4 fx_9(vec2 vUV, sampler2D previous, sampler2D feedback, int seed, vec3 b1, v
return fx_master(c0, c, seed, m0);
}
// FX 10 : lens
vec4 fx_10(vec2 vUV, sampler2D previous, sampler2D feedback, int seed, vec3 b1, vec2 f1, vec3 b2, vec2 f2, vec3 b3, vec2 f3, vec3 m0)
vec4 fx_lens(vec2 vUV, sampler2D previous, int seed, vec3 b1, vec2 f1, vec3 b2, vec2 f2, vec3 b3, vec2 f3, vec3 m0)
{
// start
@@ -311,8 +291,7 @@ vec4 fx_10(vec2 vUV, sampler2D previous, sampler2D feedback, int seed, vec3 b1,
return fx_master(c0, c, seed, m0);
}
// FX 11 : spill
vec4 fx_11(vec2 vUV, sampler2D previous, sampler2D feedback, int seed, vec3 b1, vec2 f1, vec3 b2, vec2 f2, vec3 b3, vec2 f3, vec3 m0)
vec4 fx_spill(vec2 vUV, sampler2D previous, int seed, vec3 b1, vec2 f1, vec3 b2, vec2 f2, vec3 b3, vec2 f3, vec3 m0)
{
// start
@@ -340,8 +319,7 @@ vec4 fx_11(vec2 vUV, sampler2D previous, sampler2D feedback, int seed, vec3 b1,
return fx_master(c0, c, seed, m0);
}
// FX 12 : Game Of Life
vec4 fx_12(vec2 vUV, sampler2D previous, sampler2D feedback, int seed, vec3 b1, vec2 f1, vec3 b2, vec2 f2, vec3 b3, vec2 f3, vec3 m0)
vec4 fx_game_of_life(vec2 vUV, sampler2D previous, sampler2D feedback, int seed, vec3 b1, vec2 f1, vec3 b2, vec2 f2, vec3 b3, vec2 f3, vec3 m0)
{
// start
@@ -454,8 +432,7 @@ vec4 fx_12(vec2 vUV, sampler2D previous, sampler2D feedback, int seed, vec3 b1,
return fx_master(c0, cout, seed, m0);
}
// FX 13 : Sobel
vec4 fx_13(vec2 vUV, sampler2D previous, sampler2D feedback, int seed, vec3 b1, vec2 f1, vec3 b2, vec2 f2, vec3 b3, vec2 f3, vec3 m0)
vec4 fx_sobel(vec2 vUV, sampler2D previous, int seed, vec3 b1, vec2 f1, vec3 b2, vec2 f2, vec3 b3, vec2 f3, vec3 m0)
{
// start
@@ -483,8 +460,7 @@ vec4 fx_13(vec2 vUV, sampler2D previous, sampler2D feedback, int seed, vec3 b1,
return fx_master(c0, c, seed, m0);
}
// FX 14 : Isometric
vec4 fx_14(vec2 vUV, sampler2D previous, sampler2D feedback, int seed, vec3 b1, vec2 f1, vec3 b2, vec2 f2, vec3 b3, vec2 f3, vec3 m0)
vec4 fx_isometric(vec2 vUV, sampler2D previous, int seed, vec3 b1, vec2 f1, vec3 b2, vec2 f2, vec3 b3, vec2 f3, vec3 m0)
{
// start
@@ -525,33 +501,33 @@ vec4 fx_stage(int fx, vec2 vUV, sampler2D previous, sampler2D feedback, int seed
}
if (fx == 1) {
return fx_1(vUV, previous, feedback, seed, b1, f1, b2, f2, b3, f3, m0);
} else if (fx == 2) {
return fx_2(vUV, previous, feedback, seed, b1, f1, b2, f2, b3, f3, m0);
} else if (fx == 3) {
return fx_3(vUV, previous, feedback, seed, b1, f1, b2, f2, b3, f3, m0);
return fx_thru(vUV, previous, seed, b1, f1, b2, f2, b3, f3, m0);
} else if (fx == 2) { // feedback + shift
return fx_shift(vUV, previous, feedback, seed, b1, f1, b2, f2, b3, f3, m0);
} else if (fx == 3) { // shift only
return fx_shift(vUV, previous, previous, seed, b1, f1, b2, f2, b3, f3, m0);
} else if (fx == 4) {
return fx_4(vUV, previous, feedback, seed, b1, f1, b2, f2, b3, f3, m0);
return fx_colorize(vUV, previous, seed, b1, f1, b2, f2, b3, f3, m0);
} else if (fx == 5) {
return fx_5(vUV, previous, feedback, seed, b1, f1, b2, f2, b3, f3, m0);
return fx_quantize(vUV, previous, seed, b1, f1, b2, f2, b3, f3, m0);
} else if (fx == 6) {
return fx_6(vUV, previous, feedback, seed, b1, f1, b2, f2, b3, f3, m0);
return fx_dithering(vUV, previous, seed, b1, f1, b2, f2, b3, f3, m0);
} else if (fx == 7) {
return fx_7(vUV, previous, feedback, seed, b1, f1, b2, f2, b3, f3, m0);
return fx_tv(vUV, previous, seed, b1, f1, b2, f2, b3, f3, m0);
} else if (fx == 8) {
return fx_8(vUV, previous, feedback, seed, b1, f1, b2, f2, b3, f3, m0);
return fx_kaleidoscope(vUV, previous, seed, b1, f1, b2, f2, b3, f3, m0);
} else if (fx == 9) {
return fx_9(vUV, previous, feedback, seed, b1, f1, b2, f2, b3, f3, m0);
return fx_cp437(vUV, previous, seed, b1, f1, b2, f2, b3, f3, m0);
} else if (fx == 10) {
return fx_10(vUV, previous, feedback, seed, b1, f1, b2, f2, b3, f3, m0);
return fx_lens(vUV, previous, seed, b1, f1, b2, f2, b3, f3, m0);
} else if (fx == 11) {
return fx_11(vUV, previous, feedback, seed, b1, f1, b2, f2, b3, f3, m0);
return fx_spill(vUV, previous, 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);
return fx_game_of_life(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);
return fx_sobel(vUV, previous, seed, b1, f1, b2, f2, b3, f3, m0);
} else {
return fx_14(vUV, previous, feedback, seed, b1, f1, b2, f2, b3, f3, m0);
return fx_isometric(vUV, previous, seed, b1, f1, b2, f2, b3, f3, m0);
}
}
+28 -47
View File
@@ -38,14 +38,7 @@ vec4 src_thru(vec2 vUV, sampler2D tex, int seed, vec3 b1, vec2 f1, vec3 b2, vec2
return vec4(c, 1.);
}
// SRC 1: feedback + thru
vec4 src_1(vec2 vUV, sampler2D self, int seed, vec3 b1, vec2 f1, vec3 b2, vec2 f2, vec3 b3, vec2 f3)
{
return src_thru(vUV, iTex0, seed, b1, f1, b2, f2, b3, f3);
}
// SRC 2 : lines
vec4 src_2(vec2 vUV, sampler2D self, int seed, vec3 b1, vec2 f1, vec3 b2, vec2 f2, vec3 b3, vec2 f3)
vec4 src_lines(vec2 vUV, int seed, vec3 b1, vec2 f1, vec3 b2, vec2 f2, vec3 b3, vec2 f3)
{
// start
@@ -71,8 +64,7 @@ vec4 src_2(vec2 vUV, sampler2D self, int seed, vec3 b1, vec2 f1, vec3 b2, vec2 f
return vec4(f);
}
// SRC 3 : dots
vec4 src_3(vec2 vUV, sampler2D self, int seed, vec3 b1, vec2 f1, vec3 b2, vec2 f2, vec3 b3, vec2 f3)
vec4 src_dots(vec2 vUV, int seed, vec3 b1, vec2 f1, vec3 b2, vec2 f2, vec3 b3, vec2 f3)
{
// start
@@ -101,8 +93,7 @@ vec4 src_3(vec2 vUV, sampler2D self, int seed, vec3 b1, vec2 f1, vec3 b2, vec2 f
}
// SRC 4 : bacteria
vec4 src_4(vec2 vUV, sampler2D self, int seed, vec3 b1, vec2 f1, vec3 b2, vec2 f2, vec3 b3, vec2 f3)
vec4 src_bacteria(vec2 vUV, int seed, vec3 b1, vec2 f1, vec3 b2, vec2 f2, vec3 b3, vec2 f3)
{
// start
@@ -129,8 +120,7 @@ vec4 src_4(vec2 vUV, sampler2D self, int seed, vec3 b1, vec2 f1, vec3 b2, vec2 f
return vec4(f);
}
// SRC 5 : noise
vec4 src_5(vec2 vUV, sampler2D self, int seed, vec3 b1, vec2 f1, vec3 b2, vec2 f2, vec3 b3, vec2 f3)
vec4 src_perlin(vec2 vUV, int seed, vec3 b1, vec2 f1, vec3 b2, vec2 f2, vec3 b3, vec2 f3)
{
// start
@@ -167,8 +157,7 @@ vec4 src_5(vec2 vUV, sampler2D self, int seed, vec3 b1, vec2 f1, vec3 b2, vec2 f
return vec4(f);
}
// SRC 6 : cp437
vec4 src_6(vec2 vUV, sampler2D self, int seed, vec3 b1, vec2 f1, vec3 b2, vec2 f2, vec3 b3, vec2 f3)
vec4 src_cp437(vec2 vUV, int seed, vec3 b1, vec2 f1, vec3 b2, vec2 f2, vec3 b3, vec2 f3)
{
// start
@@ -201,8 +190,7 @@ vec4 src_6(vec2 vUV, sampler2D self, int seed, vec3 b1, vec2 f1, vec3 b2, vec2 f
return vec4(f);
}
// SRC 7 : sentences
vec4 src_7(vec2 vUV, sampler2D self, int seed, vec3 b1, vec2 f1, vec3 b2, vec2 f2, vec3 b3, vec2 f3)
vec4 src_sentences(vec2 vUV, int seed, vec3 b1, vec2 f1, vec3 b2, vec2 f2, vec3 b3, vec2 f3)
{
// start
@@ -230,8 +218,7 @@ vec4 src_7(vec2 vUV, sampler2D self, int seed, vec3 b1, vec2 f1, vec3 b2, vec2 f
return vec4(f);
}
// SRC 8 : sentences repeat
vec4 src_8(vec2 vUV, sampler2D self, int seed, vec3 b1, vec2 f1, vec3 b2, vec2 f2, vec3 b3, vec2 f3)
vec4 src_sentences_repeat(vec2 vUV, int seed, vec3 b1, vec2 f1, vec3 b2, vec2 f2, vec3 b3, vec2 f3)
{
// start
@@ -265,8 +252,7 @@ vec4 src_8(vec2 vUV, sampler2D self, int seed, vec3 b1, vec2 f1, vec3 b2, vec2 f
return vec4(f);
}
// SRC 9 : dungeon
vec4 src_9(vec2 vUV, sampler2D self, int seed, vec3 b1, vec2 f1, vec3 b2, vec2 f2, vec3 b3, vec2 f3)
vec4 src_dungeon_tiles(vec2 vUV, int seed, vec3 b1, vec2 f1, vec3 b2, vec2 f2, vec3 b3, vec2 f3)
{
// start
@@ -305,8 +291,7 @@ const int dungeon_characters[] = int[DUNGEON_CHARACTERS](
0x09, 0x0A, 0x19, 0x1A, 0x1B, 0x0C, 0x21, 0x22, 0x23, 0x08, 0x0B
);
// SRC 10 : SCROLLER
vec4 src_10(vec2 vUV, sampler2D self, int seed, vec3 b1, vec2 f1, vec3 b2, vec2 f2, vec3 b3, vec2 f3)
vec4 src_scroller(vec2 vUV, int seed, vec3 b1, vec2 f1, vec3 b2, vec2 f2, vec3 b3, vec2 f3)
{
// start
@@ -385,8 +370,7 @@ vec4 src_10(vec2 vUV, sampler2D self, int seed, vec3 b1, vec2 f1, vec3 b2, vec2
return vec4(f);
}
// SRC 11 : isometric grid
vec4 src_11(vec2 vUV, sampler2D self, int seed, vec3 b1, vec2 f1, vec3 b2, vec2 f2, vec3 b3, vec2 f3)
vec4 src_isometric_grid(vec2 vUV, int seed, vec3 b1, vec2 f1, vec3 b2, vec2 f2, vec3 b3, vec2 f3)
{
// start
@@ -437,8 +421,7 @@ vec4 src_11(vec2 vUV, sampler2D self, int seed, vec3 b1, vec2 f1, vec3 b2, vec2
return vec4(f);
}
// SRC 12 : Scales
vec4 src_12(vec2 vUV, sampler2D self, int seed, vec3 b1, vec2 f1, vec3 b2, vec2 f2, vec3 b3, vec2 f3)
vec4 src_scales(vec2 vUV, int seed, vec3 b1, vec2 f1, vec3 b2, vec2 f2, vec3 b3, vec2 f3)
{
// start
@@ -480,8 +463,7 @@ vec4 src_12(vec2 vUV, sampler2D self, int seed, vec3 b1, vec2 f1, vec3 b2, vec2
return vec4(f);
}
// SRC 13 : Credenza
vec4 src_13(vec2 vUV, sampler2D self, int seed, vec3 b1, vec2 f1, vec3 b2, vec2 f2, vec3 b3, vec2 f3)
vec4 src_credenza(vec2 vUV, int seed, vec3 b1, vec2 f1, vec3 b2, vec2 f2, vec3 b3, vec2 f3)
{
// start
@@ -512,8 +494,7 @@ vec4 src_13(vec2 vUV, sampler2D self, int seed, vec3 b1, vec2 f1, vec3 b2, vec2
return vec4(f);
}
// SRC 14 : Fire
vec4 src_14(vec2 vUV, sampler2D self, int seed, vec3 b1, vec2 f1, vec3 b2, vec2 f2, vec3 b3, vec2 f3)
vec4 src_fire(vec2 vUV, sampler2D self, int seed, vec3 b1, vec2 f1, vec3 b2, vec2 f2, vec3 b3, vec2 f3)
{
// start
@@ -563,34 +544,34 @@ vec4 src_stage(int src, vec2 vUV, sampler2D self, int seed, vec3 b1, vec2 f1, ve
src = int(randTime(seed + 100.) * 14.) + 1;
}
if (src == 1) {
return src_1(vUV, self, seed, b1, f1, b2, f2, b3, f3);
if (src == 1) { // feedback
return src_thru(vUV, iTex0, seed, b1, f1, b2, f2, b3, f3);
} else if (src == 2) {
return src_2(vUV, self, seed, b1, f1, b2, f2, b3, f3);
return src_lines(vUV, seed, b1, f1, b2, f2, b3, f3);
} else if (src == 3) {
return src_3(vUV, self, seed, b1, f1, b2, f2, b3, f3);
return src_dots(vUV, seed, b1, f1, b2, f2, b3, f3);
} else if (src == 4) {
return src_4(vUV, self, seed, b1, f1, b2, f2, b3, f3);
return src_bacteria(vUV, seed, b1, f1, b2, f2, b3, f3);
} else if (src == 5) {
return src_5(vUV, self, seed, b1, f1, b2, f2, b3, f3);
return src_perlin(vUV, seed, b1, f1, b2, f2, b3, f3);
} else if (src == 6) {
return src_6(vUV, self, seed, b1, f1, b2, f2, b3, f3);
return src_cp437(vUV, seed, b1, f1, b2, f2, b3, f3);
} else if (src == 7) {
return src_7(vUV, self, seed, b1, f1, b2, f2, b3, f3);
return src_sentences(vUV, seed, b1, f1, b2, f2, b3, f3);
} else if (src == 8) {
return src_8(vUV, self, seed, b1, f1, b2, f2, b3, f3);
return src_sentences_repeat(vUV, seed, b1, f1, b2, f2, b3, f3);
} else if (src == 9) {
return src_9(vUV, self, seed, b1, f1, b2, f2, b3, f3);
return src_dungeon_tiles(vUV, seed, b1, f1, b2, f2, b3, f3);
} else if (src == 10) {
return src_10(vUV, self, seed, b1, f1, b2, f2, b3, f3);
return src_scroller(vUV, seed, b1, f1, b2, f2, b3, f3);
} else if (src == 11) {
return src_11(vUV, self, seed, b1, f1, b2, f2, b3, f3);
return src_isometric_grid(vUV, seed, b1, f1, b2, f2, b3, f3);
} else if (src == 12) {
return src_12(vUV, self, seed, b1, f1, b2, f2, b3, f3);
return src_scales(vUV, seed, b1, f1, b2, f2, b3, f3);
} else if (src == 13) {
return src_13(vUV, self, seed, b1, f1, b2, f2, b3, f3);
return src_credenza(vUV, seed, b1, f1, b2, f2, b3, f3);
} else {
return src_14(vUV, self, seed, b1, f1, b2, f2, b3, f3);
return src_fire(vUV, self, seed, b1, f1, b2, f2, b3, f3);
}
}