partikkeli valot

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

@@ -37,6 +37,31 @@ static int pidMain;
 static int pidPost;
 // static HDC hDC;
 
+#define GRID 32
+#define HEX_TEX_SIZE (GRID * GRID * 4)  // RGBA: 4 floats per texel
+
+#define SHAPES 16
+#define SHAPES_TEX_SIZE (SHAPES * SHAPES * 4)
+#define MAX_DISTANCE 100.f
+
+#define PARTICLES 16
+#define PARTICLES_TEX_SIZE (PARTICLES * PARTICLES * 4)
+#define PARTICLES_DISTANCE 80.f
+
+
+static float syncs[1 + SU_NUMSYNCS];
+
+// FFT buffers
+static float fft_input[FFT_SIZE];
+static float fft_output[FFT_SIZE / 2]; // Magnitudes
+static float fft_uniform[FFT_SIZE / 4];
+
+static float particlesData[PARTICLES_TEX_SIZE];
+static float particlesData2[PARTICLES * PARTICLES]; // additional value for particle distance
+static float shapesData[SHAPES_TEX_SIZE];
+
+static float hexGridData[HEX_TEX_SIZE];
+
 #ifndef EDITOR_CONTROLS
 #pragma code_seg(".main")
 void entrypoint(void)
@@ -118,14 +143,69 @@ int __cdecl main(int argc, char* argv[])
 	// Play sound
     direct_sound_buffer->Play(0, 0, 0);
 
-	static float syncs[1 + SU_NUMSYNCS];
+
 
 	// Init FFT
 	init_hamming_window();
-	// FFT buffers
+
-	static float fft_input[FFT_SIZE];
+	
-	static float fft_output[FFT_SIZE / 2]; // Magnitudes
+
-	static float fft_uniform[FFT_SIZE / 4];
+
+
+
+	struct Vec3 {
+		float x, y, z;
+	};
+
+
+
+	PFNGLUNIFORM1FVPROC glUniform1fvProc = ((PFNGLUNIFORM1FVPROC)wglGetProcAddress("glUniform1fv"));
+	PFNGLACTIVETEXTUREPROC glActiveTexture = ((PFNGLACTIVETEXTUREPROC)wglGetProcAddress("glActiveTexture"));
+	PFNGLUNIFORM1IPROC glUniform1i = ((PFNGLUNIFORM1IPROC)wglGetProcAddress("glUniform1i"));
+	PFNGLGETUNIFORMLOCATIONPROC glGetUniformLocation = ((PFNGLGETUNIFORMLOCATIONPROC)wglGetProcAddress("glGetUniformLocation"));
+
+	GLuint hexGridTex, shapesTex, particlesTex;
+	glGenTextures(1, &hexGridTex);
+	glBindTexture(GL_TEXTURE_2D, hexGridTex);
+
+	glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA32F, GRID, GRID, 0, GL_RGBA, GL_FLOAT, nullptr);
+
+	glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
+	glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
+	glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
+	glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
+
+	/*
+	glGenTextures(1, &shapesTex);
+	glBindTexture(GL_TEXTURE_2D, shapesTex);
+
+	glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA16F, SHAPES, SHAPES, 0, GL_RGBA, GL_FLOAT, nullptr);
+
+	glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
+	glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
+	glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
+	glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
+	*/
+
+	glGenTextures(1, &particlesTex);
+	glBindTexture(GL_TEXTURE_2D, particlesTex);
+
+	glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA16F, SHAPES, SHAPES, 0, GL_RGBA, GL_FLOAT, nullptr);
+
+	glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
+	glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
+	glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
+	glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
+
+	
+	int currentShape = 0; // mark location which shape we are currently building
+	float shapeIncrement = 0.15f;
+	float shapeLastNote = 0.0f;
+
+
+	int currentParticle = 0; // mark location which shape we are currently building
+	float particleIncrement = 3.0f;
+	float particleLastNote = 0.0f;
 
 	do
 	{
@@ -202,15 +282,183 @@ int __cdecl main(int argc, char* argv[])
 			syncs[i + 1] = syncBuf[(playCursor / (2 * sizeof(SUsample)) >> 8) * SU_NUMSYNCS + i];
 		}
 
