uusi engine

song.yml

@@ -2,112 +2,103 @@ bpm: 138
 rowsperbeat: 4
 score:
     tracks:
-        - numvoices: 1
+        - numvoices: 2
-          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]
+          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]
           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: 1
+        - numvoices: 2
-          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]
+          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]
           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, -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]
           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, -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]
           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, -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]
           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, -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]
           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, 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]
+          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]
-          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, -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]
           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: 80slead.instr
+    - name: 80s lead
-      numvoices: 2
+      numvoices: 4
       units:
         - type: oscillator
           id: 1089
-          parameters: {color: 0, detune: 80, gain: 128, lfo: 0, phase: 0, shape: 64, stereo: 0, transpose: 76, type: 1, unison: 3}
+          parameters: {color: 128, detune: 80, gain: 128, lfo: 0, phase: 0, shape: 64, stereo: 1, transpose: 76, type: 1, unison: 3}
         - type: oscillator
           id: 1090
-          parameters: {color: 64, detune: 64, gain: 128, lfo: 0, phase: 1, shape: 64, stereo: 0, transpose: 64, type: 0, unison: 0}
+          parameters: {color: 128, detune: 57, gain: 128, lfo: 0, phase: 0, shape: 64, stereo: 1, transpose: 64, type: 1, unison: 2}
         - type: addp
           id: 1091
-          parameters: {stereo: 0}
+          parameters: {stereo: 1}
         - type: envelope
           id: 1092
-          parameters: {attack: 37, decay: 66, gain: 90, release: 54, stereo: 0, sustain: 81}
+          parameters: {attack: 37, decay: 66, gain: 90, release: 54, stereo: 1, sustain: 81}
         - type: mulp
           id: 1098
-          parameters: {stereo: 0}
+          parameters: {stereo: 1}
-        - type: sync
-          id: 1172
-          parameters: {}
         - type: pan
           id: 1096
-          parameters: {panning: 63, stereo: 0}
+          parameters: {panning: 60, stereo: 1}
         - type: filter
           id: 1108
-          parameters: {bandpass: 1, frequency: 94, highpass: 0, lowpass: 1, resonance: 99, stereo: 1}
+          parameters: {bandpass: 0, frequency: 84, highpass: 0, lowpass: 1, negbandpass: 1, neghighpass: 0, resonance: 128, stereo: 1}
         - type: gain
           id: 1119
           parameters: {gain: 64, stereo: 1}
         - type: filter
-          id: 1146
+          id: 1133
-          parameters: {bandpass: 0, frequency: 13, highpass: 1, lowpass: 1, resonance: 109, stereo: 1}
+          parameters: {bandpass: 0, frequency: 10, highpass: 0, lowpass: 1, negbandpass: 0, neghighpass: 1, resonance: 88, stereo: 1}
         - type: outaux
           id: 1097
-          parameters: {auxgain: 20, outgain: 40, stereo: 1}
+          parameters: {auxgain: 34, outgain: 34, stereo: 1}
-    - name: 80sbass.instr
+    - name: 80s bass
       numvoices: 1
       units:
         - type: oscillator
           id: 3
-          parameters: {color: 0, detune: 64, gain: 128, lfo: 0, phase: 0, shape: 64, stereo: 1, transpose: 64, type: 1, unison: 0}
+          parameters: {color: 128, detune: 64, gain: 128, lfo: 0, phase: 64, shape: 64, stereo: 1, transpose: 64, type: 1, unison: 0}
         - type: oscillator
           id: 4
-          parameters: {color: 0, detune: 74, gain: 128, lfo: 0, phase: 0, shape: 64, stereo: 1, transpose: 52, type: 1, unison: 2}
+          parameters: {color: 128, detune: 76, gain: 128, lfo: 0, phase: 30, shape: 64, stereo: 1, transpose: 52, type: 1, unison: 1}
         - type: addp
           id: 1084
           parameters: {stereo: 1}
         - type: envelope
           id: 1085
-          parameters: {attack: 0, decay: 70, gain: 100, release: 68, stereo: 1, sustain: 28}
+          parameters: {attack: 0, decay: 69, gain: 100, release: 68, stereo: 1, sustain: 50}
         - type: send
           id: 1088
-          parameters: {amount: 80, port: 0, sendpop: 0, stereo: 1, target: 1087, voice: 0}
+          parameters: {amount: 100, port: 0, sendpop: 0, stereo: 1, target: 1087, voice: 0}
         - type: mulp
           id: 1086
           parameters: {stereo: 1}
-        - type: filter
-          id: 1087
-          parameters: {bandpass: 0, frequency: 45, highpass: 1, lowpass: 1, resonance: 46, stereo: 1}
         - type: distort
           id: 1107
-          parameters: {drive: 100, stereo: 1}
+          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}
         - type: pan
           id: 284
           parameters: {panning: 64, stereo: 1}
         - type: gain
           id: 1121
-          parameters: {gain: 107, stereo: 1}
+          parameters: {gain: 110, stereo: 1}
-        - type: sync
-          id: 1173
-          parameters: {}
         - type: outaux
           id: 15
-          parameters: {auxgain: 21, outgain: 42, stereo: 1}
+          parameters: {auxgain: 30, outgain: 30, stereo: 1}
-    - name: kick.instr
+    - name: Kick
       comment: 'Suggested note: C-3'
       numvoices: 1
       units:
@@ -122,10 +113,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: 64, type: 0, unison: 0}
+          parameters: {color: 128, detune: 64, gain: 128, phase: 0, shape: 64, stereo: 0, transpose: 57, type: 0, unison: 0}
         - type: filter
           id: 281
-          parameters: {bandpass: -1, frequency: 91, highpass: -1, lowpass: 0, resonance: 98, stereo: 0}
+          parameters: {bandpass: 0, frequency: 91, highpass: 0, lowpass: 0, negbandpass: 1, neghighpass: 1, resonance: 98, stereo: 0}
         - type: mulp
           id: 263
           parameters: {stereo: 0}
@@ -143,16 +134,16 @@ patch:
           parameters: {amount: 84, port: 0, sendpop: 1, stereo: 0, target: 277, voice: 0}
         - type: envelope
           id: 274
