lyhyemmät musat

This commit is contained in:
2024-07-29 19:33:06 +03:00
parent 7fbe712d53
commit f8371d479f
9 changed files with 228 additions and 246 deletions

View File

@ -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
;-------------------------------------------------------------------------------

View File

@ -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))

View File

@ -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

View File

@ -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}

View File

@ -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

View File

@ -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

BIN
music/4k_sg_v4.xrns Normal file

Binary file not shown.

View File

@ -4,7 +4,7 @@
* Contact: tdmaav@gmail.com
*/
//precision mediump float;
precision mediump float;
uniform vec2 u_resolution;
uniform float u_time;
const float PI = 22./7.;
@ -91,8 +91,8 @@ const vec3 glyph7Pos = vec3(1.7 * -1.,-1.1,0.0);
*/
// DELAYS
float STARTDELAY = 9.,
glyphPhase = 2.;
float STARTDELAY = 9.;
// COLORS
vec3 fogColor1 = vec3(.4, .2, .4), // fog color1
@ -102,7 +102,7 @@ light1Color = vec3(.9, .5, .7),
light2Color = vec3(.8, .7, .5),
chevronColor = vec3(.9, .3, 0.),
SEA_BASE = vec3(0.0, 0.1, 0.2),
SEA_WATER_COLOR =vec3(0.8,0.9,0.6)*0.6;
SEA_WATER_COLOR =vec3(0.4,0.5,0.3);
// with duration d, startTime s and speed up with timeFact
@ -119,7 +119,7 @@ float calcFactor (float startTime)
// Animate ring movements
vec3 ringAnim(vec3 p) {
for (float i = 0.; i < 7.; i++) {
float rotateDelay = STARTDELAY + (i * glyphPhase), o=1.;
float rotateDelay = STARTDELAY + (i * 2.), o=1.;
if(u_time > 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);
}

View File

@ -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)<length(m-v))"
"c*=y;"
"return c;"
"vec3 c=normalize(m-v);"
"float x=clamp(dot(d,c),0.,1.),p=h(v+d*.0025,c);"
"if(abs(p)<length(m-v))"
"x*=y;"
"return x;"
"}"
"vec3 e(vec3 v,vec3 m,vec3 x)"
"float e(vec3 v,vec3 y,vec3 d)"
"{"
"vec3 l=normalize(vec3(0,.3,.8));"
"float i=clamp(1.-dot(m,-x),0.,1.);"
"i=min(pow(i,5.),.5);"
"vec3 r=mix(d+pow(dot(m,l)*.4+.6,60.)*p*.3,vec3(0,.5,1),i);"
"r+=vec3(pow(max(dot(reflect(x,m),l),0.),60.)*(68./(y*8.)))*.3;"
"return r;"
"return pow(max(dot(reflect(d,v),y),0.),60.)*(68./(m*8.));"
"}"
"vec3 r(vec2 v,vec3 y,vec3 m)"
"vec3 h(vec3 v,vec3 m,vec3 y)"
"{"
"vec3 l=normalize(m-y),c=normalize(cross(vec3(0,1,0),l));"
"return normalize(l*2.+v.x*c+v.y*cross(l,c));"
"vec3 c=normalize(vec3(0,.3,.8));"
"float p=clamp(1.-dot(m,-y),0.,1.);"
"p=min(pow(p,5.),.5);"
"vec3 i=mix(d+pow(dot(m,c)*.4+.6,60.)*r*.3,vec3(0,.5,1),p);"
"i+=vec3(e(m,c,y))*.3;"
"return i;"
"}"
"vec3 r(vec3 m)"
"vec3 t(vec2 v,vec3 y,vec3 m)"
"{"
"m*=smoothstep(.9,.5,length(gl_FragCoord.xy/v.xy-vec2(.5)));"
"m*=vec3(.9,.8,.7);"
"m=pow(m,vec3(.4545));"
"return smoothstep(0.,1.,m);"
"vec3 d=normalize(m-y),c=normalize(cross(vec3(0,1,0),d));"
"return normalize(d*2.+v.x*c+v.y*cross(d,c));"
"}"
"vec3 t(vec3 v)"
"{"
"v*=vec3(.9,.8,.7);"
"v=pow(v,vec3(.4545));"
"return smoothstep(0.,1.,v);"
"}"
"vec3 e()"
"{"
"vec3 y=vec3(0,clamp(6.-m,2.,6.),clamp(75.-m*8.,6.,75.));"
"if(m>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_