diff --git a/project/frag8.glsl b/project/frag8.glsl index 72bc5b5..5927b38 100644 --- a/project/frag8.glsl +++ b/project/frag8.glsl @@ -20,8 +20,8 @@ float s(vec2 uv, float x0, float y0) { step(-y0 - 1, -uv.y); } -const int textSRCA[] = int[5](0x49, 0x4E, 0x20, 0x41, 0x00); -const int textSRCB[] = int[5](0x49, 0x4E, 0x20, 0x42, 0x00); +const int textSRCA[] = int[5](0x53, 0x52, 0x43, 0x20, 0x41); +const int textSRCB[] = int[5](0x53, 0x52, 0x43, 0x20, 0x42); const int textFXA[] = int[5](0x46, 0x58, 0x20, 0x41, 0x00); const int textFXB[] = int[5](0x46, 0x58, 0x20, 0x42, 0x00); const int textAB[] = int[5](0x41, 0x2B, 0x42, 0x00, 0x00); diff --git a/project/inc_debug.glsl b/project/inc_debug.glsl index 891250c..517a4fb 100644 --- a/project/inc_debug.glsl +++ b/project/inc_debug.glsl @@ -84,7 +84,6 @@ vec4 debug(vec2 vUV) const int textRAND[] = int[5](0x52, 0x41, 0x4E, 0x44, 0x00); const int textSRC[] = int[5](0x53, 0x52, 0x43, 0x00, 0x00); const int textFX[] = int[5](0x46, 0x58, 0x00, 0x00, 0x00); - const int textIN[] = int[5](0x49, 0x4E, 0x00, 0x00, 0x00); const int textMFX[] = int[5](0x4D, 0x46, 0x58, 0x00, 0x00); vec2 uv2 = uv1; diff --git a/project/inc_src.glsl b/project/inc_src.glsl index 5f5da05..48f3f90 100644 --- a/project/inc_src.glsl +++ b/project/inc_src.glsl @@ -394,22 +394,22 @@ vec4 src_dungeon_maze(vec2 vUV, int seed, vec3 b1, vec2 f1, vec3 b2, vec2 f2, ve // logic - vec2 uv2 = uv1 * zoom + vec2(iBeats * 4, seed); + vec2 uv2 = uv1 * zoom + vec2(iBeats * 4 + seed, 0) + 1000.; ivec2 iuv2 = ivec2(uv2); vec2 uv3 = fract(uv2); float f = 0; - if (rand(ivec2(uv2) + 0.5 + seed) >= wall_chances) { - bool wall_t = rand(ivec2(uv2 + vec2(0, -1)) + 0.5 + seed) >= wall_chances; - bool wall_b = rand(ivec2(uv2 + vec2(0, 1)) + 0.5 + seed) >= wall_chances; - bool wall_l = rand(ivec2(uv2 + vec2(-1, 0)) + 0.5 + seed) >= wall_chances; - bool wall_r = rand(ivec2(uv2 + vec2(1, 0)) + 0.5 + seed) >= wall_chances; - bool wall_tr = rand(ivec2(uv2 + vec2(1, -1)) + 0.5 + seed) >= wall_chances; - bool wall_tl = rand(ivec2(uv2 + vec2(-1, -1)) + 0.5 + seed) >= wall_chances; - bool wall_br = rand(ivec2(uv2 + vec2(1, 1)) + 0.5 + seed) >= wall_chances; - bool wall_bl = rand(ivec2(uv2 + vec2(-1, 1)) + 0.5 + seed) >= wall_chances; + if (rand(ivec2(uv2) + 0.5) >= wall_chances) { + bool wall_t = rand(ivec2(uv2 + vec2(0, -1)) + 0.5) >= wall_chances; + bool wall_b = rand(ivec2(uv2 + vec2(0, 1)) + 0.5) >= wall_chances; + bool wall_l = rand(ivec2(uv2 + vec2(-1, 0)) + 0.5) >= wall_chances; + bool wall_r = rand(ivec2(uv2 + vec2(1, 0)) + 0.5) >= wall_chances; + bool wall_tr = rand(ivec2(uv2 + vec2(1, -1)) + 0.5) >= wall_chances; + bool wall_tl = rand(ivec2(uv2 + vec2(-1, -1)) + 0.5) >= wall_chances; + bool wall_br = rand(ivec2(uv2 + vec2(1, 1)) + 0.5) >= wall_chances; + bool wall_bl = rand(ivec2(uv2 + vec2(-1, 1)) + 0.5) >= wall_chances; if (wall_l && wall_t && wall_tl) { f += dungeon_at(uv3 * 3, vec2(0, 0), 0xBB); @@ -448,9 +448,9 @@ vec4 src_dungeon_maze(vec2 vUV, int seed, vec3 b1, vec2 f1, vec3 b2, vec2 f2, ve f = min(1, f) * 0.6; } else { - float k = 1. - smoothstep(thing_chances - 0.01, thing_chances, rand(ivec2(uv2) + seed + 10)); + float k = 1. - smoothstep(thing_chances - 0.01, thing_chances, rand(ivec2(uv2) + 10)); - if (rand(ivec2(uv2) + seed + 20) > 0.75) { + if (rand(ivec2(uv2) + 20) > 0.75) { f += k * dungeon_at(uv3 * 1.2, vec2(.1, .1 + .1 * abs(sin(iBeats * PI))), 0x01 + int(36 * rand(ivec2(uv2) + seed + 30))); } else { f += k * 0.8 * dungeon_at(uv3 * 1.4, vec2(.2), 0x25 + int(36 * rand(ivec2(uv2) + seed + 40))); @@ -912,9 +912,9 @@ vec4 src_stage(int src, vec2 vUV, sampler2D self, int seed, vec3 b1, vec2 f1, ve } else if (src == 7) { return src_sentences(vUV, seed, b1, f1, b2, f2, b3, f3); } else if (src == 8) { - return src_dungeon_maze(vUV, 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_dungeon_tiles(vUV, seed, b1, f1, b2, f2, b3, f3); + return src_dungeon_maze(vUV, seed, b1, f1, b2, f2, b3, f3); } else if (src == 10) { return src_scroller(vUV, seed, b1, f1, b2, f2, b3, f3); } else if (src == 11) {