-          parameters: {attack: 34, decay: 70, gain: 128, release: 0, stereo: 0, sustain: 0}
+          parameters: {attack: 45, 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: 1147
+          id: 1122
           parameters: {amount: 0, port: 0, sendpop: 0, stereo: 0, target: 1121, voice: 0}
         - type: send
-          id: 1148
+          id: 1124
-          parameters: {amount: 51, port: 0, sendpop: 0, stereo: 0, target: 1159, voice: 0}
+          parameters: {amount: 32, port: 0, sendpop: 0, stereo: 0, target: 1123, voice: 0}
         - type: oscillator
           id: 277
           parameters: {color: 128, detune: 64, gain: 128, phase: 0, shape: 64, stereo: 0, transpose: 45, type: 0}
@@ -166,15 +157,21 @@ patch:
           id: 294
           parameters: {panning: 64, stereo: 0}
         - type: filter
-          id: 1149
+          id: 1132
-          parameters: {bandpass: 0, frequency: 11, highpass: -1, lowpass: 1, resonance: 128, stereo: 1}
+          parameters: {bandpass: 0, frequency: 11, highpass: 0, lowpass: 1, negbandpass: 0, neghighpass: 1, resonance: 128, stereo: 1}
-        - type: sync
-          id: 1180
-          parameters: {}
         - type: outaux
           id: 266
-          parameters: {auxgain: 20, outgain: 59, stereo: 1}
+          parameters: {auxgain: 14, outgain: 50, stereo: 1}
-    - name: snare.instr
+        - type: oscillator
+          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:
@@ -198,10 +195,10 @@ patch:
           parameters: {stereo: 0}
         - type: filter
           id: 201
-          parameters: {bandpass: 0, frequency: 78, highpass: -1, lowpass: 1, resonance: 127, stereo: 0}
+          parameters: {bandpass: 0, frequency: 78, highpass: 0, lowpass: 1, negbandpass: 0, neghighpass: 1, resonance: 127, stereo: 0}
         - type: filter
           id: 225
-          parameters: {bandpass: 0, frequency: 122, highpass: 0, lowpass: 1, resonance: 112, stereo: 0}
+          parameters: {bandpass: 0, frequency: 122, highpass: 0, lowpass: 1, negbandpass: 0, neghighpass: 0, resonance: 112, stereo: 0}
         - type: addp
           id: 226
           parameters: {stereo: 0}
@@ -213,7 +210,7 @@ patch:
           parameters: {panning: 63, stereo: 0}
         - type: outaux
           id: 232
-          parameters: {auxgain: 49, outgain: 62, stereo: 1}
+          parameters: {auxgain: 52, outgain: 58, stereo: 1}
         - type: envelope
           id: 233
           parameters: {attack: 37, decay: 47, gain: 128, release: 0, stereo: 0, sustain: 0}
@@ -232,19 +229,19 @@ patch:
         - type: send
           id: 238
           parameters: {amount: 32, port: 0, sendpop: 1, target: 202}
-    - name: SuperSaw 4.instr
+    - name: SuperSaw 4
       comment: Automate filter frequency for the classic trance sound
-      numvoices: 2
+      numvoices: 1
       units:
         - type: envelope
           id: 1109
           parameters: {attack: 0, decay: 0, gain: 64, release: 64, stereo: 0, sustain: 85}
         - type: oscillator
           id: 1099
-          parameters: {color: 0, detune: 96, gain: 64, phase: 0, shape: 64, stereo: 0, transpose: 64, type: 1, unison: 3}
+          parameters: {color: 128, detune: 96, gain: 64, phase: 64, shape: 64, stereo: 0, transpose: 64, type: 1, unison: 3}
         - type: oscillator
           id: 12
-          parameters: {color: 0, detune: 80, gain: 64, lfo: 0, phase: 0, shape: 64, stereo: 0, transpose: 64, type: 1, unison: 3}
+          parameters: {color: 128, detune: 77, gain: 80, lfo: 0, phase: 64, shape: 64, stereo: 0, transpose: 64, type: 1, unison: 3}
         - type: addp
           id: 13
           parameters: {stereo: 0}
@@ -253,62 +250,66 @@ patch:
           parameters: {stereo: 0}
         - type: envelope
           id: 17
-          parameters: {attack: 0, decay: 67, gain: 64, release: 64, stereo: 0, sustain: 99}
+          parameters: {attack: 18, decay: 67, gain: 64, release: 64, stereo: 0, sustain: 99}
         - type: oscillator
-          id: 1156
+          id: 18
-          parameters: {color: 0, detune: 44, gain: 64, phase: 0, shape: 64, stereo: 0, transpose: 64, type: 1, unison: 3}
+          parameters: {color: 128, detune: 46, gain: 81, phase: 64, shape: 64, stereo: 0, transpose: 64, type: 1, unison: 3}
         - type: oscillator
-          id: 1157
+          id: 19
-          parameters: {color: 0, detune: 35, gain: 64, lfo: 0, phase: 0, shape: 64, stereo: 0, transpose: 64, type: 1, unison: 3}
+          parameters: {color: 128, detune: 38, gain: 76, lfo: 0, phase: 64, shape: 64, stereo: 0, transpose: 64, type: 1, unison: 3}
         - type: addp
-          id: 1158
+          id: 20
           parameters: {stereo: 0}
         - type: mulp
           id: 23
           parameters: {stereo: 0}
         - type: gain
-          id: 1159
+          id: 1123
           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: 23, dry: 106, feedback: 32, notetracking: 2, pregain: 69, stereo: 1}
+          parameters: {damp: 0, dry: 71, feedback: 32, notetracking: 2, pregain: 71, stereo: 1}
-          varargs: [24, 36]
+          varargs: [32, 36]
-        - type: outaux
-          id: 1160
-          parameters: {auxgain: 25, outgain: 25, stereo: 1}
         - type: loadnote
-          id: 1174
+          id: 1140
           parameters: {stereo: 0}
         - type: sync
-          id: 1175
+          id: 1138
           parameters: {}
         - type: pop
-          id: 1176
+          id: 1139
           parameters: {stereo: 0}
-    - name: pad.instr
+        - type: outaux
+          id: 30
+          parameters: {auxgain: 23, outgain: 25, stereo: 1}
+    - name: pad
       numvoices: 1
       units:
         - type: envelope
-          id: 1161
+          id: 1
           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: 1161}
+          parameters: {amount: 64, port: 4, sendpop: 0, target: 1}
         - type: oscillator
-          id: 1162
+          id: 1125
           parameters: {color: 80, detune: 60, gain: 128, lfo: 0, phase: 32, shape: 64, stereo: 0, transpose: 64, type: 2}
         - type: oscillator
-          id: 1163
+          id: 1126
           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: 1164
+          id: 6
-          parameters: {amount: 68, port: 1, sendpop: 0, target: 1162}
+          parameters: {amount: 68, port: 1, sendpop: 0, target: 1125}
         - type: send
           id: 78
-          parameters: {amount: 61, port: 1, sendpop: 1, target: 1163}
+          parameters: {amount: 61, port: 1, sendpop: 1, target: 1126}
         - type: addp
           id: 80
           parameters: {stereo: 0}
@@ -317,10 +318,10 @@ patch:
           parameters: {stereo: 0}
         - type: filter
           id: 11
-          parameters: {bandpass: 0, frequency: 26, highpass: -1, lowpass: 1, resonance: 128, stereo: 0}
+          parameters: {bandpass: 0, frequency: 26, highpass: 0, lowpass: 1, negbandpass: 0, neghighpass: 1, resonance: 128, stereo: 0}
         - type: filter
-          id: 1165
+          id: 1127
-          parameters: {bandpass: 0, frequency: 64, highpass: 0, lowpass: 1, resonance: 64, stereo: 0}
+          parameters: {bandpass: 0, frequency: 64, highpass: 0, lowpass: 1, negbandpass: 0, neghighpass: 0, resonance: 64, stereo: 0}
         - type: distort
           id: 1128
           parameters: {drive: 109, stereo: 0}
@@ -331,13 +332,10 @@ 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.instr
+    - name: HappyLead
       numvoices: 4
       units:
         - type: oscillator
@@ -364,51 +362,17 @@ patch:
           varargs: [12550, 24402, 21265, 32419]
         - type: outaux
           id: 172
-          parameters: {auxgain: 38, outgain: 64, stereo: 1}
+          parameters: {auxgain: 64, 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: 28, dry: 0, feedback: 120, notetracking: 0, pregain: 35, stereo: 1}
+          parameters: {damp: 25, dry: 0, feedback: 120, notetracking: 0, pregain: 40, 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: 120, stereo: 1}
+          parameters: {gain: 64, stereo: 1}
-          comment: Master Out

src/main.cpp

@@ -127,42 +127,6 @@ 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);
@@ -238,68 +202,6 @@ 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

@@ -1,365 +1,694 @@
 #version 460
+
 precision mediump float;
 out vec4 o;