-        PFNGLUNIFORM1FVPROC glUniform1fvProc = ((PFNGLUNIFORM1FVPROC)wglGetProcAddress("glUniform1fv"));
+
+		/*
+		//////////////////////////////////////////////////////
+		// 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 shapeCaptureSync = syncs[5];
+
+		// Detect note change to start a new shape
+		bool shapeNoteChanged = (shapeCaptureSync - shapeLastNote) * (shapeCaptureSync - shapeLastNote) > 0.0001f;
+		shapeLastNote = shapeCaptureSync;
+
+		// If note changed and value is significant, start new shape
+		if (shapeCaptureSync > 0.001f && shapeNoteChanged) {
+			int index = currentShape * 4;
+
+			// Reset and activate current shape
+			shapesData[index + 0] = 0.0f;            // x start
+			shapesData[index + 1] = shapeCaptureSync;     // y from audio
+			shapesData[index + 2] = 1.0f;            // z (unused or length)
+			shapesData[index + 3] = 1.0f;            // active
+
+			// Advance to next shape slot (circular)
+			currentShape = (currentShape + 1) % (SHAPES*SHAPES);
+		}
+
+		// Move active shapes
+		for (int i = 0; i < SHAPES*SHAPES; ++i) {
+			int index = i * 4;
+
+			// Check if shape is active
+			if (shapesData[index + 3] > 0.5f) {
+				// Move shape right
+				shapesData[index + 0] += shapeIncrement;
+
+				// Update y (optional, reflect live audio)
+				//shapesData[index + 1] = captureSync;
+
+				// Optional: grow z value to show duration
+				//shapesData[index + 2] += shapeIncrement * 0.2f;
+
+				// If x exceeds max distance, deactivate and reset
+				if (shapesData[index + 0] > MAX_DISTANCE) {
+					shapesData[index + 0] = 0.0f;
+					shapesData[index + 1] = 0.0f;
+					shapesData[index + 2] = 0.0f;
+					shapesData[index + 3] = 0.0f; // inactive
+				}
+			}
+		}
+
+		// Bind and update u_ShapesTex
+		glActiveTexture(GL_TEXTURE0 + 2);
+		glBindTexture(GL_TEXTURE_2D, shapesTex);
+		glTexSubImage2D(GL_TEXTURE_2D, 0, 0, 0, SHAPES, SHAPES, GL_RGBA, GL_FLOAT, shapesData);
+		glUniform1i(glGetUniformLocation(pidMain, "u_ShapesTex"), 2);
+		*/
+
+		//////////////////////////////////////////////////////
+		// Particles 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 particleCaptureSync = syncs[5];
+
+		// Detect note change to start a new shape
+		bool particleNoteChanged = (particleCaptureSync - particleLastNote) * (particleCaptureSync - particleLastNote) > 0.0001f;
+		particleLastNote = particleCaptureSync;
+
+		// If note changed and value is significant, start new shape
+		if (particleCaptureSync > 0.001f && particleNoteChanged) {
+			int index = currentParticle * 4;
+
+			// Reset and activate current shape
+			particlesData[index + 0] = 0.0f;            // x offset
+			particlesData[index + 1] = 0.0f;			// y offset
+			particlesData[index + 2] = 0.0f;            // z distance
+			particlesData[index + 3] = 1.0f;            // a active
+			
+			//particlesData2[currentParticle] = 0.0f; // reset progress/time!
+
+			// Advance to next shape slot (circular)
+			currentParticle = (currentParticle + 1) % (PARTICLES * PARTICLES);
+		}
+
+		// Move active shapes
+		for (int i = 0; i < (PARTICLES * PARTICLES); ++i) {
+			int index = i * 4;
+
+			// Check if shape is active
+			if (particlesData[index + 3] > 0.5f) {
+				// Move shape
+				particlesData[index + 2] += particleIncrement;
+
+				// Update y (optional, reflect live audio)
+				//shapesData[index + 1] = captureSync;
+
+				// Optional: grow z value to show duration
+				//shapesData[index + 2] += shapeIncrement * 0.2f;
+
+				// If x exceeds max distance, deactivate and reset
+				if (particlesData[index + 2] > PARTICLES_DISTANCE) {
+					particlesData[index + 0] = 0.0f;
+					particlesData[index + 1] = 0.0f;
+					particlesData[index + 2] = 0.0f;
+					particlesData[index + 3] = 0.0f; // inactive
+				}
+			}
+		}
+
+		// Bind and update u_ParticlesTex
+		glActiveTexture(GL_TEXTURE0 + 3);
+		glBindTexture(GL_TEXTURE_2D, particlesTex);
+		glTexSubImage2D(GL_TEXTURE_2D, 0, 0, 0, PARTICLES, PARTICLES, GL_RGBA, GL_FLOAT, particlesData);
+		glUniform1i(glGetUniformLocation(pidMain, "u_ParticlesTex"), 3);
+		//glUniform1fvProc(700, PARTICLES*PARTICLES, particlesData2);
+
+		//PFNGLUNIFORM3FVPROC glUniform3fvProc = ((PFNGLUNIFORM3FVPROC)wglGetProcAddress("glUniform3fv"));
+		//glUniform3fvProc(600, 1, flatShapes); // array of shapes
+		//glUniform3fvProc(700, 1, test); // test shape
+		
 		glUniform1fvProc(0, SU_NUMSYNCS + 1, syncs);
