Merge branch 'teemun_uusi_efekti' of https://gitea.xn--jrvisalo-0za.fi/markus/4k_synthwave into teemun_uusi_efekti

song.yml

@@ -2,103 +2,112 @@ bpm: 138
 rowsperbeat: 4
 score:
     tracks:
-        - numvoices: 2
+        - numvoices: 1
-          order: [-1, -1, -1, -1, 0, -1, 1, -1, 0, -1, 1, -1, 2, -1, 1, -1, 3, -1, 1, -1, 2, -1, 1, -1, 4, -1, 1, -1, 0, -1, -1, -1, 0, -1, -1, -1, 0, -1, -1, -1, 0, -1, -1, -1, 2, -1, -1, -1, 2, -1, -1, -1, 0, -1, -1, -1, 0, -1, -1, -1, 0, -1, -1, -1, 4, -1, 2, -1, 0, -1, -1, -1, 4, -1, 2, -1, 0, -1, -1, -1, 0, -1, -1, -1, 2, -1, 2, -1, 3, 5, 2, 6, 0, -1, -1, -1, 0, -1, 1, -1, 0, -1, 1, -1, 0, -1, 1, -1]
+          order: [-1, -1, -1, -1, 0, -1, 1, -1, 0, -1, 1, -1, 2, -1, 1, -1, 3, -1, 1, -1, 2, -1, 1, -1, 4, -1, 1, -1, 0, -1, -1, -1, 0, -1, -1, -1, 0, -1, -1, -1, 0, -1, -1, -1, 2, -1, -1, -1, 2, -1, -1, -1, 0, -1, -1, -1, 0, -1, -1, -1, 0, -1, -1, -1, 4, -1, 2, -1, 0, -1, -1, -1, 4, -1, 2, -1, 0, -1, -1, -1, 0, -1, -1, -1, 2, -1, 2, -1, 3, 5, 2, 6, 0, -1, -1, -1, 0, -1, 1, -1, 0, -1, 1, -1, 0, -1, 1, -1, -1]
           patterns: [[33, 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], [29, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1], [26, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1], [31, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1], [1, 1, 1, 1, 1, 1, 1, 1, 28, 1, 1, 1, 1, 1, 1, 1], [1, 1, 1, 1, 1, 1, 1, 1, 31, 1, 1, 1, 1, 1, 1, 1]]
-        - numvoices: 2
+        - numvoices: 1
-          order: [-1, -1, -1, -1, 0, -1, 1, -1, 0, -1, 1, -1, 2, -1, 1, -1, 3, -1, 1, -1, 2, -1, 1, -1, 4, -1, 1, -1, 0, -1, -1, -1, 0, -1, -1, -1, 0, -1, -1, -1, 0, -1, -1, -1, 2, -1, -1, -1, 2, -1, -1, -1, 0, -1, -1, -1, 0, -1, -1, -1, 0, -1, -1, -1, 4, -1, 2, -1, 0, -1, -1, -1, 4, -1, 2, -1, 0, -1, -1, -1, 0, -1, -1, -1, 5, -1, 5, -1, 6, 7, 5, 8, 9, -1, -1, -1, 9, -1, 1, -1, 9, -1, 1, -1, 0, -1, 1, -1]
+          order: [-1, -1, -1, -1, 0, -1, 1, -1, 0, -1, 1, -1, 2, -1, 1, -1, 3, -1, 1, -1, 2, -1, 1, -1, 4, -1, 1, -1, 0, -1, -1, -1, 0, -1, -1, -1, 0, -1, -1, -1, 0, -1, -1, -1, 2, -1, -1, -1, 2, -1, -1, -1, 0, -1, -1, -1, 0, -1, -1, -1, 0, -1, -1, -1, 4, -1, 2, -1, 0, -1, -1, -1, 4, -1, 2, -1, 0, -1, -1, -1, 0, -1, -1, -1, 5, -1, 5, -1, 6, 7, 5, 8, 9, -1, -1, -1, 9, -1, 1, -1, 9, -1, 1, -1, 0, -1, 1, -1, -1]
           patterns: [[45, 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], [41, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1], [38, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1], [43, 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, 1, 1], [50, 1, 1, 1, 1, 1, 1, 1, 1, 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, 55, 1, 1, 1, 1, 1, 1, 1], [57, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1]]
         - numvoices: 1
-          order: [-1, -1, -1, -1, 0, -1, 1, -1, 2, -1, 1, -1, 3, -1, 1, -1, 4, -1, 1, -1, 3, -1, 1, -1, 5, -1, 1, -1, 6, 7, 6, 7, 6, 7, 6, 8, 6, 7, 6, 7, 6, 7, 6, 7, 9, 10, 9, 10, 9, 10, 9, 10, 6, 7, 6, 7, 6, 7, 6, 7, 6, 7, 6, 7, 5, -1, 3, -1, 6, 7, 6, 7, 11, 12, 9, 10, 6, 7, 6, 13, 6, 7, 6, 7, 9, 10, 9, 14, 15, 16, 9, 17, 6, 6, 6, 6, 0, -1, 1, -1, 0, -1, 1, -1, 2, -1, 1, -1]
+          order: [-1, -1, -1, -1, 0, -1, 1, -1, 2, -1, 1, -1, 3, -1, 1, -1, 4, -1, 1, -1, 3, -1, 1, -1, 5, -1, 1, -1, 6, 7, 6, 7, 6, 7, 6, 8, 6, 7, 6, 7, 6, 7, 6, 7, 9, 10, 9, 10, 9, 10, 9, 10, 6, 7, 6, 7, 6, 7, 6, 7, 6, 7, 6, 7, 5, -1, 3, -1, 6, 7, 6, 7, 11, 12, 9, 10, 6, 7, 6, 13, 6, 7, 6, 7, 9, 10, 9, 14, 15, 16, 9, 17, 6, 6, 6, 6, 0, -1, 1, -1, 0, -1, 1, -1, 2, -1, 1, -1, -1]
           patterns: [[57, 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], [45, 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, 1, 1], [50, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1], [55, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1], [57, 0, 57, 0, 57, 0, 57, 0, 57, 0, 57, 0, 57, 0, 57, 0], [57, 0, 57, 0, 57, 0, 57, 0, 57, 0, 57, 0, 67, 0, 69, 0], [57, 0, 57, 0, 57, 0, 57, 0, 64, 1, 62, 1, 60, 1, 55, 1], [53, 0, 53, 0, 53, 0, 53, 0, 53, 0, 53, 0, 53, 0, 53, 0], [53, 0, 53, 0, 53, 0, 53, 0, 53, 0, 53, 0, 63, 0, 65, 0], [55, 0, 55, 0, 55, 0, 55, 0, 55, 0, 55, 0, 55, 0, 55, 0], [55, 0, 55, 0, 55, 0, 55, 0, 55, 0, 55, 0, 65, 0, 67, 0], [57, 0, 57, 0, 57, 0, 57, 0, 57, 0, 57, 0, 69, 0, 57, 0], [53, 0, 53, 0, 53, 0, 53, 0, 53, 0, 53, 0, 53, 0, 65, 0], [50, 0, 50, 0, 50, 0, 50, 0, 50, 0, 50, 0, 50, 0, 50, 0], [50, 0, 50, 0, 50, 0, 50, 0, 52, 0, 52, 0, 52, 0, 52, 0], [53, 0, 53, 0, 53, 0, 53, 0, 55, 0, 55, 0, 55, 0, 55, 0]]
         - numvoices: 1