-const float PI = 3.14159265;
-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
+//float u_time = syncs[0];
-layout(location = 700) uniform vec3 test; // shapes test
+
-float u_time = syncs[0];
+float iTime = syncs[0];
+
+/**
+* Creative Commons CC0 1.0 Universal (CC-0)
+*
+* Contains all the helper functions used by Buffer A for the area lights.
+*
+*/
+
+#define saturate(x) clamp(x, 0., 1.)
+#define dot2(x) dot(x, x)
+
+float EPS = .0002;
+float SMOL_EPS = .0000002;
+
+float PI = 3.1415926535;
+float TWO_PI = 6.283185307;
+float PI_INV = .3183098861;
+
+// enable/disable these for floor normal map and roughness
+
+float T = (iTime * .25);
+
+float SPHERE_LIGHT_RADIUS = (sin(T) * .5 + .7);
+
+vec3 SPHERE_LIGHT_POS = vec3(9. * cos(T), 6. * abs(sin(T)) / -.75 + SPHERE_LIGHT_RADIUS, 1.);
+float SPHERE_LIGHT_VOLUME_RADIUS = 20.;
+float SPHERE_LIGHT_INTENSITY = 256.;
+            
+float LINE_LIGHT_RADIUS = (sin(T) * .075 + .125);
+float LINE_LIGHT_VOLUME_RADIUS = 20.;
+float LINE_LIGHT_INTENSITY = 512.;
+            
+float RECT_LIGHT_RADIUS = 4.;
+float RECT_LIGHT_INTENSITY = 64.;
+            
+vec3 LIGHT_COLOR = vec3(1., .6, .3);
+            
+vec3 SPHERE_ALBEDO = vec3(.2, .01, .6);
+int REFLECTION_STEPS = 8;
+            
+vec3 SILVER_F0 = vec3(.95, .93, .88);
+vec3 PLASTIC_F0 = vec3(.05);
+
+vec3 CAMERA_POS = vec3(0., 9., 21.);
+float CAMERA_FAR = 100.;
+
+struct Ray
+{
+    vec3 origin, direction;
+};
+    
+struct Rect
+{
+	vec3 center, side1, side2, side3, side4; 
+	vec3 up, right, front;
+    vec2 halfSize;
+};
+    
+float hash12(vec2 p)
+{
+	uvec2 q = uvec2(ivec2(p)) * uvec2(1597334673U, 3812015801U);
+	uint n = (q.x ^ q.y) * 1597334673U;
+	return float(n) * (1. / float(0xffffffffU));
+}
+
+mat3 rotZ(float a)
+{
+	return mat3(cos(a), -sin(a), 0.,
+                sin(a),  cos(a), 0.,
+                	0., 	 0., 1.);
+}
+
+vec3 rotateAround(vec3 v, vec3 k, float theta)
+{
+  return v * cos(theta) + cross(k, v) * sin(theta) + k * dot(k, v) * (1. - cos(theta));
+}
+
+mat3 getCameraMatrix(vec3 origin, vec3 target)
+{
+    vec3 lookAt = normalize(target - origin);
+    vec3 right = normalize(cross(lookAt, vec3(0., 1., 0.)));
+    vec3 up = normalize(cross(right, lookAt));
+    return mat3(right, up, lookAt);
+}
+
+Ray getCameraRay(vec2 uv)
+{
+    vec3 origin = CAMERA_POS;
+    vec3 target = vec3(0., 1., 0.);
+    mat3 camera = getCameraMatrix(origin, target);
+    vec3 direction = normalize(camera * vec3(uv, 2.5));
+    return Ray(origin, direction);
+}
+
+void initRect(out Rect rect, float t)
+{
+    rect.up = vec3(0., 0., 1.);
+    rect.right = vec3(1., 0., 0.);
+    rect.front = normalize(cross(rect.right, rect.up));
+    vec2 widthScale = vec2(cos(t), sin(t)) * .25 + .75;
+    rect.halfSize = vec2(2.5, 1.5) * widthScale;
+    
+    rect.center = vec3(0., 6., sin(t) * 4. - 1.5);
+    
+    rect.side1 = rect.center + rect.halfSize.x * rect.right + rect.halfSize.y * rect.up;
+    rect.side2 = rect.center - rect.halfSize.x * rect.right + rect.halfSize.y * rect.up;
+    rect.side3 = rect.center - rect.halfSize.x * rect.right - rect.halfSize.y * rect.up;
+    rect.side4 = rect.center + rect.halfSize.x * rect.right - rect.halfSize.y * rect.up;
+}
+
+
+// Based on the technique in EA's frostbite engine
+float rectSolidAngle(vec3 p, vec3 v0, vec3 v1, vec3 v2, vec3 v3)
+{
+    vec3 n0 = normalize(cross(v0, v1));
+    vec3 n1 = normalize(cross(v1, v2));
+    vec3 n2 = normalize(cross(v2, v3));
+    vec3 n3 = normalize(cross(v3, v0));
+    
+    float g0 = acos(dot(-n0, n1));
+	float g1 = acos(dot(-n1, n2));
+	float g2 = acos(dot(-n2, n3));
+	float g3 = acos(dot(-n3, n0));
+    
+    return g0 + g1 + g2 + g3 - 2. * PI;
+}
 
 vec2 getUV() {
     const vec2 scale = vec2(0.00104166667, 0.00185185185);
     return gl_FragCoord.xy * scale - 1.0;
 }
 