-		glUniform1fvProc(8, FFT_SIZE / 4, fft_uniform);
+		glUniform1fvProc(20, FFT_SIZE / 4, fft_uniform);
+
+		//////////////////////////////////////////////////////
+		// Hex Grid Builder
+		//////////////////////////////////////////////////////
+
+		float gap = 0.3f;
+
+		float cellW = 1.6f + 0.2f;   // flat-to-flat width
+		float cellH = (sqrtf(3.0f) / 2.0f) * cellW; // height based on regular hex geometry
+
+		float horizontalSpacing = 0.75f * cellW * (1.0f + gap); // 3/4 of width per column
+		float verticalSpacing = cellH * (1.0f + gap);           // full height per row
+		
+		float rippleCenterX = 7.0f;
+		float rippleCenterY = 7.0f;
+
+		Vec3 gridOffset = { horizontalSpacing * (GRID - 1) * 0.24f, -5.0f, verticalSpacing * (GRID - 1) * 0.24f };
+
+		for (int j = 0; j < GRID; ++j) {
+			for (int i = 0; i < GRID; ++i) {
+				// Offset every other column vertically
+				float offsetZ = (i % 2 == 0) ? 0.0f : 0.5f * verticalSpacing;
+
+				float x = i * horizontalSpacing;
+				float z = j * verticalSpacing + offsetZ;
+				float y = 0.0f;
+
+				Vec3 hexPos = { x - gridOffset.x, y - gridOffset.y, z - gridOffset.z };
+
+				float dx = (float)i - rippleCenterX;
+				float dy = (float)j - rippleCenterY;
+				float hexDist = sqrtf(dx * dx + dy * dy);
+
+				int idx = (j * GRID + i) * 4;
+				hexGridData[idx + 0] = hexPos.x;
+				hexGridData[idx + 1] = hexPos.y;
+				hexGridData[idx + 2] = hexPos.z;
+				hexGridData[idx + 3] = hexDist;
+			}
+		}
+		
+		// Bind and update u_hexGridTex
+		glActiveTexture(GL_TEXTURE0 + 1);
+		glBindTexture(GL_TEXTURE_2D, hexGridTex);
+		glTexSubImage2D(GL_TEXTURE_2D, 0, 0, 0, GRID, GRID, GL_RGBA, GL_FLOAT, hexGridData);
+		glUniform1i(glGetUniformLocation(pidMain, "u_hexGridTex"), 1);
 
 		glRects(-1, -1, 1, 1);
 
-		//syncs[0] = -syncs[0];
-		//glUniform1fvProc(0, SU_NUMSYNCS + 1, syncs);
-
 		// render "post process" using the opengl backbuffer
 		#if POST_PASS
 			glBindTexture(GL_TEXTURE_2D, 1);

src/shaders/fragment.inl

@@ -1,336 +1,139 @@
 // Generated with Shader Minifier 1.5.1 (https://github.com/laurentlb/Shader_Minifier/)
 #ifndef FRAGMENT_INL_
 # define FRAGMENT_INL_
-# define VAR_fft_output "f"
+# define VAR_fft_output "n"
-# define VAR_o "v"
+# define VAR_o "f"
-# define VAR_syncs "n"
+# define VAR_shapes "s"
+# define VAR_syncs "m"
+# define VAR_u_ParticlesTex "d"
+# define VAR_u_hexGridTex "k"
 
 const char *fragment_frag =
  "#version 460\n"
  "precision mediump float;"
