kamera ajotukset + valo

4klang.asm

@@ -1,6 +1,6 @@
-%define SU_LENGTH_IN_SAMPLES    2828192
+%define SU_LENGTH_IN_SAMPLES    4214960
 %define SU_SAMPLE_RATE          44100
-%define SU_BPM                  116.
+%define SU_BPM                  118.
 
 ;-------------------------------------------------------------------------------
 ;   unit struct
@@ -76,7 +76,7 @@ global _su_render_song@4
 _su_render_song@4:    
     pushad  ; Stack: edi, esi, ebp, esp, ebx, edx, ecx, eax, retaddr_su_render_song, OutputBufPtr
     xor     eax, eax
-    push    1696		; Stack: VoiceTrackBitmask, edi, esi, ebp, esp, ebx, edx, ecx, eax, retaddr_su_render_song, OutputBufPtr 
+    push    1760		; Stack: VoiceTrackBitmask, edi, esi, ebp, esp, ebx, edx, ecx, eax, retaddr_su_render_song, OutputBufPtr 
     push    1		; Stack: RandSeed, VoiceTrackBitmask, edi, esi, ebp, esp, ebx, edx, ecx, eax, retaddr_su_render_song, OutputBufPtr 
     push    eax		; Stack: GlobalTick, RandSeed, VoiceTrackBitmask, edi, esi, ebp, esp, ebx, edx, ecx, eax, retaddr_su_render_song, OutputBufPtr 
 su_render_rowloop:                      ; loop through every row in the song
@@ -114,11 +114,11 @@ su_render_sampleloop:                   ; loop through every sample in the row
             pop     eax      ; eax = Sample, Stack: Row, GlobalTick, RandSeed, VoiceTrackBitmask, edi, esi, ebp, esp, ebx, edx, ecx, eax, retaddr_su_render_song, OutputBufPtr 
             inc     dword [esp + 4] ; increment global time, used by delays
             inc     eax
-            cmp     eax, 5702
+            cmp     eax, 5605
             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, 496
+        cmp     eax, 752
         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,9 +183,9 @@ su_update_voices_skipreset:
 su_update_voices_nexttrack:
         pop     ebx                                 ; ebx=first voice of next instrument, Stack: ptrnrow
         pop     edx                                 ; edx=patrnrow
-        add     esi, 31
+        add     esi, 47
         inc     ebp        
-        cmp     ebp,su_synth_obj + 10
+        cmp     ebp,su_synth_obj + 9
         jl      su_update_voices_trackloop
     ret
 
@@ -301,6 +301,7 @@ su_op_xch:
 section .su_op_filter code align=1
 su_op_filter:
     lodsb ; load the flags to al
+    call    su_effects_stereohelper
     fld     dword [edx + 4] ; r x
     fld     dword [edx]; f r x
     fmul    st0, st0                        ; f2 x (square the input so we never get negative and also have a smoother behaviour in the lower frequencies)
@@ -322,10 +323,10 @@ su_op_filter:
     jz      short su_op_filter_skiplowpass
     fadd    dword [ebp]
 su_op_filter_skiplowpass:
-    test    al, byte 0x04
+    test    al, byte 0x08
-    jz      short su_op_filter_skipneghighpass
+    jz      short su_op_filter_skipnegbandpass
-    fsub    dword [ebp+4]
+    fsub    dword [ebp+8]
-su_op_filter_skipneghighpass:
+su_op_filter_skipnegbandpass:
     ret
 ;-------------------------------------------------------------------------------
 ;   PAN opcode: pan the signal
@@ -548,24 +549,6 @@ su_op_envelope_leave2:
     fmul    dword [edx + 16]       ; [gain]*x'
     ret
 
-;-------------------------------------------------------------------------------
-;   NOISE opcode: creates noise
-;-------------------------------------------------------------------------------
-;   Mono:   push a random value [-1,1] value on stack
-;   Stereo: push two (differeent) random values on stack
-;-------------------------------------------------------------------------------
-section .su_op_noise code align=1
-su_op_noise:
-    lea     ecx,[esp + 60]
-    imul    eax, [ecx],16007
-    mov     [ecx],eax
-    fild    dword [ecx]
-    fidiv   dword [ICONST_2147483648] ; 65536*32768
-    fld     dword [edx]
-    call    su_waveshaper
-    fmul    dword [edx + 4]
-    ret
-
 ;-------------------------------------------------------------------------------
 ;   OSCILLAT opcode: oscillator, the heart of the synth
 ;-------------------------------------------------------------------------------
@@ -797,6 +780,23 @@ su_waveshaper:
     fmulp   st1                             ; x*a/(1-a+(2*a-1)*abs(x))
     ret
 
+;-------------------------------------------------------------------------------
+;   su_effects_stereohelper: moves the workspace to next, does the filtering for
+;   right channel (pulling the calling address from stack), rewinds the
+;   workspace and returns
+;-------------------------------------------------------------------------------
+section .su_effects_stereohelper code align=1
+su_effects_stereohelper:
+    jnc     su_effects_stereohelper_mono ; carry is still the stereo bit
+    add     ebp, 16
+    fxch                  ; r l
+    call    [esp]         ; call whoever called me...
+    fxch                  ; l r
+    sub     ebp, 16       ; move WRK back to where it was
+su_effects_stereohelper_mono:
+    ret                   ; return to process l/mono sound
+
+
 section .su_clip code align=1
 su_clip:
     fld1                                    ; 1 x a
@@ -824,9 +824,8 @@ su_vm_jumptable:
     dd    su_op_outaux
     dd    su_op_pan
     dd    su_op_delay
-    dd    su_op_send
-    dd    su_op_noise
     dd    su_op_filter
+    dd    su_op_send
     dd    su_op_in
     dd    su_op_out
 
@@ -843,9 +842,8 @@ su_vm_transformcounts:
     db    2
     db    1
     db    4
+    db    2
     db    1
-    db    2
-    db    2
     db    0
     db    1
 
@@ -857,11 +855,6 @@ section .su_patterns data align=1
 su_patterns:
     db 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
     db 1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1
-    db 52,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1
-    db 1,1,1,1,62,1,64,1,65,1,1,1,67,1,1,1
-    db 69,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1
-    db 53,1,1,1,1,1,1,1,1,1,1,1,1,1,64,62
-    db 64,1,1,1,1,1,1,1,69,1,1,1,1,1,1,1
     db 33,0,0,0,33,33,33,33,0,0,33,0,0,33,0,0
     db 28,0,0,0,28,28,28,28,0,0,28,0,0,28,0,0
     db 26,0,0,0,26,26,26,26,0,0,26,0,0,26,0,0
@@ -869,42 +862,40 @@ su_patterns:
     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 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 40,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
     db 40,0,0,0,40,40,40,40,0,0,40,0,0,40,0,0
     db 38,0,0,0,38,38,38,38,0,0,38,0,0,38,0,0
     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 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 49,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 64,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1
+    db 1,1,1,1,62,1,64,1,65,1,1,1,67,1,1,1
+    db 69,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,64,62
+    db 64,1,1,1,1,1,1,1,69,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 64,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1
+    db 52,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 53,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 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 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 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
     db 73,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1
+    db 74,1,1,1,1,1,1,1,1,1,1,1,73,1,1,71
     db 1,1,1,1,0,0,0,0,73,1,1,1,1,1,1,1
     db 81,1,1,1,1,1,1,1,1,1,1,1,83,1,1,1
     db 85,1,1,1,1,1,1,1,83,1,1,1,1,1,1,81
     db 80,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1
-    db 1,1,1,0,0,0,0,0,78,1,1,1,1,1,1,80
+    db 1,1,1,1,0,0,0,0,78,1,1,1,1,1,1,80
     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
@@ -912,6 +903,7 @@ su_patterns:
     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,1,1
+    db 74,1,1,1,1,1,1,1,1,1,1,1,73,1,0,71
     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 62,1,1,1,62,62,62,62,1,1,62,1,1,62,1,1
@@ -922,16 +914,15 @@ su_patterns:
 ;-------------------------------------------------------------------------------
 section .su_tracks data align=1
 su_tracks:
