From f5afa50a0063c25024c3a1bff5ef39ce3834ceb0 Mon Sep 17 00:00:00 2001 From: klemek Date: Wed, 26 Aug 2026 18:44:16 +0200 Subject: [PATCH] wip --- .gitignore | 2 + forge_default_save.txt | 123 ----------------------------------------- project/inc_fx.glsl | 4 +- 3 files changed, 4 insertions(+), 125 deletions(-) create mode 100644 .gitignore delete mode 100644 forge_default_save.txt diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..2abeff0 --- /dev/null +++ b/.gitignore @@ -0,0 +1,2 @@ +error.glsl +forge_default_save.txt diff --git a/forge_default_save.txt b/forge_default_save.txt deleted file mode 100644 index e851335..0000000 --- a/forge_default_save.txt +++ /dev/null @@ -1,123 +0,0 @@ -tempo=60 -page=0 -selected=3 -seed_0=355 -state_0=5 -seed_1=247 -state_1=11 -seed_2=74 -state_2=10 -seed_3=251 -state_3=3 -seed_4=799 -state_4=5 -seed_5=80 -state_5=3 -active_0=1 -active_1=0 -active_2=0 -value_0_x=127 -value_0_y=127 -value_0_z=127 -value_1_x=34 -value_1_y=59 -value_1_z=127 -value_2_x=127 -value_2_y=127 -value_2_z=0 -value_3_x=56 -value_3_y=32 -value_3_z=69 -value_4_x=0 -value_4_y=127 -value_4_z=0 -value_5_x=55 -value_5_y=67 -value_5_z=18 -value_6_x=127 -value_6_y=0 -value_6_z=0 -value_7_x=75 -value_7_y=102 -value_7_z=20 -value_8_x=0 -value_8_y=0 -value_8_z=127 -value_9_x=89 -value_9_y=93 -value_9_z=72 -value_10_x=127 -value_10_y=0 -value_10_z=127 -value_11_x=92 -value_11_y=49 -value_11_z=69 -value_12_x=127 -value_12_y=127 -value_12_z=127 -value_13_x=72 -value_13_y=61 -value_13_z=104 -value_14_x=0 -value_14_y=0 -value_14_z=127 -value_15_x=74 -value_15_y=18 -value_15_z=63 -value_16_x=127 -value_16_y=127 -value_16_z=0 -value_17_x=127 -value_17_y=85 -value_17_z=6 -value_18_x=110 -value_18_y=26 -value_18_z=0 -value_19_x=127 -value_19_y=0 -value_19_z=0 -value_20_x=17 -value_20_y=34 -value_20_z=53 -value_21_x=0 -value_21_y=0 -value_21_z=0 -value_22_x=39 -value_22_y=25 -value_22_z=112 -value_23_x=0 -value_23_y=127 -value_23_z=0 -value_24_x=49 -value_24_y=57 -value_24_z=92 -value_25_x=99 -value_25_y=53 -value_25_z=127 -value_26_x=0 -value_26_y=0 -value_26_z=127 -value_27_x=30 -value_27_y=82 -value_27_z=25 -value_28_x=127 -value_28_y=0 -value_28_z=0 -value_29_x=115 -value_29_y=126 -value_29_z=84 -value_30_x=127 -value_30_y=127 -value_30_z=0 -value_31_x=4 -value_31_y=122 -value_31_z=100 -value_32_x=52 -value_32_y=6 -value_32_z=127 -value_33_x=0 -value_33_y=0 -value_33_z=127 -value_34_x=127 -value_34_y=15 -value_34_z=0 diff --git a/project/inc_fx.glsl b/project/inc_fx.glsl index b7b05e0..255e543 100644 --- a/project/inc_fx.glsl +++ b/project/inc_fx.glsl @@ -347,7 +347,7 @@ subroutine(fx_stage_sub) vec4 fx_11(vec2 vUV, sampler2D previous, sampler2D feed // FX 12 : Game Of Life subroutine(fx_stage_sub) 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) { - return texture(previous, uv0); // TODO disabled + return texture(previous, vUV); // TODO disabled // start vec2 uv0 = vUV.st; @@ -527,7 +527,7 @@ subroutine(fx_stage_sub) vec4 fx_14(vec2 vUV, sampler2D previous, sampler2D feed // FX 15 : Random subroutine(fx_stage_sub) vec4 fx_15(vec2 vUV, sampler2D previous, sampler2D feedback, int seed, vec3 b1, vec2 f1, vec3 b2, vec2 f2, vec3 b3, vec2 f3, vec3 m0) { - return texture(previous, uv0); // TODO disabled + return texture(previous, vUV); // TODO disabled int fx = int(randTime(seed + 100) * 14); if (fx == 0) {