diff --git a/project/inc_src.glsl b/project/inc_src.glsl index b28afdc..d11ae0d 100644 --- a/project/inc_src.glsl +++ b/project/inc_src.glsl @@ -299,7 +299,9 @@ vec4 src_9(vec2 vUV, sampler2D self, int seed, vec3 b1, vec2 f1, vec3 b2, vec2 f return vec4(f); } -const int dungeon_characters[] = int[11]( +#define DUNGEON_CHARACTERS 11 + +const int dungeon_characters[] = int[DUNGEON_CHARACTERS]( 0x09, 0x0A, 0x19, 0x1A, 0x1B, 0x0C, 0x21, 0x22, 0x23, 0x08, 0x0B ); @@ -316,7 +318,8 @@ vec4 src_10(vec2 vUV, sampler2D self, int seed, vec3 b1, vec2 f1, vec3 b2, vec2 float zoom = magic(f1, b1, seed + 10.) * 5. + 5.; float slope = magic(f2, b2, seed + 20.); - float character = magic(f3, b3, seed + 30.) * 10; + vec2 character_f = magic_f(f3, b3, seed + 30.); + vec3 character_b = magic_b(b3, seed + 30.); // logic @@ -330,18 +333,54 @@ vec4 src_10(vec2 vUV, sampler2D self, int seed, vec3 b1, vec2 f1, vec3 b2, vec2 vec2 uv3 = uv2 + vec2(iBeats * 4., 0); vec2 iuv3 = ivec2(uv3); - int code = 0xA9; - bool bridge = mod(iuv3.x, 40) > 30.; + float f = 0; + + // terrain + + int terrain_code = 0xA9; + bool bridge = rand(int(iuv3.x * 0.1) + seed) > 0.75; if (iuv3.y < -1) { - code = bridge ? 0xA9 : 0x9F; + terrain_code = bridge ? 0xA9 : 0x9F; } else if (iuv3.y == -1) { - code = bridge ? 0x9A : 0xA0; + terrain_code = bridge ? 0x9A : (rand(iuv3 + seed) > 0.8 ? 0xA1 : 0xA0); } - float f = dungeon(fract(uv3), code) ? 1. : 0.; + f += dungeon(fract(uv3), terrain_code) ? mix(1., 0.75, character_b.x) : 0.; - f += dungeon_at(uv2, vec2(-0.5, -1 + abs(sin(iBeats * PI))), dungeon_characters[int(character)]); + // character + + int character_code = dungeon_characters[int(character_f.x * (DUNGEON_CHARACTERS - 1))]; + vec2 character_pos = vec2(-0.5, -1 + abs(sin(iBeats * PI) * (1. + character_f.y))); + + f += dungeon_at(uv2, character_pos, character_code); + + if (character_b.y > 0.) { + f += dungeon_at(uv2 * 1.5, character_pos + vec2(2, -0.5), character_code); + f += dungeon_at(uv2 * 1.5, character_pos + vec2(-2, -0.5), character_code); + } + + // bat + + bool bat = rand(iuv3.x + seed + 123) > 0.95; + float bat_phase = rand(iuv3.x + seed + 456); + float bat_amp = rand(iuv3.x + seed + 789) * 0.5 + 1.; + float bat_size = 1 + rand(iuv3.x + seed + 012) * 1; + + if (bat) { + f += mix(1., 0.5, character_b.x) * dungeon_at(bat_size * vec2(fract(uv3.x), uv3.y + bat_amp * sin((iBeats + bat_phase) * PI * 0.5)), vec2(0, 3 * bat_size), 0x1D); + } + + // item + + bool item = mod(iuv3.x, 4.) == 0 && rand(iuv3.x + seed + 2314) > 0.9; + int item_code = 0x25 + int(35 * rand(iuv3.x + seed + 1234)); + + if (item) { + f += smoothstep(-0.2, 0.2, uv2.x) * dungeon_at(1.5 * vec2(fract(uv3.x), uv3.y), vec2(0, -1.5), item_code); + } + + // output return vec4(f); }