-    db 21,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
+    db 8,1,1,1,1,1,8,1,1,2,2,2,2,2,2,2,2,2,2,3,3,4,5,6,7,2,2,3,3,2,2,2,2,2,2,3,3,4,5,6,7,2,2,3,3,2,2
-    db 13,1,1,1,1,1,14,1,1,15,15,15,15,15,15,15,15,15,15,16,16,17,18,19,20,15,15,16,16,15,15
+    db 0,9,1,1,1,1,9,1,1,10,10,10,10,10,10,10,10,10,10,11,11,12,13,14,15,10,10,11,11,10,10,10,10,10,10,11,11,12,13,14,15,10,10,11,11,10,10
-    db 0,22,1,1,1,1,22,1,1,16,16,16,16,16,16,16,16,16,16,20,20,15,15,20,23,16,16,20,20,16,16
+    db 0,1,16,1,1,1,16,1,1,11,11,11,11,11,11,11,11,11,11,15,15,10,10,15,17,11,11,15,15,11,11,11,11,11,11,15,15,10,10,15,17,11,11,15,15,11,11
-    db 0,1,24,1,1,1,24,1,1,25,25,25,25,25,25,25,25,25,25,23,23,26,26,23,27,25,25,23,23,25,25
+    db 0,1,1,18,19,20,21,22,1,23,23,23,23,23,23,23,23,23,23,17,17,24,24,17,25,23,23,17,17,23,23,23,23,23,23,17,17,24,24,17,25,23,23,17,17,23,23
-    db 0,1,1,28,29,30,31,32,1,33,33,33,33,33,33,33,33,33,33,27,27,34,34,27,1,33,33,27,27,33,33
+    db 0,1,1,26,27,28,29,30,1,31,31,31,31,31,31,31,31,31,31,25,25,32,32,25,1,31,31,25,25,31,31,31,31,31,31,25,25,32,32,25,1,31,31,25,25,31,31
-    db 0,1,1,1,1,1,1,1,1,35,35,35,35,35,35,35,35,35,35,36,36,37,37,36,36,35,35,36,36,35,35
+    db 0,1,1,1,1,1,1,1,1,33,33,33,33,33,33,33,33,33,33,34,34,35,35,34,34,33,33,34,34,33,33,33,33,33,33,34,34,35,35,34,34,33,33,34,34,33,33
-    db 0,1,1,1,1,1,1,1,1,38,38,38,38,38,38,38,38,38,38,39,39,40,40,39,39,38,38,39,39,38,38
+    db 0,1,1,1,1,1,1,1,1,1,1,1,1,36,37,36,38,39,40,41,42,43,44,45,46,47,48,49,41,36,50,36,38,39,40,41,42,43,44,45,46,47,48,49,51,52,0
-    db 0,1,1,1,1,1,1,1,1,1,1,1,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,0
+    db 0,1,1,1,1,1,1,1,1,53,53,53,53,53,53,53,53,53,53,53,53,53,53,53,53,53,53,53,53,53,53,53,53,53,53,53,53,53,53,53,53,53,53,53,53,53,53
-    db 0,1,1,1,1,1,1,1,1,59,59,59,59,59,59,59,59,59,59,59,59,59,59,59,59,59,59,59,59,59,59
+    db 0,1,1,1,1,1,1,1,1,54,54,54,54,54,54,54,54,54,54,54,54,54,54,54,54,54,54,54,54,54,54,54,54,54,54,54,54,54,54,54,54,54,54,54,54,54,54
-    db 0,1,1,1,1,1,1,1,1,60,60,60,60,60,60,60,60,60,60,60,60,60,60,60,60,60,60,60,60,60,60
 ;-------------------------------------------------------------------------------
 ;    Sample offsets
 ;-------------------------------------------------------------------------------
@@ -961,7 +952,7 @@ su_sample_offsets:
 ;-------------------------------------------------------------------------------
 section .su_delay_times data align=1
 su_delay_times:
-    dw 5230,4533,22810,45620,1116,1188,1276,1356,1422,1492,1556,1618,1140,1212,1300,1380,1446,1516,1580,1642
+    dw 5230,4533,22423,44847,1116,1188,1276,1356,1422,1492,1556,1618,1140,1212,1300,1380,1446,1516,1580,1642
 
 
 ;-------------------------------------------------------------------------------
@@ -969,14 +960,14 @@ su_delay_times:
 ;-------------------------------------------------------------------------------
 section .su_patch_opcodes data align=1
 su_patch_opcodes:
-    db 2,4,4,6,8,2,4,4,10,6,8,13,0,2,4,4,6,8,14,17,13,0,3,5,9,17,13,2,4,8,18,0,2,4,8,2,20,8,22,22,6,14,13,0,2,4,8,14,13,0,25,17,27,0
+    db 2,4,4,6,8,2,4,4,10,6,8,13,0,2,4,4,6,8,14,17,13,0,3,5,9,17,19,13,2,4,8,20,0,2,4,8,14,13,0,2,4,8,14,13,0,23,17,25,0
 
 ;-------------------------------------------------------------------------------
 ;    The parameters / inputs to each opcode
 ;-------------------------------------------------------------------------------
 section .su_patch_operands data align=1
 su_patch_operands:
-    db 57,82,62,63,128,91,65,0,0,67,41,129,79,63,0,1,65,62,129,57,87,50,64,100,91,54,0,0,64,64,129,79,62,0,1,64,78,129,18,19,31,70,0,66,76,77,31,0,2,64,128,130,89,48,0,2,64,97,130,75,28,128,59,86,0,1,20,32,25,64,88,64,112,62,64,0,3,64,47,129,84,128,37,18,2,1,56,53,91,0,92,89,82,82,64,0,128,64,128,72,80,41,0,0,68,0,0,90,76,52,0,4,81,53,128,0,68,0,0,83,2,39,128,67,68,110,116,64,59,77,56,0,43,89,50,103,79,42,0,5,72,128,128,64,72,0,2,33,128,123,14,4,15,90
+    db 64,82,64,64,128,91,65,0,0,67,41,130,79,63,0,1,65,62,129,64,87,64,64,98,91,54,0,0,64,85,129,79,62,0,1,64,128,129,0,41,31,70,0,66,66,77,31,0,2,64,128,130,89,48,0,2,64,97,130,41,28,128,59,86,0,1,36,43,25,64,80,64,108,62,64,0,3,64,101,128,84,128,37,18,2,1,64,128,72,72,51,91,0,92,89,92,82,64,0,128,64,128,72,87,41,0,13,82,0,0,79,72,52,0,4,81,81,129,64,30,25,0,43,89,50,103,79,42,0,5,72,128,128,64,50,29,2,30,128,120,14,4,15,70
 
 ;-------------------------------------------------------------------------------
 ;    Constants
@@ -989,7 +980,6 @@ FCONST_0_99609375       dd 0x3f7f0000
 FCONST_3_80000em05      dd 0x381f6230
 FCONST_9_269614em05     dd 0x38c265dc
 FCONST_84_28075         dd 0x42a88fbe
-ICONST_2147483648       dd 0x80000000
 ICONST_1034594986       dd 0x3daaaaaa
 ICONST_24               dd 0x18
 

4klang.h

@@ -3,14 +3,14 @@
 #define SU_RENDER_H
 
 #define SU_CHANNEL_COUNT        2
-#define SU_LENGTH_IN_SAMPLES    2828192
+#define SU_LENGTH_IN_SAMPLES    4214960
 #define SU_BUFFER_LENGTH        (SU_LENGTH_IN_SAMPLES*SU_CHANNEL_COUNT)
 
 #define SU_SAMPLE_RATE          44100
-#define SU_BPM                  116
+#define SU_BPM                  118
 #define SU_ROWS_PER_BEAT        4
 #define SU_ROWS_PER_PATTERN     16
-#define SU_LENGTH_IN_PATTERNS   31
+#define SU_LENGTH_IN_PATTERNS   47
 #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))
 

4klang.inc

@@ -3,14 +3,14 @@
 %define PLAYER_INC
 
 %define SU_CHANNEL_COUNT        2
-%define SU_LENGTH_IN_SAMPLES    2828192
+%define SU_LENGTH_IN_SAMPLES    4214960
 %define SU_BUFFER_LENGTH        (SU_LENGTH_IN_SAMPLES*SU_CHANNEL_COUNT)
 
 %define SU_SAMPLE_RATE          44100
-%define SU_BPM                  116
+%define SU_BPM                  118
 %define SU_ROWS_PER_BEAT        4
 %define SU_ROWS_PER_PATTERN     16
-%define SU_LENGTH_IN_PATTERNS   31
+%define SU_LENGTH_IN_PATTERNS   47
 %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

4klang.yml

@@ -1,52 +1,46 @@
-bpm: 116
+bpm: 118
 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, 6, 6]
-          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]]
-        - 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, 2, 2]
-          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]]
-        - 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, 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]]
-        - 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, 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]]
-        - 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, 5, 5]
-          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]]
         - 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, 0, 0]
+          order: [0, -1, -1, -1, -1, -1, 0, -1, -1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 2, 2, 3, 4, 5, 6, 1, 1, 2, 2, 1, 1, 1, 1, 1, 1, 2, 2, 3, 4, 5, 6, 1, 1, 2, 2, 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]]
+          patterns: [[33, 1, 1, 1, 1, 1, 1, 1, 1, 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]]
         - 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, 0, 0]
+          order: [-1, 0, -1, -1, -1, -1, 0, -1, -1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 2, 2, 3, 4, 5, 6, 1, 1, 2, 2, 1, 1, 1, 1, 1, 1, 2, 2, 3, 4, 5, 6, 1, 1, 2, 2, 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]]
+          patterns: [[40, 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]]
-        - numvoices: 3
+        - numvoices: 2
-          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]
+          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, 1, 1, 1, 1, 2, 2, 3, 3, 2, 4, 1, 1, 2, 2, 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, 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]]
+          patterns: [[49, 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]]
+        - numvoices: 2
+          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, 8, 5, 5, 6, 6, 5, 5, 5, 5, 5, 5, 6, 6, 7, 7, 6, 8, 5, 5, 6, 6, 5, 5, -1]
+          patterns: [[64, 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], [65, 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], [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]]
+        - numvoices: 2
+          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, 5, 5, 5, 5, 6, 6, 7, 7, 6, -1, 5, 5, 6, 6, 5, 5, -1]
+          patterns: [[52, 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], [53, 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]]
+        - numvoices: 2
+          order: [-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 0, 1, 0, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 5, 0, 14, 0, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 15, 16, 17, -1]
+          patterns: [[73, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1], [74, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 73, 1, 1, 71], [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, 1, 0, 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], [74, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 73, 1, 0, 71], [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, 0, 0]
+          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, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, -1]
           patterns: [[62, 1, 1, 1, 62, 62, 62, 62, 1, 1, 62, 1, 1, 62, 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]
+          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, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, -1]
           patterns: [[60, 1, 1, 1, 60, 1, 1, 1, 60, 1, 1, 1, 60, 1, 1, 1]]
     rowsperpattern: 16