-float noise(in vec2 xy, in float seed) {
+/**
-    return fract(tan(distance(xy * PHI, xy) * seed) * xy.x);
+* Creative Commons CC0 1.0 Universal (CC-0)
-}
+*
-
+* My implementation of 3 types of area light sources (sphere, line, and rectangle). Based on most 
-// Hexagonal prism, circumcircle variant
+* representative point techniques by Brian Karis (Epic) and S<>bastien Lagarde (Unity). The general
-float fHexagonCircumcircle(vec3 p, vec2 h) {
+* idea is to calculate the location of a point light on the surface of the light source and use that
-    vec3 q = abs(p);
+* point as the light direction to calculate the diffuse and specular components of the area light. 
-    return max(q.y - h.y, max(q.x * sqrt(3.) * 0.5 + q.z * 0.5, q.z) - h.x);
+*
-	//this is mathematically equivalent to this line, but less efficient:
+* https://cdn2.unrealengine.com/Resources/files/2013SiggraphPresentationsNotes-26915738.pdf
-	//return max(q.y - h.y, max(dot(vec2(cos(PI/3), sin(PI/3)), q.zx), q.z) - h.x);
+* https://seblagarde.files.wordpress.com/2015/07/course_notes_moving_frostbite_to_pbr_v32.pdf
-}
+*
-
-float sdHex(vec3 pos, float i, float angle) {
-    float d1 = fHexagonCircumcircle(pos, vec2(0.86, i));
-    return d1;
-}
-
-float getScaledFFT(int index, float scale, float offset) {
-    // Clamp index to valid range
-    index = clamp(index, 0, 511);
-
-    // Get raw FFT value
-    float raw = fft_output[index];
-
-    // Apply logarithmic scaling: log(1 + value * scale) + 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.;
-    float d = 1e9;
-    float a = 0.;
-
-    vec2 rippleCenter = vec2(7.,7.);
-    float rippleSpeed = 4.0;
-    float rippleFreq = 1.0;
-    float rippleDecay = 0.25;
-
-    // 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);
-        po += vec3(0, 0., (1.88 + hexGap) * j);
-
-        for(float i = 0.; i < 16.; i++) {
-            if(mod(i, 2.) == 0.) {
-                po -= vec3(1.6 + hexGap, 0., 1.);
-            } else {
-                po += vec3(-(1.6 + hexGap), 0., 1.);
-            }
-
-            // Add individual hexagon ripples based on distance from center
-            int hexDist = int(length(vec2(i, j) - rippleCenter.xy));
-
-            //float wave = sin(hexDist * rippleFreq - u_time * rippleSpeed) * exp(-hexDist * rippleDecay);
-
-            // Apply ripple to hexagon size and position
-
-            // float hexSize = fft_output[int(i+1)*int(j+1)]*5.0; // sin(1.5*u_time)+ wave
-            //float hexSize = fft_output[hexDist] * 5.0;
-            float hexSize = getScaledFFT(hexDist, 15.0, 0.0) * 2.0; // Adjusted multiplier
-            a = sdHex(po, 1. + hexSize, 0.);
-            d = min(d, a);
-
-            if(d == a) {
-                mat = 1.;
-            }
-        }
-    }
 */
 
-    // main note effect shapes
+vec3 lineStart, lineEnd;
-    a = sdSphere(vec3(p.x + test.y, p.y + test.x, p.z), test.z + 2.);
+Rect rect;
-    d = min(d, a);
+
-    if (d == a) {
+vec2 sdUnion(vec2 a, vec2 b)
-        mat = 1.;
+{
+ 	return a.x < b.x ? a : b;  
 }
 
-    return vec2(d, mat);
+float sdPlane(vec3 pos, float height)
+{
+	float plane = pos.y - height;
+
+    return plane;
 }
 
-vec3 castRay(vec3 ro, vec3 rd, inout vec3 pos) {
+float sdPlaneNoDisplacement(vec3 pos, float height)
+{
+	return pos.y - height;
+}
+
+float sdSphere(vec3 position, vec3 center, float radius)
+{
+	return length(position - center) - radius;   
+}
+
+float sdCapsule(vec3 position, vec3 start, vec3 end, float radius)
+{
+    vec3 pa = position - start, ba = end - start;
+    float h = saturate(dot(pa, ba) / dot(ba, ba));
+    return length(pa - ba * h) - radius;
+}
+
+float sdRect(vec3 p, vec3 a, vec3 b, vec3 c, vec3 d)
+{
+    vec3 ba = b - a; vec3 pa = p - a;
+    vec3 cb = c - b; vec3 pb = p - b;
+    vec3 dc = d - c; vec3 pc = p - c;
+    vec3 ad = a - d; vec3 pd = p - d;
+    vec3 nor = cross(ba, ad);
+
+    return sqrt(
+        (sign(dot(cross(ba, nor), pa)) +
+         sign(dot(cross(cb, nor), pb)) +
+         sign(dot(cross(dc, nor), pc)) +
+         sign(dot(cross(ad, nor), pd)) < 3.)
+
+        ?
+
+        min(min(min(
+		dot2(ba * clamp(dot(ba, pa) / dot2(ba), 0., 1.) - pa),
+		dot2(cb * clamp(dot(cb, pb) / dot2(cb), 0., 1.) - pb)),
+		dot2(dc * clamp(dot(dc, pc) / dot2(dc), 0., 1.) - pc)),
+		dot2(ad * clamp(dot(ad, pd) / dot2(ad), 0., 1.) - pd))
+        
+        :
+        
+        dot(nor, pa) * dot(nor, pa) / dot2(nor) 
+    );
+}
+
+vec2 sdScene(vec3 pos)
+{
+	vec2 result = sdUnion(vec2(sdPlaneNoDisplacement(pos, -.75), 3.), 
+						vec2(sdSphere(pos, vec3(-4.5, .75, 0.), 1.5), 1.05));
+    
+    result = sdUnion(result, vec2(sdSphere(pos, vec3(-1.5, .75,0.), 1.5), 1.25));
+    
+	result = sdUnion(result, vec2(sdSphere(pos, vec3(1.5, .75, 0.), 1.5), 1.45));
+    
+    result = sdUnion(result, vec2(sdSphere(pos, vec3(4.5, .75, 0.), 1.5), 1.65));
+
+
+	result = sdUnion(result, vec2(sdSphere(pos, SPHERE_LIGHT_POS, SPHERE_LIGHT_RADIUS),
+                                  0.));
+    
+    result = sdUnion(result, vec2(sdCapsule(pos, lineStart, lineEnd, 
+                                          LINE_LIGHT_RADIUS), 0.));
+    
+    result = sdUnion(result, vec2(sdRect(pos, rect.side1, rect.side2, rect.side3, rect.side4), 0.));
+
+    
+    return result;
+}
+
+vec2 sdSceneNormal(vec3 pos)
+{
+	vec2 result = sdUnion(vec2(sdPlane(pos, -.75), 3.), 
+						vec2(sdSphere(pos, vec3(-4.5, .75, 0.), 1.5), 1.05));
+    
+    result = sdUnion(result, vec2(sdSphere(pos, vec3(-1.5, .75, 0.), 1.5), 1.25));
+    
+    result = sdUnion(result, vec2(sdSphere(pos, vec3(1.5, .75, 0.), 1.5), 1.45));
+    
+    result = sdUnion(result, vec2(sdSphere(pos, vec3(4.5, .75, 0.), 1.5), 1.65));
+    
+    return result;
+}
+
+vec2 sdSceneNoLights(vec3 pos)
+{
+	vec2 result = sdUnion(vec2(sdPlaneNoDisplacement(pos, -.75), 3.), 
+						vec2(sdSphere(pos, vec3(-4.5, .75, 0.), 1.5), 1.05));
+    
+    result = sdUnion(result, vec2(sdSphere(pos, vec3(-1.5, .75, 0.), 1.5), 1.25));
+    
+    result = sdUnion(result, vec2(sdSphere(pos, vec3(1.5, .75, 0.), 1.5), 1.45));
+    
+    result = sdUnion(result, vec2(sdSphere(pos, vec3(4.5, .75, 0.), 1.5), 1.65));
+    
+    return result;
+}
+
+vec3 calculateNormal(vec3 pos)
+{
+	vec2 eps = vec2(EPS, 0.);
+    return normalize(vec3(sdSceneNormal(pos + eps.xyy).x, 
+                          sdSceneNormal(pos + eps.yxy).x, 
+                          sdSceneNormal(pos + eps.yyx).x) 
+                     - sdSceneNormal(pos).x);
+}
+
+vec2 rayMarch(Ray ray)
+{
+	float dist = 0.;
+    vec2 result = vec2(-1.);
+    for(int i = 0; i < 128; ++i)
+    {  
+        result = sdScene(ray.origin + ray.direction * dist);
+        if (result.x < EPS * dist || dist >= CAMERA_FAR) break;
+        dist += result.x;
+    }
+
+    if (dist >= CAMERA_FAR) result.y = -1.;
+    return vec2(dist, result.y);
+}
+
+vec2 rayMarchNoLights(Ray ray)
+{
+	float dist = 0.;
+    vec2 result = vec2(-1.);
+    for(int i = 0; i < 64; ++i)
+    {  
+        result = sdSceneNoLights(ray.origin + ray.direction * dist);
+        if (result.x < EPS * dist || dist >= CAMERA_FAR) break;
+        dist += result.x;
+    }
+
+    if (dist >= CAMERA_FAR) result.y = -1.;
+    return vec2(dist, result.y);
+}
+#if 1
+float softShadow(Ray ray)
+{
+ 	float shadow = 1., dist = 0.;
+    for (int i = 0; i < 64; ++i)
+    {
+        vec2 result = sdSceneNoLights(ray.origin + ray.direction * dist);
+        if (result.y > 0.)
+        {
+            // iq's soft shadow hack
+            shadow = min(shadow, .5 + .5 * result.x / (.125 * dist));
+            if (shadow < 0.) break;
+            dist += clamp(result.x, .005, .5);
+        }
+    }
+    return smoothstep(0., 1., max(shadow, 0.));
+}
+#else
+float softShadow(Ray ray)
+{
     float t = 0.;
-    float mat = 0.;
+	for(int i = 0; i < 64; ++i)
-    float hit = 0.;
+    {
-    // Reduced from 40 to 24 steps
+        float h = sdSceneNoLights(ray.origin + ray.direction * t).x;
-    for(int i = 0; i < 30; i++) {
+        if (h < EPS)
-        pos = ro + rd * t;
+            return 0.0;
-        vec2 res = mapScene(pos);
+        t += h;
-        // Increase step size multiplier for faster marching
-        t += res.x;
-        mat = res.y;
-        if(t > 100.) { // Reduced max distance
-            break;
     }
-        if(res.x < 0.001 * t) { // Less precise hit detection
+    return 1.0;   
-            hit = 1.;
-            break;
 }
-    }
+#endif
-    if (t > 100.)
-        t = 0.;
 
-    return vec3(t, mat, hit);
+float normalDistributionGGXSphere(float NdotH, float alpha, float alphaPrime)
+{
+    float alpha2 = alpha * alpha;
+    float alphaPrime2 = alphaPrime * alphaPrime;
+    float NdotH2 = NdotH * NdotH;
+    
+    return 
+        			 (alpha2 * alphaPrime2)
+    	/ /*----------------------------------------*/
+        	  pow(NdotH2 * (alpha2 - 1.) + 1., 2.);      
 }
 
-float softshadow(in vec3 ro, in vec3 rd, float mint, float maxt, float w) {
+float normalDistributionGGXLine(float NdotH, float alpha, float alphaPrime)
-    float res = 1.0;
+{
-    float t = mint;
+    float alpha2 = alpha * alpha;
-    for(int i = 0; i < 6; i++) {
+    float alphaPrime2 = alphaPrime * alphaPrime;
-        if(t > maxt)
+    float NdotH2 = NdotH * NdotH;
-            break;
+    
-        float h = mapScene(ro + t * rd).x;
+    return 
-        res = min(res, h / (w * t));
+        			 (alpha2 * alphaPrime)
-        t += clamp(h, 0.1, 0.80);
+    	/ /*----------------------------------------*/
-        if(res < -1.0)
+        	  pow(NdotH2 * (alpha2 - 1.) + 1., 2.);      
-            break;
-    }
-    res = max(res, -1.0);
-    return 0.25 * (1.0 + res) * (1.0 + res) * (2.0 - res);
 }
 
-vec3 calcNormal(vec3 pos) {
+float normalDistributionGGXRect(float NdotH, float alpha, float alphaPrime)
-    vec2 e = vec2(.01, 0.);
+{
-    vec3 n = vec3(mapScene(pos + e.xyy).x - mapScene(pos - e.xyy).x, mapScene(pos + e.yxy).x - mapScene(pos - e.yxy).x, mapScene(pos + e.yyx).x - mapScene(pos - e.yyx).x);
+    float alpha2 = alpha * alpha;
-    return normalize(n);
+    float alpha4 = alpha2 * alpha2;
+    float alphaPrime3 = alphaPrime * alphaPrime * alphaPrime;
+    float NdotH2 = NdotH * NdotH;
+    
+    return 
+        			 	(alpha2 * alphaPrime3)
+    	/ /*-------------------------------------------------*/
+        	  	(pow(NdotH2 * (alpha2 - 1.) + 1., 2.));      
 }
 
-vec3 addPointLight(vec3 lightPos, vec3 lightColor, float intensity, vec3 worldPos, vec3 viewDir, vec3 normal, float roughness) {
+// Schlick-Beckmann GGX approximation used for smith's method
-    // Light vector from surface to light
+float geometrySchlickGGX(float NdotX, float k)
-    vec3 lightDir = lightPos - worldPos;
+{
-    float lightDistance = length(lightDir);
+    return 
-    lightDir = normalize(lightDir);
+        					NdotX
-
+    	/ /*----------------------------------------*/
-    // Attenuation (quadratic falloff)
+    	  	  max(NdotX * (1. - k) + k, SMOL_EPS);
-    float attenuation = intensity / (1.0 + 0.09 * lightDistance + 0.032 * lightDistance * lightDistance);
-
-    // Diffuse lighting (Lambert)
-    float NdotL = max(dot(normal, lightDir), 0.0);
-    vec3 diffuse = lightColor * NdotL * attenuation;
-
-    // Specular lighting (Blinn-Phong)
-    vec3 halfDir = normalize(lightDir + (-viewDir));
-    float NdotH = max(dot(normal, halfDir), 0.0);
-    float shininess = mix(128.0, 8.0, roughness); // Convert roughness to shininess
-    vec3 specular = lightColor * pow(NdotH, shininess) * attenuation;
-
-    // Fresnel effect
-    vec3 F0 = vec3(0.04); // Base reflectance for dielectrics
-    vec3 fresnel = F0 + (1.0 - F0) * pow(clamp(1.0 - max(dot(halfDir, lightDir), 0.0), 0.0, 1.0), 5.0);
-
-    // Soft shadows
-    float shadow = softshadow(worldPos + normal * 0.01, lightDir, 0.02, lightDistance, 4.0);
-
-    // Combine diffuse and specular with shadow
-    return (diffuse + specular * fresnel) * shadow;
 }
 
-/*vec3 addPointLight(vec3 lightPos, vec3 lightColor, float intensity, vec3 worldPos, vec3 viewDir, vec3 normal) {
+float geometrySmith(float NdotV, float NdotL, float roughness)
-    vec3 lightDir = normalize(lightPos - worldPos);
+{
-    float lightDistance = length(lightPos - worldPos);
+ 	float roughnessplusone = roughness + 1.;
+    float k = roughnessplusone * roughnessplusone / 8.;
     
-    // Attenuation
+    return geometrySchlickGGX(NdotV, k) * geometrySchlickGGX(NdotL, k);
-    float attenuation = intensity / (1.0 + 0.1 * lightDistance + 0.01 * lightDistance * lightDistance);
-
-    // Diffuse
-    float NdotL = max(dot(normal, lightDir), 0.0);
-
-    // Specular (Blinn-Phong)
-    vec3 halfDir = normalize(lightDir - viewDir);
-    float NdotH = max(dot(normal, halfDir), 0.0);
-    float specular = pow(NdotH, 32.0);
-
-    // Shadow
-    float shadow = softshadow(worldPos + normal * 0.01, lightDir, 0.01, lightDistance, 8.0);
-
-    return lightColor * (NdotL + specular * 0.5) * attenuation * shadow;
-}
-*/
-
-float getAmbientOcc(vec3 p, vec3 n) {
-    float occ = 0.;
-    float weight = 1.;
-    for(int i = 0; i < 8; i++) {
-        float len = 0.01 + 0.02 * float(i * i);
-        float dist = mapScene(p + n * len).x;
-        occ += (len - dist) * weight;
-        weight *= 0.85;
-    }
-    return 1.0 - clamp(0.6 * occ, 0., 1.);
 }
 
-vec3 shading(vec3 v, vec3 n, vec3 dir, float material) {
+// Schlick's approximation for Fresnel equation
-    float shininess = 0.01;
+vec3 fresnelSchlick(vec3 F0, float dotProd)
-
+{
-    vec3 outMaterial = vec3(0.0, 0.0, 0.0);
+    return F0 + (1. - F0) * pow(1. - dotProd, 5.);
-
-    if(material == 0.) {
-        outMaterial = vec3(0.8314, 0.2941, 0.2941);
-        shininess = 0.1;
-    } else if(material == 1.) {
-        outMaterial = vec3(0.6196, 0.6118, 0.6118);
-        shininess = .7;
-    } else if(material == 2.) {
-        outMaterial = vec3(0.3255, 0.4784, 0.3255);
-        shininess = .2;
-    } else if(material == 3.) {
-        outMaterial = vec3(0.2471, 0.3059, 0.6314);
-        shininess = 1.0;
-    } else if(material == 4.) {
-        outMaterial = vec3(0.9961, 1.0, 0.9922);
-        shininess = .1;
-    } else if(material == 5.) {
-        outMaterial = vec3(0.9961, 1.0, 0.9922);
-        shininess = .3;
 }
 
-    vec3 lights = vec3(0.);
+vec3 Irradiance_SphericalHarmonics(const vec3 n) {
-    lights += addPointLight(vec3(-10., 10.0, 0.), vec3(0.77, 0.26, 0.73), 3.0, v, dir, n, shininess);
+    // Irradiance from "Ditch River" IBL (http://www.hdrlabs.com/sibl/archive.html)
-    lights += addPointLight(vec3(0., 10.0, -5.0), vec3(0.08, 0.62, 0.75), 3.0, v, dir, n, shininess);
+    // Generated using google filament cmgen tool
-    lights += addPointLight(vec3(0., 25.0, 0.0), vec3(0.5137, 0.1961, 0.7725), 3.0, v, dir, n, shininess);
+    return max(
-
+          vec3( .754554516862612,  .748542953903366,  .790921515418539)
-    vec3 lightDir = vec3(0., 1., -3);
+        + vec3(-.083856548007422,  .092533500963210,  .322764661032516) * (n.y)
-    //float sun_dif = clamp(dot(n, lightDir), 0., 1.);
+        + vec3( .308152705331738,  .366796330467391,  .466698181299906) * (n.z)
-    //float shadow = softshadow(v + n * 0.01, lightDir, .01, 30., 18.);
+        + vec3(-.188884931542396, -.277402551592231, -.377844212327557) * (n.x)
-    //lights += vec3(0.6431, 0.7804, 0.8588) * sun_dif * shadow * occ;
+        , 0.0);
-
-    float ind = clamp(dot(n, normalize(lightDir * vec3(.0, -1.0, -2.0))), 0.0, 1.0);
-    lights += vec3(0.08, 0.62, 0.75) * ind * 0.8;
-
-    return outMaterial * max(vec3(0.), lights);
 }
 
-vec3 postProcess(vec3 col) {
+vec2 PrefilteredDFG_Karis(float roughness, float NoV) {
-    // float random = noise(gl_FragCoord.xy, 0.01+u_time);
+    // Karis 2014, "Physically Based Material on Mobile"
-    // float random2 = noise(gl_FragCoord.xy, .2+u_time);
+    // https://www.unrealengine.com/en-US/blog/physically-based-shading-on-mobile
-    //col += 0.075*clamp(vec3(0.5*random, 0.5*random2, 0.5*random), 0.02, 1.); // dither
+    const vec4 c0 = vec4(-1., -.0275,  -.572,  .022);
+    const vec4 c1 = vec4( 1.,  .0425,  1.040, -.040);
 
-    // Normalized pixel coordinates (from 0 to 1)
+    vec4 r = roughness * c0 + c1;
-    vec2 screenCoord = getUV();
+    float a004 = min(r.x * r.x, exp2(-9.28 * NoV)) * r.x + r.y;
 
-    // Vignette
+    return vec2(-1.04, 1.04) * a004 + r.zw;
-    float radius = 0.8;
-    float d = smoothstep(radius, radius - 0.4, length(screenCoord - vec2(0.5)));
-    col = mix(col, col * d, 1.);
-
-    // Contrast
-    float contrast = .75;
-    col = mix(col, smoothstep(0.0, 1.0, col), contrast);
-
-    // Colour mapping
-    col *= vec3(1.0, 1.0, 1.0);
-
-    col = pow(col, vec3(0.4545)); // gamma
-
-    // fade in at the beginning
-    //col*=vec3(clamp((u_time-1.8)*0.5,0., 1.));
-
-    // fade out at the end
-    // col*=vec3(clamp((120.-u_time)*.35, 0., 1.));
-
-    return col;
 }
 
-vec3 getCameraRay(vec2 uv, vec3 camPos, vec3 camTarget, float fov) {
+vec4 sphereLight(vec3 p, vec3 n, vec3 v, vec3 r, vec3 f0, float NdotV, float roughness,
-    // Calculate camera's orthonormal basis
+                 float metalness, out vec3 fresnel, out float attenuation)
-    vec3 camForward = normalize(camTarget - camPos);
+{
-    vec3 camRight = normalize(cross(vec3(0.0, 1.0, 0.0), camForward));
+    vec3 L = (SPHERE_LIGHT_POS - p);
-    vec3 camUp = normalize(cross(camForward, camRight));
+    vec3 centerToRay = dot(L, r) * r - L;
+    vec3 closestPoint = L + centerToRay * saturate(SPHERE_LIGHT_RADIUS
+								/ length(centerToRay));
+    vec3 l = normalize(closestPoint);
+    vec3 h = normalize(v + l);
+    float lightDist = length(closestPoint);
     
-    vec3 rayDir = normalize(uv.x * camRight + uv.y * camUp + camForward * fov);
+    float NdotL = max(dot(n, l), 0.);
+    float NdotH = max(dot(n, h), 0.);
+    float VdotH = max(dot(h, v), 0.);
     
-    return rayDir;
+    attenuation = pow(saturate(1. - pow(lightDist / SPHERE_LIGHT_VOLUME_RADIUS, 4.)), 2.)  
+            					/ (lightDist * lightDist + 1.);
+        
+	attenuation *= softShadow(Ray(p + n * EPS, l));
+    
+    float alpha = roughness * roughness;
+    float alphaPrime = saturate(alpha + (SPHERE_LIGHT_RADIUS / (2. * lightDist)));
+    
+    fresnel = fresnelSchlick(f0, VdotH);
+    vec3 specular = normalDistributionGGXSphere(NdotH, alpha, alphaPrime)
+        * geometrySmith(NdotV, NdotL, roughness)
+        * fresnel;
+    
+ 	return vec4(specular, NdotL);   
 }
 
-// Camera positioning function
+vec4 lineLight(vec3 p, vec3 n, vec3 v, vec3 r, vec3 f0, float NdotV, float roughness,
-vec3 getCameraPosition(float time, int cameraMode) {
+                 float metalness, out vec3 fresnel, out float attenuation)
-    vec3 camPos;
+{
-    camPos = vec3(0.0, 30.0, -10.0);
+    vec4 result = vec4(0.);
+    vec3 l0 = lineStart - p, l1 = lineEnd - p;
+    float lengthL0 = length(l0), lengthL1 = length(l1);
+    float NdotL0 = dot(n, l0) / (2. * lengthL0);
+    float NdotL1 = dot(n, l1) / (2. * lengthL1);
+    result.w = (2. * saturate(NdotL0 + NdotL1)) / 
+        	 (lengthL0 * lengthL1 + dot(l0, l1) + 2.); // NdotL
     
-    if(cameraMode == 1) {
+    vec3 ld = l1 - l0;
-        // Orbiting camera
+    float RdotL0 = dot(r, l0);
-        vec3 camTarget = vec3(0.0, 0.0, -20.0);
+    float RdotLd = dot(r, ld);
-        float orbitRadius = 20.0;
+    float L0dotLd = dot(l0, ld);
-        float orbitSpeed = 0.2;
+    float distLd = length(ld);
-        float orbitHeight = 10.0;
+    
-        float angle = time * orbitSpeed;
+    float t = (RdotL0 * RdotLd - L0dotLd ) / (distLd * distLd - RdotLd * RdotLd);
-        camPos = camTarget + vec3(cos(angle) * orbitRadius, orbitHeight + sin(time * 0.8) * 2.0, sin(angle) * orbitRadius);
+    
-    } else if(cameraMode == 2) {
+    // point on the line
-        // Smooth camera movement
+    vec3 closestPoint = l0 + ld * saturate(t);
-        float t = time * 0.06;
+    // point on the tube based on its radius
-        camPos = vec3(sin(t) * 15.0, 30.0 + cos(t * 0.5) * 5.0, cos(t) * 15.0);
+    vec3 centerToRay = dot(closestPoint, r) * r - closestPoint;
-    } else if(cameraMode == 3) {
+    closestPoint = closestPoint + centerToRay * saturate(LINE_LIGHT_RADIUS 
-        // First person style movement
+						/ length(centerToRay));
-        float walkSpeed = 2.0;
+    vec3 l = normalize(closestPoint);
-        camPos = vec3(sin(time * walkSpeed) * 0.1, 8.0 + sin(time * walkSpeed * 2.0) * 0.05, time * 0.5);
+    vec3 h = normalize(v + l);
+    float lightDist = length(closestPoint);
+    
+    float NdotH = max(dot(n, h), 0.);
+    float VdotH = dot(h, v);
+    
+    float denom = lightDist / LINE_LIGHT_VOLUME_RADIUS;
+    attenuation = 1. / (denom * denom + 1.);
+        
+	attenuation *= softShadow(Ray(p + n * EPS, normalize(l0 + ld * .5)));
+    
+    float alpha = roughness * roughness;
+    float alphaPrime = saturate(alpha + (LINE_LIGHT_RADIUS / (2. * lightDist)));
+    
+    fresnel = fresnelSchlick(f0, VdotH);
+    result.xyz = normalDistributionGGXLine(NdotH, alpha, alphaPrime)
+        * geometrySmith(NdotV, result.w, roughness)
+        * fresnel;
+    
+    return result;
 }
 
-    return camPos;
+vec3 rayPlaneIntersect(Ray ray)
+{
+   return ray.origin + ray.direction * (dot(rect.front, rect.center - ray.origin)
+										/ dot(rect.front, ray.direction));
 }
 
-// Main camera function that combines everything
+vec4 rectLight(vec3 p, vec3 n, vec3 v, vec3 r, vec3 f0, float NdotV, float roughness,
-vec3 setupCamera(vec2 uv, float time, int positionMode) {
+                 float metalness, out vec3 fresnel, out float attenuation)
-    vec3 camPos = getCameraPosition(time, positionMode);
+{
-    vec3 camTarget = vec3(0.0, -1.0, 10.0); // Adjust target as needed
+ 	vec4 result = vec4(0.);
-    float fov = 1.;
     
-    return getCameraRay(uv, camPos, camTarget, fov);
+    // facing side check
+    float windingCheck = dot(cross(rect.right, rect.up), rect.center - p);
+    if (windingCheck > 0.)
+        return result;
+    
+    vec3 v0 = rect.side1 - p;
+    vec3 v1 = rect.side2 - p;
+    vec3 v2 = rect.side3 - p;
+    vec3 v3 = rect.side4 - p;
+    
+    float solidAngle = rectSolidAngle(p, v0, v1, v2, v3);
+    
+    // diffuse
+    result.w = solidAngle * .2 * (
+        saturate(dot(normalize(v0), n)) +
+        saturate(dot(normalize(v1), n)) +
+        saturate(dot(normalize(v2), n)) +
+        saturate(dot(normalize(v3), n)) +
+        saturate(dot(normalize(rect.center - p), n)));    
+    
+    attenuation = softShadow(Ray(p + n * EPS, normalize(rect.center)));
+    
+    // specular
+	Ray rectRay = Ray(p, r);
+    vec3 planePointCenter = rayPlaneIntersect(rectRay) - rect.center;
+    // project point on the plane on which the rectangle lies
+    vec2 planePointProj = vec2(dot(planePointCenter, rect.right), 
+                               dot(planePointCenter, rect.up));
+    // translate the point to the top-right quadrant of the rectangle, project it on
+    // the rectangle or its edge and translate back using sign of the original point.
+    vec2 c = min(abs(planePointProj), rect.halfSize) * sign(planePointProj);
+    vec3 L = rect.center + rect.right * c.x + rect.up * c.y - p;
+    
+    vec3 l = normalize(L);
+    vec3 h = normalize(v + l);
+    float lightDist = length(L);
+    
+    float NdotH = max(dot(n, h), 0.);
+    float VdotH = dot(h, v);
+
+    float alpha = roughness * roughness;
+    float alphaPrime = saturate(alpha + (RECT_LIGHT_RADIUS / (2. * lightDist)));
+    
+    fresnel = fresnelSchlick(f0, VdotH);
+    result.xyz = normalDistributionGGXRect(NdotH, alpha, alphaPrime)
+        * geometrySmith(NdotV, result.w, roughness)
+        * fresnel;
+    
+    return result;
 }
 
-// Simplified version of your render function using the new camera system
+vec3 renderScene(Ray ray)
-vec3 render(vec2 uv) {
+{
-    // Choose camera modes:
+    // update line light position & rotation
-    // Position: 0=static, 1=orbit, 2=smooth, 3=walk
+    //float t = iTime * .25;
-    // Ray: 0=standard, 1=zoom, 2=dof
+    vec3 lineRotation = vec3(2., 0., 0.) * rotZ(T);
-    int positionMode = 2; // Static
+    vec3 linePosition = vec3(6. * sin(T), 3., 5.);
+    lineStart = linePosition - lineRotation;
+    lineEnd = linePosition + lineRotation;
     
-    vec3 rayDir = setupCamera(uv, u_time, positionMode);
+	initRect(rect, T);
-    vec3 camPos = getCameraPosition(u_time, positionMode);
     
-    vec3 col = vec3(0.102, 0.2431, 0.3412);
+    vec3 col = vec3(0.);
-    vec3 hitPos = vec3(0);
+    vec2 marchResult = rayMarch(ray);
-    vec3 t = castRay(camPos, rayDir, hitPos);
+    vec3 position = ray.origin + ray.direction * marchResult.x;
+    vec3 normal = calculateNormal(position);
+    vec3 viewDirection = -ray.direction;
+    vec3 reflectDirection = reflect(ray.direction, normal);
+    
+    float NdotV = max(dot(normal, viewDirection), 0.);
+    
+    vec3 albedo = SPHERE_ALBEDO;
+    
+    float roughness = fract(marchResult.y), metalness = .88;
+    vec3 reflectance = SILVER_F0;  
+
+    if (marchResult.y > -1.)
+    {
+        if (marchResult.y > 2.)
+        {
+            // albedo = pow(textureLod(iChannel0, position.xz * .18, 0.).rgb, vec3(2.2));
+            albedo = vec3(0.31, 0.62, 0.47);
+
+            roughness = max(0.05, albedo.r * .5);
+
+            //roughness = .05;
+
+            metalness = .05;
+            reflectance = PLASTIC_F0;
+        }
+        else if (marchResult.y < .5)
+            return LIGHT_COLOR * RECT_LIGHT_INTENSITY;
+        
+        vec3 F0 = mix(reflectance, albedo, metalness);
+        
+        vec3 sphereLightFresnel = vec3(0.);
+        float sphereLightAttenuation = 1.;
+        vec4 sphereLightDiffSpec = sphereLight(position, normal, viewDirection, 
+				reflectDirection, F0, NdotV, roughness, metalness, sphereLightFresnel, 
+				sphereLightAttenuation);
+        vec3 sphereLightKd = 1. - sphereLightFresnel;
+    	sphereLightKd *= 1. - metalness;
+
+        vec3 lineLightFresnel = vec3(0.);
+        float lineLightAttenuation = 1.;
+        vec4 lineLightDiffSpec = lineLight(position, normal, viewDirection, 
+				reflectDirection, F0, NdotV, roughness, metalness, lineLightFresnel, 
+				lineLightAttenuation);
+        vec3 lineLightKd = 1. - lineLightFresnel;
+        lineLightKd *= 1. - metalness;
+        
+        vec3 rectLightFresnel = vec3(0.);
+        float rectLightAttenuation = 1.;
+        vec4 rectLightDiffSpec = rectLight(position, normal, viewDirection, 
+				reflectDirection, F0, NdotV, roughness, metalness, rectLightFresnel, 
+				rectLightAttenuation);
+		vec3 rectLightKd = 1. - rectLightFresnel;
+        rectLightKd *= 1. - metalness;
+        
+        col += (sphereLightKd * PI_INV * albedo + sphereLightDiffSpec.xyz)
+            * SPHERE_LIGHT_INTENSITY * sphereLightDiffSpec.w * sphereLightAttenuation;
+        
+        col += (lineLightKd * PI_INV * albedo + lineLightDiffSpec.xyz)
+            * LINE_LIGHT_INTENSITY * lineLightDiffSpec.w * lineLightAttenuation;
+
+        col += (rectLightKd * PI_INV * albedo + rectLightDiffSpec.xyz)
+            * RECT_LIGHT_INTENSITY * rectLightDiffSpec.w * rectLightAttenuation;
+        
+        col += albedo * .025; // global ambient
+        
+        // calculate glossy reflection + ibl
+        float glossiness = roughness * roughness;
+        vec3 indirectSpecular = vec3(.1125, .1875, .25) + reflectDirection.y * .35;
+        Ray reflectRay = Ray(position, vec3(0.));
+        for (int i = 0; i < REFLECTION_STEPS; ++i)
+        {
+			float percentage = float(i) / float(REFLECTION_STEPS);
+            vec3 delta = rotateAround(vec3(0., 1., 0.), reflectDirection, 
+                                      TWO_PI * percentage);
+			reflectRay.direction = normalize(delta * glossiness + reflectDirection);
+        	vec2 indirectMarchResult = rayMarchNoLights(reflectRay);
+            
+            if (floor(indirectMarchResult.y) == 3.)
+            {
+                vec3 indirectPosition = position + indirectMarchResult.x
+                    	* reflectRay.direction;
+                //indirectSpecular += textureLod(iChannel0, indirectPosition.xz * .18, 0.).rgb;
+                indirectSpecular = vec3(0.1, 0.3, 0.2);
+            }  
+            else if(floor(indirectMarchResult.y) == 1.)
+                indirectSpecular += SPHERE_ALBEDO;
 			
-    if(t.x > 0.0) {
-        vec3 nor = calcNormal(hitPos);
-        col = shading(hitPos, nor, rayDir, t.y);
         }
         
-    return col;
+        indirectSpecular /= float(REFLECTION_STEPS);
+        
+        vec2 dfg = PrefilteredDFG_Karis(roughness, NdotV);
+        vec3 specularColor = F0 * dfg.x + dfg.y;
+        vec3 ibl = indirectSpecular * specularColor
+            + Irradiance_SphericalHarmonics(normal) * PI_INV * albedo;
+        
+        col += ibl * .84;
+        col *= LIGHT_COLOR;
     }   
 
-void main() {
+    // fog
-
+    return mix(col, vec3(.01, .006, .004), // brown-ish fog color
-    vec3 finalColor = render(getUV());
+               		clamp(1. - exp(-marchResult.x * .08), 0., 1.));
-
+}
-    //finalColor = postProcess(finalColor);
+
-
+void main()
-    o = vec4(finalColor, 1.);
+{
-
+    vec2 iResolution = vec2(1920,1080);
+
+   // vec2 blueNoise = texelFetch(iChannel1,
+    //					(iFrame * ivec2(113, 127)) & 63, 0).rg;
+    vec2 uv = (2. * gl_FragCoord.xy - iResolution.xy) / iResolution.y;
+    //vec2 st = fragCoord / iResolution.xy;
+    
+    Ray ray = getCameraRay(uv);
+    
+    vec3 col = renderScene(ray);
+
+    o = vec4(col, 1.);
 }

src/shaders/fragment.inl

@@ -2,131 +2,335 @@
 #ifndef FRAGMENT_INL_
 # define FRAGMENT_INL_
 # define VAR_fft_output "f"
-# define VAR_o "i"
+# define VAR_o "v"
-# define VAR_shapes "C"
+# define VAR_syncs "n"
-# define VAR_syncs "m"
-# define VAR_test "k"
 
 const char *fragment_frag =
  "#version 460\n"
  "precision mediump float;"
- "out vec4 i;"
+ "out vec4 v;"
- "const float n=2.*acos(-1.),v=sqrt(5.)*.5+.5;"
+ "layout(location=0)uniform float n[7];"
- "layout(location=0)uniform float m[7];"
  "layout(location=8)uniform float f[512];"
- "layout(location=600)uniform vec3 C[15];"
+ "float m=n[0];\n"
- "layout(location=700)uniform vec3 k;"
+ "#define saturate(x)clamp(x,0.,1.)\n"
- "float l=m[0];"
+ "#define dot2(x)dot(x,x)\n"
- "vec2 t(vec3 v)"
+ "float d=m*.25,s=sin(d)*.5+.7;"
+ "vec3 e=vec3(9.*cos(d),6.*abs(sin(d))/-.75+s,1);"
+ "float c=sin(d)*.075+.125;"
+ "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 n=0.,i=1e9,m=length(vec3(v.x+k.y,v.y+k.x,v.z))-k.z-2.;"
+   "float v=d;"
-   "i=min(i,m);"
+   "return mat3(cos(v),-sin(v),0.,sin(v),cos(v),0.,0.,0.,1.);"
-   "if(i==m)"
-     "n=1.;"
-   "return vec2(i,n);"
  "}"
- "vec3 t(vec3 v,vec3 i,inout vec3 n)"
+ "vec3 t(vec3 v,float d)"
  "{"
-   "float f=0.,r=0.,m=0.;"
+   "vec3 f=vec3(0,1,0);"
-   "for(int e=0;e<30;e++)"
+   "return f*cos(d)+cross(v,f)*sin(d)+v*dot(v,f)*(1.-cos(d));"
+ "}"
+ "mat3 t(vec3 v)"
  "{"
-       "n=v+i*f;"
+   "v=normalize(vec3(0,1,0)-v);"
-       "vec2 l=t(n);"
+   "vec3 d=normalize(cross(v,vec3(0,1,0)));"
-       "f+=l.x;"
+   "return mat3(d,normalize(cross(d,v)),v);"
-       "r=l.y;"
+ "}"
-       "if(f>1e2)"
+ "Ray t(vec2 v)"
+ "{"
+   "vec3 d=r;"
+   "return Ray(d,normalize(t(d)*vec3(v,2.5)));"
+ "}"
+ "void t(out Rect v)"
+ "{"
+   "float f=d;"
+   "v.up=vec3(0,0,1);"
+   "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)"
+ "{"
+   "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 y=saturate(dot(v,d)/dot(d,d));"
+   "return length(v-d*y)-c;"
+ "}"
+ "float h(vec3 v,vec3 f,vec3 d,vec3 i,vec3 y)"
+ "{"
+   "vec3 x=d-f,s=v-f,c=i-d,n=v-d,R=y-i;"
+   "i=v-i;"
+   "d=f-y;"
+   "f=v-y;"
+   "v=cross(x,d);"
+   "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.?"
+     "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)):"
+     "dot(v,s)*dot(v,s)/dot2(v));"
+ "}"
+ "vec2 w(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));"
+   "d=t(d,vec2(h(v,R,y),0));"
+   "return t(d,vec2(h(v,i.side1,i.side2,i.side3,i.side4),0));"
+ "}"
+ "vec2 a(vec3 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));"
+ "}"
+ "vec2 u(vec3 v)"
+ "{"
+   "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);"
+       "if(f.x<2e-4*d||d>=1e2)"
          "break;"
-       "if(l.x<.001*f)"
+       "d+=f.x;"
+     "}"
+   "if(d>=1e2)"
+     "f.y=-1.;"
+   "return vec2(d,f.y);"
+ "}"
+ "vec2 a(Ray v)"
  "{"
-           "m=1.;"
+   "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)"
-   "if(f>1e2)"
+     "f.y=-1.;"
-     "f=0.;"
+   "return vec2(d,f.y);"
-   "return vec3(f,r,m);"
+ "}\n"
- "}"
+ "#if 1\n"
- "float t(vec3 v,vec3 f,float n)"
+ "float h(Ray v)"
  "{"
-   "float i=1.,m=.02;"
+   "float d=1.,f=0.;"
-   "for(int e=0;e<6;e++)"
+   "for(int i=0;i<64;++i)"
      "{"
-       "if(m>n)"
+       "vec2 c=u(v.origin+v.direction*f);"
-         "break;"
+       "if(c.y>0.)"
-       "float l=t(v+m*f).x;"
+         "{"
-       "i=min(i,l/(4.*m));"
+           "d=min(d,.5+.5*c.x/(.125*f));"
-       "m+=clamp(l,.1,.8);"
+           "if(d<0.)"
-       "if(i<-1.)"
              "break;"
+           "f+=clamp(c.x,.005,.5);"
          "}"
-   "i=max(i,-1.);"
-   "return.25*(1.+i)*(1.+i)*(2.-i);"
      "}"
- "vec3 e(vec3 v)"
+   "return smoothstep(0.,1.,max(d,0.));"
+ "}\n"
+ "#else\n"
+ "float h(Ray v)"
  "{"
-   "vec2 i=vec2(.01,0);"
+   "float f=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));"
+   "for(int d=0;d<64;++d)"
- "}"
- "vec3 e(vec3 v,vec3 i,vec3 l,vec3 f,vec3 m,float n)"
      "{"
-   "v-=l;"
+       "float i=u(v.origin+v.direction*f).x;"
-   "float e=length(v);"
+       "if(i<2e-4)"
-   "v=normalize(v);"
+         "return 0.;"
-   "float y=3./(1.+.09*e+.032*e*e),r=max(dot(m,v),0.);"
+       "f+=i;"
-   "f=normalize(v-f);"
-   "vec3 x=vec3(.04);"
-   "x+=(1.-x)*pow(clamp(1.-max(dot(f,v),0.),0.,1.),5.);"
-   "e=t(l+m*.01,v,e);"
-   "return(i*r*y+i*pow(max(dot(m,f),0.),mix(128.,8.,n))*y*x)*e;"
      "}"
- "vec3 e(vec3 v,vec3 i,vec3 f,float n)"
+   "return 1.;"
+ "}\n"
+ "#endif\n"
+ "float C(float v,float d,float f)"
  "{"
-   "float m=.01;"
+   "d*=d;"
-   "vec3 l=vec3(0);"
+   "return f*f*d/pow(v*v*(d-1.)+1.,2.);"
-   "if(n==0.)"
-     "l=vec3(.8314,.2941,.2941),m=.1;"
-   "else if(n==1.)"
-     "l=vec3(.6196,.6118,.6118),m=.7;"
-   "else if(n==2.)"
-     "l=vec3(.3255,.4784,.3255),m=.2;"
-   "else if(n==3.)"
-     "l=vec3(.2471,.3059,.6314),m=1.;"
-   "else if(n==4.)"
-     "l=vec3(.9961,1,.9922),m=.1;"
-   "else if(n==5.)"
-     "l=vec3(.9961,1,.9922),m=.3;"
-   "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 l*max(vec3(0),v);"
  "}"
- "vec3 e(vec2 v,vec3 i)"
+ "float a(float v,float d,float f)"
  "{"
-   "i=normalize(vec3(0,-1,10)-i);"
+   "d*=d;"
-   "vec3 m=normalize(cross(vec3(0,1,0),i));"
+   "return d*f/pow(v*v*(d-1.)+1.,2.);"
-   "return normalize(v.x*m+v.y*normalize(cross(i,m))+i);"
  "}"
- "vec3 e()"
+ "float h(float v,float d,float f)"
  "{"
-   "vec3 i;"
+   "d*=d;"
-   "{"
+   "return f*f*f*d/pow(v*v*(d-1.)+1.,2.);"
-     "float v=l*.06;"
-     "i=vec3(sin(v)*15.,30.+cos(v*.5)*5.,cos(v)*15.);"
  "}"
-   "return i;"
+ "float C(float v,float d)"
- "}"
- "vec3 e(vec2 v)"
  "{"
-   "vec3 i=e(v,e()),m=vec3(.102,.2431,.3412),n=vec3(0),l=t(e(),i,n);"
+   "return v/max(v*(1.-d)+d,2e-7);"
-   "if(l.x>0.)"
-     "{"
-       "vec3 v=e(n);"
-       "m=e(n,v,i,l.y);"
  "}"
-   "return m;"
+ "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()"
  "{"
-   "vec3 v=e(gl_FragCoord.xy*vec2(.00104166667,.00185185185)-1.);"
+   "vec2 d=vec2(1920,1080);"
-   "i=vec4(v,1);"
+   "d=(2.*gl_FragCoord.xy-d.xy)/d.y;"
+   "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             11
+#define SU_NUMSYNCS             2
 #define SU_SYNCBUFFER_LENGTH    ((SU_LENGTH_IN_SAMPLES+255)>>8)*SU_NUMSYNCS
 
 #include <stdint.h>