From f8371d479f841f62fe5e5ce096dec56b383012f4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petri=20J=C3=A4rvisalo?= Date: Mon, 29 Jul 2024 19:33:06 +0300 Subject: [PATCH] =?UTF-8?q?lyhyemm=C3=A4t=20musat?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- 4klang.asm | 75 ++++------- 4klang.h | 4 +- 4klang.inc | 4 +- 4klang.yml | 48 +++---- base.config | 4 +- minified.config | 2 +- music/4k_sg_v4.xrns | Bin 0 -> 24526 bytes shader.glsl | 36 +++--- shader_minified.h | 301 ++++++++++++++++++++++---------------------- 9 files changed, 228 insertions(+), 246 deletions(-) create mode 100644 music/4k_sg_v4.xrns diff --git a/4klang.asm b/4klang.asm index 456a434..96fda11 100644 --- a/4klang.asm +++ b/4klang.asm @@ -1,4 +1,4 @@ -%define SU_LENGTH_IN_SAMPLES 3740512 +%define SU_LENGTH_IN_SAMPLES 3010656 %define SU_SAMPLE_RATE 44100 %define SU_BPM 116. @@ -118,7 +118,7 @@ su_render_sampleloop: ; loop through every sample in the row jl su_render_sampleloop pop eax ; eax = Row, Stack: GlobalTick, RandSeed, VoiceTrackBitmask, edi, esi, ebp, esp, ebx, edx, ecx, eax, retaddr_su_render_song, OutputBufPtr ; Stack: pushad ptr inc eax - cmp eax, 656 + cmp eax, 528 jl su_render_rowloop ; rewind the stack the entropy of multiple pop eax is probably lower than add pop eax ; eax = GlobalTick, Stack: RandSeed, VoiceTrackBitmask, edi, esi, ebp, esp, ebx, edx, ecx, eax, retaddr_su_render_song, OutputBufPtr @@ -183,7 +183,7 @@ su_update_voices_skipreset: su_update_voices_nexttrack: pop ebx ; ebx=first voice of next instrument, Stack: ptrnrow pop edx ; edx=patrnrow - add esi, 41 + add esi, 33 inc ebp cmp ebp,su_synth_obj + 10 jl su_update_voices_trackloop @@ -868,10 +868,7 @@ su_patterns: db 23,0,0,0,23,23,23,23,0,0,23,0,0,23,0,0 db 28,0,0,0,28,28,28,30,0,0,30,0,0,30,0,0 db 32,0,0,0,32,32,32,32,0,0,32,0,0,32,0,0 - db 26,1,1,1,1,1,1,1,1,1,25,1,1,1,1,1 - db 23,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1 - db 28,1,1,1,1,1,1,1,30,1,1,1,1,1,32,1 - db 21,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1 + db 33,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 db 33,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1 db 45,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1 db 45,0,0,0,45,45,45,45,0,0,45,0,0,45,0,0 @@ -880,42 +877,30 @@ su_patterns: db 35,0,0,0,35,35,35,35,0,0,35,0,0,35,0,0 db 40,0,0,0,40,40,40,42,0,0,42,0,0,42,0,0 db 47,0,0,0,47,47,47,47,0,0,47,0,0,47,0,0 - db 38,1,1,1,1,1,1,1,1,1,37,1,1,1,1,1 - db 35,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1 - db 40,1,1,1,1,1,1,1,42,1,1,1,1,1,44,1 + db 45,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 + db 21,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1 db 40,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1 db 44,0,0,0,44,44,44,44,0,0,44,0,0,44,0,0 - db 57,1,1,1,1,1,1,1,1,1,57,1,1,1,1,1 - db 57,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1 - db 59,1,1,1,1,1,1,1,59,1,1,1,1,1,59,1 + db 40,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 db 49,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1 db 49,0,0,0,49,49,49,49,0,0,49,0,0,49,0,0 db 42,0,0,0,42,42,42,42,0,0,42,0,0,42,0,0 db 59,0,0,0,59,59,59,59,0,0,59,0,0,59,0,0 - db 54,1,1,1,1,1,1,1,1,1,54,1,1,1,1,1 - db 54,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1 - db 56,1,1,1,1,1,1,1,56,1,1,1,1,1,56,1 + db 49,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 db 64,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1 db 1,1,1,1,50,1,52,1,53,1,1,1,55,1,1,1 + db 57,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1 db 65,1,1,1,1,1,1,1,1,1,1,1,1,1,52,50 db 52,1,1,1,1,1,1,1,57,1,1,1,1,1,1,1 db 52,0,0,0,52,52,52,52,0,0,52,0,0,52,0,0 db 57,0,0,0,57,57,57,57,0,0,57,0,0,57,0,0 - db 62,1,1,1,1,1,1,1,1,1,62,1,1,1,1,1 - db 62,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1 - db 64,1,1,1,1,1,1,1,64,1,1,1,1,1,64,1 + db 52,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 db 33,1,1,1,33,33,33,33,1,1,33,1,1,33,1,1 db 32,1,1,1,32,32,32,32,1,1,32,1,1,32,1,1 db 30,1,1,1,30,30,30,30,1,1,30,1,1,30,1,1 - db 50,1,1,1,50,1,1,1,50,1,1,1,50,1,1,1 - db 52,1,1,1,52,1,1,1,52,1,1,1,52,1,1,1 - db 52,1,1,1,52,1,1,1,0,0,0,0,0,0,0,0 db 45,1,1,1,45,45,45,45,1,1,45,1,1,45,1,1 db 44,1,1,1,44,44,44,44,1,1,44,1,1,44,1,1 db 42,1,1,1,42,42,42,42,1,1,42,1,1,42,1,1 - db 62,1,1,1,62,1,1,1,62,1,1,1,62,1,1,1 - db 64,1,1,1,64,1,1,1,64,1,1,1,64,1,1,1 - db 64,1,1,1,64,1,1,1,0,0,0,0,0,0,0,0 db 0,0,0,0,0,0,0,0,0,0,0,0,69,1,1,1 db 73,1,1,1,1,1,1,1,1,1,1,1,1,1,0,0 db 74,1,1,1,1,1,1,1,1,1,0,0,73,1,0,71 @@ -928,42 +913,32 @@ su_patterns: db 81,1,1,1,1,1,1,1,1,1,0,0,78,1,1,80 db 81,1,1,1,1,1,1,1,1,0,0,0,83,1,1,81 db 80,1,1,1,1,1,1,1,81,1,1,1,1,1,1,1 - db 83,1,1,1,1,1,0,0,81,1,1,1,1,1,1,83 + db 83,1,1,1,1,1,0,0,81,1,1,1,1,1,83,1 db 85,1,1,1,1,1,1,1,0,0,0,0,85,1,1,83 db 85,1,1,1,1,1,1,1,0,0,0,0,81,1,1,85 - db 83,1,1,1,1,1,1,1,81,1,1,1,1,1,83,81 - db 80,1,1,1,1,1,1,1,0,0,0,0,76,1,1,1 - db 86,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1 - db 1,1,1,1,0,0,0,0,86,1,1,1,85,1,1,1 - db 83,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1 - db 1,1,1,1,0,0,0,0,83,1,1,1,88,1,1,1 - db 1,1,1,1,1,1,0,0,86,1,1,1,88,1,1,1 - db 88,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1 - db 1,1,1,1,0,0,0,0,76,1,1,1,1,1,1,1 + db 83,1,1,1,1,1,1,1,81,1,1,1,1,1,1,1 + db 80,1,1,1,1,1,1,1,0,0,0,0,80,1,1,1 db 81,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1 - db 1,1,1,1,0,0,0,0,0,0,0,0,0,0,0,0 db 62,1,1,1,62,62,62,62,1,1,62,1,1,62,1,1 - db 62,1,1,1,62,1,1,1,62,1,1,1,62,1,62,62 - db 62,1,1,1,62,1,1,1,62,1,1,1,62,1,62,1 - db 62,1,1,1,62,1,1,1,1,1,1,1,1,1,1,1 + db 62,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1 db 60,1,1,1,60,1,1,1,60,1,1,1,60,1,1,1 - db 60,1,1,1,60,1,1,1,1,1,1,1,1,1,1,1 + db 60,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1 ;------------------------------------------------------------------------------- ; Tracks ;------------------------------------------------------------------------------- section .su_tracks data align=1 su_tracks: - db 16,1,1,2,3,4,5,6,1,7,7,7,7,7,7,7,7,7,7,8,8,9,10,11,12,7,7,8,8,13,14,15,1,13,14,15,1,0,1,1,1 - db 17,1,1,1,1,1,18,1,1,19,19,19,19,19,19,19,19,19,19,20,20,21,22,23,24,19,19,20,20,25,26,27,1,25,26,27,1,0,1,1,1 - db 0,28,1,1,1,1,28,1,1,20,20,20,20,20,20,20,20,20,20,24,24,19,19,24,29,20,20,24,24,30,31,32,1,30,31,32,1,0,1,1,1 - db 0,1,33,1,1,1,33,1,1,34,34,34,34,34,34,34,34,34,34,29,29,35,35,29,36,34,34,29,29,37,38,39,1,37,38,39,1,0,1,1,1 - db 0,1,1,40,41,31,42,43,1,44,44,44,44,44,44,44,44,44,44,36,36,45,45,36,1,44,44,36,36,46,47,48,1,46,47,48,1,0,1,1,1 - db 0,1,1,1,1,1,1,1,1,49,49,49,49,49,49,49,49,49,49,50,50,51,51,50,50,49,49,50,50,52,52,53,53,52,52,53,54,1,1,1,1 - db 0,1,1,1,1,1,1,1,1,55,55,55,55,55,55,55,55,55,55,56,56,57,57,56,56,55,55,56,56,58,58,59,59,58,58,59,60,1,1,1,1 - db 0,1,1,1,1,1,1,1,1,1,1,1,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,78,82,83,84,85,86,1,1 - db 0,1,1,1,1,1,1,1,1,87,87,87,87,87,87,87,87,87,87,87,87,87,87,87,87,87,87,87,87,88,89,88,89,88,89,88,90,1,1,1,1 - db 0,1,1,1,1,1,1,1,1,91,91,91,91,91,91,91,91,91,91,91,91,91,91,91,91,91,91,91,91,91,91,91,91,91,91,91,92,1,1,1,1 + db 23,1,1,2,3,4,5,6,1,7,7,7,7,7,7,7,7,7,7,8,8,9,10,11,12,7,7,8,8,7,7,13,1 + db 14,1,1,1,1,1,15,1,1,16,16,16,16,16,16,16,16,16,16,17,17,18,19,20,21,16,16,17,17,16,16,22,1 + db 0,24,1,1,1,1,24,1,1,17,17,17,17,17,17,17,17,17,17,21,21,16,16,21,25,17,17,21,21,17,17,26,1 + db 0,1,27,1,1,1,27,1,1,28,28,28,28,28,28,28,28,28,28,25,25,29,29,25,30,28,28,25,25,28,28,31,1 + db 0,1,1,32,33,34,35,36,1,37,37,37,37,37,37,37,37,37,37,30,30,38,38,30,1,37,37,30,30,37,37,39,1 + db 0,1,1,1,1,1,1,1,1,40,40,40,40,40,40,40,40,40,40,41,41,42,42,41,41,40,40,41,41,40,40,14,1 + db 0,1,1,1,1,1,1,1,1,43,43,43,43,43,43,43,43,43,43,44,44,45,45,44,44,43,43,44,44,43,43,15,1 + db 0,1,1,1,1,1,1,1,1,1,1,1,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,0,1,1 + db 0,1,1,1,1,1,1,1,1,64,64,64,64,64,64,64,64,64,64,64,64,64,64,64,64,64,64,64,64,64,64,65,1 + db 0,1,1,1,1,1,1,1,1,66,66,66,66,66,66,66,66,66,66,66,66,66,66,66,66,66,66,66,66,66,66,67,1 ;------------------------------------------------------------------------------- ; Sample offsets ;------------------------------------------------------------------------------- diff --git a/4klang.h b/4klang.h index 896e260..0e48b4f 100644 --- a/4klang.h +++ b/4klang.h @@ -3,14 +3,14 @@ #define SU_RENDER_H #define SU_CHANNEL_COUNT 2 -#define SU_LENGTH_IN_SAMPLES 3740512 +#define SU_LENGTH_IN_SAMPLES 3010656 #define SU_BUFFER_LENGTH (SU_LENGTH_IN_SAMPLES*SU_CHANNEL_COUNT) #define SU_SAMPLE_RATE 44100 #define SU_BPM 116 #define SU_ROWS_PER_BEAT 4 #define SU_ROWS_PER_PATTERN 16 -#define SU_LENGTH_IN_PATTERNS 41 +#define SU_LENGTH_IN_PATTERNS 33 #define SU_LENGTH_IN_ROWS (SU_LENGTH_IN_PATTERNS*SU_PATTERN_SIZE) #define SU_SAMPLES_PER_ROW (SU_SAMPLE_RATE*60/(SU_BPM*SU_ROWS_PER_BEAT)) diff --git a/4klang.inc b/4klang.inc index 18b2af3..01137ca 100644 --- a/4klang.inc +++ b/4klang.inc @@ -3,14 +3,14 @@ %define PLAYER_INC %define SU_CHANNEL_COUNT 2 -%define SU_LENGTH_IN_SAMPLES 3740512 +%define SU_LENGTH_IN_SAMPLES 3010656 %define SU_BUFFER_LENGTH (SU_LENGTH_IN_SAMPLES*SU_CHANNEL_COUNT) %define SU_SAMPLE_RATE 44100 %define SU_BPM 116 %define SU_ROWS_PER_BEAT 4 %define SU_ROWS_PER_PATTERN 16 -%define SU_LENGTH_IN_PATTERNS 41 +%define SU_LENGTH_IN_PATTERNS 33 %define SU_LENGTH_IN_ROWS (SU_LENGTH_IN_PATTERNS*SU_PATTERN_SIZE) %define SU_SAMPLES_PER_ROW (SU_SAMPLE_RATE*60/(SU_BPM*SU_ROWS_PER_BEAT)) %define SU_SAMPLE_SIZE 2 diff --git a/4klang.yml b/4klang.yml index c344813..4fe6ad7 100644 --- a/4klang.yml +++ b/4klang.yml @@ -3,37 +3,37 @@ rowsperbeat: 4 score: tracks: - numvoices: 1 - order: [0, -1, -1, 1, 2, 3, 4, 5, -1, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 7, 7, 8, 9, 10, 11, 6, 6, 7, 7, 12, 13, 14, -1, 12, 13, 14, -1, 15, -1, -1, -1, -1] - patterns: [[21, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1], [52, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1], [1, 1, 1, 1, 62, 1, 64, 1, 65, 1, 1, 1, 67, 1, 1, 1], [69, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1], [53, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 64, 62], [64, 1, 1, 1, 1, 1, 1, 1, 69, 1, 1, 1, 1, 1, 1, 1], [33, 0, 1, 1, 33, 33, 33, 33, 0, 1, 33, 0, 1, 33, 0, 1], [28, 0, 1, 1, 28, 28, 28, 28, 0, 1, 28, 0, 1, 28, 0, 1], [26, 0, 1, 1, 26, 26, 26, 26, 0, 1, 26, 0, 1, 26, 0, 1], [23, 0, 1, 1, 23, 23, 23, 23, 0, 1, 23, 0, 1, 23, 0, 1], [28, 0, 1, 1, 28, 28, 28, 30, 0, 1, 30, 0, 1, 30, 0, 1], [32, 0, 1, 1, 32, 32, 32, 32, 0, 1, 32, 0, 1, 32, 0, 1], [26, 1, 1, 1, 1, 1, 1, 1, 1, 1, 25, 1, 1, 1, 1, 1], [23, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1], [28, 1, 1, 1, 1, 1, 1, 1, 30, 1, 1, 1, 1, 1, 32, 1], [0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1]] + order: [0, -1, -1, 1, 2, 3, 4, 5, -1, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 7, 7, 8, 9, 10, 11, 6, 6, 7, 7, 6, 6, 12, -1] + patterns: [[21, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1], [52, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1], [1, 1, 1, 1, 62, 1, 64, 1, 65, 1, 1, 1, 67, 1, 1, 1], [69, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1], [53, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 64, 62], [64, 1, 1, 1, 1, 1, 1, 1, 69, 1, 1, 1, 1, 1, 1, 1], [33, 0, 1, 1, 33, 33, 33, 33, 0, 1, 33, 0, 1, 33, 0, 1], [28, 0, 1, 1, 28, 28, 28, 28, 0, 1, 28, 0, 1, 28, 0, 1], [26, 0, 1, 1, 26, 26, 26, 26, 0, 1, 26, 0, 1, 26, 0, 1], [23, 0, 1, 1, 23, 23, 23, 23, 0, 1, 23, 0, 1, 23, 0, 1], [28, 0, 1, 1, 28, 28, 28, 30, 0, 1, 30, 0, 1, 30, 0, 1], [32, 0, 1, 1, 32, 32, 32, 32, 0, 1, 32, 0, 1, 32, 0, 1], [33, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1]] - numvoices: 1 - order: [0, -1, -1, -1, -1, -1, 1, -1, -1, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 3, 3, 4, 5, 6, 7, 2, 2, 3, 3, 8, 9, 10, -1, 8, 9, 10, -1, 11, -1, -1, -1, -1] - patterns: [[33, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1], [45, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1], [45, 0, 1, 1, 45, 45, 45, 45, 0, 1, 45, 0, 1, 45, 0, 1], [40, 0, 1, 1, 40, 40, 40, 40, 0, 1, 40, 0, 1, 40, 0, 1], [38, 0, 1, 1, 38, 38, 38, 38, 0, 1, 38, 0, 1, 38, 0, 1], [35, 0, 1, 1, 35, 35, 35, 35, 0, 1, 35, 0, 1, 35, 0, 1], [40, 0, 1, 1, 40, 40, 40, 42, 0, 1, 42, 0, 1, 42, 0, 1], [47, 0, 1, 1, 47, 47, 47, 47, 0, 1, 47, 0, 1, 47, 0, 1], [38, 1, 1, 1, 1, 1, 1, 1, 1, 1, 37, 1, 1, 1, 1, 1], [35, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1], [40, 1, 1, 1, 1, 1, 1, 1, 42, 1, 1, 1, 1, 1, 44, 1], [0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1]] + order: [0, -1, -1, -1, -1, -1, 1, -1, -1, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 3, 3, 4, 5, 6, 7, 2, 2, 3, 3, 2, 2, 8, -1] + patterns: [[33, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1], [45, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1], [45, 0, 1, 1, 45, 45, 45, 45, 0, 1, 45, 0, 1, 45, 0, 1], [40, 0, 1, 1, 40, 40, 40, 40, 0, 1, 40, 0, 1, 40, 0, 1], [38, 0, 1, 1, 38, 38, 38, 38, 0, 1, 38, 0, 1, 38, 0, 1], [35, 0, 1, 1, 35, 35, 35, 35, 0, 1, 35, 0, 1, 35, 0, 1], [40, 0, 1, 1, 40, 40, 40, 42, 0, 1, 42, 0, 1, 42, 0, 1], [47, 0, 1, 1, 47, 47, 47, 47, 0, 1, 47, 0, 1, 47, 0, 1], [45, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1]] - numvoices: 1 - order: [-1, 0, -1, -1, -1, -1, 0, -1, -1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 2, 2, 3, 3, 2, 4, 1, 1, 2, 2, 5, 6, 7, -1, 5, 6, 7, -1, 8, -1, -1, -1, -1] - patterns: [[40, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1], [40, 0, 1, 1, 40, 40, 40, 40, 0, 1, 40, 0, 1, 40, 0, 1], [47, 0, 1, 1, 47, 47, 47, 47, 0, 1, 47, 0, 1, 47, 0, 1], [45, 0, 1, 1, 45, 45, 45, 45, 0, 1, 45, 0, 1, 45, 0, 1], [44, 0, 1, 1, 44, 44, 44, 44, 0, 1, 44, 0, 1, 44, 0, 1], [57, 1, 1, 1, 1, 1, 1, 1, 1, 1, 57, 1, 1, 1, 1, 1], [57, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1], [59, 1, 1, 1, 1, 1, 1, 1, 59, 1, 1, 1, 1, 1, 59, 1], [0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1]] + order: [-1, 0, -1, -1, -1, -1, 0, -1, -1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 2, 2, 3, 3, 2, 4, 1, 1, 2, 2, 1, 1, 5, -1] + patterns: [[40, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1], [40, 0, 1, 1, 40, 40, 40, 40, 0, 1, 40, 0, 1, 40, 0, 1], [47, 0, 1, 1, 47, 47, 47, 47, 0, 1, 47, 0, 1, 47, 0, 1], [45, 0, 1, 1, 45, 45, 45, 45, 0, 1, 45, 0, 1, 45, 0, 1], [44, 0, 1, 1, 44, 44, 44, 44, 0, 1, 44, 0, 1, 44, 0, 1], [40, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1]] - numvoices: 1 - order: [-1, -1, 0, -1, -1, -1, 0, -1, -1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 2, 2, 3, 3, 2, 4, 1, 1, 2, 2, 5, 6, 7, -1, 5, 6, 7, -1, 8, -1, -1, -1, -1] - patterns: [[49, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1], [49, 0, 1, 1, 49, 49, 49, 49, 0, 1, 49, 0, 1, 49, 0, 1], [44, 0, 1, 1, 44, 44, 44, 44, 0, 1, 44, 0, 1, 44, 0, 1], [42, 0, 1, 1, 42, 42, 42, 42, 0, 1, 42, 0, 1, 42, 0, 1], [59, 0, 1, 1, 59, 59, 59, 59, 0, 1, 59, 0, 1, 59, 0, 1], [54, 1, 1, 1, 1, 1, 1, 1, 1, 1, 54, 1, 1, 1, 1, 1], [54, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1], [56, 1, 1, 1, 1, 1, 1, 1, 56, 1, 1, 1, 1, 1, 56, 1], [0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1]] + order: [-1, -1, 0, -1, -1, -1, 0, -1, -1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 2, 2, 3, 3, 2, 4, 1, 1, 2, 2, 1, 1, 5, -1] + patterns: [[49, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1], [49, 0, 1, 1, 49, 49, 49, 49, 0, 1, 49, 0, 1, 49, 0, 1], [44, 0, 1, 1, 44, 44, 44, 44, 0, 1, 44, 0, 1, 44, 0, 1], [42, 0, 1, 1, 42, 42, 42, 42, 0, 1, 42, 0, 1, 42, 0, 1], [59, 0, 1, 1, 59, 59, 59, 59, 0, 1, 59, 0, 1, 59, 0, 1], [49, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1]] - numvoices: 1 - order: [-1, -1, -1, 0, 1, 2, 3, 4, -1, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 6, 6, 7, 7, 6, -1, 5, 5, 6, 6, 8, 9, 10, -1, 8, 9, 10, -1, 11, -1, -1, -1, -1] - patterns: [[64, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1], [1, 1, 1, 1, 50, 1, 52, 1, 53, 1, 1, 1, 55, 1, 1, 1], [57, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1], [65, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 52, 50], [52, 1, 1, 1, 1, 1, 1, 1, 57, 1, 1, 1, 1, 1, 1, 1], [52, 0, 1, 1, 52, 52, 52, 52, 0, 1, 52, 0, 1, 52, 0, 1], [59, 0, 1, 1, 59, 59, 59, 59, 0, 1, 59, 0, 1, 59, 0, 1], [57, 0, 1, 1, 57, 57, 57, 57, 0, 1, 57, 0, 1, 57, 0, 1], [62, 1, 1, 1, 1, 1, 1, 1, 1, 1, 62, 1, 1, 1, 1, 1], [62, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1], [64, 1, 1, 1, 1, 1, 1, 1, 64, 1, 1, 1, 1, 1, 64, 1], [0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1]] + order: [-1, -1, -1, 0, 1, 2, 3, 4, -1, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 6, 6, 7, 7, 6, -1, 5, 5, 6, 6, 5, 5, 8, -1] + patterns: [[64, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1], [1, 1, 1, 1, 50, 1, 52, 1, 53, 1, 1, 1, 55, 1, 1, 1], [57, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1], [65, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 52, 50], [52, 1, 1, 1, 1, 1, 1, 1, 57, 1, 1, 1, 1, 1, 1, 1], [52, 0, 1, 1, 52, 52, 52, 52, 0, 1, 52, 0, 1, 52, 0, 1], [59, 0, 1, 1, 59, 59, 59, 59, 0, 1, 59, 0, 1, 59, 0, 1], [57, 0, 1, 1, 57, 57, 57, 57, 0, 1, 57, 0, 1, 57, 0, 1], [52, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1]] - numvoices: 2 - order: [-1, -1, -1, -1, -1, -1, -1, -1, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 2, 2, 1, 1, 0, 0, 1, 1, 3, 3, 4, 4, 3, 3, 4, 5, -1, -1, -1, -1, -1] - patterns: [[33, 1, 1, 1, 33, 33, 33, 33, 1, 1, 33, 1, 1, 33, 1, 1], [32, 1, 1, 1, 32, 32, 32, 32, 1, 1, 32, 1, 1, 32, 1, 1], [30, 1, 1, 1, 30, 30, 30, 30, 1, 1, 30, 1, 1, 30, 1, 1], [50, 1, 1, 1, 50, 1, 1, 1, 50, 1, 1, 1, 50, 1, 1, 1], [52, 1, 1, 1, 52, 1, 1, 1, 52, 1, 1, 1, 52, 1, 1, 1], [52, 1, 1, 1, 52, 1, 1, 1, 0, 1, 1, 1, 1, 1, 1, 1]] + order: [-1, -1, -1, -1, -1, -1, -1, -1, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 2, 2, 1, 1, 0, 0, 1, 1, 0, 0, 3, -1] + patterns: [[33, 1, 1, 1, 33, 33, 33, 33, 1, 1, 33, 1, 1, 33, 1, 1], [32, 1, 1, 1, 32, 32, 32, 32, 1, 1, 32, 1, 1, 32, 1, 1], [30, 1, 1, 1, 30, 30, 30, 30, 1, 1, 30, 1, 1, 30, 1, 1], [33, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1]] - numvoices: 2 - order: [-1, -1, -1, -1, -1, -1, -1, -1, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 2, 2, 1, 1, 0, 0, 1, 1, 3, 3, 4, 4, 3, 3, 4, 5, -1, -1, -1, -1, -1] - patterns: [[45, 1, 1, 1, 45, 45, 45, 45, 1, 1, 45, 1, 1, 45, 1, 1], [44, 1, 1, 1, 44, 44, 44, 44, 1, 1, 44, 1, 1, 44, 1, 1], [42, 1, 1, 1, 42, 42, 42, 42, 1, 1, 42, 1, 1, 42, 1, 1], [62, 1, 1, 1, 62, 1, 1, 1, 62, 1, 1, 1, 62, 1, 1, 1], [64, 1, 1, 1, 64, 1, 1, 1, 64, 1, 1, 1, 64, 1, 1, 1], [64, 1, 1, 1, 64, 1, 1, 1, 0, 1, 1, 1, 1, 1, 1, 1]] + order: [-1, -1, -1, -1, -1, -1, -1, -1, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 2, 2, 1, 1, 0, 0, 1, 1, 0, 0, 3, -1] + patterns: [[45, 1, 1, 1, 45, 45, 45, 45, 1, 1, 45, 1, 1, 45, 1, 1], [44, 1, 1, 1, 44, 44, 44, 44, 1, 1, 44, 1, 1, 44, 1, 1], [42, 1, 1, 1, 42, 42, 42, 42, 1, 1, 42, 1, 1, 42, 1, 1], [45, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1]] - numvoices: 3 - order: [-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 17, 21, 22, 23, 24, 25, -1, -1, -1] - patterns: [[1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 69, 1, 1, 1], [73, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 1], [74, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 1, 73, 1, 0, 71], [73, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1], [1, 1, 1, 1, 0, 1, 1, 1, 73, 1, 1, 1, 1, 1, 1, 1], [81, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 83, 1, 1, 1], [85, 1, 1, 1, 1, 1, 1, 1, 83, 1, 1, 1, 1, 1, 1, 81], [80, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1], [1, 1, 1, 0, 1, 1, 1, 1, 78, 1, 1, 1, 1, 1, 1, 80], [81, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 1, 78, 1, 1, 80], [81, 1, 1, 1, 1, 1, 1, 1, 1, 0, 1, 1, 83, 1, 1, 81], [80, 1, 1, 1, 1, 1, 1, 1, 81, 1, 1, 1, 1, 1, 1, 1], [83, 1, 1, 1, 1, 1, 0, 1, 81, 1, 1, 1, 1, 1, 1, 83], [85, 1, 1, 1, 1, 1, 1, 1, 0, 1, 1, 1, 85, 1, 1, 83], [85, 1, 1, 1, 1, 1, 1, 1, 0, 1, 1, 1, 81, 1, 1, 85], [83, 1, 1, 1, 1, 1, 1, 1, 81, 1, 1, 1, 1, 1, 83, 81], [80, 1, 1, 1, 1, 1, 1, 1, 0, 1, 1, 1, 76, 1, 1, 1], [86, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1], [1, 1, 1, 1, 0, 1, 1, 1, 86, 1, 1, 1, 85, 1, 1, 1], [83, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1], [1, 1, 1, 1, 0, 1, 1, 1, 83, 1, 1, 1, 88, 1, 1, 1], [1, 1, 1, 1, 1, 1, 0, 1, 86, 1, 1, 1, 88, 1, 1, 1], [88, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1], [1, 1, 1, 1, 0, 1, 1, 1, 76, 1, 1, 1, 1, 1, 1, 1], [81, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1], [1, 1, 1, 1, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1]] + order: [-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, -1, -1] + patterns: [[1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 69, 1, 1, 1], [73, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 1], [74, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 1, 73, 1, 0, 71], [73, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1], [1, 1, 1, 1, 0, 1, 1, 1, 73, 1, 1, 1, 1, 1, 1, 1], [81, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 83, 1, 1, 1], [85, 1, 1, 1, 1, 1, 1, 1, 83, 1, 1, 1, 1, 1, 1, 81], [80, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1], [1, 1, 1, 0, 1, 1, 1, 1, 78, 1, 1, 1, 1, 1, 1, 80], [81, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 1, 78, 1, 1, 80], [81, 1, 1, 1, 1, 1, 1, 1, 1, 0, 1, 1, 83, 1, 1, 81], [80, 1, 1, 1, 1, 1, 1, 1, 81, 1, 1, 1, 1, 1, 1, 1], [83, 1, 1, 1, 1, 1, 0, 1, 81, 1, 1, 1, 1, 1, 83, 1], [85, 1, 1, 1, 1, 1, 1, 1, 0, 1, 1, 1, 85, 1, 1, 83], [85, 1, 1, 1, 1, 1, 1, 1, 0, 1, 1, 1, 81, 1, 1, 85], [83, 1, 1, 1, 1, 1, 1, 1, 81, 1, 1, 1, 1, 1, 1, 1], [80, 1, 1, 1, 1, 1, 1, 1, 0, 1, 1, 1, 80, 1, 1, 1], [81, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1], [0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1]] - numvoices: 1 - order: [-1, -1, -1, -1, -1, -1, -1, -1, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 2, 1, 2, 1, 2, 1, 3, -1, -1, -1, -1, -1] - patterns: [[62, 1, 1, 1, 62, 62, 62, 62, 1, 1, 62, 1, 1, 62, 1, 1], [62, 1, 1, 1, 62, 1, 1, 1, 62, 1, 1, 1, 62, 1, 62, 62], [62, 1, 1, 1, 62, 1, 1, 1, 62, 1, 1, 1, 62, 1, 62, 1], [62, 1, 1, 1, 62, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1]] + order: [-1, -1, -1, -1, -1, -1, -1, -1, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, -1] + patterns: [[62, 1, 1, 1, 62, 62, 62, 62, 1, 1, 62, 1, 1, 62, 1, 1], [62, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1]] - numvoices: 1 - order: [-1, -1, -1, -1, -1, -1, -1, -1, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, -1, -1, -1, -1, -1] - patterns: [[60, 1, 1, 1, 60, 1, 1, 1, 60, 1, 1, 1, 60, 1, 1, 1], [60, 1, 1, 1, 60, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1]] + order: [-1, -1, -1, -1, -1, -1, -1, -1, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, -1] + patterns: [[60, 1, 1, 1, 60, 1, 1, 1, 60, 1, 1, 1, 60, 1, 1, 1], [60, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1]] rowsperpattern: 16 - length: 41 + length: 33 patch: - name: Strings numvoices: 5 @@ -49,12 +49,12 @@ patch: parameters: {color: 69, detune: 63, gain: 62, looplength: 10741, loopstart: 284, phase: 0, samplestart: 1351767, shape: 65, stereo: 0, transpose: 79, type: 4, unison: 1} - type: addp id: 20 - parameters: {panning: 64, stereo: 0} + parameters: {damp: 0, dry: 128, feedback: 96, notetracking: 2, panning: 64, pregain: 40, stereo: 0} - type: mulp - parameters: {auxgain: 64, outgain: 64, stereo: 0} + parameters: {auxgain: 64, outgain: 64, panning: 64, stereo: 0} - type: envelope id: 46 - parameters: {attack: 57, decay: 87, gain: 100, panning: 64, release: 64, stereo: 0, sustain: 50} + parameters: {attack: 57, auxgain: 64, decay: 87, gain: 100, outgain: 64, panning: 64, release: 64, stereo: 0, sustain: 50} - type: oscillator id: 37 parameters: {auxgain: 35, color: 64, detune: 54, gain: 64, looplength: 9710, loopstart: 251, outgain: 40, phase: 0, samplestart: 1448797, shape: 64, stereo: 0, transpose: 91, type: 4, unison: 1} diff --git a/base.config b/base.config index ef18196..6bcc4b6 100644 --- a/base.config +++ b/base.config @@ -47,7 +47,7 @@ TIME_DIVIDER=91241.383 TIME_BASE=bars AUDIO_DELAY=2048 -PROD_END_TIME=3742560 +PROD_END_TIME=3012704 ########### Final product ########### @@ -61,7 +61,7 @@ QUOTE=\" CRINKLER_ORDERTRIES=4000 -AUDIO_BUFFER_ALLOCATED_LENGTH=3742560 +AUDIO_BUFFER_ALLOCATED_LENGTH=3012704 AUDIO_SAMPLING_RATE=44100 LOOP_END=5.0 LOOP_START=3.0 diff --git a/minified.config b/minified.config index 0787922..e277170 100644 --- a/minified.config +++ b/minified.config @@ -10,7 +10,7 @@ include $(PARENT_CONFIG) EXE_LINKER_PROGRAM=Crinkler CRINKLER_ORDERTRIES=4000 SHADER_FILE=shader_minified.h -TIME_UNIFORM_NAME='m' +TIME_UNIFORM_NAME='y' RESOLUTION_UNIFORM_NAME='v' TEXTS_UNIFORM_NAME='f' USE_WIDECHAR_TEXTS=1 diff --git a/music/4k_sg_v4.xrns b/music/4k_sg_v4.xrns new file mode 100644 index 0000000000000000000000000000000000000000..baa0153194a0080045339ae42b5abb4ef20cc252 GIT binary patch literal 24526 zcmb@t1yo#3vo1V?yL)hg1%e0H;DJC0!Gb#kx8TeG!95UyJAvR5+#P}?xVyVMGyhET zp6{M>)?MdYXZ@E2y}NqX?!Bj;s;8=(*>98(k%#~Y05kwN^-)`M&{+RS5CFJcMTLz3 z0O}6*mK+{-wuipfE^GabTi18Q%I@9W3rS_QPf1d#X_mPxxa|?m`R5l}odRTQ%`rP< zJK5X(c+_7$>0Eh+Ua%78BCPi+KjFK(=b8RzpHZlb_&dVmGZ`(pxi&vSD3PC1|9cSM zn;+Yt$Egn_ZJCc(nWW1j`&ImJT^qQ^G6)0JpvzZ;$wLmL%LHNPpN03_G`u91Uo`#* z6U#Q?^$gvHHFX>~7hCbzWxI2{-Db|Psa8_oZTrpSwf{0B1aX+Ij?gDrs3=@AgG|@wahN1EG9BiyiviW*PhsTjfP*80$08 zZ{~UjFLo8b4BnY9zggOhC@3o$G_z>6P~9F}wJIWSoZWHwhUoRAwJf##cgm?}se|i) zK>ny|2}q}knN`wj*Wn=hAe^}-q z+Y!FuKvO_k=Axk&f&0Q4o}akz7hHx=UBIlSUX*O zj+3T-Na~lNPx4E6(L)et3pEB@SUGFJh7f4ZggU5sbY`h;d7Nrx18tO z4S&XsCl2Kqmb`b_>|ZgmtGz#J<(}r0kmtTuzCH14SE9_Z^HX!ooE%iPfF?!u@^p~R z%9%8xx!%Xet?2&p@Ph#{33|4meqpVpk*Ivkd3M$`_LYzUfjqBzJMo@Qj*9=y z%Zst_pHU!`t%UBD*NSsojK3uqtsT@~*(ZJ8$b9Pz>)9o}9h1nPSo)T*#Fd`_dbQi~ znzh>al{GYh$2)awH<;D@L0x!pK4FAkdEf=&IMPlWa{S_K*TeyEnz_!JW83U?Qqh6$ zHD^_ceM-@Z<&4>nKJ2WG5EtP#uiXzRC1V<|nWMXxzS%~lYGXHxpT<~P{47+FQ}Zga zgSlS%$YI^TuFdQk4+7Hl-y^D(eX>Bk0xQy{>_tp3e17 zTl&2FI7j96*W!XhrMe-j+|xk?^}8#1!RJzouZnn#)Gq}Zm}G};?4mm@n2qHPXDTVC zvBS>8dEWe-^Z0;7K~7?md|H23=Taxkv*D%Xo%lq~y;G0ZP)Tw+fS-1JsIhU3q+mV2 zjL>kF=k09$63Kmpc+$;n%vVLNuS!*0A4kMSq)fACZ7+V5x|ncufHHHs{SPd_s^ z72$V((`17;^?o;6EWFMu_(u$S-L&CW!zzj>bYJte&5sJ7R$7Wu6mIVl+#`G3fQew+ zos7}b1?S~kAx?T3Lz7hb%C}w5If5=J2sPatieK-A^Dw`%j_>R=GUZN$Ue2S6`JJ~# zdzoffMIC=bhnTDgpD68jyvpH^@jD7R@Kv!HpV^i`v-jk3>67J6(6OUj;7e$=dfOqL zs_u*w+rb+ViL#^(f_(T8sp3*`jJ{hha2(4^XbVY&A7&mqPnKv zEhA~R+EzXS7vP$a@eaK?q-p0SKlevsrWc`K@~rl4w&q@MdzyrBgbnL>e`PLeDB&Fp zNFfhX(h!rF{nhazu(F6O)izX>qa^!zF&%qRUd-{J=30aO$ith0(Qp#8k&**Vy8cg# zdvASqVkf?#a7*szewRvGtML@A^U2Zw)!4nS)5E5v1$>{7x)-)AP>BEg4HHTov`!^z zwLyzXSvQ3?$68ERx`Dz+%)PqtHHqyF-!isp$>*89jMV4=+xpAlbNs09;!Fk)ubdZN zmqiziO{O~*@ye`VFT3;zSz8!g=|6P&^;^3&A;0@2IyJxPniaWlNSzv`ZS&0IcjMUfN{yrJ5Aw8%lQVpQ;5%&sk}$;YHt0u+t$E7`-|(+`a7Zv z%J&h@TYgUJA8O{b+z(Aok4m-6>+GG6_Gw;A(Tz?V)m~T59eon1Nh)qjo-PgXZ&Ee= zTFHOGx>)0qGFfnxJgUpQBPLL)8TUgYVliN@q%OQ6@z==j{iejl0-wISg{L$@UyJ=E z@2mnTTRvVk9HEtr-kaKR?fn+-Vm~}T+Eb@U@-;ZdOrK!bSI_q~5Qx%v9xGn%Hder1 zf47k2ThtJpwRJp`7U4P~bnN4EK~4d2U_PIHwOthwd~Mf+duxzdFnN*7I|? zXkGTK&6bMF`1pO;n(Q%Vt9aB?deZMU6m+Yd^~--G3UzkB)7^cibo7td!?l^h33}#+v$W^8p5$E}VfjJekHRrL3C*45T;d2aU0h zzghNwj8fUfqa0&*FtRCs)b!m_oU**7e^I_n33+a~;Jas$nf8mlapUvA_r*TSh?0om zmtWS5<5x|`#5AWyQ#G|tMul{jA^Nj_=H5rvg@9flHwEiUY1p4!XrN;!% zwDlFobz7#pPJFRQNxX)OZ!zg+z)a4*ZjevG%@V73a`74z%d#@^DITIka?~ zrxy#C(ntI9*0{{!(p;n8;x141J_Xj#FIF9HVy2py%Tk3Ym!_31cx%%uwDGqJ{0uDfFUF8Yf6 z@uts|p3B#!2~~?T>f452q92au`@RYummjwFqbwqMSgx63-kEoy_8y0nsT_TEQkW$V z5x;Yga|-KMX*VRL=Jsj)u~D}&qolRfC<_Vq)3u5anmsGaVWap<(ic{HB0Sz&ETTXWB6>#MdM0U@{vxaW>=o&TwZyh=RuJ`eA{y+reX0! zQIxCfr26>9ikSiX`nj`ZIf!24A!vn6e?T%Z6WI~78x_v| zDC+0kw9;H~*lfA|V)*^O((8`PjH#{LSO*6+p~oy$`xo2T=d3jWZHtxax=Z4RA%4H= zNK0RA_=SkuP03@E4f1BH*f3xZU;j7~bvd%i-1OFU+@icWY-;V>xbM<8qKOZl(q0nZ zqrIN3Oesw_zs$XsS=D;j@Pe!gS5-VjHq_XRI$gO-u=epS!;gQ5?C0c&| zLEWn4F79sggM%PmBcEJ4r$wn}^Vt6V)9lR(D_4q5tPbyNiFXC*W8&nB( zs91;O&c@Pa0tF72-Vo2!J+*GuO|QJhnji0|D82qHH2LH5Xh*o2udl^(cd?EYJCXgH zc%IAi){g@sMZ>KI)SB`!*Spr+esURfjdC~FEX3nx%|taJB5$2+{j`K+m+E#FMko71 zie4QlnPF?(DK=`>E)TpoO}9@B3@JMCC|8;FjVdch{|eD{l4`5`Mv-72bR>Pb=_IHn zQtSK6f@jM|_2VtecdwXVHDB4QlWZQtM^>XsM}1$lq4ID{lD^iW&M#59pERIhjas5U z?jfhj+(Hc$@xs6~BTOjsQ?!`juMbS*BsFTEFD^s2BbFXBW`-3Bb$i}OSJ=?`sYI(Y)KnP1NUZ?Jz-qV@HJe>}dMvQIGlTUgaW1G?%21YQ&i{pZ-=;Ex$^2Suw-=P|;;BX6QOq ze`WsG%X9bZdp1w)v0JyJ(f$|t0-LH{vz+GSs%Yufx^oAreb%aBKCQgTpc|dr=dEsK zoKy|@>nQzp1@HLow3s+0Vh8yu%>&IM#vJ9`rW-BJsA&zOhxDKa*P$k(k76CoAac=W zE4IY~mt98mqmr#ot5ok@?D6%b3RO=A56}2qK~GhWjD1|xp{s8;rY(5{2Fp9?-j?ac zHZ31cmFbqhxxJ(3buDANB`W$EEMzckNX?iYIh}J?!*3ZtS{{SzumRz1X={`>i~r@E zM2yO)8yqBgM@V_Jka}nDSFL4vugFx*^g2c2arjtftgmJ4!Tiln4!xwz1@LW-?P$|W zx6b?mcLOoIrH0FQH+(3Ko+BF$sY^@fH9iuDM<$Ia|6m z3pSQt#3j<&;xCg=_)4)~jb0?{xb2p3a|nM+qWpsPJTLL`aNkD8d^SbvYfS5lHT!vr zxDwe4x&HjU{y3?t*ZVwV7&y0%ZsfMO^>&{#4X&x@ggdr~GuVrxBt_8?+m=vq-2$XX z%Pw;W*d1^W6HH@TZchqh&-Rp^u5W)lf3jSw@orz2ntyhD6@MEylIXg7#+ z%SHZCFb8xwxrCV-EwjXE!rMCTP}5dkiJi*!F4!PUPt_YqwY26a>c)waN4J_&pKS8$ z!$;O02=2j{&P?qat}TKTHQU;0VwckEbvtvNtZB>!*#Y@efH>K2y!uA@(IKyM%f|{yuTe<)s;e< zqH`8284XS2cs@%(Ae4%GG(X<=wEB19QB>n~pjzgQwr_;yCjrI#lv{I|+A!shWns3z zE`!fZl9)c84JJKo`$2Q0?a;=q<4%Y4rn|IN`+dHRT-VmF-;c!{mnMuZDUZEijcmZb zo&G-D)VciuawrYTPXs;SRTtUXy=o&A%GN%a`!Zo|S$PEIVRsq4O96o?;Rz%nPJ~!VFss7m7czBO6oa%E>&DSih^c+gSV=?ZQ-}bzW zp~AtVFutbi3iseL{0;{zMyafR{>&+8k;8C3%6N`nxvVu2JtMU;Fe+(5yUWbtJcJr_ zI+soVB_@Wu;ime5j)$j!r;5Ucq(s2&W%=NjmfNZ6B}%B}jHXC_>KE*o-mkARUAYi zWpDVLL^FLu*`nD1DpKEa&qMcpKbn5us5bI76WUtqSVPBws^wsF8>LxQ8YiT-)cS=r z8VB{m>j7ei)XifxI1|Z zXoacgrjEI8q}cIzrN!(ED9NS##mKLeeXj>=JKvJ6!2zl%`N}&lR*kb5dkHQLYuigi z#yT3ZF)y-axkJto(fQ!@gphqmLDc@|zU3jU0F$Bn*bdeX@aENV)#2ukdHy1nY8Dgw z>YcUFbf@E#&F_a~DvX9`z2Ps~Dy4n8a}+LiCO4s^*u$Xh$;O(*|8*AEQhT~rSytcaCS-vdEtX({^ zX5rS0I;_X0Zfn^Jr)Y{@iQ3Rz2ck#KTGH%%{*8(>u{hC%G+KI^jcgRa(QTa*JN)w=Uu z(u`HnRWV1K|C@7Fg->Zvi^Lm78(iNy;_K=wT>-BF@d(AnWi_=VmD)Qtan|C;Q~^!s zWCp5BrlC#JYo4_HbHCI!+)o!bP703Mt4k4O1Z{b(R(SJy=O?y@I@dqcC=JSdUKcEH zJ{$Fvez4OR`6_1PE7@kTov{*eVRB{Ju-FPUi0@BjwXv}O5;gm|pF;Mcx0`NyNh9pe zI9-FIRB^-6!q_{kMBv$Cgu;5}W?j>ew3Eu#_^!mpK4Db`nV8d3c_LQ&PR_^T?{YD- zSjqw~*6IYBCLkZQ3{m)c_YQV#@t`;9H&d7mvIkplQ^!)ugnlkMFMwETzrGtC(B?H6 z7rUJFgdWie6vumt)^7WD;szjhZ_$|&`bB%c*MI8!wR<@Ur%bmO-2c9gj^luvqO)Ym zM=g}IsSr!|yy#t$``M#sfuiq7lj|4l&oAirW0b}$@%f-n)^yDoc?y1n*z<||^q76O z?h7opYHA4{$)NrOdb|c1-i&gbr1ftLlXSbW7@kNBFlL z!Pp-%82_Oaa2%iZqfDYVpc(0mpkIlW)BoRgy7@WdWDF2I(Ki@lzpe;#I>|QIkiz?t z|1tPKcGe`%2+04XUUp7!D98Idf9zW8B@Jr|_amh2$*VPJ1@0p+9U9a>5BW2R!h2fl zf8U{07+WJ!#C-ZZ_J`zHzK{oI>1ME zi=ENpt>u9FQ?}R=$*MJ_&%_7O)7Sj-wagUG`ue;3VaH*BT#?}25d8;K=K5aBzz9N$ zxAD-%yM3BL8|7a%kC}}nQAGMGu#MkG)<wfVl#`3@Tn92oAt`=vBQy&UkC#2-kl zdMBBMzt-*u(JZNBDjDc~SDlkF)z+fVLh-hzmX|#dP*Q^`(VNiB5%XPkRg?&i?EPXR zR+P^=x`*g|jtJO0<5Qm_vLy$f)@-SFnk#YcHbGA-YtzmP*%e ziifIh5jjrxSgc9Q#{WWMlI-u5!7? zmGcF)kqu|{6s@HN>!L#VZ9Rnb#?tM6*ay@9t+}~{=?LGivJnZ8u#}XJFJO zM|owVozcH)H#74)s@($1w)ej@4@N}ZTotH@5@bENa&cfu1O#-nr?jzuI-xTVBO-D% zGul{x!4j-b_bE;Ta#RvsjHr$XW~*so4Lz1;(a_|dW-S>NQ(wZ4tRIH&c}Ih}v+3Ke z)>XdPqYaut6v8&3d`IQcOiS}ZU&6U{xAdoL<1K!rk9|$twlF>XnyBVGTfp7oG!$J0&tU?6@jo>;@J zarffWG3;M59#X4ekO$LAMLqAJYluKhhgognAzFEZGwSmF*5&wPot9eTO4ITJ=6bL^ z;<4wt(UF6WHzb#1IgPjqT3Z!1Bs{j@5Kbn}f#EZK4&z4bQL7r*Yj_`7{% z@Rk^Fg!KIwIIw&XDjo64y$tJ1zTIwGx!%DT4ySXofaQrgA0{iy!$YjrU8l9jtnI6H-qt2gpcm|v!ZKID6rZEeu!Us>+MITEqmIEG{P7iPsJ%oeS zKQXTecA(!O^eKK?N9se5CZuE*RB=p$4LYs$IeoCwhpLk6lQVOFdHEAvwcRCP`%?m; zD6@ykN!p4~2TVj7-Q5u@u<#Y891PC3y~^n3^-%RdSR!m@-bh~&>+lY^Mmk1^iyo>W zdtw@mjg=iC&WmTBZ;2PtF0!90-gMpJst{#>36Vo~Fw)TpGCN2RIyUyP!51VEP^zCWhDHxAhj%WR#m-%IKhZ)_tALQrWB1O3+X}Q?Cy3DaB z@oCa|Ql0+(OL~$@r+OdZ$;7H#mwHG6j_M=ZS^Cvn%TXcf;>#sMPt}{vlR;eJV{#;) zww1TD<-DUy?l{AB*#R$-`}PVb!HzXmBc@}*$vDHrs=xcphMSsiRAP2;o2z$|({xN2 zPeug39i!Zm9rjt7l{Riq|2&TI%^ zWp>V0`SPc%Ics3;Y4E*NT`3Of*LP<#Z2=+;Ki~ZdC)+o#YC$_W%@P?^oSRNtaG&;c ze3^VgXW2beUb(eFdJK~3?Yw?kXT~=_)mipKJ1YOOwNW5LGqXd9;cfAnbTnx72eNA$ z9)uQp-UHj>iw+c)WH|}4j6sU@?*wzA_I|w-OWGFze7H9rdw(=M_zVOYUdG}-40%lr zTB_EX(?9#QKZtT$>uA*AYNXowE28mE4B7HxfA-By#ukT)+D%44Aa;{0Ct8Z4EGZ(p z&*%YrAHfD05M8j<2#d@`CQ?cPfeyU_oh}TKr%*j)pKV*{;>-E6DWRMc5wco>(SV?c z-T;d;3wh6tLNE(enN@-yQPh~b%%%`tloF2YI)R#Jw?#z+s-HL+VlQ9-&n)NQr>!PrNfLM_3iv(cb< zk6ap{8C0S{Zbke9<2`YeX8OzGERA19u{C>GOCr6Y;&Pu(ING1AP&K}%y9(#NqP0-W z68QCGhpP5{K6r_Yq2qqE(0@tNA?v#FeL6x5x7>ya6P+`{1&UWlnI`=N#s}mY4BgVF zg~YHfaqW9L0A@|V`=BySw04t7u~2e^3fQIYJ0F4o?7cIAN#=j1a_|4}g$O>m|9F-Y zhXUmYGQN!<~iX|Fibv!T|#!c#D{W% z;z7gek?SbXI}?(WZI1;9qVYYf12-NWCHh~p7d{E(&LQO`IzsV6Y*DL!0>j|tsy!Tn zpr&liH*AH(81AN#NEq&jE&faBa5Yn`e<>G!m0Yz~Wr)_r@F3U@$ZEvKaEIMbuv%aw zE0Ur-O={KNKq#3Aj*&VgaZtfhpT-2bKV-)WoX6!#LbB+|=E_A`+_YHqt=n}omyT%7hV*(3rXUh*c8UcG1vPOj9E)G+H z`8QRQ=Bl33ACop|{A1Dyp*}M2P<*;(Oqfw&z8c!{$02_n0ANPRE++nYU<7y2&bWUZ zlt+Y&!HZiu-39LcZX<9zP6&m(mnwa;O$jq_!29eGp+C2UVUjKhSL^-L!j=8K&?khh z`PN*Ez|2k@XyHJZ?p|6TulG7u(a7mf@(H2sFT8~=Bb+vGRuXiljK0I%_OG~|raJ}u zD0Lip7?@ZyNk`{X+^NsR6Ev6 z;vZgmO;WNN^ao5wkDwkk1F<#2G7}kOH3V{coQUpFECK+}9`=e8eOKJerzPUrz9Cv% z{K(H_no#NG-btcwhPvEy=LDd6L<(C{G4lW@az1`qlR?2Z3l;1mgUR%{Bk4V1ShMR- z5pxhjaVQP&y?41HX5=XbHj|oIOk(zSU=95htf47hD@3Ct_WvVrzv-riCkUd-kUtQx znBc+?$PN{Qk&|1}`yl!&m`%9pKe+>!0LQ;3F)FnpD^avx|5}WalEJ*MV z8q(;dGMpB$Szzpx8!84fG;9hu1mQE%rEmm@D*MRLi7HWHMka)-^^*Nd`3)!RnKI-k z#Yj$`jv!0rGZR(H<9j<=IHXA_O2LST{;Js-MfTv<9J^@Rd60trMRV0(F?dHKgs zr%w@S31kn{x~YEyWl%r9w(I>C>YLyR){E@NGpAm;9nO&M#^ z>ku)|x86M242l9Np6}B#mfX7}AB7QX+E=9*M5*`U)*V&ymp${;eMWZsgcx9~B>zm9 zmCf(v^cZT>C4h}gvw}gtW9-*6INyou=KkfoBK3bIc)DPJZUUzzS}b@ru>nxvTfy;C zf_uE=am6IYi%zay>Tax6g@5pj;)<*cS)>U~`^$`9&|qXIRobb^hW>~5f=Xe@{3Q%X z7-{|umtX+<-$45(nsokF3{~$LkzuT;u(Cjxrgx^n{58REyZrO4r6w`=RDogI!o zvkSi_&cV%ce9!0&lJ%~|Jdd=O)TSk6aNq%z`T}b~^CZI`k?b>)Ht0R^iYco2(Toxn z|CFr!9qCQm%q1OifTr@rm8Nfn{8U#PiiZQAqMt5uZ(2Kfc`air?X#V8J)|>y-aZ+M zR>IkS_mD0x+_O#QN68Sty_PP9@)5BqhM;NuFW4$gx^S>_C;k)I9o~IpVIIe)NFIpI zF}xSyGi>luf$?vh1tY#SEjYoE7z^^q3(Pxe1xO>nqL4w0ji{{?#+f<^5=d|ojUj5u zeK2N)g|1u42SzD))D~AvK12TxPe3x_hPw<<`yZD9kiZGJ3YI!ylwel#3PaK%GOj&L zM6i0jc;tY^Sv#_bEK}H+)iGFoB(H;9MJOI7+2jj(s86d^b=?Pj!l}<@Ah;(;o{zM0V|+4i$j>66HiN zZdHMf0G1P5yNV-{5r}idXT|y7N#@V=t42qwn!B}|UWAbMhG2n%3#qaN=~`*3o|>sc9te`+d14+ z+W-;wQC020D8NUU$p)k;F;;RFmITQ`#{WGKuvX?T>7ghaJ-1uA@cesWq$sPkZsLNMFBVo49YZ&Y9c%Xw!{#$sEuL6d0P##Lkc5u@wXSz zXYv~`+McW|`hxTi@WoGIF7c6}dE@aS8No>emK1>6f9Cs3DzTH#SOKuL0Rr>U z%20Hid&ysCks;*atB$UhXH_zj!L+JawXAuR%R?ubqw4E%rR3Y0!O!NKw4-*>}3 zAy{g2B8IopS45vg*J!BE**CZi>e=+uAJDa1VH{8ss>?U;M7$lQ$nhDqvWU(m5Fj@@ zY&7mSV@9~p;O*B*VT)98KZo6F6aHb`ST$oJLwQGG?9e5Hq@dt>k*ld~Hph$E_;sRzb+$cgW<~v^fr(!ZSsRYU3&@Osz`amRbq!*$`TEAl+9{L~1iA`Sr z3-T1f|0U#5k`q3T$)($p>khY%4B|t?43S^8NAjpVH(6 z)%(yrxocJaxIl#(%mvK9zvr9({ciJr=K^9me_i0@dD}=GyQ7C3Ud;CChG3fdt~>QE zQ6|9?L3%XPZqGKXiYGI^c{AyMOJ-yFCYTSvAn$+gh5@VGq>7_W3V^+W?8o{tJH#v4 zC$JJ3&l?`D)lXr08dfsvmcE(6`7b3iQSJY$l3C*|zzeq6R9WaqrZRN1kl%HO{5A*^ zdE?2zlJ}>`#sKnBGw>v8@$tzXLxE(F)wN`IC`KU}wUfPs+&esAjM{d|x(te>^hETV zw0_zEEc|UUxNJ7jPz@^|ywl7iT>-!S5m|;>+id&IePDINQU6S=|G25KN3>;MXj3vf zUW^<_Mv|IQn&6ex0G>6Sw%-7rsZH(JGoLdG!S?NK3aw7T@4ot>KlKkzi>u`jO3A-sTRKz6|YTfzUI3Xl=)Pdfis1&IDK62B!$@&8=~ z_>Klf10gO_GB{d>r$)sez`P+R#rBRCQM}~vk{~SrR{zO;LWeDRKO4aczK*x>l@oxX zt^~gWzQf}WuLR*641ZR|RYusHB~nuWoxrYQlT28O7h8P>1C$X4{r_!8$K7Kx44xsp zX<;j^iT!B7IvR#&q2RtkmnkQD#4NfG@+>N5c(8pPmq?gQ%d@wjlhz+Arouxj4Bly9 zC2olsJL)=aCMaBr-a9lREUGiL>mf%MWB^XitF=(cKV2b15ggTCk=9wM)FLlJp6uLW z3+3iFq*DTLN4vej1ezd)b}%7@t~*c}H6R+clb#^^01cxPIVW^&w<3dJ+ew_s+CwssOCTv#_%n3i3Qum6^ z5LM&(Fu65r-UA`wXs}JhfA$iM8oOLWcB2=01^ejtT-a4wZ^W79mscsVX`jJ%Ey3Kd zolr!1%xDtI=SNh}??1a$l>0@>J+rAWe2`Gr+1FhVY)esL`ZOXT*J#4RaQJd4R_AuE zRY!)OhTW=H#>rM+wJCzTcAB|F=+lJu^pj5v8=KglCKp~)z3NN>aY z#d7x=OHa4?))VY4@59?eD?S|0La!%`gaUctX3L3=O7-|5vHlTz&F*L5+ypJ8+()XHmdMZsA~!>C!ywCC zK9RxM`UraS=bcE{>yLlliF83=Dhy==0N{VG;qOEm+d0~r%NV;Fb1K@qxH`MpncKT^ z3DB~b+u9kr7&@9eTbP@=8ale$v2y;^<>LCko#e2vH8!0|1_G!G1C8 zfhPa}Mtf(Oj?=pGesF?J!**fI(>^2sfQ1&O>TGUd?rd&vYEElwZ6c>EB~8oC!OOu- z%frRZ$IZ?20;U28000!6tt~8EU{5LvANWr{|6K;c&XN76^YCsP#{U_B-gv%o9 z-3$RBO$$KqI|2ZJlhe@P0R@0zas{B{J55KiAQ*Ks2*NGqfiPSKlGVu~>LrAj#XxW6 z+qquGTxm=LPFSD|0$7M+s~}tDUpP;K9(}jKTnD2U=jDLxRYNG{FC-uoTDK2&%w4{o zvO;-21%2fW(Bhyuy~#rwmxCgmv~{0kp0Ub5JkbLRGeG-LD~QHK9)7F>^)#U)*>6bP zx*qY9fsW*$vF!>{ll4dGE})m5#3U&m=`Z!i_pv}f7U*Qh8`8CyM?E5-Z(rMFYz660 ziO08BK(7|iL`^$sh%Wq^k1?R}B1uwl%SSFC&`At5rqNEa&ihDF53~uV`3+Pc2?ahP z9std!X+{&kB<#ZvM|nUahUF1S0P*kShv{kHd&kTXTqA-${hMepP&)v?IiwGR697Qu z>o)|duC{>zN?-*5?m+K@S!Wh?Pdgyc3ff6{1*W=cyBP?Q#J;$E_^P}@%&G*n!vr!1 zN%Xrq+=28^si2VfY)Jy+{kusF@Vm&-1M*IwZnZ=OH5sxL52UuQozNxZE?W;QyC1Xr zaSd^g7xeNri;7+Z`fV5pdwuFmN|Kx`7g7QMx?xDH?*fRcc^?-QfHD@KnGcc#5W+_x z8X&a=Xw-)b?~vx9*&7Ii-MPgPFM|llSOG}b36}l=#_u>lqFe7J#IR0TPjKmko$HA6r8*>;#Ed)5_^PoIg4vS*?O3 zle6Sn>n?E1kn9{ml6Na|$A%Zg-AMMAP$@mhSI;EQeLDfyp(DfqImBhCtRsSW4Cr3f2!9j` z?coK4SJONkIwC#2gw9d7`&Dy36y~9RpN2Ljw13RPy~~|JWu}HEZ-MPyK{xrdC`DdS z?^Q`lOwiRLEs97G)L6dV=u6wB+5z&M81xl+yDp)`1!5?2SSgghUQ$z?^K7#nS-Jzt zWGwmC9`5DHn4h5JZtbePoTvOmNDJmr97nKnxWLI*2vV&%6j^QM)%)cWvbRWyUQpnc zVShf&iNfUr%&Sq8Gy4QpPcjH$76X2QLcutnzx**CcC8xx_<}C*1R%MXg_+9-K%y0g zAimWHqh^snB(iT%vw5MR!vM!;k{E;fk9Vw+cpIa)O62YMADeFJ$|Qv{NUyQP0hQlC zlj<|5Gndf)pmQf^Goyl}dk`W?473mgt(mS6Kd?ct4}dzQ&}AtFVxi>6 zMR|V}`OF2&3ZgLi$4XwHbnf!(G#=rp{9{-dj4hU@-SG$wbssJ2{kdV0Zv-G%E`5|6 z20r7U8TU*g2#~6iFo1u1^_hRZ~*{(oj(8otcS-341apW(;+aHJnsYH zS^~gN+hIM|8!Wshai#AB{3QnJvpT-%`h=hig{q@gV9PZ;rsINz-+`{O)B)>apqT~* zM3G#mX6_26;P4~uP&?!27^vV|#BCPn^o^0g2I&4&0g)CR`dxU1eLv*Zq8=f12o&tr z{&WL$W9I;&%7uQ$YFnwbLN70cu&IG_cxg5a>M{JCAn%<3CEq|>Rk4^rD#*tea8L}Nk;&j%P3TUg0;ZupBrFD8!z;04 zrH%QD7!v3WsP=W(zT3cL$%S~Y0xA=s+x`les5}r?d2o3}<~C{t#%3qPW*=N?b-d+& zfYJRH;!qDxe01o03V^_DrnR_63%4DTas3?rX!Q*Mtvm_<_(>Pj6=4a;xG@}H?0PT^ z10YJ*gUI=tf&0@EUvondjaET#-0{c(>W|o%K!wY8JptUuLI7&yB_ydci$Fm4uDKqp zy2-h3Y5PBoVzGih~pL@$)A#xeVEX%DZug=&{?=7 zxvDOttqbVADzQcOhD1vjg02UAa{`*5Y$x33eROvMa_C8n$DI%$4L&070||{KhWWsF zL0u1p^)U96RFM9KmqCVP_7;fm)h-ibgzs^I#FYo6T$Pj>p(P+iL&9POGKzsExeCt0 zW0COcpzK6OQX{x$o1I8cy`Y?{MlU<$&ndl-cvzr3`&rU~)8~>`NFwr3zA=FGCe68y z0+K&3NK()UFy&hTHyRBxybb^WysJI|L}DyY(2~<10P%uZ05@ygRsAb~0D0zpvF>BS zTL9@xiQB|_Fr}K(t+QA=u|4U1jTqPlFLT!*7KmU0T4ypMC7ga>Ck6r;+BHs(FAd00 z{4Ahx;gYVnhWFtcsEsku(FIA+vEgI;I|S@~=y6Cpp0zyGkr)7WY`cqc#BC*n!ftcL zL37;>z_|~Eny>5Toir4E@>&Nb=C9RF0@_)R2=V0NG&3Jq`v~DWh#ynh!Bg9=d%*%emll0HCj^LDswhMI1CI-C#_PIw&hEpndzRET2F1!1V2avRHs? zOqWj=Sm3h}u7WFGW}d{)U@YW9pnBk9HR!QYC`ME=1jfYQ;*O7=e8P}Qg3KhtIDzvJ zaRwby59yWi9 zk1PO?jRFj-FKy3Ho_v-=p=E(^)I(3Ez>bN@}zC%iVV?Z6=Y%q#%9xf{17C`*?)a;BL*nomH5@|gCI}`J#@?x z0~tOV(<1r?f!cpc@{DTTEter|27%IFW<7&_+xO%d0*vbeX2DMl>TW(pL1@cBF+DUZ zWU99glMr$uaN4Tj+GalnDLO=44V;hFw$Tp2@OOY{=7Nh1+BQ!B7#*?@b0QcyLAO#Q zG1eL&wq<~_7Q?M|E{vmPh&?Z$?1*OT*a+ij6()eoBA2&*u3#*eLTp$8rO7c{(L@-- zju7){KnW3OOYjDxo&{nQ1SpCz+?=k!$eeK=Xu z!3n}n2<>vA<$*$>9?#$mrX=Qw_CxJaNl%iITmDkr3GhXWX5zpHK|&3xx=D*>qx;B) z3-)ct-AO}0Y^8=iS{MlqhCuN~5cQ^@o3gY#+vSg0SBQu#(9tx>=Zz8%#+?Xt`=Azs zc2>*sdmRM?k11%G9xdbg^qs#m0<0FwF>PlcF}$5%L4ehMN$V@LbIZ3X76^b&aGV!R z*g@OIK!6!O;wylj(+Dl$3V}_nJ;dsSfukNxg9bsU6CC*H$N+n=XE6xUc>w<)+NbVl zXeh)8%CLn~-0{YS4;q0eL`|(d;ziqTMIHd>@Dy${fEjN${D3l&)DAeASZ@EcpV>|# z!v#RX4~C$Le+KlB((I|!<2sW7Z*rjtCb7U&`L@I)B%n1|B9`SHVxJdOHvx=cbP28L z1g`|q?5p5mSP;TI1QdeW&gR#47hi$M<_PW3qZO#0exw#hEH8yFFd2y+IzT955f_3$ z>oG=R2YnFEDa7eZ&`J=kX!GdfNGxKb8gxb{OW2L(kv|&o^AKo+6d*9f{1B#qXnqOp zA^^O=*uG!JLKI~M)sGtScnRD~ULg`&fXc!DUn^%G)I_%L@zb3J5frQ5l^pW6*JAks;Bb;KDN3LE?f5D8f|`+z5Kr z1W{0eEV6}=^m(U!_3Bl)P zH#Y;ibU$O9P~yxAp~Le^NXp3@Zm{=#4(H)y>bM^`G@IYP^#})-;p0OI4^Fv!>nM!vR{BdP!o4o82r;FSe7Q^)eS^Vn|P)wz~Wen|1%ffYB$U%gJVstxJpJ` z?}+y+SBzx={I_Jy)pvcus-&?udNH8F4v9 z>vR75(dANbl`iVQ+3)P>fCJ+mAfL9}s0F~b6FLFDAE2@P+O<3!L9+f z7fqv^Nia_lN1dF3qe=p$g8}z7%w(zoNf0hR|%PSPxLxq4d>-zD!_|Wmh#)P z0M`#4xsEJcCVI2Qz+G#kmWPt(kHa@_NbZhMDpF1sW$@p6hjY_p)T&%<@dU@Wi?wvd zT$M`}RcPMMO6I0UQBl#LXsZ6Lt%}k`D(m}vmplGE7oM%<|7&I|=$fjp1&ttWx1w`lH&{8(u{SCYTiODZ zn*?^nQPfc#$kqbkQ;pSE%J^CZO**h3p=>bi95~=ZJYFA+PaT30+(_FKZPs}qV(%c` z;N>vPyp>ResU5%CYh@3ElpqoGwP(Xz_|iyjwe7X!?_w&A!YRI{Ln&CYSm1Ouk-62FZvPKa>jC6|70*aoG}{YOda&8#i+0!0!~Gu{Ah`}%Adytm z_nn^;exwF|RaefN?T)`P!qi(@)=nK2JtANg$f(874NN~sJ=`dEFX5ZTI&x7?oH^da z{+fl5oj8izDp^7zSdcGRsf ztTlu%S^_6;m(Zr{u|(4~+sX5pg!+Yx-CYkmE{Z1^7}U~WtU?7}?+cvxAc0~wVueEZ zYI3s2)k>>YhW+L!dTvwh{-?xB%CUnUM9Y+{3AbFVOB%2ri{Yb6CmNGD=V6Innxbh^Qhn!2673cxfqk7^rxaZO=F%fqU7>4w))zwI2wW=Qzv?2YJsFkFO@$XuRME z09y~p#||~K8ssoNNE|uNamYKIx!McP=tHMk;8ZANmV{%DCy8cttaw*JC#*MmV<4QDoR8a4oW<*wF|G5r*Jo*JG8| zu~IBnCekkyyG9wUUBg&(3w+t#%(L9LJ`tvWJyrjLwB;3*SgWL%Bw6v?Y~U@~WL0Hg z3#I&LDaf;YX3bQmFW`z=ZTnp0(E6h+eeO4~<*!tigHJ7J?nH(VX*OO^r9}h4E_ogT zBhq*PX6}sbvst+r%t+G==0eKHMh&uRMRf{3m;-DEWZS{i`iMbGBX+lnxT6IwYs1-{ z5~$;mJ{LuUb$Q@Au6TM%&2Vmkv8G6Sk7{dVDVTLmGuYAyig3llul(_Eyr79k(iY;g z+gN)6>?$hv6b?``KE=ET4_qvw7C62@b9XVH#u*va2y_tloO}BgyzG>_5{+?ZTm&s1MB+1;NX6IJJ z_tA6;dzTo^c*TK|Gh)6{WtNnZ*3b2i*f(vObkxxlL#T7_pwC|HSrtJY$nwnJ1m2(||^9gwr4_Jfc*pwm7!##b@)kcd|hq)F*v>`gd^_B-}%#OvsUl#9_u-7J_c**N5r`?o?mMw8@2Oeu$5(n?!2{?5?Zm zL8N>GK;2x?OO?*V_2~fY4`tN2cQ{DR2M$&h#`KP&wl$IN9uiA67cD)acD|zTcsI*`2!@1`(ow~bM#`3y zz!a`{b3>CUF^2s(1KC_MDI#ukcef2wh~S(!d1t`ri3Mz!15dpGNnT~6(;Cyj5-(dQLJG98u64-mv*J}SaFH^Gs{B|d zWr@{<@B&zcaKVl+=AqEE8;3Q>zesIARdt}GHAxFxRf|o4eUBiSOyMq7$X+luvDMGjmKPx3Y%41EsS}}WdIJH~s#Ht9Qnl35Ff4FV! z=VAeEqL#OO6JKgm90mJ~THlJg!3rt3GLv``Ux>d}6H$2vyX73~yfHB2if)kf1AiP) zG>572FKUR717eXrj#>a1)kflJM0`k|-m-_sSRG2-m;mN1%{Gs5@lgqJ?gzmvVeIIg zVY-k!8AJMwmzy5mLG>!}vkpw}g(mlC9Bm^9ztFcI)X|>Tk4qe7@!KjiCc_ZrI0Ul} zD-0VYqy9q_mH|#yXbc7J9N9I>aTp*k+7=$kIXZ`Oj|REtliI4gX_35S;=FqSuekaFc+vrr-Gp%f@7jkdlp=ng=SBcl zE+M*q9A?bR1KaKzOvHMX41zZ|W(qyDs zLJg|Pq8OrQ(h)kc9;nFz8DTW7;ate2(6)HWN_2U-bLR7@lfxhjVbC0t?aMAI%}5?a zNGh_>_T&%^3J%+pbu1RxuJ)p&YVzP#`P&Wdwq7zSqLFs81}Jry7L6hJnE?$cs%F9>8;aZf3M0-lm3vM&x%T{;10A>VTFx`E@8 zVg2_;@^AS~!xJ)qCWd&lG#~#Pa-|!zA*dcX#lt^%5vRCf+7$eKJH9f180p{@ilhQf`TU-1IrdK_RGXT-w@3eBlfZsIpK90+YK5@dv)NvVQI&o`b3U%C zKGN=yo;s@{uV*;E&-AxDsH5bCprSV5U1E&g7i|0s-Uy=N zYP1&`n%?RzbNmOkW#x zdDKWva~0Y=X`}K|cj4zsUx8G_(2T3oWf3sJd0}k%H)n zlQ+YJy&Tgr7IqWMKI^md%LCR9qIPRA2zb#nVDST=vlB+D`QYwMVywr>{`5f#EzsX; zlr$omo5es}#hi&+h6l}}Xb@9Hyx-k}t>qHuDxFwgg;H5E(gntuC-TT;d-O0WANMXL zdT?c!DVE~xW87$gPkIC)nmEe|8DqnGcq_^f6h1O0v1g#F>QaUnSB@)v&7GzKH+-uRW_ZU>FLE@E52Lf+fmBg@>xgNMANAQLcx0yHb!vp^ zVkl~R5SiEYZSh4WbQTQ-sR0wI!c)`Lm7aK?%@;!QLN`g@Y~eK$kU0H1jZ0u>OQCwx$iD3oBDdo`)adz$^RXeRH$NFfV*t3B0Ux^5N|@D_U`6OAwNpc134ib`4+T zr8)b3^He!BW4G}@m8O6tn3AQUcc&>sFfUi>{lLX^RL3Zhk$@4n%0O!d^ncRY#jFnp zASJZyO+_nk?=1%tWm`?63&r52kD{rl9J`RKdHmeq_C6fnyB@}82pl&Xt?g2=^Q_xr zH=@B_0)FuD!p=2lF7C2rEsKJ%iWD$(){H#HmP4>2NHBX}-DpY|zGpp5k0D-9uo;cn zOZfnR5HCWnb}s9wBMs#B3QbpbxxMRcN|Qm}^%No6ZU1``U3=UQjq70q+G`+PZrq2k z$8nAQH6w)}0iE1_QQFJDr5;27oJ2^!mmT>jmr$$+%kUA7fUhxd*Y)Q0plhK{FvhuQyu_H8=PizxkUd%`Im=hjl zxo{mhSM2>qUy{~taz$?{=qwZ=SGDmnVBbB54p(a*`!kpZiuxW*12_{9ZXw0k8kwd7 z&v9ti(I0cwC;sy|IGBkx^{M*SNx`@wnbE-XW3?E10E7eoUIj1bJduasqye3 z;`~POv^TrVsnIy{uf-DO^r%kruQ_<^CU}7xIQ_s;^KYd%!YZhlIsI6rIjazll@Z0y zl+%AoFdxo90Vyh;;52>yX>;l-Jer51v)RZ0{^-#l;4=7#7HwWe96bO#&FO_(rb3eS zDlHA9tu}#;KLot#&cb$fhPfo61W!?#Z3H6aTY3cNg z+H04h!Q5S+nD|&JG2EvepSjoUE+-?t=zUkU149-0S+$Az7E&1-#pA2^&=?Fd?}_M^ zziSPAlp)^R-#hlW)n;o3ERGd#Pt%Nk8O**XgXt&91gdO!><~MY1LJDQI3qFSXv?}Y z1Q7&Z>)$l6tDN_iuzY3Si+)+3G%qxtLF7*uebQ~h)Gp(HIlOa zCw`WY&~(ID$OZZ&)c-;;a2c5j0A@RN_F>#dT2=xdV2Z7f6o+PkYo($)NAF<0=#mdh zK=(IU*a!hn75ZbVc%R@puSS!#M9m0BQyK`gRdAr$4>SZS`j>@p2oANj6db>#M5$xU zMT(zKhV`}LfY>tYF*PFXM0=ky__>HWFJo-n1V5Y+&qZ}YM;Ie9l=vV9bKQ_wKQj=I z>&(;!Z)>7LOpLiYLccM7&gwd3Mi?$_M9U&&;J67^_Zc`ky2coC)~iZOW;EUyMBJ&< z&U~!1*calZT;isc^c&5lE2QH_0<9B7&Btb6!*}Ou%ANas+Jnq3S@?fM!HZfjy~u_R zwx}q0KCpb6e7$*LF1~O*q_bafgxN-ie;y>t{D;{2hwF%I4u1nU?<1FEI1l{a55lL_ z1wioW`~N%^|G)o>{xSXd{QrHa*nj=G01Z5Z8UJ4|9E)7eV$*Mrqpv^FX!B{={3qhy B8D; rotateDelay) { if(mod(i,2.) >= 1.) o = -1.; p.xy *= rot2D(calcFactor(rotateDelay)*o); @@ -182,7 +182,7 @@ vec2 map(vec3 p, int displace) if (i == 7.) anRot -= .2; q.xy = rot2D(anRot) * q.xy; - float rotateDelay = STARTDELAY + (i - 1.) * glyphPhase + 1.5; + float rotateDelay = STARTDELAY + (i - 1.) * 2. + 1.5; // We can now call each prism by it's index // draw all except the middle bottom prism if (i > 0.) { @@ -236,9 +236,9 @@ vec2 map(vec3 p, int displace) uv *= mat2(1.6,1.2,-1.2,1.6); freq *= 1.9; amp *= 0.22; choppy = mix(choppy,1.0,0.4); } - } + } float cs = sdCappedCylinder(p, .025, 1.6) - h*0.15; - d2 = max(-sdCappedCylinder(p, 2.0, clamp((2.0 - (u_time*3.0 - 3.0*23.0)),0.,2.3)), cs); + d2 = max(-sdCappedCylinder(p, 2.0, clamp((2.0 - 3.*(u_time - 23.0)),-.2,2.3)), cs); d2 = max(d2, sdCappedCylinder ( p, 0.3, 1.7)); d = min(d, d2); if (d==d2) mat = 1.0; @@ -325,6 +325,7 @@ vec3 postProcess(vec3 col) { col = pow( col, vec3(.4545) ); // Contrast = a col = smoothstep(0., 1., col); + return col; } @@ -336,8 +337,8 @@ vec3 cameraPos() // close up shot for 1st glyph lock if (u_time > 10.5) cPos = vec3(2.,-1.,1.); // zoom away for 2nd glyph animation - if (u_time > 12.) cPos = vec3(-1., -1., 4.); - + if (u_time > 12.) cPos = vec3(-1., -.7, 4.); + if (u_time > 13.) cPos =mix(vec3(-1., -.7, 4.), vec3(0., 0.5, -1.), (u_time - 13.)*0.3); return cPos; } @@ -346,7 +347,8 @@ vec3 cameraPointAt() { // look at 1st glyph if (u_time > 10.5) p = vec3(1.7,-1.1,0.); // look gate at distance - if(u_time > 12.) p = vec3(.0,.1,0.); + if(u_time > 12.) p = vec3(0.); + if (u_time > 13.) p = mix(vec3(0.), vec3(0., 2., -5.), (u_time - 13.)*0.3); return p; } @@ -391,21 +393,21 @@ vec3 sceneGate(vec2 uv) if(mat==0.) col *= vec3(.3) + vec3(specular(n,normalize(vec3(0.0,0.3,0.8)),normalize(rd),60.0))*0.5; - else if(mat==1.){ + if(mat==1.){ col = getSeaColor(p, n, normalize(vec3(0.0,0.3,0.8)),normalize(rd)); //col = vec3(0.,0.,.5); // + (noise(5.*(p.xy+2.)+u_time, -1.0) * noise(50.*(p.xy+2.), -0.4) + 0.5*noise(20.*(p.xy+2.0)-u_time, -0.5) * noise(5.*(p.xy+2.0), -0.75))*smoothstep(0.,0.75,(u_time-5.0)*0.1) + vec3(0.,0.,0.5*noise(10.*(p.xy+4.0)-u_time, -0.5)); } - else if(mat==2.) + if(mat==2.) col *= vec3(.3, .1, .0)+ vec3(specular(n,normalize(vec3(0.0,0.3,0.8)),normalize(rd),60.0))*0.1; // - 0.2*noise((vec2(100.*p.x+300.,75.*p.z+150.0)), -2.2) * noise((vec2(15.*p.x+2.0,3.*p.z+2.)), -1.) + noise((vec2(15.*p.x+2.4,3.*p.z+2.)), -0.25); - else if(mat==3.) + if(mat==3.) col *= vec3(.8, .8, .5) + noise(p.xz*500.+100., .3,0); // + noise(p.xz*1000.+5000., 0.1) + noise(p.xz*1000.+5000., 0.1); - else if(mat==4.) + if(mat==4.) col *= vec3(.1)+ vec3(specular(n,normalize(vec3(0.0,0.3,0.8)),normalize(rd),60.0))*0.5; - else if(mat ==5.) + if(mat ==5.) col *= chevronColor; // activated glyph color } col = applyFog(col, d, rd, vec3(0., -.1, -1.), .01); - col = colorFlashesAnim(col); // animated color flash + col = colorFlashesAnim(col); // animated color flash return postProcess(col); } diff --git a/shader_minified.h b/shader_minified.h index cde9b0c..3369879 100644 --- a/shader_minified.h +++ b/shader_minified.h @@ -2,276 +2,281 @@ #ifndef SHADER_MINIFIED_H_ # define SHADER_MINIFIED_H_ # define VAR_u_resolution "v" -# define VAR_u_time "m" +# define VAR_u_time "y" const char *__temp_cleaned_shader_glsl = "uniform vec2 v;" - "uniform float m;" - "const float y=22./7.;" + "uniform float y;" + "const float m=22./7.;" "mat2 f(float v)" "{" - "float m=sin(v),y=cos(v);" - "return mat2(y,-m,m,y);" + "float y=sin(v),m=cos(v);" + "return mat2(m,-y,y,m);" "}" "float f(float v,float y,float m)" "{" "float x=max(m-abs(v-y),0.);" "return max(v,y)+x*x*.25/m;" "}" - "float f(vec2 v,int m)" + "float f(vec2 v,int y)" "{" - "if(m==1)" + "if(y==1)" "{" - "float y=dot(v,vec2(127.1,311.7));" - "return fract(sin(y)*43758.5453123);" + "float m=dot(v,vec2(127.1,311.7));" + "return fract(sin(m)*43758.5453123);" "}" "v=50.*fract(v*.3183099);" "return fract(v.x*v.y*(v.x+v.y));" "}" "float n(vec2 v,float m,int y)" "{" - "vec2 i=floor(v),x=fract(v),c=x*x*(3.-2.*x);" + "vec2 a=floor(v),x=fract(v),c=x*x*(3.-2.*x);" "float n=m;" "if(y==1)" "n=2.;" - "return-m+n*mix(mix(f(i+vec2(0),y),f(i+vec2(1,0),y),c.x),mix(f(i+vec2(0,1),y),f(i+vec2(1),y),c.x),c.y);" + "return-m+n*mix(mix(f(a+vec2(0),y),f(a+vec2(1,0),y),c.x),mix(f(a+vec2(0,1),y),f(a+vec2(1),y),c.x),c.y);" "}" - "float s(vec3 v,float y,float m)" + "float x(vec3 v,float y,float m)" "{" - "vec2 i=abs(vec2(length(v.xy),v.z))-vec2(m,y);" - "return min(max(i.x,i.y),0.)+length(max(i,0.));" + "vec2 c=abs(vec2(length(v.xy),v.z))-vec2(m,y);" + "return min(max(c.x,c.y),0.)+length(max(c,0.));" "}" "float n(vec3 v,vec3 y)" "{" "vec3 m=abs(v)-y;" "return length(max(m,0.))+min(max(m.x,max(m.y,m.z)),0.);" "}" - "float s(vec3 v,vec2 y)" + "float x(vec3 v,vec2 y)" "{" "v.xy*=f(.5);" "vec3 m=abs(v);" "return max(m.z-y.y,max(m.x*.866025+v.y*.5,-v.y)-y.x*.5);" "}" - "vec3 i=vec3(.4,.2,.4),x=vec3(.7,.4,.2),a=vec3(.2,.1,.3),c=vec3(.9,.5,.7),k=vec3(.8,.7,.5),l=vec3(.9,.3,0),d=vec3(0,.1,.2),p=vec3(.8,.9,.6)*.6;" + "vec3 a=vec3(.4,.2,.4),c=vec3(.7,.4,.2),s=vec3(.2,.1,.3),i=vec3(.9,.5,.7),k=vec3(.8,.7,.5),p=vec3(.9,.3,0),d=vec3(0,.1,.2),r=vec3(.4,.5,.3);" "float n(vec3 v)" "{" "v.y*=v.z;" - "return y*min((m*v.z-v.y)/y,v.x);" + "return m*min((y*v.z-v.y)/m,v.x);" "}" - "vec3 s(vec3 v)" + "vec3 x(vec3 v)" "{" - "for(float i=0.;i<7.;i++)" + "for(float m=0.;m<7.;m++)" "{" - "float y=9.+i*2.,c=1.;" - "if(m>y)" + "float x=9.+m*2.,c=1.;" + "if(y>x)" "{" - "if(mod(i,2.)>=1.)" + "if(mod(m,2.)>=1.)" "c=-1.;" - "v.xy*=f((9.+9.*clamp(sin(n(vec3(1.5,y,4))*.06),-.9,.9))*c);" + "v.xy*=f((9.+9.*clamp(sin(n(vec3(1.5,x,4))*.06),-.9,.9))*c);" "}" "}" "return v;" "}" - "float t(vec2 v)" + "float e(vec2 v)" "{" - "if(m>=v.y)" + "if(y>=v.y)" "v.x+=.045*clamp(sin(n(vec3(3,v.y,40))*.4),-.8,.8);" "return v.x;" "}" - "float t(vec2 v,float y)" + "float e(vec2 v,float y)" "{" "v+=n(v,1.,1);" "vec2 m=1.-abs(sin(v)),c=abs(cos(v));" "m=mix(m,c,m);" "return pow(1.-pow(m.x*m.y,.65),y);" "}" - "vec2 r(vec3 v,int i)" + "vec2 t(vec3 v,int a)" "{" - "float c=0.,r=y/12.,x=floor(atan(v.y,v.x)/r+.5)*r;" - "vec3 a=v;" - "a.xy=mat2(cos(x),-sin(x),sin(x),cos(x))*a.xy;" - "float d=length(max(abs(a.xy-vec2(1.8,0))-vec2(.24,.14),0.))-.02,l=abs(length(v.xy)-1.8)-.2;" - "d=min(d,l);" - "l=abs(length(v.xy)-1.75)-.08;" - "l=f(l,abs(v.z-.1)-.04,.005);" - "d=max(-l,d);" + "float c=0.,i=m/12.,r=floor(atan(v.y,v.x)/i+.5)*i;" + "vec3 s=v;" + "s.xy=mat2(cos(r),-sin(r),sin(r),cos(r))*s.xy;" + "float d=length(max(abs(s.xy-vec2(1.8,0))-vec2(.24,.14),0.))-.02,p=abs(length(v.xy)-1.8)-.2;" + "d=min(d,p);" + "p=abs(length(v.xy)-1.75)-.08;" + "p=f(p,abs(v.z-.1)-.04,.005);" + "d=max(-p,d);" "d=f(d,abs(v.z)-.1,.02);" - "for(float e=0.;e<8.;e++)" + "for(float l=0.;l<8.;l++)" "{" - "r=24.67/(y*2.);" - "a=v;" - "x=r+(e+1.)*y/4.;" - "if(e==1.)" - "x+=.2;" - "if(e==7.)" - "x-=.2;" - "a.xy=f(x)*a.xy;" - "float z=9.+(e-1.)*2.+1.5;" - "if(e>0.)" + "i=24.67/(m*2.);" + "s=v;" + "r=i+(l+1.)*m/4.;" + "if(l==1.)" + "r+=.2;" + "if(l==7.)" + "r-=.2;" + "s.xy=f(r)*s.xy;" + "float z=9.+(l-1.)*2.+1.5;" + "if(l>0.)" "{" - "a.x-=1.95;" - "vec3 p=a;" - "if(m>z)" - "p.x=t(vec2(p.x,z));" - "float h=s(vec3(a.x-.06,a.yz),vec2(.1,.15))-.01;" - "l=max(-s(vec3(p.x-.14,p.yz),vec2(.22))-.01,s(vec3(p),vec2(.2,.12))-.02);" - "l=min(l,h);" - "d=min(d,l);" - "if(d==l)" + "s.x-=1.95;" + "vec3 t=s;" + "if(y>z)" + "t.x=e(vec2(t.x,z));" + "float h=x(vec3(s.x-.06,s.yz),vec2(.1,.15))-.01;" + "p=max(-x(vec3(t.x-.14,t.yz),vec2(.22))-.01,x(vec3(t),vec2(.2,.12))-.02);" + "p=min(p,h);" + "d=min(d,p);" + "if(d==p)" "c=4.;" - "if(d==h&&m>z+.2)" + "if(d==h&&y>z+.2)" "c=5.;" "}" "}" - "vec3 p=s(v),e=p;" - "r=y/16.;" - "e.xy=f(floor(atan(p.y,p.x)/r+.5)*r)*e.xy;" - "l=n(e.xyz-vec3(1.75,0,0),vec3(.04,.14,.05))-.02;" - "d=min(d,l);" - "if(d==l)" + "vec3 t=x(v),l=t;" + "i=m/16.;" + "l.xy=f(floor(atan(t.y,t.x)/i+.5)*i)*l.xy;" + "p=n(l.xyz-vec3(1.75,0,0),vec3(.04,.14,.05))-.02;" + "d=min(d,p);" + "if(d==p)" "c=4.;" - "l=1e3;" + "p=1e3;" "float z=1.5;" "for(int h=0;h<4;h++)" "{" "float k=n(vec3(v.x,v.y+z,v.z),vec3(2,.1,z))-.05;" - "l=min(l,k);" + "p=min(p,k);" "d=min(d,k);" "z+=.2;" "}" - "if(d==l)" + "if(d==p)" "c=2.;" - "l=v.y+4.25+n(vec2(v.x*.04,(v.z-40.)*.04)+1e2,15.,0)*1.5;" - "d=min(d,l);" - "if(d==l)" + "p=v.y+4.25+n(vec2(v.x*.04,(v.z-40.)*.04)+1e2,15.,0)*1.5;" + "d=min(d,p);" + "if(d==p)" "c=3.;" - "l=1e3;" + "p=1e3;" "float h=0.,k,g=4.,C=.6,F=.2;" - "if(i==1)" + "if(a==1)" "{" "vec2 w=v.xy;" "for(int u=0;u<4;u++)" - "k=t((w+m)*C,g),k+=t((w-m)*C,g),h+=k*F,w*=mat2(1.6,1.2,-1.2,1.6),C*=1.9,F*=.22,g=mix(g,1.,.4);" + "k=e((w+y)*C,g),k+=e((w-y)*C,g),h+=k*F,w*=mat2(1.6,1.2,-1.2,1.6),C*=1.9,F*=.22,g=mix(g,1.,.4);" "}" - "float w=s(v,.025,1.6)-h*.15;" - "l=m<25.?" - "max(-s(v,2.,clamp(2.-m*2.+46.,0.,2.3)),w):" - "w;" - "l=max(l,s(v,.3,1.7));" - "d=min(d,l);" - "if(d==l)" + "float w=x(v,.025,1.6)-h*.15;" + "p=max(-x(v,2.,clamp(2.-3.*(y-23.),-.2,2.3)),w);" + "p=max(p,x(v,.3,1.7));" + "d=min(d,p);" + "if(d==p)" "c=1.;" "return vec2(d,c);" "}" - "float e(vec3 v,vec3 y)" + "float h(vec3 v,vec3 y)" "{" "float m,i=0.;" "for(int d=0;d<90;d++)" "{" - "m=r(v+y*i,0).x;" + "m=t(v+y*i,0).x;" "i+=m;" - "if(abs(m)<.002||i>4e2)" + "if(abs(m)<.001||i>4e2)" "break;" "}" "return i;" "}" - "vec3 e(vec3 v)" + "vec3 h(vec3 v)" "{" "vec2 m=vec2(.01,0);" - "vec3 y=r(v,1).x-vec3(r(v-m.xyy,1).x,r(v-m.yxy,1).x,r(v-m.yyx,1));" + "vec3 y=t(v,1).x-vec3(t(v-m.xyy,1).x,t(v-m.yxy,1).x,t(v-m.yyx,1));" "return normalize(y);" "}" - "float e(vec3 v,vec3 m,float y,vec3 x)" + "float e(vec3 v,vec3 m,float y,vec3 d)" "{" - "vec3 l=normalize(m-v);" - "float c=clamp(dot(x,l),0.,1.),d=e(v+x*.0025,l);" - "if(abs(d)7.5)" - "y+=vec3(0,clamp(7.5-m,-1.,0.),0);" - "if(m>10.5)" - "y=vec3(2,-1,1);" - "if(m>12.)" - "y=vec3(-1,-1,4);" - "return y;" + "vec3 m=vec3(0,clamp(6.-y,2.,6.),clamp(75.-y*8.,6.,75.));" + "if(y>7.5)" + "m+=vec3(0,clamp(7.5-y,-1.,0.),0);" + "if(y>10.5)" + "m=vec3(2,-1,1);" + "if(y>12.)" + "m=vec3(-1,-.7,4);" + "if(y>13.)" + "m=mix(vec3(-1,-.7,4),vec3(0,.5,-1),(y-13.)*.3);" + "return m;" "}" "vec3 f()" "{" - "vec3 y=vec3(0,-.5,0);" - "if(m>10.5)" - "y=vec3(1.7,-1.1,0);" - "if(m>12.)" - "y=vec3(0,.1,0);" - "return y;" + "vec3 m=vec3(0,-.5,0);" + "if(y>10.5)" + "m=vec3(1.7,-1.1,0);" + "if(y>12.)" + "m=vec3(0);" + "if(y>13.)" + "m=mix(vec3(0),vec3(0,2,-5),(y-13.)*.3);" + "return m;" "}" - "vec3 h(vec3 v)" + "vec3 w(vec3 v)" "{" - "if(m>10.75)" + "if(y>10.75)" "{" - "float y=smoothstep(-1.,.8,sin(n(vec3(.8,10.75,8))*2.));" - "v=mix(v,y*1.4*l,y*.76);" + "float m=smoothstep(-1.,.8,sin(n(vec3(.8,10.75,8))*2.));" + "v=mix(v,m*1.4*p,m*.76);" "}" "return v;" "}" - "vec3 w(vec2 v)" + "vec3 l(vec2 v)" "{" - "vec3 m=e(),y=r(v,m,f()),d=vec3(0);" - "float p=e(m,y);" - "if(p<150.)" + "vec3 m=e(),y=t(v,m,f()),d=vec3(0);" + "float x=h(m,y);" + "if(x<150.)" "{" - "vec3 z=m+y*p,g=e(z);" - "float w=r(z,0).y,s=e(z,vec3(10,15,25),.2,g);" - "d+=s*c;" - "s=e(z,vec3(4,2,-15),1.,g);" - "d+=s*k;" - "d+=a*clamp(dot(g,normalize(vec3(0,1,10))),0.,1.);" - "if(w==0.)" - "d*=vec3(.3);" - "else if(w==1.)" - "d=e(z,g,normalize(y));" - "else if(w==2.)" - "d*=vec3(.3,.1,0);" - "else if(w==3.)" - "d*=vec3(.8,.8,.5)+n(z.xz*5e2+1e2,.3,0);" - "else if(w==4.)" - "d*=vec3(.1);" - "else if(w==5.)" - "d*=l;" + "vec3 l=m+y*x,r=h(l);" + "float g=t(l,0).y,z=e(l,vec3(10,15,25),.2,r);" + "d+=z*i;" + "z=e(l,vec3(4,2,-15),1.,r);" + "d+=z*k;" + "d+=s*clamp(dot(r,normalize(vec3(0,1,10))),0.,1.);" + "if(g==0.)" + "d*=vec3(.3)+vec3(e(r,normalize(vec3(0,.3,.8)),normalize(y)))*.5;" + "if(g==1.)" + "d=h(l,r,normalize(y));" + "if(g==2.)" + "d*=vec3(.3,.1,0)+vec3(e(r,normalize(vec3(0,.3,.8)),normalize(y)))*.1;" + "if(g==3.)" + "d*=vec3(.8,.8,.5)+n(l.xz*5e2+1e2,.3,0);" + "if(g==4.)" + "d*=vec3(.1)+vec3(e(r,normalize(vec3(0,.3,.8)),normalize(y)))*.5;" + "if(g==5.)" + "d*=p;" "}" - "d=mix(d,mix(i,x,pow(max(dot(y,vec3(0,-.1,-1)),0.),8.)),1.-exp(-p*.01));" - "d=h(d);" - "return r(d);" + "d=mix(d,mix(a,c,pow(max(dot(y,vec3(0,-.1,-1)),0.),8.)),1.-exp(-x*.01));" + "d=w(d);" + "return t(d);" "}" "void main()" "{" "vec2 m=(gl_FragCoord.xy*2.-v.xy)/v.y;" - "gl_FragColor=vec4(w(m),1);" + "gl_FragColor=vec4(l(m),1);" "}"; #endif // SHADER_MINIFIED_H_