-    length: 31
+    length: 47
 patch:
     - name: Strings
-      numvoices: 5
+      numvoices: 10
       units:
         - type: envelope
           id: 33
-          parameters: {attack: 57, channel: 2, decay: 82, gain: 128, release: 63, stereo: 0, sustain: 62}
+          parameters: {attack: 50, channel: 2, decay: 82, gain: 128, release: 64, stereo: 0, sustain: 64}
         - type: oscillator
           id: 19
-          parameters: {color: 65, damp: 64, detune: 65, dry: 128, feedback: 125, gain: 41, looplength: 9710, loopstart: 251, notetracking: 0, phase: 0, pregain: 40, samplestart: 1448797, shape: 67, stereo: 0, transpose: 91, type: 4, unison: 1}
+          parameters: {color: 64, damp: 64, detune: 67, dry: 128, feedback: 125, gain: 41, looplength: 9710, loopstart: 251, notetracking: 0, phase: 0, pregain: 40, samplestart: 1448797, shape: 64, stereo: 0, transpose: 91, type: 4, unison: 1}
         - type: oscillator
           id: 24
-          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}
+          parameters: {color: 64, detune: 63, gain: 62, looplength: 10741, loopstart: 284, phase: 0, samplestart: 1351767, shape: 64, stereo: 0, transpose: 79, type: 4, unison: 0}
         - type: addp
           id: 20
           parameters: {damp: 0, dry: 128, feedback: 96, notetracking: 2, panning: 64, pregain: 40, stereo: 0}
@@ -54,13 +48,13 @@ patch:
           parameters: {auxgain: 64, outgain: 64, panning: 64, stereo: 0}
         - type: envelope
           id: 46
-          parameters: {attack: 57, auxgain: 64, decay: 87, gain: 100, outgain: 64, panning: 64, release: 64, stereo: 0, sustain: 50}
+          parameters: {attack: 50, auxgain: 64, decay: 82, gain: 98, outgain: 64, panning: 64, release: 66, stereo: 0, sustain: 64}
         - 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}
+          parameters: {auxgain: 35, color: 64, detune: 54, gain: 85, looplength: 9710, loopstart: 251, outgain: 40, phase: 0, samplestart: 1448797, shape: 64, stereo: 0, transpose: 91, type: 4, unison: 0}
         - type: oscillator
           id: 38
-          parameters: {color: 128, detune: 62, gain: 78, looplength: 10741, loopstart: 284, phase: 0, samplestart: 1351767, shape: 64, stereo: 0, transpose: 79, type: 4, unison: 1}
+          parameters: {color: 128, detune: 62, gain: 128, looplength: 10741, loopstart: 284, phase: 0, samplestart: 1351767, shape: 64, stereo: 0, transpose: 79, type: 4, unison: 0}
         - type: xch
           id: 41
           parameters: {stereo: 0}
@@ -70,57 +64,36 @@ patch:
         - type: mulp
           id: 35
           parameters: {stereo: 0}
+        - type: filter
+          id: 1046
+          parameters: {bandpass: 0, frequency: 90, highpass: 0, lowpass: 1, negbandpass: 1, neghighpass: 0, resonance: 128, stereo: 1}
         - type: outaux
           id: 23
-          parameters: {auxgain: 19, outgain: 18, stereo: 1}
+          parameters: {auxgain: 45, outgain: 0, stereo: 1}
-    - name: Pizzicato
-      numvoices: 4
-      units:
-        - type: envelope
-          id: 1
-          parameters: {attack: 31, channel: 2, decay: 70, gain: 76, release: 66, stereo: 0, sustain: 0}
-        - type: oscillator
-          id: 2
-          parameters: {color: 64, damp: 64, detune: 31, dry: 128, feedback: 125, gain: 128, looplength: 398, loopstart: 2073, notetracking: 0, phase: 0, pregain: 40, samplestart: 1034961, shape: 64, stereo: 0, transpose: 77, type: 4, unison: 2}
-        - type: oscillator
-          parameters: {auxgain: 64, color: 64, detune: 48, gain: 97, looplength: 398, loopstart: 2073, outgain: 64, phase: 0, samplestart: 1034961, shape: 64, stereo: 0, transpose: 89, type: 4, unison: 2}
-        - type: addp
-          id: 16
-          parameters: {stereo: 0}
-        - type: mulp
-          id: 14
-          parameters: {bandpass: 0, frequency: 82, highpass: 0, lowpass: 1, negbandpass: 0, neghighpass: 0, resonance: 128, stereo: 0}
-        - type: pan
-          id: 5
-          parameters: {auxgain: 39, outgain: 58, panning: 75, stereo: 0}
-        - type: delay
-          id: 49
-          parameters: {damp: 86, dry: 128, feedback: 59, notetracking: 0, pregain: 28, stereo: 1}
-          varargs: [5230, 4533]
-        - type: outaux
-          id: 6
-          parameters: {auxgain: 32, outgain: 20, stereo: 1}
     - name: Trumpet
-      numvoices: 3
+      numvoices: 2
       units:
         - type: envelope
           id: 51
-          parameters: {attack: 25, decay: 64, gain: 112, release: 64, stereo: 1, sustain: 88}
+          parameters: {attack: 25, decay: 64, gain: 108, release: 46, stereo: 1, sustain: 80}
         - type: oscillator
           id: 1037
-          parameters: {color: 64, detune: 64, gain: 47, looplength: 76, loopstart: 1916, phase: 0, samplestart: 1622065, shape: 64, stereo: 1, transpose: 62, type: 4, unison: 1}
+          parameters: {color: 64, detune: 64, gain: 101, looplength: 76, loopstart: 1916, phase: 0, samplestart: 1622065, shape: 64, stereo: 1, transpose: 62, type: 4, unison: 0}
         - type: mulp
           id: 53
           parameters: {stereo: 1}
         - type: delay
           parameters: {damp: 18, dry: 128, feedback: 37, notetracking: 2, pregain: 84, stereo: 1}
           varargs: [48, 96]
+        - type: filter
+          id: 1045
+          parameters: {bandpass: 1, frequency: 67, highpass: 0, lowpass: 1, negbandpass: 0, neghighpass: 0, resonance: 128, stereo: 1}
         - type: outaux
           id: 56
-          parameters: {auxgain: 53, outgain: 56, stereo: 1}
+          parameters: {auxgain: 49, outgain: 50, stereo: 1}
         - type: envelope
           id: 61
-          parameters: {attack: 91, decay: 0, gain: 82, release: 89, stereo: 0, sustain: 92}
+          parameters: {attack: 91, decay: 0, gain: 92, release: 89, stereo: 0, sustain: 92}
         - type: oscillator
           id: 59
           parameters: {color: 128, detune: 64, gain: 128, lfo: 1, phase: 0, shape: 64, stereo: 0, transpose: 82, type: 0, unison: 0}
@@ -129,35 +102,22 @@ patch:
           parameters: {stereo: 0}
         - type: send
           id: 1038
-          parameters: {amount: 80, port: 1, sendpop: 1, stereo: 0, target: 1037, unit: 0, voice: 0}
+          parameters: {amount: 87, port: 1, sendpop: 1, stereo: 0, target: 1037, unit: 0, voice: 0}
     - name: snare edm 2 (sample-st)
       comment: 'Suggested range: E-2 to C-3'
       numvoices: 1
       units:
         - type: envelope
-          parameters: {attack: 0, decay: 68, gain: 90, release: 0, stereo: 0, sustain: 0}
+          parameters: {attack: 23, decay: 80, gain: 100, release: 0, stereo: 0, sustain: 0}
         - type: oscillator
           id: 200
-          parameters: {color: 48, detune: 52, gain: 53, lfo: 0, looplength: 1, loopstart: 4276, phase: 0, samplestart: 560606, shape: 81, stereo: 0, transpose: 76, type: 4}
+          parameters: {color: 64, detune: 48, gain: 104, lfo: 0, looplength: 1, loopstart: 4276, phase: 0, samplestart: 560606, shape: 64, stereo: 0, transpose: 72, type: 4, unison: 1}
         - type: mulp
           parameters: {panning: 64, stereo: 0}
-        - type: envelope
-          parameters: {attack: 0, auxgain: 64, decay: 68, gain: 83, outgain: 64, release: 0, stereo: 0, sustain: 0}
-        - type: noise
-          parameters: {gain: 39, shape: 2, stereo: 0}
-        - type: mulp
-          parameters: {stereo: 0}
-        - type: filter
-          id: 201
-          parameters: {bandpass: 0, frequency: 128, highpass: 0, lowpass: 1, negbandpass: 0, neghighpass: 1, resonance: 67, stereo: 0}
-        - type: filter
-          parameters: {bandpass: 0, frequency: 110, highpass: 0, lowpass: 1, negbandpass: 0, neghighpass: 0, resonance: 116, stereo: 0}
-        - type: addp
-          parameters: {stereo: 0}
         - type: pan