- "out vec4 v;"
+ "out vec4 f;"
- "layout(location=0)uniform float n[7];"
+ "const float i=2.*acos(-1.),v=sqrt(5.)*.5+.5;"
- "layout(location=8)uniform float f[512];"
+ "layout(location=0)uniform float m[12];"
- "float m=n[0];\n"
+ "layout(location=20)uniform float n[512];"
- "#define saturate(x)clamp(x,0.,1.)\n"
+ "layout(location=600)uniform vec3 s[15];"
- "#define dot2(x)dot(x,x)\n"
+ "layout(binding=1)uniform sampler2D k;"
- "float d=m*.25,s=sin(d)*.5+.7;"
+ "layout(binding=3)uniform sampler2D d;"
- "vec3 e=vec3(9.*cos(d),6.*abs(sin(d))/-.75+s,1);"
+ "float g=m[0];"
- "float c=sin(d)*.075+.125;"
+ "float t(vec2 v)"
- "vec3 x=vec3(1,.6,.3),o=vec3(.2,.01,.6),p=vec3(.95,.93,.88),l=vec3(.05),r=vec3(0,9,21);"
- "struct Ray{vec3 origin,direction;};"
- "struct Rect{vec3 center,side1,side2,side3,side4;vec3 up,right,front;vec2 halfSize;};"
- "mat3 t()"
  "{"
-   "float v=d;"
+   "return fract(sin(dot(v,vec2(127.1,311.7)))*43758.5453123);"
-   "return mat3(cos(v),-sin(v),0.,sin(v),cos(v),0.,0.,0.,1.);"
  "}"
- "vec3 t(vec3 v,float d)"
+ "vec2 t(vec3 v)"
  "{"
-   "vec3 f=vec3(0,1,0);"
+   "return vec2(v.y,0);"
-   "return f*cos(d)+cross(v,f)*sin(d)+v*dot(v,f)*(1.-cos(d));"
  "}"
- "mat3 t(vec3 v)"
+ "vec3 t(vec3 v,vec3 x,inout vec3 f)"
  "{"
-   "v=normalize(vec3(0,1,0)-v);"
+   "float i=0.,e=0.,y=0.;"
-   "vec3 d=normalize(cross(v,vec3(0,1,0)));"
+   "for(int n=0;n<30;n++)"
-   "return mat3(d,normalize(cross(d,v)),v);"
+     "{"
+       "f=v+x*i;"
+       "vec2 m=t(f);"
+       "i+=m.x;"
+       "e=m.y;"
+       "if(i>6e2)"
+         "break;"
+       "if(m.x<.001*i)"
+         "{"
+           "y=1.;"
+           "break;"
+         "}"
+     "}"
+   "return vec3(i,e,y);"
  "}"
- "Ray t(vec2 v)"
+ "float t(vec3 v,vec3 i,float f)"
  "{"
-   "vec3 d=r;"
+   "float m=1.,y=.02;"
-   "return Ray(d,normalize(t(d)*vec3(v,2.5)));"
+   "for(int n=0;n<6;n++)"
+     "{"
+       "if(y>f)"
+         "break;"
+       "float d=t(v+y*i).x;"
+       "m=min(m,d/(4.*y));"
+       "y+=clamp(d,.1,.8);"
+       "if(m<-1.)"
+         "break;"
+     "}"
+   "m=max(m,-1.);"
+   "return.25*(1.+m)*(1.+m)*(2.-m);"
  "}"
- "void t(out Rect v)"
+ "vec3 x(vec3 v)"
  "{"
-   "float f=d;"
+   "vec2 m=vec2(.01,0);"
-   "v.up=vec3(0,0,1);"
+   "return normalize(vec3(t(v+m.xyy).x-t(v-m.xyy).x,t(v+m.yxy).x-t(v-m.yxy).x,t(v+m.yyx).x-t(v-m.yyx).x));"
-   "v.right=vec3(1,0,0);"
-   "v.front=normalize(cross(v.right,v.up));"
-   "v.halfSize=vec2(2.5,1.5)*(vec2(cos(f),sin(f))*.25+.75);"
-   "v.center=vec3(0,6,sin(f)*4.-1.5);"
-   "v.side1=v.center+v.halfSize.x*v.right+v.halfSize.y*v.up;"
-   "v.side2=v.center-v.halfSize.x*v.right+v.halfSize.y*v.up;"
-   "v.side3=v.center-v.halfSize.x*v.right-v.halfSize.y*v.up;"
-   "v.side4=v.center+v.halfSize.x*v.right-v.halfSize.y*v.up;"
  "}"