-          order: [-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -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, -1, -1, -1, -1, -1, -1, -1, -1, 0, 0, 0, 0, 0, 0, 0, 1, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1]
+          order: [-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -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, -1, -1, -1, -1, -1, -1, -1, -1, 0, 0, 0, 0, 0, 0, 0, 1, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1]
           patterns: [[60, 1, 1, 1, 1, 1, 1, 1, 60, 1, 1, 1, 1, 1, 1, 1], [60, 1, 1, 1, 1, 1, 1, 1, 1, 1, 60, 1, 1, 1, 60, 1], [60, 1, 1, 1, 60, 1, 1, 1, 60, 1, 1, 1, 60, 1, 1, 1]]
         - numvoices: 1
-          order: [-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -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, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 1, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1]
+          order: [-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -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, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 1, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1]
           patterns: [[1, 1, 1, 1, 1, 1, 1, 1, 72, 1, 1, 1, 1, 1, 1, 1], [1, 1, 1, 1, 1, 1, 1, 1, 72, 1, 1, 1, 72, 1, 1, 1], [1, 1, 1, 1, 72, 1, 1, 1, 1, 1, 1, 1, 72, 1, 1, 1]]
         - numvoices: 1
-          order: [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, 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, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 0, 0, 1, 1, 2, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, -1, 4, -1]
+          order: [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, 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, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 0, 0, 1, 1, 2, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, -1, 4, -1, -1]
           patterns: [[88, 0, 83, 0, 84, 0, 81, 0, 88, 0, 83, 0, 84, 0, 81, 0], [91, 0, 83, 0, 84, 0, 81, 0, 91, 0, 83, 0, 84, 0, 81, 0], [89, 0, 83, 0, 84, 0, 81, 0, 89, 0, 83, 0, 84, 0, 81, 0], [45, 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, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 0, 1, -1, 2, 3, 4, 5, -1, 0, 6, -1, -1, 0, 6, -1, 7, 0, -1, -1, -1, 8, -1, -1, 9, -1, -1, -1, -1, 10, 7, 11, 12, 0, -1, -1, 13, 10, 7, 11, 7, 8, -1, 14, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1]
+          order: [-1, -1, -1, -1, 0, -1, 1, -1, 0, -1, 1, -1, 2, -1, 1, -1, 3, -1, 1, -1, 2, -1, 1, -1, 4, -1, 1, -1, 0, -1, -1, -1, 0, -1, -1, -1, 0, -1, 1, -1, 0, -1, -1, -1, 2, -1, -1, -1, 2, -1, -1, -1, 0, -1, -1, -1, 0, -1, -1, -1, 0, -1, -1, -1, 1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 0, -1, 1, -1, 0, -1, 1, -1, -1, -1, -1, -1, -1]
+          patterns: [[45, 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], [41, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1], [38, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1], [43, 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, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 0, 1, -1, 2, 3, 4, 5, -1, 0, 6, -1, -1, 0, 6, -1, 7, 0, -1, -1, -1, 8, -1, -1, 9, -1, -1, -1, -1, 10, 7, 11, 12, 0, -1, -1, 13, 10, 7, 11, 7, 8, -1, 14, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1]
           patterns: [[83, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1], [1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 84, 1, 81, 1], [1, 1, 1, 1, 1, 1, 1, 1, 72, 1, 74, 1, 76, 1, 1, 1], [71, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1], [1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 72, 1, 1, 1], [69, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1], [1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 84, 1, 1, 1], [1, 1, 1, 1, 1, 1, 1, 1, 86, 1, 1, 1, 1, 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], [88, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1], [84, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1], [1, 1, 1, 1, 1, 1, 1, 1, 83, 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, 1, 1, 1, 1, 1, 0, 1, 1, 1]]
         - numvoices: 4
-          order: [-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 0, 1, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, -1, 13, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1]
+          order: [-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 0, 1, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, -1, 13, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1]
           patterns: [[1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 81, 83, 84, 86], [88, 83, 84, 81, 88, 83, 84, 81, 88, 83, 84, 81, 88, 83, 84, 81], [91, 83, 84, 81, 91, 83, 84, 81, 91, 83, 84, 81, 91, 83, 84, 81], [93, 83, 84, 81, 93, 83, 84, 81, 93, 83, 84, 81, 93, 83, 84, 81], [89, 81, 83, 84, 86, 88, 89, 91, 89, 81, 83, 84, 83, 84, 86, 88], [89, 79, 81, 83, 81, 83, 84, 86, 84, 86, 88, 89, 88, 84, 86, 83], [91, 88, 89, 86, 88, 84, 86, 83, 84, 81, 83, 79, 81, 77, 79, 76], [77, 74, 76, 72, 74, 71, 72, 69, 71, 67, 69, 65, 67, 69, 71, 74], [77, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 76, 1, 77, 76], [74, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 69, 71, 72, 76], [84, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 83, 1, 1, 1], [81, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 79, 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]]
     rowsperpattern: 16
     length: 108
 patch:
-    - name: 80s lead
+    - name: 80slead.instr
-      numvoices: 4
+      numvoices: 2
       units:
         - type: oscillator
           id: 1089
-          parameters: {color: 128, detune: 80, gain: 128, lfo: 0, phase: 0, shape: 64, stereo: 1, transpose: 76, type: 1, unison: 3}
+          parameters: {color: 0, detune: 80, gain: 128, lfo: 0, phase: 0, shape: 64, stereo: 0, transpose: 76, type: 1, unison: 3}
         - type: oscillator
           id: 1090
-          parameters: {color: 128, detune: 57, gain: 128, lfo: 0, phase: 0, shape: 64, stereo: 1, transpose: 64, type: 1, unison: 2}
+          parameters: {color: 64, detune: 64, gain: 128, lfo: 0, phase: 1, shape: 64, stereo: 0, transpose: 64, type: 0, unison: 0}
         - type: addp
           id: 1091
-          parameters: {stereo: 1}
+          parameters: {stereo: 0}
         - type: envelope
           id: 1092
-          parameters: {attack: 37, decay: 66, gain: 90, release: 54, stereo: 1, sustain: 81}
+          parameters: {attack: 37, decay: 66, gain: 90, release: 54, stereo: 0, sustain: 81}
         - type: mulp
           id: 1098
-          parameters: {stereo: 1}
+          parameters: {stereo: 0}
+        - type: sync
+          id: 1172
+          parameters: {}
         - type: pan
           id: 1096
-          parameters: {panning: 60, stereo: 1}
+          parameters: {panning: 63, stereo: 0}
         - type: filter
           id: 1108
-          parameters: {bandpass: 0, frequency: 84, highpass: 0, lowpass: 1, negbandpass: 1, neghighpass: 0, resonance: 128, stereo: 1}
+          parameters: {bandpass: 1, frequency: 94, highpass: 0, lowpass: 1, resonance: 99, stereo: 1}
         - type: gain
           id: 1119
           parameters: {gain: 64, stereo: 1}
         - type: filter
-          id: 1133
+          id: 1146
-          parameters: {bandpass: 0, frequency: 10, highpass: 0, lowpass: 1, negbandpass: 0, neghighpass: 1, resonance: 88, stereo: 1}
+          parameters: {bandpass: 0, frequency: 13, highpass: 1, lowpass: 1, resonance: 109, stereo: 1}
         - type: outaux
           id: 1097
-          parameters: {auxgain: 34, outgain: 34, stereo: 1}
+          parameters: {auxgain: 20, outgain: 40, stereo: 1}
-    - name: 80s bass
+    - name: 80sbass.instr
       numvoices: 1
       units:
         - type: oscillator
           id: 3
-          parameters: {color: 128, detune: 64, gain: 128, lfo: 0, phase: 64, shape: 64, stereo: 1, transpose: 64, type: 1, unison: 0}
+          parameters: {color: 0, detune: 64, gain: 128, lfo: 0, phase: 0, shape: 64, stereo: 1, transpose: 64, type: 1, unison: 0}
         - type: oscillator
           id: 4
-          parameters: {color: 128, detune: 76, gain: 128, lfo: 0, phase: 30, shape: 64, stereo: 1, transpose: 52, type: 1, unison: 1}
+          parameters: {color: 0, detune: 74, gain: 128, lfo: 0, phase: 0, shape: 64, stereo: 1, transpose: 52, type: 1, unison: 2}
         - type: addp
           id: 1084
           parameters: {stereo: 1}
         - type: envelope
           id: 1085
-          parameters: {attack: 0, decay: 69, gain: 100, release: 68, stereo: 1, sustain: 50}
+          parameters: {attack: 0, decay: 70, gain: 100, release: 68, stereo: 1, sustain: 28}
         - type: send
           id: 1088
-          parameters: {amount: 100, port: 0, sendpop: 0, stereo: 1, target: 1087, voice: 0}
+          parameters: {amount: 80, port: 0, sendpop: 0, stereo: 1, target: 1087, voice: 0}
         - type: mulp
           id: 1086
           parameters: {stereo: 1}
-        - type: distort
-          id: 1107
-          parameters: {drive: 112, stereo: 1}
         - type: filter
           id: 1087
-          parameters: {bandpass: 0, frequency: 30, highpass: 1, lowpass: 1, negbandpass: 1, neghighpass: 0, resonance: 40, stereo: 1}
+          parameters: {bandpass: 0, frequency: 45, highpass: 1, lowpass: 1, resonance: 46, stereo: 1}
+        - type: distort
+          id: 1107
+          parameters: {drive: 100, stereo: 1}
         - type: pan
           id: 284
           parameters: {panning: 64, stereo: 1}
         - type: gain
           id: 1121
-          parameters: {gain: 110, stereo: 1}
+          parameters: {gain: 107, stereo: 1}
+        - type: sync
+          id: 1173
+          parameters: {}
         - type: outaux
           id: 15
-          parameters: {auxgain: 30, outgain: 30, stereo: 1}
+          parameters: {auxgain: 21, outgain: 42, stereo: 1}
-    - name: Kick
+    - name: kick.instr
       comment: 'Suggested note: C-3'
       numvoices: 1
       units:
@@ -113,10 +122,10 @@ patch:
           parameters: {amount: 96, port: 0, sendpop: 1, stereo: 0, target: 262, voice: 0}
         - type: oscillator
           id: 262
-          parameters: {color: 128, detune: 64, gain: 128, phase: 0, shape: 64, stereo: 0, transpose: 57, type: 0, unison: 0}
+          parameters: {color: 128, detune: 64, gain: 128, phase: 0, shape: 64, stereo: 0, transpose: 64, type: 0, unison: 0}
         - type: filter
           id: 281
-          parameters: {bandpass: 0, frequency: 91, highpass: 0, lowpass: 0, negbandpass: 1, neghighpass: 1, resonance: 98, stereo: 0}
+          parameters: {bandpass: -1, frequency: 91, highpass: -1, lowpass: 0, resonance: 98, stereo: 0}
         - type: mulp
           id: 263
           parameters: {stereo: 0}
@@ -134,16 +143,16 @@ patch:
           parameters: {amount: 84, port: 0, sendpop: 1, stereo: 0, target: 277, voice: 0}
         - type: envelope
           id: 274
-          parameters: {attack: 45, decay: 70, gain: 128, release: 0, stereo: 0, sustain: 0}
+          parameters: {attack: 34, decay: 70, gain: 128, release: 0, stereo: 0, sustain: 0}
         - type: send
           id: 1118
           parameters: {amount: 0, port: 0, sendpop: 0, stereo: 0, target: 1119, voice: 0}
         - type: send
-          id: 1122
+          id: 1147
           parameters: {amount: 0, port: 0, sendpop: 0, stereo: 0, target: 1121, voice: 0}
         - type: send
-          id: 1124
+          id: 1148
-          parameters: {amount: 32, port: 0, sendpop: 0, stereo: 0, target: 1123, voice: 0}
+          parameters: {amount: 51, port: 0, sendpop: 0, stereo: 0, target: 1159, voice: 0}
         - type: oscillator
           id: 277
           parameters: {color: 128, detune: 64, gain: 128, phase: 0, shape: 64, stereo: 0, transpose: 45, type: 0}
@@ -157,21 +166,15 @@ patch:
           id: 294
           parameters: {panning: 64, stereo: 0}
         - type: filter
-          id: 1132
+          id: 1149
-          parameters: {bandpass: 0, frequency: 11, highpass: 0, lowpass: 1, negbandpass: 0, neghighpass: 1, resonance: 128, stereo: 1}
+          parameters: {bandpass: 0, frequency: 11, highpass: -1, lowpass: 1, resonance: 128, stereo: 1}
+        - type: sync
+          id: 1180
+          parameters: {}
         - type: outaux
           id: 266
-          parameters: {auxgain: 14, outgain: 50, stereo: 1}
+          parameters: {auxgain: 20, outgain: 59, stereo: 1}
-        - type: oscillator
+    - name: snare.instr
-          id: 1134
-          parameters: {color: 64, detune: 64, gain: 128, lfo: 1, phase: 0, shape: 64, stereo: 0, transpose: 52, type: 0}
-        - type: sync
-          id: 1135
-          parameters: {}
-        - type: pop
-          id: 1136
-          parameters: {stereo: 0}
-    - name: snare edm 3
       comment: 'Suggested range: E-4'
       numvoices: 1
       units:
@@ -195,10 +198,10 @@ patch:
           parameters: {stereo: 0}
         - type: filter
           id: 201
-          parameters: {bandpass: 0, frequency: 78, highpass: 0, lowpass: 1, negbandpass: 0, neghighpass: 1, resonance: 127, stereo: 0}
+          parameters: {bandpass: 0, frequency: 78, highpass: -1, lowpass: 1, resonance: 127, stereo: 0}
         - type: filter
           id: 225
-          parameters: {bandpass: 0, frequency: 122, highpass: 0, lowpass: 1, negbandpass: 0, neghighpass: 0, resonance: 112, stereo: 0}
+          parameters: {bandpass: 0, frequency: 122, highpass: 0, lowpass: 1, resonance: 112, stereo: 0}
         - type: addp
           id: 226
           parameters: {stereo: 0}
@@ -210,7 +213,7 @@ patch:
           parameters: {panning: 63, stereo: 0}
         - type: outaux
           id: 232
-          parameters: {auxgain: 52, outgain: 58, stereo: 1}
+          parameters: {auxgain: 49, outgain: 62, stereo: 1}
         - type: envelope
           id: 233
           parameters: {attack: 37, decay: 47, gain: 128, release: 0, stereo: 0, sustain: 0}
@@ -229,19 +232,19 @@ patch:
         - type: send
           id: 238
           parameters: {amount: 32, port: 0, sendpop: 1, target: 202}
-    - name: SuperSaw 4
+    - name: SuperSaw 4.instr
       comment: Automate filter frequency for the classic trance sound
-      numvoices: 1
+      numvoices: 2
       units:
         - type: envelope
           id: 1109
           parameters: {attack: 0, decay: 0, gain: 64, release: 64, stereo: 0, sustain: 85}
         - type: oscillator
           id: 1099
-          parameters: {color: 128, detune: 96, gain: 64, phase: 64, shape: 64, stereo: 0, transpose: 64, type: 1, unison: 3}
+          parameters: {color: 0, detune: 96, gain: 64, phase: 0, shape: 64, stereo: 0, transpose: 64, type: 1, unison: 3}
         - type: oscillator
           id: 12
-          parameters: {color: 128, detune: 77, gain: 80, lfo: 0, phase: 64, shape: 64, stereo: 0, transpose: 64, type: 1, unison: 3}
+          parameters: {color: 0, detune: 80, gain: 64, lfo: 0, phase: 0, shape: 64, stereo: 0, transpose: 64, type: 1, unison: 3}
         - type: addp
           id: 13
           parameters: {stereo: 0}
@@ -250,66 +253,62 @@ patch:
           parameters: {stereo: 0}
         - type: envelope
           id: 17
-          parameters: {attack: 18, decay: 67, gain: 64, release: 64, stereo: 0, sustain: 99}
+          parameters: {attack: 0, decay: 67, gain: 64, release: 64, stereo: 0, sustain: 99}
         - type: oscillator
-          id: 18
+          id: 1156
-          parameters: {color: 128, detune: 46, gain: 81, phase: 64, shape: 64, stereo: 0, transpose: 64, type: 1, unison: 3}
+          parameters: {color: 0, detune: 44, gain: 64, phase: 0, shape: 64, stereo: 0, transpose: 64, type: 1, unison: 3}
         - type: oscillator
-          id: 19
+          id: 1157
-          parameters: {color: 128, detune: 38, gain: 76, lfo: 0, phase: 64, shape: 64, stereo: 0, transpose: 64, type: 1, unison: 3}
+          parameters: {color: 0, detune: 35, gain: 64, lfo: 0, phase: 0, shape: 64, stereo: 0, transpose: 64, type: 1, unison: 3}
         - type: addp
-          id: 20
+          id: 1158
           parameters: {stereo: 0}
         - type: mulp
           id: 23
           parameters: {stereo: 0}
         - type: gain
-          id: 1123
+          id: 1159
           parameters: {gain: 120, stereo: 1}
-        - type: delay
-          id: 24
-          parameters: {damp: 0, dry: 0, feedback: 0, notetracking: 0, pregain: 128, stereo: 0}
-          varargs: [420]
         - type: delay
           id: 29
-          parameters: {damp: 0, dry: 71, feedback: 32, notetracking: 2, pregain: 71, stereo: 1}
+          parameters: {damp: 23, dry: 106, feedback: 32, notetracking: 2, pregain: 69, stereo: 1}
-          varargs: [32, 36]
+          varargs: [24, 36]
+        - type: outaux
+          id: 1160
+          parameters: {auxgain: 25, outgain: 25, stereo: 1}
         - type: loadnote
-          id: 1140
+          id: 1174
           parameters: {stereo: 0}
         - type: sync
-          id: 1138
+          id: 1175
           parameters: {}
         - type: pop
-          id: 1139
+          id: 1176
           parameters: {stereo: 0}
-        - type: outaux
+    - name: pad.instr
-          id: 30
-          parameters: {auxgain: 23, outgain: 25, stereo: 1}
-    - name: pad
       numvoices: 1
       units:
         - type: envelope
-          id: 1
+          id: 1161
           parameters: {attack: 72, decay: 96, gain: 128, release: 88, stereo: 0, sustain: 96}
         - type: send
           id: 2
-          parameters: {amount: 64, port: 4, sendpop: 0, target: 1}
+          parameters: {amount: 64, port: 4, sendpop: 0, target: 1161}
         - type: oscillator
-          id: 1125
+          id: 1162
           parameters: {color: 80, detune: 60, gain: 128, lfo: 0, phase: 32, shape: 64, stereo: 0, transpose: 64, type: 2}
         - type: oscillator
-          id: 1126
+          id: 1163
           parameters: {color: 96, detune: 72, gain: 128, lfo: 0, phase: 32, shape: 64, stereo: 0, transpose: 64, type: 1}
         - type: oscillator
           id: 5
           parameters: {color: 128, detune: 64, gain: 128, lfo: 1, phase: 0, shape: 90, stereo: 0, transpose: 32, type: 0}
         - type: send
-          id: 6
+          id: 1164
-          parameters: {amount: 68, port: 1, sendpop: 0, target: 1125}
+          parameters: {amount: 68, port: 1, sendpop: 0, target: 1162}
         - type: send
           id: 78
-          parameters: {amount: 61, port: 1, sendpop: 1, target: 1126}
+          parameters: {amount: 61, port: 1, sendpop: 1, target: 1163}
         - type: addp
           id: 80
           parameters: {stereo: 0}
@@ -318,10 +317,10 @@ patch:
           parameters: {stereo: 0}
         - type: filter
           id: 11
-          parameters: {bandpass: 0, frequency: 26, highpass: 0, lowpass: 1, negbandpass: 0, neghighpass: 1, resonance: 128, stereo: 0}
+          parameters: {bandpass: 0, frequency: 26, highpass: -1, lowpass: 1, resonance: 128, stereo: 0}
         - type: filter
-          id: 1127
+          id: 1165
-          parameters: {bandpass: 0, frequency: 64, highpass: 0, lowpass: 1, negbandpass: 0, neghighpass: 0, resonance: 64, stereo: 0}
+          parameters: {bandpass: 0, frequency: 64, highpass: 0, lowpass: 1, resonance: 64, stereo: 0}
         - type: distort
           id: 1128
           parameters: {drive: 109, stereo: 0}
@@ -332,10 +331,13 @@ patch:
           id: 1130
           parameters: {damp: 64, dry: 128, feedback: 96, notetracking: 2, pregain: 96, stereo: 1}
           varargs: [24, 48]
+        - type: sync
+          id: 1181
+          parameters: {}
         - type: outaux
           id: 1131
           parameters: {auxgain: 15, outgain: 15, stereo: 1}
-    - name: HappyLead
+    - name: HappyLead.instr
       numvoices: 4
       units:
         - type: oscillator
@@ -362,17 +364,51 @@ patch:
           varargs: [12550, 24402, 21265, 32419]
         - type: outaux
           id: 172
-          parameters: {auxgain: 64, outgain: 64, stereo: 1}
+          parameters: {auxgain: 38, outgain: 64, stereo: 1}
+        - type: loadnote
+          id: 1177
+          parameters: {stereo: 0}
+        - type: sync
+          id: 1178
+          parameters: {}
+        - type: pop
+          id: 1179
+          parameters: {stereo: 0}
     - name: Global
       numvoices: 1
       units:
         - type: in
           id: 7
           parameters: {channel: 2, stereo: 1}
+          comment: Aux 1 (reverb)
         - type: delay
           id: 8
-          parameters: {damp: 25, dry: 0, feedback: 120, notetracking: 0, pregain: 40, stereo: 1}
+          parameters: {damp: 28, dry: 0, feedback: 120, notetracking: 0, pregain: 35, stereo: 1}
           varargs: [1116, 1188, 1276, 1356, 1422, 1492, 1556, 1618, 1140, 1212, 1300, 1380, 1446, 1516, 1580, 1642]
+        - type: out
+          id: 1169
+          parameters: {gain: 92, stereo: 1}
+          comment: Reverb amount to master
+        - type: in
+          id: 1170
+          parameters: {channel: 0, stereo: 1}
+          comment: Input (Master)
+        - type: filter
+          id: 1171
+          parameters: {bandpass: 0, frequency: 128, highpass: 0, lowpass: 1, resonance: 128, stereo: 1}
+          comment: Limit highs
+        - type: filter
+          id: 1166
+          parameters: {bandpass: 0, frequency: 8, highpass: 1, lowpass: 0, resonance: 128, stereo: 1}
+          comment: Low cut
+        - type: compressor
+          id: 1167
+          parameters: {attack: 0, invgain: 52, ratio: 128, release: 46, stereo: 1, threshold: 52}
+          comment: Clipper (change threshold and invgain to match loudness)
+        - type: mulp
+          id: 1168
+          parameters: {stereo: 1}
         - type: out
           id: 9
-          parameters: {gain: 64, stereo: 1}
+          parameters: {gain: 120, stereo: 1}
+          comment: Master Out

src/main.cpp

@@ -127,6 +127,42 @@ int __cdecl main(int argc, char* argv[])
 	static float fft_output[FFT_SIZE / 2]; // Magnitudes
 	static float fft_uniform[FFT_SIZE / 4];
 	
+	// main note effect
+	boolean beenPlaying = false;
+	const int SHAPES_SIZE = 15;
+	float shapeIncrement = 0.02f;
+
+	/**
+	* Definition of shape with 3 parameters in a vec3
+	*
+	* h position, v position, length
+	*
+	*/
+	float vec3ShapeArray[5][3] = {
+		{ 0.0f, 0.0f, 0.0f },
+		{ 0.0f, 0.0f, 0.0f },
+		{ 0.0f, 0.0f, 0.0f },
+		{ 0.0f, 0.0f, 0.0f },
+		{ 0.0f, 0.0f, 0.0f }
+		};
+
+	float test[3] = { 0.0f, 0.1f, 0.0f }; // test float of one shape
+
+	int currentShape = 0; // mark location which shape we are currently building
+	
+	boolean isPlaying = false;
+
+	float lastPlayPos = 0;
+	float lastNote = 0.0f;
+
+	/*GLfloat shapes[5][3] = {
+	{ 0.0f, 0.0f, 0.0f },
+	{ 0.0f, 0.0f, 0.0f },
+	{ 0.0f, 0.0f, 0.0f },
+	{ 0.0f, 0.0f, 0.0f },
+	{ 0.0f, 0.0f, 0.0f }
+	};*/
+
 	do
 	{
 		direct_sound_buffer->GetCurrentPosition((DWORD*)&playCursor, NULL);
@@ -202,6 +238,68 @@ int __cdecl main(int argc, char* argv[])
 			syncs[i + 1] = syncBuf[(playCursor / (2 * sizeof(SUsample)) >> 8) * SU_NUMSYNCS + i];
 		}
 
+		//////////////////////////////////////////////////////
+		// Shape builder
+		//////////////////////////////////////////////////////
+
+		// if sound is playing, start a shape, if shape is already started - add length
+		// if sound has stopped, end shape
+		// if shape is finished, move shape forward
+
+		float captureSync = syncs[5];
+
+		if (captureSync >= 0.001f) {
+			isPlaying = true;
+		}
+
+		if (isPlaying) {
+			vec3ShapeArray[currentShape][1] = captureSync;
+			vec3ShapeArray[currentShape][2] = vec3ShapeArray[currentShape][2] + shapeIncrement;
+
+			test[0] = captureSync; // y position
+			test[1] = test[1] + shapeIncrement; // x position
+			test[2] = 0.3f; // length
+		}
+
+
+		// when note changes -- reset
+		if (lastNote != captureSync) {
+			test[1] = 0.1f;
+			test[2] = 0.0f;
+			lastNote = captureSync;
+		}
+
+		// shape mover, if the shape isnt the current one - move it
+		for (int i = 0; i < SHAPES_SIZE; ++i) {
+			if (i != currentShape) {
+				vec3ShapeArray[i][0] = vec3ShapeArray[i][0] + shapeIncrement;
+			}
+		}
+
+		beenPlaying = isPlaying;
+
+		// go through the array and start from the first when all shapes have been used
+		if (beenPlaying) {
+			if (currentShape <= SHAPES_SIZE) {
+				++currentShape;
+			}
+			else {
+				currentShape = 0;
+			}
+		}
+
+		float flatShapes[15] = {
+			vec3ShapeArray[0][0], vec3ShapeArray[0][1], vec3ShapeArray[0][2],
+			vec3ShapeArray[1][0], vec3ShapeArray[1][1], vec3ShapeArray[1][2],
+			vec3ShapeArray[2][0], vec3ShapeArray[2][1], vec3ShapeArray[2][2],
+			vec3ShapeArray[3][0], vec3ShapeArray[3][1], vec3ShapeArray[3][2],
+			vec3ShapeArray[4][0], vec3ShapeArray[4][1], vec3ShapeArray[4][2]
+		};
+
+		PFNGLUNIFORM3FVPROC glUniform3fvProc = ((PFNGLUNIFORM3FVPROC)wglGetProcAddress("glUniform3fv"));
+		glUniform3fvProc(10, 3, flatShapes); // array of shapes
+		glUniform3fvProc(40, 1, test); // test shape
+
         PFNGLUNIFORM1FVPROC glUniform1fvProc = ((PFNGLUNIFORM1FVPROC)wglGetProcAddress("glUniform1fv"));
 		glUniform1fvProc(0, SU_NUMSYNCS + 1, syncs);
 		glUniform1fvProc(8, FFT_SIZE / 4, fft_uniform);

src/shaders/fragment.frag

@@ -6,6 +6,8 @@ const float TAU = (2. * PI);
 const float PHI = sqrt(5.) * 0.5 + 0.5;
 layout(location = 0) uniform float syncs[7];
 layout(location = 8) uniform float fft_output[512]; // FFT_SIZE / 4
+layout(location = 600) uniform vec3 shapes[15]; // shapes - x = horizontal position, y = vertical position, z = length
+layout(location = 700) uniform vec3 test; // shapes test
 float u_time = syncs[0];
 
 vec2 getUV() {
@@ -41,6 +43,10 @@ float getScaledFFT(int index, float scale, float offset) {
     return log(1.0 + raw * scale) + offset;
 }
 
+float sdSphere(vec3 p, float r){
+    return length(p) -r;
+}
+
 // Modify your mapScene function
 vec2 mapScene(in vec3 p) {
     float mat = 0.;
@@ -54,7 +60,7 @@ vec2 mapScene(in vec3 p) {
 
     // Hexagonal grid
     float hexGap = 0.2;
-
+    /*
     for(float j = 0.; j < 16.; j++) {
         vec3 po = p;
         po += vec3((1.6 + hexGap) * 8, -5., -(1.88 + hexGap) * 10);
@@ -85,6 +91,14 @@ vec2 mapScene(in vec3 p) {
             }
         }
     }
+    */
+
+    // main note effect shapes
+    a = sdSphere(vec3(p.x + test.y, p.y + test.x, p.z), test.z + 2.);
+    d = min(d, a);
+    if (d == a) {
+        mat = 1.;
+    }
 
     return vec2(d, mat);
 }

src/shaders/fragment.inl

@@ -1,152 +1,132 @@
 // Generated with Shader Minifier 1.5.1 (https://github.com/laurentlb/Shader_Minifier/)
 #ifndef FRAGMENT_INL_
 # define FRAGMENT_INL_
-# define VAR_fft_output "n"
+# define VAR_fft_output "f"
-# define VAR_o "f"
+# define VAR_o "i"
+# define VAR_shapes "C"
 # define VAR_syncs "m"
+# define VAR_test "k"
 
 const char *fragment_frag =
  "#version 460\n"
  "precision mediump float;"
- "out vec4 f;"
+ "out vec4 i;"
- "const float i=2.*acos(-1.),v=sqrt(5.)*.5+.5;"
+ "const float n=2.*acos(-1.),v=sqrt(5.)*.5+.5;"
  "layout(location=0)uniform float m[7];"
- "layout(location=8)uniform float n[512];"
+ "layout(location=8)uniform float f[512];"
- "float c=m[0];"
+ "layout(location=600)uniform vec3 C[15];"
- "float t(vec3 v,vec2 i)"
+ "layout(location=700)uniform vec3 k;"
- "{"
+ "float l=m[0];"
-   "v=abs(v);"
-   "return max(v.y-i.y,max(v.x*sqrt(3.)*.5+v.z*.5,v.z)-i.x);"
- "}"
- "float t(int v)"
- "{"
-   "v=clamp(v,0,511);"
-   "float i=n[v];"
-   "return log(1.+i*15.);"
- "}"
  "vec2 t(vec3 v)"
  "{"
-   "float i=0.,f=1e9,m=0.;"
+   "float n=0.,i=1e9,m=length(vec3(v.x+k.y,v.y+k.x,v.z))-k.z-2.;"
-   "vec2 n=vec2(7);"
+   "i=min(i,m);"
-   "for(float r=0.;r<16.;r++)"
+   "if(i==m)"
-     "{"
+     "n=1.;"
-       "vec3 c=v+vec3(1.8*8,-5,-2.08*10)+vec3(0,0,2.08*r);"
+   "return vec2(i,n);"
-       "for(float v=0.;v<16.;v++)"
-         "{"
-           "c=mod(v,2.)==0.?"
-             "c-vec3(1.8,0,1):"
-             "c+vec3(-1.8,0,1);"
-           "int y=int(length(vec2(v,r)-n.xy));"
-           "m=t(c,vec2(.86,1.+t(y)*2.));"
-           "f=min(f,m);"
-           "if(f==m)"
-             "i=1.;"
  "}"
-     "}"
+ "vec3 t(vec3 v,vec3 i,inout vec3 n)"
-   "return vec2(f,i);"
- "}"
- "vec3 t(vec3 v,vec3 i,inout vec3 f)"
  "{"
-   "float r=0.,m=0.,y=0.;"
+   "float f=0.,r=0.,m=0.;"
-   "for(int c=0;c<30;c++)"
+   "for(int e=0;e<30;e++)"
      "{"
-       "f=v+i*r;"
+       "n=v+i*f;"
-       "vec2 n=t(f);"
+       "vec2 l=t(n);"
-       "r+=n.x;"
+       "f+=l.x;"
-       "m=n.y;"
+       "r=l.y;"
-       "if(r>1e2)"
+       "if(f>1e2)"
          "break;"
-       "if(n.x<.001*r)"
+       "if(l.x<.001*f)"
          "{"
-           "y=1.;"
+           "m=1.;"
            "break;"
          "}"
      "}"
-   "if(r>1e2)"
+   "if(f>1e2)"
-     "r=0.;"
+     "f=0.;"
-   "return vec3(r,m,y);"
+   "return vec3(f,r,m);"
  "}"
- "float t(vec3 v,vec3 i,float y)"
+ "float t(vec3 v,vec3 f,float n)"
  "{"
-   "float f=1.,r=.02;"
+   "float i=1.,m=.02;"
-   "for(int c=0;c<6;c++)"
+   "for(int e=0;e<6;e++)"
      "{"
-       "if(r>y)"
+       "if(m>n)"
          "break;"
-       "float m=t(v+r*i).x;"
+       "float l=t(v+m*f).x;"
-       "f=min(f,m/(4.*r));"
+       "i=min(i,l/(4.*m));"
-       "r+=clamp(m,.1,.8);"
+       "m+=clamp(l,.1,.8);"
-       "if(f<-1.)"
+       "if(i<-1.)"
          "break;"
      "}"
-   "f=max(f,-1.);"
+   "i=max(i,-1.);"
-   "return.25*(1.+f)*(1.+f)*(2.-f);"
+   "return.25*(1.+i)*(1.+i)*(2.-i);"
  "}"
  "vec3 e(vec3 v)"
  "{"
    "vec2 i=vec2(.01,0);"
    "return normalize(vec3(t(v+i.xyy).x-t(v-i.xyy).x,t(v+i.yxy).x-t(v-i.yxy).x,t(v+i.yyx).x-t(v-i.yyx).x));"
  "}"
- "vec3 e(vec3 v,vec3 i,vec3 f,vec3 r,vec3 c,float m)"
+ "vec3 e(vec3 v,vec3 i,vec3 l,vec3 f,vec3 m,float n)"
  "{"
-   "v-=f;"
+   "v-=l;"
-   "float y=length(v);"
+   "float e=length(v);"
    "v=normalize(v);"
-   "float n=3./(1.+.09*y+.032*y*y),p=max(dot(c,v),0.);"
+   "float y=3./(1.+.09*e+.032*e*e),r=max(dot(m,v),0.);"
-   "r=normalize(v-r);"
+   "f=normalize(v-f);"
-   "vec3 e=vec3(.04);"
+   "vec3 x=vec3(.04);"
-   "e+=(1.-e)*pow(clamp(1.-max(dot(r,v),0.),0.,1.),5.);"
+   "x+=(1.-x)*pow(clamp(1.-max(dot(f,v),0.),0.,1.),5.);"
-   "y=t(f+c*.01,v,y);"
+   "e=t(l+m*.01,v,e);"
-   "return(i*p*n+i*pow(max(dot(c,r),0.),mix(128.,8.,m))*n*e)*y;"
+   "return(i*r*y+i*pow(max(dot(m,f),0.),mix(128.,8.,n))*y*x)*e;"
  "}"
- "vec3 e(vec3 v,vec3 f,vec3 i,float y)"
+ "vec3 e(vec3 v,vec3 i,vec3 f,float n)"
  "{"
    "float m=.01;"
-   "vec3 c=vec3(0);"
+   "vec3 l=vec3(0);"
-   "if(y==0.)"
+   "if(n==0.)"
-     "c=vec3(.8314,.2941,.2941),m=.1;"
+     "l=vec3(.8314,.2941,.2941),m=.1;"
-   "else if(y==1.)"
+   "else if(n==1.)"
-     "c=vec3(.6196,.6118,.6118),m=.7;"
+     "l=vec3(.6196,.6118,.6118),m=.7;"
-   "else if(y==2.)"
+   "else if(n==2.)"
-     "c=vec3(.3255,.4784,.3255),m=.2;"
+     "l=vec3(.3255,.4784,.3255),m=.2;"
-   "else if(y==3.)"
+   "else if(n==3.)"
-     "c=vec3(.2471,.3059,.6314),m=1.;"
+     "l=vec3(.2471,.3059,.6314),m=1.;"
-   "else if(y==4.)"
+   "else if(n==4.)"
-     "c=vec3(.9961,1,.9922),m=.1;"
+     "l=vec3(.9961,1,.9922),m=.1;"
-   "else if(y==5.)"
+   "else if(n==5.)"
-     "c=vec3(.9961,1,.9922),m=.3;"
+     "l=vec3(.9961,1,.9922),m=.3;"
-   "v=vec3(0)+e(vec3(-10,10,0),vec3(.77,.26,.73),v,i,f,m)+e(vec3(0,10,-5),vec3(.08,.62,.75),v,i,f,m)+e(vec3(0,25,0),vec3(.5137,.1961,.7725),v,i,f,m)+vec3(.08,.62,.75)*clamp(dot(f,normalize(vec3(0,1,-3)*vec3(0,-1,-2))),0.,1.)*.8;"
+   "v=vec3(0)+e(vec3(-10,10,0),vec3(.77,.26,.73),v,f,i,m)+e(vec3(0,10,-5),vec3(.08,.62,.75),v,f,i,m)+e(vec3(0,25,0),vec3(.5137,.1961,.7725),v,f,i,m)+vec3(.08,.62,.75)*clamp(dot(i,normalize(vec3(0,1,-3)*vec3(0,-1,-2))),0.,1.)*.8;"
-   "return c*max(vec3(0),v);"
+   "return l*max(vec3(0),v);"
  "}"
- "vec3 e(vec2 v,vec3 f)"
+ "vec3 e(vec2 v,vec3 i)"
  "{"
-   "f=normalize(vec3(0,-1,10)-f);"
+   "i=normalize(vec3(0,-1,10)-i);"
-   "vec3 m=normalize(cross(vec3(0,1,0),f));"
+   "vec3 m=normalize(cross(vec3(0,1,0),i));"
-   "return normalize(v.x*m+v.y*normalize(cross(f,m))+f);"
+   "return normalize(v.x*m+v.y*normalize(cross(i,m))+i);"
  "}"
  "vec3 e()"
  "{"
-   "vec3 f;"
+   "vec3 i;"
    "{"
-     "float v=c*.06;"
+     "float v=l*.06;"
-     "f=vec3(sin(v)*15.,30.+cos(v*.5)*5.,cos(v)*15.);"
+     "i=vec3(sin(v)*15.,30.+cos(v*.5)*5.,cos(v)*15.);"
    "}"
-   "return f;"
+   "return i;"
  "}"
  "vec3 e(vec2 v)"
  "{"
-   "vec3 f=e(v,e()),m=vec3(.102,.2431,.3412),y=vec3(0),i=t(e(),f,y);"
+   "vec3 i=e(v,e()),m=vec3(.102,.2431,.3412),n=vec3(0),l=t(e(),i,n);"
-   "if(i.x>0.)"
+   "if(l.x>0.)"
      "{"
-       "vec3 v=e(y);"
+       "vec3 v=e(n);"
-       "m=e(y,v,f,i.y);"
+       "m=e(n,v,i,l.y);"
      "}"
    "return m;"
  "}"
  "void main()"
  "{"
    "vec3 v=e(gl_FragCoord.xy*vec2(.00104166667,.00185185185)-1.);"
-   "f=vec4(v,1);"
+   "i=vec4(v,1);"
  "}";
 
 #endif // FRAGMENT_INL_

src/sointu/song.h

@@ -13,7 +13,7 @@
 #define SU_LENGTH_IN_PATTERNS   108
 #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_NUMSYNCS             2
+#define SU_NUMSYNCS             11
 #define SU_SYNCBUFFER_LENGTH    ((SU_LENGTH_IN_SAMPLES+255)>>8)*SU_NUMSYNCS
 
 #include <stdint.h>