-          parameters: {panning: 59, stereo: 0}
+          parameters: {panning: 64, stereo: 0}
         - type: outaux
-          parameters: {auxgain: 56, outgain: 77, stereo: 1}
+          parameters: {auxgain: 17, outgain: 23, stereo: 1}
     - name: kick
       numvoices: 1
       units:
@@ -166,16 +126,19 @@ patch:
           parameters: {attack: 0, decay: 43, gain: 103, release: 50, stereo: 0, sustain: 89}
         - type: oscillator
           id: 1040
-          parameters: {color: 42, detune: 42, gain: 128, looplength: 1, loopstart: 1034, phase: 0, samplestart: 741926, shape: 72, stereo: 0, transpose: 79, type: 4}
+          parameters: {color: 64, detune: 44, gain: 128, looplength: 1, loopstart: 1034, phase: 0, samplestart: 741926, shape: 64, stereo: 0, transpose: 79, type: 4}
         - type: mulp
           id: 1041
           parameters: {stereo: 0}
+        - type: filter
+          id: 1047
+          parameters: {bandpass: 0, frequency: 11, highpass: 1, lowpass: 0, negbandpass: 1, neghighpass: 0, resonance: 36, stereo: 0}
         - type: pan
           id: 1043
           parameters: {panning: 64, stereo: 0}
         - type: outaux
           id: 1044
-          parameters: {auxgain: 0, outgain: 72, stereo: 1}
+          parameters: {auxgain: 29, outgain: 50, stereo: 1}
     - name: Global
       numvoices: 1
       units:
@@ -184,8 +147,8 @@ patch:
           parameters: {channel: 2, stereo: 1}
         - type: delay
           id: 8
-          parameters: {damp: 14, dry: 128, feedback: 123, notetracking: 0, pregain: 33, stereo: 1}
+          parameters: {damp: 14, dry: 128, feedback: 120, notetracking: 0, pregain: 30, stereo: 1}
           varargs: [1116, 1188, 1276, 1356, 1422, 1492, 1556, 1618, 1140, 1212, 1300, 1380, 1446, 1516, 1580, 1642]
         - type: out
           id: 9
-          parameters: {gain: 90, stereo: 1}
+          parameters: {gain: 70, stereo: 1}

4klang_old.yml

@@ -0,0 +1,191 @@
+bpm: 116
+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, 6, 6]
+          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]]
+        - 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, 2, 2]
+          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]]
+        - 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, 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]]
+        - 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, 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]]
+        - 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, 5, 5]
+          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]]
+        - 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, 0, 0]
+          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]]
+        - 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, 0, 0]
+          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]]
+        - 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]
+          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, 0, 0]
+          patterns: [[62, 1, 1, 1, 62, 62, 62, 62, 1, 1, 62, 1, 1, 62, 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]
+          patterns: [[60, 1, 1, 1, 60, 1, 1, 1, 60, 1, 1, 1, 60, 1, 1, 1]]
+    rowsperpattern: 16
+    length: 31
+patch:
+    - name: Strings
+      numvoices: 5
+      units:
+        - type: envelope
+          id: 33
+          parameters: {attack: 57, channel: 2, decay: 82, gain: 128, release: 63, stereo: 0, sustain: 62}
+        - type: oscillator
+          id: 19
+          parameters: {color: 65, damp: 64, detune: 65, dry: 128, feedback: 125, gain: 41, looplength: 9710, loopstart: 251, notetracking: 0, phase: 0, pregain: 40, samplestart: 1448797, shape: 67, stereo: 0, transpose: 91, type: 4, unison: 1}
+        - type: oscillator
+          id: 24
+          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: {damp: 0, dry: 128, feedback: 96, notetracking: 2, panning: 64, pregain: 40, stereo: 0}
+        - type: mulp
+          parameters: {auxgain: 64, outgain: 64, panning: 64, stereo: 0}
+        - type: envelope
+          id: 46
+          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}
+        - type: oscillator
+          id: 38
+          parameters: {color: 128, detune: 62, gain: 78, looplength: 10741, loopstart: 284, phase: 0, samplestart: 1351767, shape: 64, stereo: 0, transpose: 79, type: 4, unison: 1}
+        - type: xch
+          id: 41
+          parameters: {stereo: 0}
+        - type: addp
+          id: 39
+          parameters: {stereo: 0}
+        - type: mulp
+          id: 35
+          parameters: {stereo: 0}
+        - type: outaux
+          id: 23
+          parameters: {auxgain: 19, outgain: 18, stereo: 1}
+    - name: Pizzicato
+      numvoices: 4
+      units:
+        - type: envelope
+          id: 1
+          parameters: {attack: 31, channel: 2, decay: 70, gain: 76, release: 66, stereo: 0, sustain: 0}
+        - type: oscillator
+          id: 2
+          parameters: {color: 64, damp: 64, detune: 31, dry: 128, feedback: 125, gain: 128, looplength: 398, loopstart: 2073, notetracking: 0, phase: 0, pregain: 40, samplestart: 1034961, shape: 64, stereo: 0, transpose: 77, type: 4, unison: 2}
+        - type: oscillator
+          parameters: {auxgain: 64, color: 64, detune: 48, gain: 97, looplength: 398, loopstart: 2073, outgain: 64, phase: 0, samplestart: 1034961, shape: 64, stereo: 0, transpose: 89, type: 4, unison: 2}
+        - type: addp
+          id: 16
+          parameters: {stereo: 0}
+        - type: mulp
+          id: 14
+          parameters: {bandpass: 0, frequency: 82, highpass: 0, lowpass: 1, negbandpass: 0, neghighpass: 0, resonance: 128, stereo: 0}
+        - type: pan
+          id: 5
+          parameters: {auxgain: 39, outgain: 58, panning: 75, stereo: 0}
+        - type: delay
+          id: 49
+          parameters: {damp: 86, dry: 128, feedback: 59, notetracking: 0, pregain: 28, stereo: 1}
+          varargs: [5230, 4533]
+        - type: outaux
+          id: 6
+          parameters: {auxgain: 32, outgain: 20, stereo: 1}
+    - name: Trumpet
+      numvoices: 3
+      units:
+        - type: envelope
+          id: 51
+          parameters: {attack: 25, decay: 64, gain: 112, release: 64, stereo: 1, sustain: 88}
+        - type: oscillator
+          id: 1037
+          parameters: {color: 64, detune: 64, gain: 47, looplength: 76, loopstart: 1916, phase: 0, samplestart: 1622065, shape: 64, stereo: 1, transpose: 62, type: 4, unison: 1}
+        - type: mulp
+          id: 53
+          parameters: {stereo: 1}
+        - type: delay
+          parameters: {damp: 18, dry: 128, feedback: 37, notetracking: 2, pregain: 84, stereo: 1}
+          varargs: [48, 96]
+        - type: outaux
+          id: 56
+          parameters: {auxgain: 53, outgain: 56, stereo: 1}
+        - type: envelope
+          id: 61
+          parameters: {attack: 91, decay: 0, gain: 82, release: 89, stereo: 0, sustain: 92}
+        - type: oscillator
+          id: 59
+          parameters: {color: 128, detune: 64, gain: 128, lfo: 1, phase: 0, shape: 64, stereo: 0, transpose: 82, type: 0, unison: 0}
+        - type: mulp
+          id: 62
+          parameters: {stereo: 0}
+        - type: send
+          id: 1038
+          parameters: {amount: 80, port: 1, sendpop: 1, stereo: 0, target: 1037, unit: 0, voice: 0}
+    - name: snare edm 2 (sample-st)
+      comment: 'Suggested range: E-2 to C-3'
+      numvoices: 1
+      units:
+        - type: envelope
+          parameters: {attack: 0, decay: 68, gain: 90, release: 0, stereo: 0, sustain: 0}
+        - type: oscillator
+          id: 200
+          parameters: {color: 48, detune: 52, gain: 53, lfo: 0, looplength: 1, loopstart: 4276, phase: 0, samplestart: 560606, shape: 81, stereo: 0, transpose: 76, type: 4}
+        - type: mulp
+          parameters: {panning: 64, stereo: 0}
+        - type: envelope
+          parameters: {attack: 0, auxgain: 64, decay: 68, gain: 83, outgain: 64, release: 0, stereo: 0, sustain: 0}
+        - type: noise
+          parameters: {gain: 39, shape: 2, stereo: 0}
+        - type: mulp
+          parameters: {stereo: 0}
+        - type: filter
+          id: 201
+          parameters: {bandpass: 0, frequency: 128, highpass: 0, lowpass: 1, negbandpass: 0, neghighpass: 1, resonance: 67, stereo: 0}
+        - type: filter
+          parameters: {bandpass: 0, frequency: 110, highpass: 0, lowpass: 1, negbandpass: 0, neghighpass: 0, resonance: 116, stereo: 0}
+        - type: addp
+          parameters: {stereo: 0}
+        - type: pan
+          parameters: {panning: 59, stereo: 0}
+        - type: outaux
+          parameters: {auxgain: 56, outgain: 77, stereo: 1}
+    - name: kick
+      numvoices: 1
+      units:
+        - type: envelope
+          id: 1039
+          parameters: {attack: 0, decay: 43, gain: 103, release: 50, stereo: 0, sustain: 89}
+        - type: oscillator
+          id: 1040
+          parameters: {color: 42, detune: 42, gain: 128, looplength: 1, loopstart: 1034, phase: 0, samplestart: 741926, shape: 72, stereo: 0, transpose: 79, type: 4}
+        - type: mulp
+          id: 1041
+          parameters: {stereo: 0}
+        - type: pan
+          id: 1043
+          parameters: {panning: 64, stereo: 0}
+        - type: outaux
+          id: 1044
+          parameters: {auxgain: 0, outgain: 72, stereo: 1}
+    - name: Global
+      numvoices: 1
+      units:
+        - type: in
+          id: 7
+          parameters: {channel: 2, stereo: 1}
+        - type: delay
+          id: 8
+          parameters: {damp: 14, dry: 128, feedback: 123, notetracking: 0, pregain: 33, stereo: 1}
+          varargs: [1116, 1188, 1276, 1356, 1422, 1492, 1556, 1618, 1140, 1212, 1300, 1380, 1446, 1516, 1580, 1642]
+        - type: out
+          id: 9
+          parameters: {gain: 90, stereo: 1}