- "float t(vec3 v,vec3 d,vec3 f,vec3 i,vec3 c)"
+ "vec3 t(vec3 v,vec3 m,float i,vec3 d,vec3 f,vec3 x,float y)"
- "{"
-   "v=normalize(cross(d,f));"
-   "f=normalize(cross(f,i));"
-   "i=normalize(cross(i,c));"
-   "d=normalize(cross(c,d));"
-   "return acos(dot(-v,f))+acos(dot(-f,i))+acos(dot(-i,d))+acos(dot(-d,v))-2.*acos(-1.);"
- "}"
- "vec3 R,y;"
- "Rect i;"
- "vec2 t(vec2 v,vec2 i)"
- "{"
-   "return v.x<i.x?"
-     "v:"
-     "i;"
- "}"
- "float h(vec3 v)"
- "{"
-   "return v.y+.75;"
- "}"
- "float h(vec3 v,vec3 d,float f)"
- "{"
-   "return length(v-d)-f;"
- "}"
- "float h(vec3 v,vec3 d,vec3 f)"
  "{"
    "v-=d;"
-   "d=f-d;"
+   "float n=length(v);"
-   "float y=saturate(dot(v,d)/dot(d,d));"
+   "v=normalize(v);"
-   "return length(v-d*y)-c;"
+   "i/=1.+.09*n+.032*n*n;"
+   "float g=max(dot(x,v),0.);"
+   "f=normalize(v-f);"
+   "vec3 e=vec3(.04);"
+   "e+=(1.-e)*pow(clamp(1.-max(dot(f,v),0.),0.,1.),5.);"
+   "n=t(d+x*.01,v,n);"
+   "return(m*g*i+m*pow(max(dot(x,f),0.),mix(128.,8.,y))*i*e)*n;"
  "}"
- "float h(vec3 v,vec3 f,vec3 d,vec3 i,vec3 y)"
+ "vec3 t(vec3 v,vec3 f,vec3 i,float m)"
  "{"
-   "vec3 x=d-f,s=v-f,c=i-d,n=v-d,R=y-i;"
+   "float y=.01;"
-   "i=v-i;"
+   "vec3 n=vec3(0);"
-   "d=f-y;"
+   "if(m==0.)"
-   "f=v-y;"
+     "n=vec3(.8314,.2941,.2941),y=.1;"
-   "v=cross(x,d);"
+   "else if(m==1.)"
-   "return sqrt(sign(dot(cross(x,v),s))+sign(dot(cross(c,v),n))+sign(dot(cross(R,v),i))+sign(dot(cross(d,v),f))<3.?"
+     "n=vec3(.6196,.6118,.6118),y=.7;"
-     "min(min(min(dot2(x*clamp(dot(x,s)/dot2(x),0.,1.)-s),dot2(c*clamp(dot(c,n)/dot2(c),0.,1.)-n)),dot2(R*clamp(dot(R,i)/dot2(R),0.,1.)-i)),dot2(d*clamp(dot(d,f)/dot2(d),0.,1.)-f)):"
+   "else if(m==2.)"
-     "dot(v,s)*dot(v,s)/dot2(v));"
+     "n=vec3(.3255,.4784,.3255),y=.2;"
+   "else if(m==3.)"
+     "n=vec3(.2471,.3059,.6314),y=1.;"
+   "else if(m==4.)"
+     "n=vec3(.9961,1,.9922),y=.1;"
+   "else if(m==5.)"
+     "n=vec3(.9961,1,.9922),y=.3;"
+   "vec3 e=vec3(0)+t(vec3(0,40,-10),vec3(.77,.26,.73),30.,v,i,f,y)+t(vec3(0,20,15),vec3(.77,.26,.73),30.,v,i,f,y);"
+   "int g=0;"
+   "for(float m=0;m<16.;m++)"
+     "for(float i=0;i<16.;i++)"
+       "{"
+         "vec2 n=(vec2(i,m)+.5)/float(16.);"
+         "vec4 x=texture(d,n);"
+         "if(x.z<.5)"
+           "continue;"
+         "float s=t(vec2(m,i))*2.*acos(-1.);"
+         "vec3 c=normalize(vec3(cos(s),0,sin(s))),l=vec3(t(vec2(i,m))*15.,4,t(vec2(m,i))*15.);"
+         "e+=t(l+c*max(40.-x.z,-40.),vec3(.46,.2,.94)+vec3(.66,.64,.77)*cos(6.28318*(vec3(.91,.62,.97)*(i+m)+vec3(.26,.2,.84))),3.,v,c,f,y);"
+         "g++;"
+       "}"
+   "e+=vec3(.08,.62,.75)*clamp(dot(f,normalize(vec3(0,1,-3)*vec3(0,-1,-2))),0.,1.)*.8;"
+   "return n*max(vec3(0),e);"
  "}"
