fix: update sentences sources

This commit is contained in:
2026-11-11 18:05:19 +01:00
parent 15d434beee
commit 06e625bb27
2 changed files with 110 additions and 4 deletions
+109 -3
View File
@@ -272,7 +272,13 @@ vec4 src_sentences(vec2 vUV, int seed, vec3 b1, vec2 f1, vec3 b2, vec2 f2, vec3
// controls
float zoom = magic(f1, b1, seed + 10.);
float sentence = magic_reverse(f2, b2, seed + 20.);
vec2 sentence_ctrl = magic_f(f2, b2, seed + 20.);
vec3 sentence_ctrl_b = magic_b(b2, seed + 20.);
float sentence = sentence_ctrl.x;
if (sentence_ctrl_b.y > 0) {
float sentence_rand_beats = pow(2, floor((1 - sentence_ctrl.y) * 5) - 2);
sentence = mod(sentence + rand(seed + floor(iBeats / sentence_rand_beats)), 1);
}
float h_delta = magic(f3, b3, seed + 30.);
vec3 h_delta_b = magic_b(b3, seed + 30.);
@@ -286,6 +292,8 @@ vec4 src_sentences(vec2 vUV, int seed, vec3 b1, vec2 f1, vec3 b2, vec2 f2, vec3
uv2.y = mix(uv2.y, mod(uv2.y, 1.), h_delta_b.x);
float f = cp437_sentence(uv2, vec2(-float(cp437_sentences_lengths[s]) * .5, 0.), s);
f *= (1. - abs(floor(uv2.y) * .125)) * (1. - abs(floor(uv2.y) * .125));
return vec4(f);
}
@@ -300,7 +308,13 @@ vec4 src_sentences_repeat(vec2 vUV, int seed, vec3 b1, vec2 f1, vec3 b2, vec2 f2
// controls
float h_shift = magic(f1, b1, seed + 10.);
float sentence = magic_reverse(f2, b2, seed + 20.);
vec2 sentence_ctrl = magic_f(f2, b2, seed + 20.);
vec3 sentence_ctrl_b = magic_b(b2, seed + 20.);
float sentence = sentence_ctrl.x;
if (sentence_ctrl_b.y > 0) {
float sentence_rand_beats = pow(2, floor((1 - sentence_ctrl.y) * 5) - 2);
sentence = mod(sentence + rand(seed + floor(iBeats / sentence_rand_beats)), 1);
}
float h_delta = magic(f3, b3, seed + 30.);
vec3 h_delta_b = magic_b(b3, seed + 30.);
@@ -356,6 +370,98 @@ vec4 src_dungeon_tiles(vec2 vUV, int seed, vec3 b1, vec2 f1, vec3 b2, vec2 f2, v
return vec4(f);
}
vec4 src_dungeon_maze(vec2 vUV, int seed, vec3 b1, vec2 f1, vec3 b2, vec2 f2, vec3 b3, vec2 f3)
{
// start
vec2 uv0 = vUV.st;
float ratio = iResolution.x / iResolution.y;
vec2 uv1 = (uv0 - 0.5) * vec2(ratio, 1.);
// controls
float zoom = magic(f1, b1, seed + 10.) * 20 + 10;
float thing_chances = magic(f2, b2, seed + 20.);
float wall_chances = magic(f3, b3, seed + 30.);
if (magic_b(b3, seed + 30.).x == 0.) {
wall_chances = 0.5;
}
if (magic_b(b2, seed + 20.).x == 0.) {
thing_chances = 0.1;
}
// logic
vec2 uv2 = uv1 * zoom + vec2(iBeats * 4, seed);
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 (wall_l && wall_t && wall_tl) {
f += dungeon_at(uv3 * 3, vec2(0, 0), 0xBB);
}
if (wall_l) {
f += dungeon_at(uv3 * 3, vec2(0, 1), 0xBB);
}
if (wall_l && wall_b && wall_bl) {
f += dungeon_at(uv3 * 3, vec2(0, 2), 0xBB);
}
if (wall_t) {
f += dungeon_at(uv3 * 3, vec2(1, 0), 0xBB);
}
f += dungeon_at(uv3 * 3, vec2(1, 1), 0xBB);
if (wall_b) {
f += dungeon_at(uv3 * 3, vec2(1, 2), 0xBB);
}
if (wall_r && wall_t && wall_tr) {
f += dungeon_at(uv3 * 3, vec2(2, 0), 0xBB);
}
if (wall_r) {
f += dungeon_at(uv3 * 3, vec2(2, 1), 0xBB);
}
if (wall_r && wall_b && wall_br) {
f += dungeon_at(uv3 * 3, vec2(2, 2), 0xBB);
}
f = min(1, f) * 0.6;
} else {
float k = 1. - smoothstep(thing_chances - 0.01, thing_chances, rand(ivec2(uv2) + seed + 10));
if (rand(ivec2(uv2) + seed + 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)));
}
}
// output
return vec4(f);
}
#define DUNGEON_CHARACTERS 11
const int dungeon_characters[] = int[DUNGEON_CHARACTERS](
@@ -806,7 +912,7 @@ 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_sentences_repeat(vUV, seed, b1, f1, b2, f2, b3, f3);
return src_dungeon_maze(vUV, seed, b1, f1, b2, f2, b3, f3);
} else if (src == 9) {
return src_dungeon_tiles(vUV, seed, b1, f1, b2, f2, b3, f3);
} else if (src == 10) {