base.config

@@ -8,7 +8,7 @@ MUSIC_BEATS_PER_BAR=4.0
 
 ########### Visuals ############
 SHADER_FILE=shader.glsl
-RESOLUTION_X=1980
+RESOLUTION_X=1920
 RESOLUTION_Y=1080
 
 USE_TIME_UNIFORM=1
@@ -43,11 +43,11 @@ USE_WIDECHAR_TEXTS=1
 
 ###########  Time base ###########
 USE_TIME_DIVIDER_IN_X86_CODE=1
-TIME_DIVIDER=91241.383
+TIME_DIVIDER=89694.914
 TIME_BASE=bars
 
 AUDIO_DELAY=2048
-PROD_END_TIME=2830240
+PROD_END_TIME=4217008
 
 
 ########### Final product ###########
@@ -61,9 +61,9 @@ QUOTE=\"
 
 CRINKLER_ORDERTRIES=4000
 
-AUDIO_BUFFER_ALLOCATED_LENGTH=2830240
+AUDIO_BUFFER_ALLOCATED_LENGTH=4217008
 AUDIO_SAMPLING_RATE=44100
 LOOP_END=28.0
 LOOP_START=24.0
 LOOP_ENABLED=0
-TIME_DIVIDER_INT=91241
+TIME_DIVIDER_INT=89694

minified.config

@@ -13,11 +13,12 @@ TIME_UNIFORM_NAME='y'
 RESOLUTION_UNIFORM_NAME='v'
 TEXTS_UNIFORM_NAME='f'
 USE_WIDECHAR_TEXTS=1
-TIME_DIVIDER=91241.383
+TIME_DIVIDER=89694.914
 TIME_BASE=bars
-TIME_DIVIDER_INT=91241
+TIME_DIVIDER_INT=89694
 TWO_PASS_RENDERING=0
 SECOND_PASS_NEGATIVE_TIME=0
 USE_TEXTS=0
 USE_TEXTS_UNIFORM=0
 CRINKLER_ORDERTRIES=30000
+USE_RESOLUTION_UNIFORM=1

shader.glsl

@@ -72,6 +72,11 @@ float sdTriPrism( vec3 p, vec2 h, float rot )
     return max(q.z-h.y,max(q.x*.866025+p.y*.5,-p.y)-h.x*.5);
 }
 
+float sdPyramid( vec3 p, float s)
+{
+  p = abs(p);
+  return (p.x+p.y+p.z-s)*0.577;// 35027;
+}
 
 //////////////////
 //   ANIMATION  //
@@ -88,20 +93,12 @@ float sdTriPrism( vec3 p, vec2 h, float rot )
 // DELAYS
 float STARTDELAY = 9., glow = 0.;
 