- "vec2 w(vec3 v)"
+ "vec3 t(vec2 m,vec3 v)"
  "{"
-   "vec2 d=t(t(t(t(t(vec2(h(v),3),vec2(h(v,vec3(-4.5,.75,0),1.5),1.05)),vec2(h(v,vec3(-1.5,.75,0),1.5),1.25)),vec2(h(v,vec3(1.5,.75,0),1.5),1.45)),vec2(h(v,vec3(4.5,.75,0),1.5),1.65)),vec2(h(v,e,s),0));"
+   "v=normalize(vec3(0,10,0)-v);"
-   "d=t(d,vec2(h(v,R,y),0));"
+   "vec3 y=normalize(cross(vec3(0,1,0),v));"
-   "return t(d,vec2(h(v,i.side1,i.side2,i.side3,i.side4),0));"
+   "return normalize(v+m.x*y+m.y*cross(v,y));"
  "}"
- "vec2 a(vec3 v)"
+ "vec3 x(vec2 v)"
  "{"
-   "return t(t(t(t(vec2(v.y+.75,3),vec2(h(v,vec3(-4.5,.75,0),1.5),1.05)),vec2(h(v,vec3(-1.5,.75,0),1.5),1.25)),vec2(h(v,vec3(1.5,.75,0),1.5),1.45)),vec2(h(v,vec3(4.5,.75,0),1.5),1.65));"
+   "vec3 f=vec3(-10,20,-20),y=t(v,f),i=vec3(0),n=vec3(0);"
- "}"
+   "f=t(f,y,n);"
- "vec2 u(vec3 v)"
+   "if(f.x>0.)"
- "{"
-   "return t(t(t(t(vec2(h(v),3),vec2(h(v,vec3(-4.5,.75,0),1.5),1.05)),vec2(h(v,vec3(-1.5,.75,0),1.5),1.25)),vec2(h(v,vec3(1.5,.75,0),1.5),1.45)),vec2(h(v,vec3(4.5,.75,0),1.5),1.65));"
- "}"
- "vec3 C(vec3 v)"
- "{"
-   "vec2 i=vec2(2e-4,0);"
-   "return normalize(vec3(a(v+i.xyy).x,a(v+i.yxy).x,a(v+i.yyx))-a(v).x);"
- "}"
- "vec2 C(Ray v)"
- "{"
-   "float d=0.;"
-   "vec2 f=vec2(-1);"
-   "for(int i=0;i<128;++i)"
      "{"
-       "f=w(v.origin+v.direction*d);"
+       "vec3 v=x(n);"
-       "if(f.x<2e-4*d||d>=1e2)"
+       "i=t(n,v,y,f.y);"
-         "break;"
-       "d+=f.x;"
      "}"