-// COLORS
+// POSITIONS
-vec3
-glyph3Pos = vec3(1.5,1.4,0.0),
-glyph5Pos = vec3(-1.5,1.4,0.0),
-fogColor1 = vec3(0.49, 0.18, 0.49),       // fog color1
-fogColor2 = vec3(0.93, 0.37, 0.16),       // fog color2
-indirColor = vec3(0.29, 0.28, 0.33),       // indirect light color
-light1Color = vec3(0.82, 0.5, 0.9),
-light2Color = vec3(0.79, 0.66, 0.43),
-chevronColor = vec3(0.46, 0.0, 0.9),
-SEA_BASE = vec3(0.0, 0.1, 0.3),
-SEA_WATER_COLOR =vec3(0.11, 0.16, 0.18);
 
 
+// COLORS
+vec3 chevronColor = vec3(0.36, 0.9, 0.0);
+
 //  with duration d, startTime s and speed up with timeFact
 float timedSine(vec3 i) {
     return min((u_time  - i.y)*i.z, i.x*PI);
@@ -115,7 +112,7 @@ float calcFactor (float startTime)
 // Animate ring movements
 vec3 ringAnim(vec3 p) {
     for (float i = 0.; i < 7.; i++) {
-        float rotateDelay = STARTDELAY + (i * 2.), o=1.;
+        float rotateDelay = STARTDELAY + (i * 3.), o=1.;
         if(u_time > rotateDelay) {
             if(mod(i,2.) >= 1.) o = -1.;
             p.xy *= rot2D(calcFactor(rotateDelay)*o);
@@ -138,8 +135,7 @@ float prismAnim(vec2 i) {
 float sea_octave(vec2 uv, float choppy) {
     uv += noise(uv, 1., 1);
     vec2 wv = 1.0-abs(sin(uv));
-    vec2 swv = abs(cos(uv));
+    wv = mix(wv, abs(cos(uv)),wv);
-    wv = mix(wv,swv,wv);
     return pow(1.0-pow(wv.x * wv.y,0.65),choppy);
 }
 
@@ -159,8 +155,7 @@ vec3 map(vec3 p, int displace)
     d = min(d,d2);
 
     // Inner ring
-    d2 = abs(length(p.xy) - 1.75) - .08;
+    d2 = smax(  abs(length(p.xy) - 1.75) - .08, abs(p.z - .1)-.04, .005 );
-    d2 = smax( d2, abs(p.z - .1)-.04, .005 );
     d = max(-d2,d);
 
     // Depth slice rings
@@ -182,7 +177,7 @@ vec3 map(vec3 p, int displace)
         d2 = min(d2, step);
         stepDist += .2;
     }
-    d2 += noise(p.xz * 50.+200., .01, 0) - noise (p.yz*2.+1.5, 0.15,0);
+    d2 += noise(p.xz * 50.+200., .007, 0);
     d = min(d, d2);
     if (d==d2) mat = 2.0;
 
@@ -196,7 +191,7 @@ vec3 map(vec3 p, int displace)
             choppy = mix(choppy,1.0,0.4);
         }
     }
-    d2 = max(-sdCappedCylinder(p, 2.0, min((2.0 - (u_time - 23.0)*3.),2.3)), sdCappedCylinder(p, .025, 1.6) - h*0.15);
+    d2 = max(-sdCappedCylinder(p, 2.0, min((1.7 - (u_time - 28.9)*2.5),2.3)), sdCappedCylinder(p, .025, 1.6) - h*0.15);
     d2 = max(d2, sdCappedCylinder ( p, 0.3, 1.7));
     d = min(d, d2);
     if (d==d2) {
@@ -208,17 +203,20 @@ vec3 map(vec3 p, int displace)
     d = min(d,d2);
     if (d==d2) mat = 3.0;
 
+    // pyradmid
+    d2 = sdPyramid(p+vec3(-75., 0., 100.), 60.);
+    d = min(d, d2);
+    if (d==d2) mat=3.;
     // Prisms
     for(float i = 0.; i < 8.; i++ ) {
-        an = 24.67 / (PI * 2.); // sector size
         q = p;
-        anRot = an + (i+1.) * PI / 4.;
+        anRot = 24.67 / (PI * 2.) + (i+1.) * PI / 4.;
 
         // Nudge first and the last prism out of the ground
         if (i == 1.) anRot += .2;
         if (i == 7.) anRot -= .2;
         q.xy = rot2D(anRot) * q.xy;
-        float rotateDelay = STARTDELAY + (i - 1.) * 2. + 1.5;
+        float rotateDelay = STARTDELAY + (i - 1.) * 3. + 1.5;
         // We can now call each prism by it's index
         // draw all except the middle bottom prism
         if (i > 0.) {
@@ -252,9 +250,9 @@ float rayMarch(vec3 ro, vec3 rd, int a) {
     // Raymarching
     for (int i = 0; i < 100; i++) {
         d = map(ro + rd * t, 0); // Get distance to objects
-        if (a==0&&d.z<0.3) glow += 0.05/(1.0 + 10.*pow(d.z, .5));
+        if (a==0&&d.z<0.3) glow += pow(0.01/d.z,0.8)*0.6;
         t += d.x; // "march" the ray
-        if (d.x < 1e-3 || t > 400.) break;
+        if (d.x < 1e-3 || t > 500.) break;
     }
     return t;
 }
@@ -268,9 +266,10 @@ vec3 getNormal(vec3 p) {
     return no(n);
 }
 
-float getLight(vec3 p, vec3 lightPos, float intensity, float shadow, vec3 n) {
+float getLight(vec3 p, vec3 lightPos, float intensity, float shadow, vec3 n, float atte) {
     vec3 l = no(lightPos - p);
-    float dif = cl(dot(n, l), 0., intensity),
+    float len = length( lightPos - p ); // Distance from the light to the surface point.
+    float dif = cl(dot(n, l)*intensity, 0., intensity) * 1.0 / (1.0 + atte*len),
     d = rayMarch(p+n*.0025, l, 1);
     if(d<length(lightPos-p)) dif *= shadow;
     return dif;
@@ -288,16 +287,16 @@ float specular(vec3 normal,vec3 lightPos,vec3 rayOrigin,float specular) {
 
 vec3 getSeaColor(vec3 p, vec3 n, vec3 l, vec3 eye) {
 
-    vec3 color = SEA_BASE + diffuse(n,l,60.0) * SEA_WATER_COLOR * 0.3;
+    vec3 color = vec3(0.0, 0.1, 0.3) + diffuse(n,l,60.0) * vec3(0.11, 0.16, 0.18) * 0.3;
-    color -= vec3(0.73, 0.15, 0.66) * pow(clamp(1.-dot(n, -eye), 0., 1.), .7);
+    color -= vec3(0.73, 0.15, 0.66) * pow(cl(1.-dot(n, -eye), 0., 1.), .7);
     color += vec3(specular(n,l,eye,60.0))*0.2;
     return color;
 }
 
 
 vec3 applyFog(vec3 col, float t, vec3 rd, vec3  lightDir, float b ) {
-    vec3 fogColor = mix( fogColor1, // blue
+    vec3 fogColor = mix( vec3(0.34, 0.11, 0.34), // blue
-                         fogColor2, // yellow
+                         vec3(0.93, 0.37, 0.16), // yellow
                          pow(max( dot(rd, lightDir), 0.) ,8.));
     return mix( col, fogColor, 1.0 - exp(-t*b) );
 }
@@ -324,7 +323,7 @@ vec3 postProcess(vec3 col) {
     col = smoothstep(0., 1., col);
 
     // fade out at the end
-    col += 1.0 - vec3(cl((31. - u_time)*.5, 0., 1.0));
+    col += 1.0 - vec3(cl((46. - u_time)*.5, 0., 1.0));
     return col;
 }
 
@@ -337,18 +336,23 @@ vec3 cameraPos()
     if (u_time > 10.5) cPos = vec3(2.,-1.,1.);
     // zoom away for 2nd glyph animation
     if (u_time > 12.) cPos = vec3(-1., -.7, 4.);
-    if (u_time > 13.5) {
+    if (u_time > 14.5) {
     cPos = vec3(0., 0., 4.);
-    cPos.yz *= rot2D(-0.6-(cos(u_time-15.))*0.2);
+    cPos.yz *= rot2D(-0.6-(cos(u_time-15.))*0.05);
-    cPos.xz *= rot2D(sin((u_time-16.5)*0.3));
+    cPos.xz *= rot2D(sin((u_time-16.5)*0.1));
     }
-    if (u_time > 19.5)
+    if (u_time > 23.5)
     {
         cPos = vec3(3., -.7, 4.);
     }
-    if (u_time > 21.8) {
+    if (u_time > 32.5)
-        cPos.yz *= rot2D(((1.-cos(u_time-21.8))*-0.025));
+    {
-        cPos.xz *= rot2D(sin((u_time-21.8)*0.07));
+        cPos = vec3(-20.,10.,50.);
+    }
+    if (u_time > 36.5) {
+        cPos = vec3(3., -.7, 4.);
+        cPos.yz *= rot2D(((1.-cos(u_time-36.5))*-0.025));
+        cPos.xz *= rot2D(sin((u_time-36.5)*0.07));
     }
 
     return cPos;
@@ -360,15 +364,15 @@ vec3 cameraPointAt() {
     if (u_time > 10.5) p = vec3(1.7,-1.1,0.);
     // look gate at distance
     if(u_time > 12.) p = vec3(0.);
-    if(u_time > 13.5) p = mix(glyph3Pos,glyph5Pos, (u_time-13.5)*0.13);
+    if(u_time > 14.5) p = mix(vec3(1.5,1.4,0.0),vec3(-1.5,1.4,0.0), (u_time-16.5)*0.13);
-    if(u_time > 19.5) p = vec3(0.);
+    if(u_time > 23.5) p = vec3(0.);
     return p;
 }
 
 // flash screen with glyph color when it is locked
 vec3 colorFlashesAnim(vec3 col) {
     if(u_time > 10.75) {
-        float x = smoothstep(sin(timedSine(vec3(.8, 10.75, 8.)*2.)), -1.,.8);
+        float x = smoothstep(-1.,.8,sin((timedSine(vec3(.8, 10.75, 8.))*2.)));
         col = mix(col, chevronColor * (x * 1.4), x *.76);
     }
     return col;
@@ -383,11 +387,11 @@ vec3 sceneGate(vec2 uv)
 {
     // Initialization
     vec3 ro = cameraPos(),
-    rd = getCameraRayDir(uv, ro, cameraPointAt(), cl((28.-u_time)*-2.,2.,25.)),
+    rd = getCameraRayDir(uv, ro, cameraPointAt(), cl((43.-u_time)*-2.,2.,25.)),
     col = vec3(0.);
     float d = rayMarch(ro, rd,0), mat = 0.;
 
-    if (d < 200.) {
+    if (d < 500.) {
         // Lighting
         vec3 p = ro + rd * d,
         n = getNormal(p);
@@ -399,17 +403,18 @@ vec3 sceneGate(vec2 uv)
         // 4: Shadow intensity
 
         // Lights
-        col += light1Color * getLight(p,  vec3( 10., 15., 25.), 1., .2,n);
+        col += vec3(0.82, 0.5, 0.9) * getLight(p,  vec3( 10., 15., 25.), 1., .2,n,1e-10);
-        col += light2Color * getLight(p,  vec3( 4., 2., -15.), 1., 1.,n);
+        col += vec3(0.79, 0.66, 0.43) * getLight(p,  vec3( 4., 2., -15.), 1., 1.,n,1e-10);
+        col += vec3(0.0, 0.06, 0.7) * getLight(p,  vec3( 0., 0., 5.),cl((u_time-29.0)*100.,0.,50.), 0.0,n,3.1);
         // indirect lightning -> vec3 in normalize is light direction
-        col += indirColor * cl( dot( n, no(vec3(0. , 1., 10.))), 0., 1.);
+        col += vec3(0.29, 0.28, 0.33) * cl( dot( n, no(vec3(0. , 1., 10.))), 0., 1.);
 
         if(mat==0.)
             col *= vec3(0.2, 0.3, 0.3) + addSpecular(n,rd,.5, 2.);
         if(mat==1.)
-            col = getSeaColor(p, n, no(vec3(0.0,0.3,0.8)),no(rd));
+            col *= getSeaColor(p, n, no(vec3(0.0,0.3,0.8)),no(rd));
         if(mat==2.)
-            col *= vec3(.8, .8, .5);
+            col *= vec3(0.7, 0.7, 0.4) + noise (p.xz*3.+1.5, 0.1,0);
         if(mat==3.)
             col *= vec3(.8, .8, .5) + noise(p.xz*500.+1e5, .3,0);
         if(mat==4.)
@@ -419,7 +424,7 @@ vec3 sceneGate(vec2 uv)
         if(mat == 6.)
             col *= vec3(0.01, 0.04, 0.06) + addSpecular(n,rd,.1, 2.5);
    }
-   col += glow * chevronColor*3.0;
+   col += glow * chevronColor*.25;
    return postProcess(colorFlashesAnim(applyFog(col, d, rd, vec3(0., -.1, -1.), .01)));
 }
 

shader_minified.h

@@ -8,9 +8,9 @@ const char *__temp_cleaned_shader_glsl =
  "uniform vec2 v;"
  "uniform float y;"
  "const float m=22./7.;"
- "vec3 f(vec3 y)"
+ "vec3 f(vec3 v)"
  "{"
-   "return normalize(y);"
+   "return normalize(v);"
  "}"
  "float f(float v,float f,float y)"
  "{"
@@ -24,8 +24,8 @@ const char *__temp_cleaned_shader_glsl =
  "}"
  "float n(float v,float y,float m)"
  "{"
-   "float z=max(m-abs(v-y),0.);"
+   "float x=max(m-abs(v-y),0.);"
-   "return max(v,y)+z*z*.25/m;"
+   "return max(v,y)+x*x*.25/m;"
  "}"
  "float f(vec2 v,int y)"
  "{"
@@ -42,10 +42,10 @@ const char *__temp_cleaned_shader_glsl =
    "vec2 s=floor(v);"
    "v=fract(v);"
    "v=v*v*(3.-2.*v);"
-   "float z=y;"
+   "float x=y;"
    "if(m==1)"
-     "z=2.;"
+     "x=2.;"
-   "return-y+z*mix(mix(f(s+vec2(0),m),f(s+vec2(1,0),m),v.x),mix(f(s+vec2(0,1),m),f(s+vec2(1),m),v.x),v.y);"
+   "return-y+x*mix(mix(f(s+vec2(0),m),f(s+vec2(1,0),m),v.x),mix(f(s+vec2(0,1),m),f(s+vec2(1),m),v.x),v.y);"
  "}"
  "float s(vec3 v,float y,float m)"
  "{"
@@ -63,106 +63,114 @@ const char *__temp_cleaned_shader_glsl =
    "vec3 m=abs(v);"
    "return max(m.z-y.y,max(m.x*.866025+v.y*.5,-v.y)-y.x*.5);"
  "}"
- "float z=0.;"
- "vec3 d=vec3(1.5,1.4,0),i=vec3(-1.5,1.4,0),a=vec3(.49,.18,.49),p=vec3(.93,.37,.16),c=vec3(.29,.28,.33),l=vec3(.82,.5,.9),r=vec3(.79,.66,.43),C=vec3(.46,0,.9),F=vec3(0,.1,.3),K=vec3(.11,.16,.18);"
  "float s(vec3 v)"
+ "{"
+   "v=abs(v);"
+   "return(v.x+v.y+v.z-60.)*.577;"
+ "}"
+ "float z=0.;"
+ "vec3 a=vec3(.36,.9,0);"
+ "float x(vec3 v)"
  "{"
    "return min((y-v.y)*v.z,v.x*m);"
  "}"
- "vec3 x(vec3 v)"
+ "vec3 t(vec3 v)"
  "{"
    "for(float i=0.;i<7.;i++)"
      "{"
-       "float m=9.+i*2.,z=1.;"
+       "float m=9.+i*3.,z=1.;"
        "if(y>m)"
          "{"
            "if(mod(i,2.)>=1.)"
              "z=-1.;"
-           "v.xy*=n((9.+9.*f(sin(s(vec3(1.5,m,4))*.06),-.9,.9))*z);"
+           "v.xy*=n((9.+9.*f(sin(x(vec3(1.5,m,4))*.06),-.9,.9))*z);"
          "}"
      "}"
    "return v;"
  "}"
- "float t(vec2 v)"
+ "float w(vec2 v)"
  "{"
    "if(y>=v.y)"
-     "v.x+=.045*f(sin(s(vec3(3,v.y,40))*.4),-.8,.8);"
+     "v.x+=.045*f(sin(x(vec3(3,v.y,40))*.4),-.8,.8);"
    "return v.x;"
  "}"
  "float t(vec2 v,float y)"
  "{"
    "v+=x(v,1.,1);"
    "vec2 f=1.-abs(sin(v));"
-   "v=abs(cos(v));"
+   "f=mix(f,abs(cos(v)),f);"
-   "f=mix(f,v,f);"
    "return pow(1.-pow(f.x*f.y,.65),y);"
  "}"
- "vec3 x(vec3 v,int f)"
+ "vec3 w(vec3 v,int f)"
  "{"
-   "float z=0.,i=1e3,r=m/12.,p,a=floor(atan(v.y,v.x)/r+.5)*r;"
+   "float z=0.,i=1e3,r=m/12.,a,d=floor(atan(v.y,v.x)/r+.5)*r;"
-   "vec3 c=v;"
+   "vec3 p=v;"
-   "c.xy=n(a)*c.xy;"
+   "p.xy=n(d)*p.xy;"
-   "float d=length(max(abs(c.xy-vec2(1.8,0))-vec2(.24,.14),0.))-.02,l=abs(length(v.xy)-1.8)-.2;"
+   "float c=length(max(abs(p.xy-vec2(1.8,0))-vec2(.24,.14),0.))-.02,l=abs(length(v.xy)-1.8)-.2;"
-   "d=min(d,l);"
+   "c=min(c,l);"
    "l=n(abs(length(v.xy)-1.75)-.08,abs(v.z-.1)-.04,.005);"
-   "d=n(max(-l,d),abs(v.z)-.1,.02);"
+   "c=n(max(-l,c),abs(v.z)-.1,.02);"
-   "vec3 C=x(v),K=C;"
+   "vec3 h=t(v),g=h;"
    "r=m/16.;"
-   "K.xy=n(floor(atan(C.y,C.x)/r+.5)*r)*K.xy;"
+   "g.xy=n(floor(atan(h.y,h.x)/r+.5)*r)*g.xy;"
-   "l=n(K.xyz-vec3(1.75,0,0),vec3(.04,.14,.05))-.02+x(v.xy*1e2,.001,0);"
+   "l=n(g.xyz-vec3(1.75,0,0),vec3(.04,.14,.05))-.02+x(v.xy*1e2,.001,0);"
-   "d=min(d,l);"
+   "c=min(c,l);"
-   "if(d==l)"
+   "if(c==l)"
      "z=6.;"
    "l=1e3;"
-   "float F=1.5,e=0.,b,g=4.,E=.6,D=.2;"
+   "r=1.5;"
+   "float e=0.,b,C=4.,E=.6,D=.2;"
    "for(int i=0;i<4;i++)"
-     "p=n(vec3(v.x,v.y+F+.05,v.z),vec3(2,.2,F))-.05,l=min(l,p),F+=.2;"
+     "a=n(vec3(v.x,v.y+r+.05,v.z),vec3(2,.2,r))-.05,l=min(l,a),r+=.2;"
-   "l+=x(v.xz*50.+2e2,.01,0)-x(v.yz*2.+1.5,.15,0);"
+   "l+=x(v.xz*50.+2e2,.007,0);"
-   "d=min(d,l);"
+   "c=min(c,l);"
-   "if(d==l)"
+   "if(c==l)"
      "z=2.;"
    "if(f==1)"
      "{"
        "vec2 f=v.xy;"
        "for(int i=0;i<4;i++)"
-         "b=t((f+y)*E,g)+t((f-y)*E,g),e+=b*D,f*=mat2(1.6,1.2,-1.2,1.6),E*=1.9,D*=.22,g=mix(g,1.,.4);"
+         "b=t((f+y)*E,C)+t((f-y)*E,C),e+=b*D,f*=mat2(1.6,1.2,-1.2,1.6),E*=1.9,D*=.22,C=mix(C,1.,.4);"
      "}"
-   "l=max(max(-s(v,2.,min(2.-(y-23.)*3.,2.3)),s(v,.025,1.6)-e*.15),s(v,.3,1.7));"
+   "l=max(max(-s(v,2.,min(1.7-(y-28.9)*2.5,2.3)),s(v,.025,1.6)-e*.15),s(v,.3,1.7));"
-   "d=min(d,l);"
+   "c=min(c,l);"
-   "if(d==l)"
+   "if(c==l)"
      "z=1.;"
    "l=v.y+3.7+x(vec2(v.x,v.z*.44-40.)*.04+1e2,20.,0)+.25*sin(v.z*.5+y);"
-   "d=min(d,l);"
+   "c=min(c,l);"
-   "if(d==l)"
+   "if(c==l)"
+     "z=3.;"
+   "l=s(v+vec3(-75,0,100));"
+   "c=min(c,l);"
+   "if(c==l)"
      "z=3.;"
    "for(float f=0.;f<8.;f++)"
      "{"
-       "r=24.67/(m*2.);"
+       "p=v;"
-       "c=v;"
+       "d=24.67/(m*2.)+(f+1.)*m/4.;"
-       "a=r+(f+1.)*m/4.;"
        "if(f==1.)"
-         "a+=.2;"
+         "d+=.2;"
        "if(f==7.)"
-         "a-=.2;"
+         "d-=.2;"
-       "c.xy=n(a)*c.xy;"
+       "p.xy=n(d)*p.xy;"
-       "float p=9.+(f-1.)*2.+1.5;"
+       "float r=9.+(f-1.)*3.+1.5;"
        "if(f>0.)"
          "{"
-           "c.x-=1.95;"
+           "p.x-=1.95;"
-           "vec3 v=c;"
+           "vec3 v=p;"
-           "if(y>p)"
+           "if(y>r)"
-             "v.x=t(vec2(v.x,p));"
+             "v.x=w(vec2(v.x,r));"
-           "float f=s(vec3(c.x-.06,c.yz),vec2(.1,.15))-.01;"
+           "float f=s(vec3(p.x-.06,p.yz),vec2(.1,.15))-.01;"
            "l=min(max(-s(vec3(v.x-.14,v.yz),vec2(.22))-.01,s(vec3(v),vec2(.2,.12))-.02),f);"
-           "d=min(d,l);"
+           "c=min(c,l);"
-           "if(d==l)"
+           "if(c==l)"
              "z=4.;"
-           "if(d==f)"
+           "if(c==f)"
-             "if(y>p+.2)"
+             "if(y>r+.2)"
                "z=5.,i=min(l,f);"
          "}"
      "}"
-   "return vec3(d,z,i);"
+   "return vec3(c,z,i);"
  "}"
  "float t(vec3 v,vec3 y,int f)"
  "{"
@@ -170,39 +178,38 @@ const char *__temp_cleaned_shader_glsl =
    "float i=0.;"
    "for(int r=0;r<100;r++)"
      "{"
-       "m=x(v+y*i,0);"
+       "m=w(v+y*i,0);"
        "if(f==0&&m.z<.3)"
-         "z+=.05/(1.+10.*pow(m.z,.5));"
+         "z+=pow(.01/m.z,.8)*.6;"
        "i+=m.x;"
-       "if(m.x<.001||i>4e2)"
+       "if(m.x<.001||i>5e2)"
          "break;"
      "}"
    "return i;"
  "}"
- "vec3 w(vec3 v)"
+ "vec3 h(vec3 v)"
  "{"
    "vec2 y=vec2(.01,0);"
-   "return f(x(v,1).x-vec3(x(v-y.xyy,1).x,x(v-y.yxy,1).x,x(v-y.yyx,1)));"
+   "return f(w(v,1).x-vec3(w(v-y.xyy,1).x,w(v-y.yxy,1).x,w(v-y.yyx,1)));"
  "}"
- "float f(vec3 v,vec3 y,float m,vec3 d)"
+ "float f(vec3 v,vec3 y,float i,float m,vec3 c,float r)"
  "{"
-   "float i=1.;"
    "vec3 l=f(y-v);"
-   "i=f(dot(d,l),0.,i);"
+   "i=f(dot(c,l)*i,0.,i)/(1.+r*length(y-v));"
-   "float z=t(v+d*.0025,l,1);"
+   "r=t(v+c*.0025,l,1);"
-   "if(z<length(y-v))"
+   "if(r<length(y-v))"
      "i*=m;"
    "return i;"
  "}"
- "float n(vec3 v,vec3 y,vec3 f,float l)"
+ "float f(vec3 v,vec3 y,vec3 f,float l)"
  "{"
    "return pow(max(dot(reflect(f,v),y),0.),l)*((l+8.)/(m*8.));"
  "}"
- "vec3 s(vec3 v,vec3 y,vec3 f,vec3 m)"
+ "vec3 h(vec3 v,vec3 y,vec3 m,vec3 l)"
  "{"
-   "return F+pow(dot(y,f)*.4+.6,60.)*K*.3-vec3(.73,.15,.66)*pow(clamp(1.-dot(y,-m),0.,1.),.7)+vec3(n(y,f,m,60.))*.2;"
+   "return vec3(0,.1,.3)+pow(dot(y,m)*.4+.6,60.)*vec3(.11,.16,.18)*.3-vec3(.73,.15,.66)*pow(f(1.-dot(y,-l),0.,1.),.7)+vec3(f(y,m,l,60.))*.2;"
  "}"
- "vec3 t(vec2 v,vec3 y,vec3 i,float m)"
+ "vec3 n(vec2 v,vec3 y,vec3 i,float m)"
  "{"
    "y=f(i-y);"
    "i=f(cross(vec3(0,1,0),y));"
@@ -217,72 +224,75 @@ const char *__temp_cleaned_shader_glsl =
      "v=vec3(2,-1,1);"
    "if(y>12.)"
      "v=vec3(-1,-.7,4);"
-   "if(y>13.5)"
+   "if(y>14.5)"
-     "v=vec3(0,0,4),v.yz*=n(-.6-cos(y-15.)*.2),v.xz*=n(sin((y-16.5)*.3));"
+     "v=vec3(0,0,4),v.yz*=n(-.6-cos(y-15.)*.05),v.xz*=n(sin((y-16.5)*.1));"
-   "if(y>19.5)"
+   "if(y>23.5)"
      "v=vec3(3,-.7,4);"
-   "if(y>21.8)"
+   "if(y>32.5)"
-     "v.yz*=n((1.-cos(y-21.8))*-.025),v.xz*=n(sin((y-21.8)*.07));"
+     "v=vec3(-20,10,50);"
+   "if(y>36.5)"
+     "v=vec3(3,-.7,4),v.yz*=n((1.-cos(y-36.5))*-.025),v.xz*=n(sin((y-36.5)*.07));"
    "return v;"
  "}"
- "vec3 n()"
+ "vec3 h()"
  "{"
    "vec3 v=vec3(0,-.5,0);"
    "if(y>10.5)"
      "v=vec3(1.7,-1.1,0);"
    "if(y>12.)"
      "v=vec3(0);"
-   "if(y>13.5)"
+   "if(y>14.5)"
-     "v=mix(d,i,(y-13.5)*.13);"
+     "v=mix(vec3(1.5,1.4,0),vec3(-1.5,1.4,0),(y-16.5)*.13);"
-   "if(y>19.5)"
+   "if(y>23.5)"
      "v=vec3(0);"
    "return v;"
  "}"
- "vec3 h(vec3 v)"
+ "vec3 r(vec3 v)"
  "{"
    "if(y>10.75)"
      "{"
-       "float f=smoothstep(sin(s(vec3(.8,10.75,8)*2.)),-1.,.8);"
+       "float f=smoothstep(-1.,.8,sin(x(vec3(.8,10.75,8))*2.));"
-       "v=mix(v,f*1.4*C,f*.76);"
+       "v=mix(v,f*1.4*a,f*.76);"
      "}"
    "return v;"
  "}"
- "vec3 h(vec3 v,vec3 y,float m,float l)"
+ "vec3 r(vec3 v,vec3 y,float m,float l)"
  "{"
-   "return vec3(n(v,f(vec3(0,.3,.8)),f(y),pow(10.,l)))*m;"
+   "return vec3(f(v,f(vec3(0,.3,.8)),f(y),pow(10.,l)))*m;"
  "}"
- "vec3 e(vec2 v)"
+ "vec3 d(vec2 v)"
  "{"
-   "vec3 m=f(),d=t(v,m,n(),f((28.-y)*-2.,2.,25.)),i=vec3(0);"
+   "vec3 m=f(),l=n(v,m,h(),f((43.-y)*-2.,2.,25.)),i=vec3(0);"
-   "float K=t(m,d,0),g=0.;"
+   "float c=t(m,l,0),s=0.;"
-   "if(K<2e2)"
+   "if(c<5e2)"
      "{"
-       "vec3 v=m+d*K,y=w(v);"
+       "vec3 v=m+l*c,z=h(v);"
-       "g=x(v,0).y;"
+       "s=w(v,0).y;"
-       "i+=l*f(v,vec3(10,15,25),.2,y);"
+       "i+=vec3(.82,.5,.9)*f(v,vec3(10,15,25),1.,.2,z,1e-10);"
-       "i+=r*f(v,vec3(4,2,-15),1.,y);"
+       "i+=vec3(.79,.66,.43)*f(v,vec3(4,2,-15),1.,1.,z,1e-10);"
-       "i+=c*f(dot(y,f(vec3(0,1,10))),0.,1.);"
+       "i+=vec3(0,.06,.7)*f(v,vec3(0,0,5),f((y-29.)*1e2,0.,50.),0.,z,3.1);"
-       "if(g==0.)"
+       "i+=vec3(.29,.28,.33)*f(dot(z,f(vec3(0,1,10))),0.,1.);"
-         "i*=vec3(.2,.3,.3)+h(y,d,.5,2.);"
+       "if(s==0.)"
-       "if(g==1.)"
+         "i*=vec3(.2,.3,.3)+r(z,l,.5,2.);"
-         "i=s(v,y,f(vec3(0,.3,.8)),f(d));"
+       "if(s==1.)"
-       "if(g==2.)"
+         "i*=h(v,z,f(vec3(0,.3,.8)),f(l));"
-         "i*=vec3(.8,.8,.5);"
+       "if(s==2.)"
-       "if(g==3.)"
+         "i*=vec3(.7,.7,.4)+x(v.xz*3.+1.5,.1,0);"
+       "if(s==3.)"
          "i*=vec3(.8,.8,.5)+x(v.xz*5e2+1e5,.3,0);"
-       "if(g==4.)"
+       "if(s==4.)"
-         "i*=vec3(0,.08,.11)+h(y,d,.3,.7);"
+         "i*=vec3(0,.08,.11)+r(z,l,.3,.7);"
-       "if(g==5.)"
+       "if(s==5.)"
-         "i=C*.4;"
+         "i=a*.4;"
-       "if(g==6.)"
+       "if(s==6.)"
-         "i*=vec3(.01,.04,.06)+h(y,d,.1,2.5);"
+         "i*=vec3(.01,.04,.06)+r(z,l,.1,2.5);"
      "}"
-   "i+=z*C*3.;"
+   "i+=z*a*.25;"
-   "return smoothstep(0.,1.,pow(h(mix(i,mix(a,p,pow(max(dot(d,vec3(0,-.1,-1)),0.),8.)),1.-exp(-K*.01)))*vec3(.9,.8,.7),vec3(.45)))+1.-vec3(f((31.-y)*.5,0.,1.));"
+   "return smoothstep(0.,1.,pow(r(mix(i,mix(vec3(.34,.11,.34),vec3(.93,.37,.16),pow(max(dot(l,vec3(0,-.1,-1)),0.),8.)),1.-exp(-c*.01)))*vec3(.9,.8,.7),vec3(.45)))+1.-vec3(f((46.-y)*.5,0.,1.));"
  "}"
  "void main()"
  "{"
-   "gl_FragColor=vec4(e((gl_FragCoord.xy*2.-v.xy)/v.y),1);"
+   "gl_FragColor=vec4(d((gl_FragCoord.xy*2.-v.xy)/v.y),1);"
  "}";
 
 #endif // SHADER_MINIFIED_H_