-   "if(d>=1e2)"
+   "return i*exp(-f.x*.01)+mix(i,mix(vec3(.2667,.2941,.3451),vec3(.302,.3176,.3725),pow(max(dot(y,vec3(0,-.5,1.8)),0.),clamp(m[1]+m[2]+m[3],0.,1.)*5.)),1.-exp(-f.x*.01))*(1.-exp(-f.x*.01));"
-     "f.y=-1.;"
-   "return vec2(d,f.y);"
- "}"
- "vec2 a(Ray v)"
- "{"
-   "float d=0.;"
-   "vec2 f=vec2(-1);"
-   "for(int i=0;i<64;++i)"
-     "{"
-       "f=u(v.origin+v.direction*d);"
-       "if(f.x<2e-4*d||d>=1e2)"
-         "break;"
-       "d+=f.x;"
-     "}"
-   "if(d>=1e2)"
-     "f.y=-1.;"
-   "return vec2(d,f.y);"
- "}\n"
- "#if 1\n"
- "float h(Ray v)"
- "{"
-   "float d=1.,f=0.;"
-   "for(int i=0;i<64;++i)"
-     "{"
-       "vec2 c=u(v.origin+v.direction*f);"
-       "if(c.y>0.)"
-         "{"
-           "d=min(d,.5+.5*c.x/(.125*f));"
-           "if(d<0.)"
-             "break;"
-           "f+=clamp(c.x,.005,.5);"
-         "}"
-     "}"
-   "return smoothstep(0.,1.,max(d,0.));"
- "}\n"
- "#else\n"
- "float h(Ray v)"
- "{"
-   "float f=0.;"
-   "for(int d=0;d<64;++d)"
-     "{"
-       "float i=u(v.origin+v.direction*f).x;"
-       "if(i<2e-4)"
-         "return 0.;"
-       "f+=i;"
-     "}"
-   "return 1.;"
- "}\n"
- "#endif\n"
- "float C(float v,float d,float f)"
- "{"
-   "d*=d;"
-   "return f*f*d/pow(v*v*(d-1.)+1.,2.);"
- "}"
- "float a(float v,float d,float f)"
- "{"
-   "d*=d;"
-   "return d*f/pow(v*v*(d-1.)+1.,2.);"
- "}"
- "float h(float v,float d,float f)"
- "{"
-   "d*=d;"
-   "return f*f*f*d/pow(v*v*(d-1.)+1.,2.);"
- "}"
- "float C(float v,float d)"
- "{"
-   "return v/max(v*(1.-d)+d,2e-7);"
- "}"
- "float t(float v,float d,float f)"
- "{"
-   "f+=1.;"
-   "f=f*f/8.;"
-   "return C(v,f)*C(d,f);"
- "}"
- "vec3 C(vec3 v,float d)"
- "{"
-   "return v+(1.-v)*pow(1.-d,5.);"
- "}"
- "vec2 a(float v,float d)"
- "{"
-   "vec4 i=v*vec4(-1,-.0275,-.572,.022)+vec4(1,.0425,1.04,-.04);"
-   "return vec2(-1.04,1.04)*(min(i.x*i.x,exp2(-9.28*d))*i.x+i.y)+i.zw;"
- "}"
- "vec4 C(vec3 v,vec3 d,vec3 f,vec3 i,vec3 c,float x,float n,float R,out vec3 r,out float y)"
- "{"
-   "vec3 m=e-v,o=dot(m,i)*i-m;"
-   "i=m+o*saturate(s/length(o));"
-   "o=normalize(i);"
-   "m=normalize(f+o);"
-   "R=length(i);"
-   "float p=max(dot(d,o),0.);"
-   "y=pow(saturate(1.-pow(R/20.,4.)),2.)/(R*R+1.);"
-   "y*=h(Ray(v+d*2e-4,o));"
-   "float a=n*n;"
-   "R=saturate(a+s/(2.*R));"
-   "r=C(c,max(dot(m,f),0.));"
-   "m=C(max(dot(d,m),0.),a,R)*t(x,p,n)*r;"
-   "return vec4(m,p);"
- "}"
- "vec4 a(vec3 v,vec3 d,vec3 f,vec3 i,vec3 x,float m,float n,float s,out vec3 r,out float o)"
- "{"
-   "vec4 e=vec4(0);"
-   "vec3 p=R-v,l=y-v;"
-   "s=length(p);"
-   "float w=length(l);"
-   "e.w=2.*saturate(dot(d,p)/(2.*s)+dot(d,l)/(2.*w))/(s*w+dot(p,l)+2.);"
-   "l-=p;"
-   "w=dot(i,l);"
-   "s=length(l);"
-   "vec3 z=p+l*saturate((dot(i,p)*w-dot(p,l))/(s*s-w*w));"
-   "i=dot(z,i)*i-z;"
-   "z+=i*saturate(c/length(i));"
-   "i=normalize(f+normalize(z));"
-   "w=length(z);"
-   "s=w/20.;"
-   "o=1./(s*s+1.);"
-   "o*=h(Ray(v+d*2e-4,normalize(p+l*.5)));"
-   "s=n*n;"
-   "w=saturate(s+c/(2.*w));"
-   "r=C(x,dot(i,f));"
-   "e.xyz=a(max(dot(d,i),0.),s,w)*t(m,e.w,n)*r;"
-   "return e;"
- "}"
- "vec4 h(vec3 v,vec3 d,vec3 f,vec3 s,vec3 c,float x,float n,float R,out vec3 r,out float y)"
- "{"
-   "vec4 e=vec4(0);"
-   "R=dot(cross(i.right,i.up),i.center-v);"
-   "if(R>0.)"
-     "return e;"
-   "vec3 m=i.side1-v,o=i.side2-v,p=i.side3-v,l=i.side4-v;"
-   "e.w=t(v,m,o,p,l)*.2*(saturate(dot(normalize(m),d))+saturate(dot(normalize(o),d))+saturate(dot(normalize(p),d))+saturate(dot(normalize(l),d))+saturate(dot(normalize(i.center-v),d)));"
-   "y=h(Ray(v+d*2e-4,normalize(i.center)));"
-   "Ray w=Ray(v,s);"
-   "m=w.origin+w.direction*(dot(i.front,i.center-w.origin)/dot(i.front,w.direction))-i.center;"
-   "vec2 z=vec2(dot(m,i.right),dot(m,i.up));"
-   "z=min(abs(z),i.halfSize)*sign(z);"
-   "m=i.center+i.right*z.x+i.up*z.y-v;"
-   "o=normalize(f+normalize(m));"
-   "R=n*n;"
-   "float a=saturate(R+4./(2.*length(m)));"
-   "r=C(c,dot(o,f));"
-   "e.xyz=h(max(dot(d,o),0.),R,a)*t(x,e.w,n)*r;"
-   "return e;"
- "}"
- "vec3 t(Ray v)"
- "{"
-   "vec3 f=vec3(2,0,0)*t(),s=vec3(6.*sin(d),3,5);"
-   "R=s-f;"
-   "y=s+f;"
-   "t(i);"
-   "f=vec3(0);"
-   "vec2 c=C(v);"
-   "s=v.origin+v.direction*c.x;"
-   "vec3 m=C(s),n=-v.direction,e=reflect(v.direction,m);"
-   "float w=max(dot(m,n),0.);"
-   "vec3 r=o;"
-   "float z=fract(c.y),F=.88;"
-   "vec3 u=p;"
-   "if(c.y>-1.)"
-     "{"
-       "if(c.y>2.)"
-         "r=vec3(.31,.62,.47),z=max(.05,r.x*.5),F=.05,u=l;"
-       "else if(c.y<.5)"
-         "return x*64.;"
-       "vec3 v=mix(u,r,F),d=vec3(0);"
-       "float i=1.;"
-       "vec4 R=C(s,m,n,e,v,w,z,F,d,i);"
-       "d=(1.-d)*(1.-F);"
-       "vec3 y=vec3(0);"
-       "float p=1.;"
-       "vec4 g=a(s,m,n,e,v,w,z,F,y,p);"
-       "y=(1.-y)*(1.-F);"
-       "vec3 b=vec3(0);"
-       "float A=1.;"
-       "vec4 B=h(s,m,n,e,v,w,z,F,b,A);"
-       "b=(1.-b)*(1.-F);"
-       "f=f+(d*.3183098861*r+R.xyz)*256.*R.w*i+(y*.3183098861*r+g.xyz)*512.*g.w*p+(b*.3183098861*r+B.xyz)*64.*B.w*A+r*.025;"
-       "A=z*z;"
-       "b=vec3(.1125,.1875,.25)+e.y*.35;"
-       "Ray D=Ray(s,vec3(0));"
-       "for(int v=0;v<8;++v)"
-         "{"
-           "float d=float(v)/float(8);"
-           "D.direction=normalize(t(e,2.*acos(-1.)*d)*A+e);"
-           "vec2 i=a(D);"
-           "if(floor(i.y)==3.)"
-             "b=vec3(.1,.3,.2);"
-           "else if(floor(i.y)==1.)"
-             "b+=o;"
-         "}"
-       "b/=float(8);"
-       "vec2 E=a(z,w);"
-       "b=b*(v*E.x+E.y)+max(vec3(.754554516862612,.748542953903366,.790921515418539)+vec3(-.083856548007422,.09253350096321,.322764661032516)*m.y+vec3(.308152705331738,.366796330467391,.466698181299906)*m.z+vec3(-.188884931542396,-.277402551592231,-.377844212327557)*m.x,0.)*.3183098861*r;"
-       "f=(f+b*.84)*x;"
-     "}"
-   "return mix(f,vec3(.01,.006,.004),clamp(1.-exp(-c.x*.08),0.,1.));"
  "}"
  "void main()"
  "{"
-   "vec2 d=vec2(1920,1080);"
+   "vec3 v=x(gl_FragCoord.xy*vec2(.00104166667,.00185185185)-1.);"
-   "d=(2.*gl_FragCoord.xy-d.xy)/d.y;"
+   "f=vec4(v,1);"
-   "Ray f=t(d);"
-   "vec3 i=t(f);"
-   "v=vec4(i,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>