Compare commits
12 Commits
hexakoodi
...
teemun_sha
| Author | SHA1 | Date | |
|---|---|---|---|
| f9a8dc2b69 | |||
| e00ae27d46 | |||
| 99af2bbf5c | |||
| 77e5f0fc70 | |||
| 62e58d0e1f | |||
| d33042e30a | |||
| f460f71ab4 | |||
| 3f3b84b15c | |||
| b86794f9b2 | |||
| 3110e64236 | |||
| be7398cc91 | |||
| 09efaee330 |
Binary file not shown.
224
song.yml
224
song.yml
@ -2,103 +2,112 @@ bpm: 138
|
||||
rowsperbeat: 4
|
||||
score:
|
||||
tracks:
|
||||
- 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]
|
||||
- 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, -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
|
||||
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]
|
||||
- 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, -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
|
||||
numvoices: 4
|
||||
- name: 80slead.instr
|
||||
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
|
||||
parameters: {bandpass: 0, frequency: 10, highpass: 0, lowpass: 1, negbandpass: 0, neghighpass: 1, resonance: 88, stereo: 1}
|
||||
id: 1146
|
||||
parameters: {bandpass: 0, frequency: 13, highpass: 1, lowpass: 1, resonance: 109, stereo: 1}
|
||||
- type: outaux
|
||||
id: 1097
|
||||
parameters: {auxgain: 34, outgain: 34, stereo: 1}
|
||||
- name: 80s bass
|
||||
parameters: {auxgain: 20, outgain: 40, stereo: 1}
|
||||
- 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}
|
||||
- name: Kick
|
||||
parameters: {auxgain: 21, outgain: 42, stereo: 1}
|
||||
- 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
|
||||
parameters: {amount: 32, port: 0, sendpop: 0, stereo: 0, target: 1123, voice: 0}
|
||||
id: 1148
|
||||
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
|
||||
parameters: {bandpass: 0, frequency: 11, highpass: 0, lowpass: 1, negbandpass: 0, neghighpass: 1, resonance: 128, stereo: 1}
|
||||
id: 1149
|
||||
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}
|
||||
- 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
|
||||
parameters: {auxgain: 20, outgain: 59, stereo: 1}
|
||||
- name: snare.instr
|
||||
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
|
||||
parameters: {color: 128, detune: 46, gain: 81, phase: 64, shape: 64, stereo: 0, transpose: 64, type: 1, unison: 3}
|
||||
id: 1156
|
||||
parameters: {color: 0, detune: 44, gain: 64, phase: 0, shape: 64, stereo: 0, transpose: 64, type: 1, unison: 3}
|
||||
- type: oscillator
|
||||
id: 19
|
||||
parameters: {color: 128, detune: 38, gain: 76, lfo: 0, phase: 64, shape: 64, stereo: 0, transpose: 64, type: 1, unison: 3}
|
||||
id: 1157
|
||||
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}
|
||||
varargs: [32, 36]
|
||||
parameters: {damp: 23, dry: 106, feedback: 32, notetracking: 2, pregain: 69, stereo: 1}
|
||||
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
|
||||
id: 30
|
||||
parameters: {auxgain: 23, outgain: 25, stereo: 1}
|
||||
- name: pad
|
||||
- name: pad.instr
|
||||
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
|
||||
parameters: {amount: 68, port: 1, sendpop: 0, target: 1125}
|
||||
id: 1164
|
||||
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
|
||||
parameters: {bandpass: 0, frequency: 64, highpass: 0, lowpass: 1, negbandpass: 0, neghighpass: 0, resonance: 64, stereo: 0}
|
||||
id: 1165
|
||||
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
|
||||
|
||||
@ -71,8 +71,8 @@ void compute_fft(float* time_data, float* freq_out) {
|
||||
|
||||
for (int i = 0; i < FFT_SIZE / 2; ++i) {
|
||||
float mag = sqrtf(real[i] * real[i] + imag[i] * imag[i]) / FFT_SIZE;
|
||||
float db = 20.0f * log10f(mag + 1e-6f); // Decibels
|
||||
float normalized = (db + 60.0f) / 60.0f; // [0,1]
|
||||
//float db = 20.0f * log10f(mag + 1e-6f); // Decibels
|
||||
//float normalized = (db + 60.0f) / 60.0f; // [0,1]
|
||||
freq_out[i] = mag;
|
||||
}
|
||||
}
|
||||
|
||||
336
src/main.cpp
336
src/main.cpp
@ -16,9 +16,6 @@
|
||||
#define USE_AUDIO 1
|
||||
#define NO_UNIFORMS 0
|
||||
|
||||
#define GRID 32
|
||||
#define HEX_TEX_SIZE (GRID * GRID * 4) // RGBA: 4 floats per texel
|
||||
|
||||
#include "definitions.h"
|
||||
#if OPENGL_DEBUG
|
||||
#include "debug.h"
|
||||
@ -40,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)
|
||||
@ -113,34 +135,80 @@ int __cdecl main(int argc, char* argv[])
|
||||
|
||||
long playCursor = 0;
|
||||
long lastPlayCursor = -1;
|
||||
|
||||
volatile float maximum = 0.0; // Helper variable to calculate maximum fft output for normalization
|
||||
|
||||
// Unlock buffer for next use
|
||||
IDirectSoundBuffer_Unlock(direct_sound_buffer, p1, SU_LENGTH_IN_SAMPLES * SU_CHANNEL_COUNT * SU_SAMPLE_SIZE, NULL, NULL);
|
||||
|
||||
// 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];
|
||||
|
||||
//// Bind to texture unit 0
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
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"));
|
||||
|
||||
const ULONGLONG targetIntervalMs = 1000 / 60; // For 60 FPS FFT updates
|
||||
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
|
||||
{
|
||||
static ULONGLONG lastFFTTime = 0;
|
||||
ULONGLONG currentTime = GetTickCount64();
|
||||
|
||||
direct_sound_buffer->GetCurrentPosition((DWORD*)&playCursor, NULL);
|
||||
|
||||
#if !(DESPERATE)
|
||||
@ -170,44 +238,43 @@ int __cdecl main(int argc, char* argv[])
|
||||
((PFNGLUNIFORM1IPROC)wglGetProcAddress("glUniform1i"))(0, (static_cast<int>(position*44100.0)));
|
||||
|
||||
#endif
|
||||
if (currentTime - lastFFTTime >= targetIntervalMs) {
|
||||
lastFFTTime = currentTime;
|
||||
/******************
|
||||
* FFT
|
||||
*******************/
|
||||
LPVOID audio_ptr = NULL;
|
||||
DWORD audio_size = 0;
|
||||
|
||||
// Read audio
|
||||
HRESULT hr = IDirectSoundBuffer_Lock(direct_sound_buffer, 0, FFT_SIZE * sizeof(SUsample), &audio_ptr, &audio_size, NULL, NULL, DSBLOCK_FROMWRITECURSOR);
|
||||
/******************
|
||||
* FFT
|
||||
*******************/
|
||||
LPVOID audio_ptr = NULL;
|
||||
DWORD audio_size = 0;
|
||||
|
||||
if (SUCCEEDED(hr) && audio_ptr) {
|
||||
if (playCursor < ((SU_LENGTH_IN_SAMPLES * SU_CHANNEL_COUNT * SU_SAMPLE_SIZE) - (FFT_SIZE * SU_CHANNEL_COUNT * SU_SAMPLE_SIZE)))
|
||||
{
|
||||
SUsample* samples = (SUsample*)audio_ptr;
|
||||
for (int i = 0; i < FFT_SIZE; ++i) {
|
||||
fft_input[i] = (float)samples[i];
|
||||
}
|
||||
}
|
||||
// Read audio
|
||||
HRESULT hr = IDirectSoundBuffer_Lock(direct_sound_buffer, 0, FFT_SIZE * sizeof(SUsample), &audio_ptr, &audio_size, NULL, NULL, DSBLOCK_FROMWRITECURSOR);
|
||||
|
||||
IDirectSoundBuffer_Unlock(direct_sound_buffer, audio_ptr, audio_size, NULL, 0);
|
||||
}
|
||||
|
||||
// Calculate FFT
|
||||
compute_fft(fft_input, fft_output);
|
||||
|
||||
// Normalize output
|
||||
for (int i = 0; i < (FFT_SIZE / 4); i++)
|
||||
{
|
||||
float gain = 50.0f;
|
||||
float alpha = 0.10f; // "Hidastaa" FFT:n piikkej<65>
|
||||
float threshhold = 0.05f; // Alin arvo mik<69> p<><70>stet<65><74>n shaderille (v<>hent<6E><74> "noisea")
|
||||
float x_t = fft_output[i] * gain;
|
||||
// Exponential smoothing kaava
|
||||
// s(t) = alpha*x(t)+(1-alpha)*s(t-1)
|
||||
fft_uniform[i] = (x_t < threshhold) ? 0.f : alpha * (x_t)+(1 - alpha) * fft_uniform[i];
|
||||
if (SUCCEEDED(hr) && audio_ptr) {
|
||||
if (playCursor < ((SU_LENGTH_IN_SAMPLES * SU_CHANNEL_COUNT * SU_SAMPLE_SIZE) - (FFT_SIZE* SU_CHANNEL_COUNT * SU_SAMPLE_SIZE)))
|
||||
{
|
||||
SUsample* samples = (SUsample*)audio_ptr;
|
||||
for (int i = 0; i < FFT_SIZE; ++i) {
|
||||
fft_input[i] = (float)samples[i];
|
||||
}
|
||||
}
|
||||
|
||||
IDirectSoundBuffer_Unlock(direct_sound_buffer, audio_ptr, audio_size, NULL, 0);
|
||||
}
|
||||
|
||||
// Calculate FFT
|
||||
compute_fft(fft_input, fft_output);
|
||||
|
||||
// Normalize output
|
||||
for (int i = 0; i < (FFT_SIZE / 4); i++)
|
||||
{
|
||||
float gain = 50.0f;
|
||||
float alpha = 0.15f; // "Hidastaa" FFT:n piikkej<65>
|
||||
float threshhold = 0.05f; // Alin arvo mik<69> p<><70>stet<65><74>n shaderille (v<>hent<6E><74> "noisea")
|
||||
float x_t = fft_output[i] * gain;
|
||||
// Exponential smoothing kaava
|
||||
// s(t) = alpha*x(t)+(1-alpha)*s(t-1)
|
||||
fft_uniform[i] = (x_t < threshhold) ? 0.f : alpha*(x_t) + (1-alpha)*fft_uniform[i];
|
||||
}
|
||||
|
||||
syncs[0] = (float)playCursor / (SU_SAMPLE_RATE * SU_CHANNEL_COUNT * SU_SAMPLE_SIZE); // Aika sekunteina.
|
||||
|
||||
for (int i = 0; i < SU_NUMSYNCS; ++i)
|
||||
@ -215,9 +282,180 @@ 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);
|
||||
|
||||
|
||||
@ -4,122 +4,41 @@ 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
|
||||
//uniform sampler2D u_fft_texture;
|
||||
uniform sampler2D u_hexGridTex;
|
||||
|
||||
layout(location = 0) uniform float syncs[12];
|
||||
layout(location = 20) uniform float fft_output[512]; // FFT_SIZE / 4
|
||||
layout(location = 600) uniform vec3 shapes[15]; // shapes - x = horizontal position, y = vertical position, z = length
|
||||
//layout(location = 700) uniform float particlesData2[256]; // additional particles data for distance
|
||||
layout(binding = 1) uniform sampler2D u_hexGridTex; //uniform sampler2D u_fft_texture;
|
||||
//layout(binding = 0) uniform sampler2D u_ShapesTex; // uniform sampler2D shapes texture
|
||||
layout(binding = 3) uniform sampler2D u_ParticlesTex; // uniform sampler2D particles texture
|
||||
float u_time = syncs[0];
|
||||
/* uses some snippets from:
|
||||
* "Seascape" by Alexander Alekseev aka TDM - 2014
|
||||
* License Creative Commons Attribution-NonCommercial-ShareAlike 3.0 Unported License.
|
||||
* Contact: tdmaav@gmail.com
|
||||
*/
|
||||
|
||||
//precision mediump float;
|
||||
vec2 u_resolution = vec2(1920,1080);
|
||||
vec3 palette(float t){
|
||||
vec3 a=vec3(0.46,0.2,0.94);
|
||||
vec3 b=vec3(0.66,0.64,0.77);
|
||||
vec3 c=vec3(0.91,0.62,0.97);
|
||||
vec3 d=vec3(0.26,0.2,0.84);
|
||||
return a+b*cos(6.28318*(c*t+d));
|
||||
}
|
||||
|
||||
vec3 no(vec3 v) { return normalize(v); }
|
||||
float cl(float a, float b, float c) { return clamp(a,b,c); }
|
||||
// Or 2D version
|
||||
float hash(vec2 p) {
|
||||
return fract(sin(dot(p, vec2(127.1, 311.7))) * 43758.5453123);
|
||||
}
|
||||
|
||||
vec2 getUV() {
|
||||
const vec2 scale = vec2(0.00104166667, 0.00185185185);
|
||||
return gl_FragCoord.xy * scale - 1.0;
|
||||
}
|
||||
|
||||
// Rotate
|
||||
mat2 rot2D(float angle) {
|
||||
float s = sin(angle), c = cos(angle);
|
||||
float s = sin(angle);
|
||||
float c = cos(angle);
|
||||
return mat2(c, -s, s, c);
|
||||
}
|
||||
|
||||
float smax( float a, float b, float k )
|
||||
{
|
||||
float h = max(k-abs(a-b),0.0);
|
||||
return max(a, b) + h*h*0.25/k;
|
||||
}
|
||||
|
||||
float hash(vec2 p, int algo)
|
||||
{
|
||||
if (algo == 1) {
|
||||
float h = dot(p,vec2(127.1,311.7));
|
||||
return fract(sin(h)*43758.5453123);
|
||||
}
|
||||
p = 50. * fract( p*0.3183099);
|
||||
return fract( p.x*p.y*(p.x+p.y) );
|
||||
}
|
||||
|
||||
float noise(vec2 p, float scale, int a)
|
||||
{
|
||||
vec2 i = floor( p ),
|
||||
f = fract( p ),
|
||||
u = f*f*(3.-2.*f);
|
||||
float sc = scale;
|
||||
if (a == 1) sc = 2.;
|
||||
return -scale+sc*mix( mix( hash( i + vec2(0.), a),
|
||||
hash( i + vec2(1.0,0.0), a ), u.x),
|
||||
mix( hash( i + vec2(0.0,1.0), a),
|
||||
hash( i + vec2(1.), a), u.x), u.y);
|
||||
}
|
||||
|
||||
float sdHexPrism( vec3 p, vec2 h )
|
||||
{
|
||||
const vec3 k = vec3(-0.8660254, 0.5, 0.57735);
|
||||
p = abs(p);
|
||||
p.xy -= 2.0*min(dot(k.xy, p.xy), 0.0)*k.xy;
|
||||
vec2 d = vec2(
|
||||
length(p.xy-vec2(clamp(p.x,-k.z*h.x,k.z*h.x), h.x))*sign(p.y-h.x),
|
||||
p.z-h.y );
|
||||
return min(max(d.x,d.y),0.0) + length(max(d,0.0));
|
||||
}
|
||||
|
||||
float fHexagonCircumcircle(vec3 p, vec2 h) {
|
||||
vec3 q = abs(p);
|
||||
return max(q.y - h.y, max(q.x * sqrt(3.) * 0.5 + q.z * 0.5, q.z) - h.x);
|
||||
}
|
||||
|
||||
float hexPylon(vec3 p, vec2 h) {//float r, float ht){
|
||||
|
||||
//vec3 p = vec3(p.x, p.z, p2.y);
|
||||
vec3 b = vec3(h.x, h.y, h.x);
|
||||
|
||||
// Hexagon.
|
||||
p.xz = abs(p.xz);
|
||||
p.xz = vec2(p.x*.866025 + p.z*.5, p.z);
|
||||
// The ".015" is a subtle rounding factor. Zero gives sharp edges,
|
||||
// and larger numbers give a more rounded look.
|
||||
return length(max(abs(p) - b + .015, 0.)) - .015;
|
||||
}
|
||||
|
||||
#define zclamp(a) max(a,0.0) //Clamp negative values at zero
|
||||
float DF_RoundedHex( vec3 p, vec2 h) //float width, float height)
|
||||
{
|
||||
float width = h.x;
|
||||
float height = h.y;
|
||||
//Modified version (smooth edges) of the exagon prism found here:
|
||||
//https://iquilezles.org/articles/distfunctions
|
||||
float smoothRadius = 0.05;
|
||||
width -= smoothRadius*2.0;
|
||||
|
||||
//Hexagon prism constructed using X,Y,Z symmetry.
|
||||
//Only quadrant 1 needs to be solved, but the joining diagonal to quadrant IV is also
|
||||
//required for distance blending (see db).
|
||||
p = abs(p);
|
||||
|
||||
//Hexagonal edge distances :
|
||||
//Note : [.8666,0.5] = [sin(PI/3,cos(PI/3)] -> Hexagon edges rotation coeff (60 degrees).
|
||||
float da = (p.x*0.866025+p.z*0.5)-width; //quadrant I diagonal edge distance
|
||||
float db = (p.x*0.866025-p.z*0.5)-width; //quadrant IV diagonal edge distance (needed for blending)
|
||||
float dc = p.z-width; //upper distance
|
||||
|
||||
vec3 d = zclamp(vec3(da,db,dc));
|
||||
//Note: this is not an euclidian length, therefore this operation slightly distorts our distance field.
|
||||
//Yet, it is harmless to convergence, and does the smoothing job quite well.
|
||||
float dw = length(d)-smoothRadius; //hexagonal part smoothness (blending at 60 deg)
|
||||
float dh = p.y-height;
|
||||
|
||||
//Now that we have xz distance(dw) and y distance (dh), we can compute the distance
|
||||
//for the given isovalue (the smoothing radius).
|
||||
//Note : internal distance (maxX,maxY,maxZ) is also used to genereate internal signed dist,
|
||||
// helping convergence when overstepping (very frequent with domain repetition).
|
||||
float externalDistance = length(zclamp(vec2(dh,dw)))-smoothRadius; //Smoothed, unsigned
|
||||
float internalDistance = max(max(da,dc),dh); //Sharp, signed.
|
||||
return min(externalDistance,internalDistance);
|
||||
float noise(in vec2 xy, in float seed) {
|
||||
return fract(tan(distance(xy * PHI, xy) * seed) * xy.x);
|
||||
}
|
||||
|
||||
float getScaledFFT(int index, float scale, float offset) {
|
||||
@ -133,215 +52,530 @@ float getScaledFFT(int index, float scale, float offset) {
|
||||
return log(1.0 + raw * scale) + offset;
|
||||
}
|
||||
|
||||
// Return local coordinates inside hex AND axial ID
|
||||
struct HexData {
|
||||
vec3 local; // Local position inside hex
|
||||
vec2 axial; // Axial ID (q, r)
|
||||
};
|
||||
/////////////////
|
||||
// GEOMETRY //
|
||||
/////////////////
|
||||
|
||||
HexData hexTile(vec3 p, float radius) {
|
||||
float q = (sqrt(3.0)/3.0 * p.x - 1.0/3.0 * p.z) / radius;
|
||||
float r = (2.0/3.0 * p.z) / radius;
|
||||
|
||||
float rq = round(q);
|
||||
float rr = round(r);
|
||||
float rs = round(-q - r);
|
||||
|
||||
float dq = abs(rq - q);
|
||||
float dr = abs(rr - r);
|
||||
float ds = abs(rs + q + r);
|
||||
|
||||
if (dq > dr && dq > ds) rq = -rr - rs;
|
||||
else if (dr > ds) rr = -rq - rs;
|
||||
|
||||
float hx = radius * sqrt(3.0) * (rq + rr * 0.5);
|
||||
float hz = radius * 1.5 * rr;
|
||||
|
||||
HexData outData;
|
||||
outData.local = p - vec3(hx, 0.0, hz);
|
||||
outData.axial = vec2(rq, rr); // Hex ID
|
||||
return outData;
|
||||
// Hexagonal prism, circumcircle variant
|
||||
float fHexagonCircumcircle(vec3 p, vec2 h) {
|
||||
vec3 q = abs(p);
|
||||
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:
|
||||
//return max(q.y - h.y, max(dot(vec2(cos(PI/3), sin(PI/3)), q.zx), q.z) - h.x);
|
||||
}
|
||||
|
||||
struct HexData {
|
||||
vec3 local;
|
||||
vec2 axial;
|
||||
};
|
||||
|
||||
float hexDistance(vec2 axial) {
|
||||
float q = axial.x;
|
||||
float r = axial.y;
|
||||
float s = -q - r;
|
||||
return max(abs(q), max(abs(r), abs(s)));
|
||||
float sdHex(vec3 pos, float i, float angle) {
|
||||
float d1 = fHexagonCircumcircle(pos, vec2(0.86, i));
|
||||
return d1;
|
||||
}
|
||||
|
||||
// Modify your mapScene function
|
||||
vec3 mapScene(vec3 p) {
|
||||
float sdSphere(vec3 p, float r){
|
||||
return length(p) -r;
|
||||
}
|
||||
|
||||
//////////////
|
||||
// SCENE //
|
||||
//////////////
|
||||
|
||||
// instructions -> opU( { float to union with } , vec2( {put shape here}, {put material here} ) )
|
||||
vec2 opU( vec2 d1, vec2 d2 )
|
||||
{
|
||||
return (d1.x<d2.x) ? d1 : d2;
|
||||
}
|
||||
|
||||
// float opU( float d1, float d2 ) { return -max( -d1, -d2 ); }
|
||||
|
||||
vec2 mapScene(in vec3 p) {
|
||||
|
||||
vec2 res = vec2( p.y, 0.0 );
|
||||
|
||||
float mat = 1.;
|
||||
float d = 1e9;
|
||||
float mat = 0.;
|
||||
float hexRadius = 0.83;
|
||||
vec3 hexpos = vec3(p.x, p.y - 10.0, p.z);
|
||||
float a = 0.;
|
||||
|
||||
HexData hex = hexTile(hexpos, 1.0);
|
||||
vec2 rippleCenter = vec2(7.,7.);
|
||||
float rippleSpeed = 4.0;
|
||||
float rippleFreq = 1.0;
|
||||
float rippleDecay = 0.25;
|
||||
|
||||
// Use axial coordinates as a stable hex ID
|
||||
float distFromCenter = hexDistance(hex.axial);
|
||||
int fftIndex = int(clamp(distFromCenter +1.0, 0.0, 511.0)); // tweak 15.0 to taste
|
||||
// Hexagonal grid
|
||||
float hexGap = 0.2;
|
||||
/*
|
||||
for(float j = 0.; j < 16.; j++) {
|
||||
vec3 po = p-vec3(-2.0,-5., 0.0);
|
||||
po += vec3((1.6 + hexGap) * 8, -5., -(1.88 + hexGap) * 10);
|
||||
po += vec3(0, 0., (1.88 + hexGap) * j);
|
||||
|
||||
float fftVal = fft_output[fftIndex];
|
||||
float hexHeight = 1.0 + fftVal * 1.0;
|
||||
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.);
|
||||
}
|
||||
|
||||
// Rotate individual hex tiles if needed
|
||||
vec3 r = hex.local;
|
||||
//r.yz *= rot2D(1.0);
|
||||
r.xz *= rot2D(0.5);
|
||||
// Add individual hexagon ripples based on distance from center
|
||||
int hexDist = int(length(vec2(i, j) - rippleCenter.xy));
|
||||
|
||||
float d1 = fHexagonCircumcircle(vec3(r.x,(r.y-hexHeight/2),r.z), vec2(hexRadius, hexHeight/2));
|
||||
d = min(d,d1);
|
||||
//float wave = sin(hexDist * rippleFreq - u_time * rippleSpeed) * exp(-hexDist * rippleDecay);
|
||||
|
||||
return vec3(d, 0.0, 0.0);
|
||||
}
|
||||
// Apply ripple to hexagon size and position
|
||||
|
||||
////////////////
|
||||
// DRAWING //
|
||||
////////////////
|
||||
|
||||
float rayMarch(vec3 ro, vec3 rd, int a) {
|
||||
vec3 d;
|
||||
float t = 0.,ad,tmax=100.; // total distance travelled
|
||||
const float tolerance = 0.00001;
|
||||
const float Z_REPEAT_DIST = 1.;
|
||||
|
||||
// Raymarching
|
||||
for (int i = 0; i < 80; i++) {
|
||||
d = mapScene(ro + rd * t); // Get distance to objects
|
||||
ad = abs(d.x);
|
||||
if (ad < tolerance*(t*0.125 + 1.0) || t > tmax) break;
|
||||
t += d.x; // "march" the ray
|
||||
// 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);
|
||||
res = opU(res, vec2(a, 2.));
|
||||
}
|
||||
}
|
||||
t -= Z_REPEAT_DIST*15.;
|
||||
*/
|
||||
// main note effect shapes
|
||||
// res = opU( res, vec2( sdSphere(p- vec3(2.0 + (test.x * 2.), 12. + (test.y * 10.), 0.0), 0.2 ), 1.));
|
||||
|
||||
/*
|
||||
float gridSize = 16.0; // or GRID if you want full size
|
||||
//float hexGap = 0.2;
|
||||
|
||||
for(float j = 0.; j < gridSize; j++) {
|
||||
for(float i = 0.; i < gridSize; i++) {
|
||||
ivec2 texSize = textureSize(u_hexGridTex, 0);
|
||||
vec2 texCoord = (vec2(i, j)) / vec2(texSize);
|
||||
|
||||
vec4 hexData = texture(u_hexGridTex, texCoord); // RGBA: x, y, z, dist
|
||||
|
||||
vec3 hexPos = hexData.rgb;
|
||||
float hexDist = hexData.a;
|
||||
|
||||
// Optionally use hexDist for ripple effect with FFT
|
||||
int index = clamp(int((hexDist / 34.)*512.), 0, 511);
|
||||
float hexSize = getScaledFFT(index, 15. ,0.);
|
||||
float a = sdHex(p - hexPos, 1.0 + hexSize, 0.0);
|
||||
res = opU(res, vec2(a, 1.));
|
||||
}
|
||||
}
|
||||
*/
|
||||
/*
|
||||
float gridSize2 = 16.;
|
||||
for(float j = 0.; j < gridSize2; j++) {
|
||||
for(float i = 0.; i < gridSize2; i++) {
|
||||
vec2 texCoord = (vec2(i, j) + 0.5) / float(gridSize2);
|
||||
vec4 shapeData = texture(u_ShapesTex, texCoord); // RGBA: x, y, length, active
|
||||
|
||||
float shapeActive = shapeData.a;
|
||||
if(shapeActive < 0.5) continue;
|
||||
|
||||
vec3 shapePos = p - vec3(-70.0 + (shapeData.x * 2.), 12. + (shapeData.y * 80.), 0.0);
|
||||
|
||||
float a = sdSphere(shapePos, 0.8);
|
||||
|
||||
res = opU(res, vec2(a, 1.));
|
||||
}
|
||||
}
|
||||
*/
|
||||
/*
|
||||
float maxRadius = 40.; // Circle radius
|
||||
float sphereRadius = 0.3;
|
||||
int index = 0;
|
||||
|
||||
for( int i=0; i<80; i++ )
|
||||
{
|
||||
d = mapScene(ro + rd * t); // get distance to objects
|
||||
ad = abs(d.x);
|
||||
if (ad < tolerance*(t*0.00125) || t > tmax) break;
|
||||
t += min(d.x, Z_REPEAT_DIST/5.0); // "march" the ray
|
||||
float gridSize3 = 16.;
|
||||
for(float j = 0; j < gridSize3; j++) {
|
||||
for(float i = 0; i < gridSize3; i++) {
|
||||
vec2 texCoord = (vec2(i, j) + 0.5) / float(gridSize3);
|
||||
vec4 particleData = texture(u_ParticlesTex, texCoord); // RGBA: x, y, distance, active
|
||||
float particleActive = particleData.a;
|
||||
|
||||
if(particleData.z < 0.5) continue;
|
||||
|
||||
// Map param to angle
|
||||
float particleStartPos = hash(vec2(j, i)) * 2.0 * PI;
|
||||
|
||||
// Direction from center to initial circle position (in XY plane)
|
||||
vec3 dir = normalize(vec3(cos(particleStartPos), 0.0, sin(particleStartPos))); // XZ direction
|
||||
|
||||
float r = max(maxRadius - particleData.z, -maxRadius);
|
||||
|
||||
float offsetFactor = 15.;
|
||||
vec3 particleOffset = vec3(hash(vec2(i, j)) * offsetFactor , 4., hash(vec2(j, i)) * offsetFactor); // particle offset
|
||||
|
||||
// Final object position = center (offset) + radial movement
|
||||
vec3 center = particleOffset; // Circle center
|
||||
vec3 objPos = center + dir * r; // Object slides inward
|
||||
res = opU(res, vec2(sdSphere(p - objPos, sphereRadius), 1.));
|
||||
|
||||
index++;
|
||||
}
|
||||
}
|
||||
if (ad >= tmax) t= - 1.0;
|
||||
return t;
|
||||
*/
|
||||
return res;
|
||||
}
|
||||
|
||||
vec3 getNormal(vec3 p) {
|
||||
////////////////
|
||||
// RAYCAST //
|
||||
////////////////
|
||||
|
||||
vec3 castRay(vec3 ro, vec3 rd, inout vec3 pos) {
|
||||
float t = 0.;
|
||||
float mat = 0.;
|
||||
float hit = 0.;
|
||||
// Reduced from 40 to 24 steps
|
||||
for(int i = 0; i < 30; i++) {
|
||||
pos = ro + rd * t;
|
||||
vec2 res = mapScene(pos);
|
||||
// Increase step size multiplier for faster marching
|
||||
t += res.x;
|
||||
mat = res.y;
|
||||
if(t > 600.) { // Reduced max distance
|
||||
break;
|
||||
}
|
||||
if(res.x < 0.001 * t) { // Less precise hit detection
|
||||
hit = 1.;
|
||||
break;
|
||||
}
|
||||
}
|
||||
// This will break fog effect
|
||||
//if (t > 100.)
|
||||
// t = 0.;
|
||||
|
||||
return vec3(t, mat, hit);
|
||||
}
|
||||
|
||||
////////////////
|
||||
// SHADING //
|
||||
////////////////
|
||||
|
||||
float softshadow(in vec3 ro, in vec3 rd, float mint, float maxt, float w) {
|
||||
float res = 1.0;
|
||||
float t = mint;
|
||||
for(int i = 0; i < 6; i++) {
|
||||
if(t > maxt)
|
||||
break;
|
||||
float h = mapScene(ro + t * rd).x;
|
||||
res = min(res, h / (w * t));
|
||||
t += clamp(h, 0.1, 0.80);
|
||||
if(res < -1.0)
|
||||
break;
|
||||
}
|
||||
res = max(res, -1.0);
|
||||
return 0.25 * (1.0 + res) * (1.0 + res) * (2.0 - res);
|
||||
}
|
||||
|
||||
vec3 calcNormal(vec3 pos) {
|
||||
vec2 e = vec2(.01, 0.);
|
||||
vec3 n = mapScene(p).x - vec3(
|
||||
mapScene(p-e.xyy).x,
|
||||
mapScene(p-e.yxy).x,
|
||||
mapScene(p-e.yyx).x);
|
||||
return no(n);
|
||||
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);
|
||||
return normalize(n);
|
||||
}
|
||||
|
||||
float getLight(vec3 p, vec3 lightPos, float intensity, float shadow, vec3 n, float atte) {
|
||||
vec3 l = no(lightPos - p);
|
||||
float len = length( lightPos - p ); // Distance from the light to the surface point.
|
||||
float dif = cl(dot(n, l)*intensity, 0., intensity) * 1.0 / (1.0 + atte*len),
|
||||
d = rayMarch(p+n*.025, l, 1);
|
||||
if(d<length(lightPos-p)) dif *= shadow;
|
||||
return dif;
|
||||
}
|
||||
vec3 addPointLight(vec3 lightPos, vec3 lightColor, float intensity, vec3 worldPos, vec3 viewDir, vec3 normal, float roughness) {
|
||||
// Light vector from surface to light
|
||||
vec3 lightDir = lightPos - worldPos;
|
||||
float lightDistance = length(lightDir);
|
||||
lightDir = normalize(lightDir);
|
||||
|
||||
// lighting
|
||||
float diffuse(vec3 n,vec3 l,float p) {
|
||||
return pow(dot(n,l) * 0.4 + 0.6,p);
|
||||
}
|
||||
// Attenuation (quadratic falloff)
|
||||
float attenuation = intensity / (1.0 + 0.09 * lightDistance + 0.032 * lightDistance * lightDistance);
|
||||
|
||||
float specular(vec3 normal,vec3 lightPos,vec3 rayOrigin,float specular) {
|
||||
float nrm = (specular + 8.0) / (PI * 8.0);
|
||||
return pow(max(dot(reflect(rayOrigin,normal),lightPos),0.0),specular) * nrm;
|
||||
}
|
||||
// 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 applyFog(vec3 col, float t, vec3 rd, vec3 lightDir, float b ) {
|
||||
vec3 fogColor = mix( vec3(0.34, 0.11, 0.34), // blue
|
||||
vec3(0.93, 0.37, 0.16), // yellow
|
||||
pow(max( dot(rd, lightDir), 0.) ,8.));
|
||||
return mix( col, fogColor, 1.0 - exp(-t*b) );
|
||||
|
||||
float syncsBass = clamp((syncs[1] + syncs[2] + syncs[3]), 0., 1.);
|
||||
|
||||
float fogAmount = 1.0 - exp(-t*b);
|
||||
float sunAmount = max( dot(rd, lightDir), 0.0 );
|
||||
vec3 fogColor = mix( vec3(0.2667, 0.2941, 0.3451), // blue
|
||||
vec3(0.302, 0.3176, 0.3725), // yellow
|
||||
pow(sunAmount, syncsBass * 5.0) );
|
||||
return mix( col, fogColor, fogAmount );
|
||||
}
|
||||
|
||||
vec3 getCameraRayDir(vec2 uv, vec3 p, vec3 l, float z)
|
||||
{
|
||||
vec3 f = no(l-p),
|
||||
r = no(cross(vec3(0.,1.,0.), f)),
|
||||
u = cross(f,r),
|
||||
c = f*z,
|
||||
i = c + uv.x*r + uv.y*u,
|
||||
d = no(i);
|
||||
return d;
|
||||
// Point light with no shadow and radius based falloff
|
||||
vec3 addPointLightNoShadow(vec3 lightPos, vec3 lightColor, float intensity, float radius, vec3 worldPos, vec3 viewDir, vec3 normal, float roughness) {
|
||||
// Light vector from surface to light
|
||||
vec3 lightDir = lightPos - worldPos;
|
||||
float lightDistance = length(lightDir);
|
||||
lightDir = normalize(lightDir);
|
||||
|
||||
// Attenuation (radius based falloff)
|
||||
float attenuation = clamp(intensity - lightDistance*lightDistance/(radius*radius), 0.0, 1.0);
|
||||
|
||||
// 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;
|
||||
}
|
||||
|
||||
|
||||
/*vec3 addPointLight(vec3 lightPos, vec3 lightColor, float intensity, vec3 worldPos, vec3 viewDir, vec3 normal) {
|
||||
vec3 lightDir = normalize(lightPos - worldPos);
|
||||
float lightDistance = length(lightPos - worldPos);
|
||||
|
||||
// Attenuation
|
||||
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;
|
||||
}
|
||||
*/
|
||||
|
||||
vec3 shading(vec3 v, vec3 n, vec3 dir, float material) {
|
||||
float shininess = 0.01;
|
||||
|
||||
vec3 outMaterial = vec3(0.);
|
||||
|
||||
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.);
|
||||
lights += addPointLight(vec3(0., 40.0, -10.), vec3(0.77, 0.26, 0.73), 30.0, v, dir, n, shininess);
|
||||
lights += addPointLight(vec3(0., 20.0, 15.), vec3(0.77, 0.26, 0.73), 30.0, v, dir, n, shininess);
|
||||
|
||||
// LIGHTS IN HEX GRID PATTERN
|
||||
/*
|
||||
float gridsize = 16.0; // or GRID if you want full size
|
||||
vec3 p = vec3(0.);
|
||||
for(float j = 0.; j < gridsize; j++) {
|
||||
for(float i = 0.; i < gridsize; i++) {
|
||||
ivec2 texSize = textureSize(u_hexGridTex, 0);
|
||||
vec2 texCoord = (vec2(i, j)) / vec2(texSize);
|
||||
|
||||
vec4 hexData = texture(u_hexGridTex, texCoord); // RGBA: x, y, z, dist
|
||||
|
||||
vec3 hexPos = hexData.rgb;
|
||||
float hexDist = hexData.a;
|
||||
|
||||
// Optionally use hexDist for ripple effect with FFT
|
||||
int index = clamp(int((hexDist / 34.)*512.), 0, 511);
|
||||
float hexSize = getScaledFFT(index, 15. ,0.);
|
||||
//float a = sdHex(p - hexPos, 1.0 + hexSize, 0.0);
|
||||
|
||||
lights += addPointLightNoShadow(vec3(hexPos.x, (hexPos.y + hexSize) + 2., hexPos.z), palette(hexSize* 1.5), clamp(hexSize * 5., 0., 1.), 3.4 ,v, dir, n, shininess);
|
||||
}
|
||||
}
|
||||
*/
|
||||
|
||||
// LIGHTS WITH PARTICLES
|
||||
float maxRadius = 40.; // Circle radius
|
||||
float sphereRadius = 0.7;
|
||||
int index = 0;
|
||||
float particleHeight = 4.;
|
||||
|
||||
float gridSize3 = 16.;
|
||||
for(float j = 0; j < gridSize3; j++) {
|
||||
for(float i = 0; i < gridSize3; i++) {
|
||||
vec2 texCoord = (vec2(i, j) + 0.5) / float(gridSize3);
|
||||
vec4 particleData = texture(u_ParticlesTex, texCoord); // RGBA: x, y, distance, active
|
||||
float particleActive = particleData.a;
|
||||
|
||||
if(particleData.z < 0.5) continue;
|
||||
|
||||
// Map param to angle
|
||||
float particleStartPos = hash(vec2(j, i)) * 2.0 * PI;
|
||||
|
||||
// Direction from center to initial circle position (in XY plane)
|
||||
vec3 dir = normalize(vec3(cos(particleStartPos), 0.0, sin(particleStartPos))); // XZ direction
|
||||
|
||||
float r = max(maxRadius - particleData.z, -maxRadius);
|
||||
|
||||
float offsetFactor = 15.;
|
||||
vec3 particleOffset = vec3(hash(vec2(i, j)) * offsetFactor , particleHeight, hash(vec2(j, i)) * offsetFactor); // particle offset
|
||||
|
||||
// Final object position = center (offset) + radial movement
|
||||
vec3 center = particleOffset; // Circle center
|
||||
vec3 objPos = center + dir * r; // Object slides inward
|
||||
//res = opU(res, vec2(sdSphere(p - objPos, sphereRadius), 1.));
|
||||
|
||||
lights += addPointLight(objPos, palette(i + j), 3.0, v, dir, n, shininess);
|
||||
//lights += addPointLightNoShadow(objPos, palette(i + j), 10. , 20. ,v, dir, n, shininess);
|
||||
|
||||
index++;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
vec3 lightDir = vec3(0., 1., -3);
|
||||
//float sun_dif = clamp(dot(n, lightDir), 0., 1.);
|
||||
//float shadow = softshadow(v + n * 0.01, lightDir, .01, 30., 18.);
|
||||
//lights += vec3(0.6431, 0.7804, 0.8588) * sun_dif * shadow * occ;
|
||||
|
||||
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;
|
||||
|
||||
outMaterial *= max(vec3(0.), lights); // output with lights;
|
||||
|
||||
return outMaterial;
|
||||
}
|
||||
|
||||
vec3 postProcess(vec3 col) {
|
||||
// float random = noise(gl_FragCoord.xy, 0.01+u_time);
|
||||
// float random2 = noise(gl_FragCoord.xy, .2+u_time);
|
||||
//col += 0.075*clamp(vec3(0.5*random, 0.5*random2, 0.5*random), 0.02, 1.); // dither
|
||||
|
||||
// Normalized pixel coordinates (from 0 to 1)
|
||||
vec2 screenCoord = getUV();
|
||||
|
||||
// Vignette
|
||||
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(.9, 0.8, 0.7);
|
||||
// gamma
|
||||
col = pow( col, vec3(.45) );
|
||||
// Contrast = a
|
||||
col = smoothstep(0., 1., col);
|
||||
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 += 1.0 - vec3(cl((46. - u_time)*.5, 0., 1.0));
|
||||
// col*=vec3(clamp((120.-u_time)*.35, 0., 1.));
|
||||
|
||||
return col;
|
||||
}
|
||||
|
||||
vec3 cameraPos()
|
||||
//////////////////
|
||||
// RENDERING //
|
||||
//////////////////
|
||||
|
||||
vec3 getCameraRayDir(vec2 uv, vec3 camPos, vec3 camTarget, float fov)
|
||||
{
|
||||
// first zoom in to the gate
|
||||
vec3 cPos = vec3(0., 25., 25.);
|
||||
|
||||
return cPos;
|
||||
vec3 f = normalize(camTarget-camPos),
|
||||
r = normalize(cross(vec3(0,1,0), f)),
|
||||
u = cross(f,r),
|
||||
c = f*fov,
|
||||
i = c + uv.x*r + uv.y*u,
|
||||
d = normalize(i);
|
||||
return d;
|
||||
}
|
||||
|
||||
vec3 cameraPointAt() {
|
||||
vec3 p = vec3(0., 0.0, -5.);
|
||||
return p;
|
||||
vec3 render(vec2 uv) {
|
||||
|
||||
vec3 camPos = vec3(-10.0, 20.0, -20.0);
|
||||
vec3 camTarget = vec3(0.0, 10.0, 0.0); // Adjust target as needed
|
||||
float fov = 1.0;
|
||||
|
||||
vec3 rayDir = getCameraRayDir(uv, camPos, camTarget, fov);
|
||||
|
||||
vec3 col = vec3(0.); // background color
|
||||
|
||||
vec3 hitPos = vec3(0);
|
||||
vec3 t = castRay(camPos, rayDir, hitPos);
|
||||
|
||||
if(t.x > 0.0) {
|
||||
vec3 nor = calcNormal(hitPos);
|
||||
col = shading(hitPos, nor, rayDir, t.y);
|
||||
}
|
||||
/*
|
||||
//glow from the bottom
|
||||
vec3 bGlowColor = palette(clamp((syncs[1] + syncs[2] + syncs[3]), 0., 1.)); // color change
|
||||
float bGlowDistance = 0.3;
|
||||
vec3 p = camPos + t.x * rayDir;
|
||||
|
||||
vec3 bGlowLevel = bGlowColor * exp(-(p.y + 0.0) / bGlowDistance) * 9900.;
|
||||
col += bGlowLevel;
|
||||
col = clamp(mix(bGlowLevel, col, t.z), 0.0, 1.0);
|
||||
|
||||
*/
|
||||
// distance fog + bass thunder
|
||||
float fogAmount = 0.01;
|
||||
col = col *exp(-t.x*fogAmount) + applyFog(col, t.x, rayDir, vec3(0., -0.5, 1.8), fogAmount) * (1.0-exp(-t.x*fogAmount));
|
||||
return col;
|
||||
}
|
||||
|
||||
vec3 addSpecular(vec3 nor, vec3 rod, float amount, float phong)
|
||||
{
|
||||
return vec3(specular(nor,no(vec3(0.0,0.3,0.8)),no(rod),pow(10.,phong)))*amount;
|
||||
}
|
||||
|
||||
vec3 sceneGate(vec2 uv)
|
||||
{
|
||||
// Initialization
|
||||
vec3 ro = cameraPos(),
|
||||
rd = getCameraRayDir(uv, ro, cameraPointAt(), cl(1.0,2.,25.)),
|
||||
col = vec3(0.);
|
||||
float d = rayMarch(ro, rd,0), mat = 0.;
|
||||
|
||||
if (d < 500.) {
|
||||
// Lighting
|
||||
vec3 p = ro + rd * d,
|
||||
n = getNormal(p);
|
||||
mat = mapScene(p).y;
|
||||
// Light 1 Arguments
|
||||
// 1: Ray starting point
|
||||
// 2: Light position
|
||||
// 3: Light intensity
|
||||
// 4: Shadow intensity
|
||||
|
||||
// Lights
|
||||
col += vec3(0.82, 0.5, 0.9) * getLight(p, vec3( 10., 15., 25.), 1., .2,n,1e-10);
|
||||
col += vec3(0.79, 0.66, 0.43) * getLight(p, vec3( 4., 2., -15.), 1., 1.,n,1e-10);
|
||||
col += vec3(0.0, 0.06, 0.7) * getLight(p, vec3( 0., 0., 5.),cl((u_time-29.0)*100.,0.,50.), 0.0,n,3.1);
|
||||
// indirect lightning -> vec3 in normalize is light direction
|
||||
col += vec3(0.29, 0.28, 0.33) * cl( dot( n, no(vec3(0. , 1., 10.))), 0., 1.);
|
||||
|
||||
if(mat==0.)
|
||||
col *= vec3(0.2, 0.3, 0.3) + addSpecular(n,rd,.5, 2.);
|
||||
}
|
||||
return postProcess(applyFog(col, d, rd, vec3(0., -.1, -1.), .01));
|
||||
}
|
||||
|
||||
void main() {
|
||||
o = vec4(sceneGate( (gl_FragCoord.xy * 2. - u_resolution.xy) / u_resolution.y), 1.);
|
||||
}
|
||||
vec3 finalColor = render(getUV());
|
||||
//finalColor = postProcess(finalColor);
|
||||
o = vec4(finalColor, 1.);
|
||||
}
|
||||
|
||||
/*
|
||||
vec3 render2(vec2 uv, float time) {
|
||||
|
||||
vec3 res = vec3(.0);
|
||||
|
||||
float pos = syncs[5];
|
||||
if (uv.x >= pos && uv.x <= pos+0.01 ) {
|
||||
res += vec3(1.);
|
||||
}
|
||||
|
||||
//if (uv.x >= 0.0 && uv.x <= 0.01 ) {
|
||||
// res += vec3(abs(syncs[4]*2));
|
||||
//}
|
||||
|
||||
//res += vec3(0.1, 0.2, 0.3) * abs(syncs[2]*1.2);
|
||||
|
||||
return res;
|
||||
}
|
||||
|
||||
|
||||
void main() {
|
||||
vec2 uv = gl_FragCoord.xy * 2. / vec2(1920,1080);
|
||||
vec3 col = render2(uv, u_time);
|
||||
o = vec4(col,1.0);
|
||||
}
|
||||
*/
|
||||
@ -1,139 +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 "H"
|
||||
# define VAR_fft_output "n"
|
||||
# define VAR_o "f"
|
||||
# define VAR_syncs "a"
|
||||
# define VAR_u_hexGridTex "l"
|
||||
# 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 f;"
|
||||
"const float m=2.*acos(-1.),v=sqrt(5.)*.5+.5;"
|
||||
"layout(location=0)uniform float a[7];"
|
||||
"layout(location=8)uniform float H[512];"
|
||||
"uniform sampler2D l;"
|
||||
"float d=a[0];"
|
||||
"vec2 n=vec2(1920,1080);"
|
||||
"vec3 s(vec3 v)"
|
||||
"const float i=2.*acos(-1.),v=sqrt(5.)*.5+.5;"
|
||||
"layout(location=0)uniform float m[12];"
|
||||
"layout(location=20)uniform float n[512];"
|
||||
"layout(location=600)uniform vec3 s[15];"
|
||||
"layout(binding=1)uniform sampler2D k;"
|
||||
"layout(binding=3)uniform sampler2D d;"
|
||||
"float g=m[0];"
|
||||
"float t(vec2 v)"
|
||||
"{"
|
||||
"return normalize(v);"
|
||||
"return fract(sin(dot(v,vec2(127.1,311.7)))*43758.5453123);"
|
||||
"}"
|
||||
"float s(float v,float f,float m)"
|
||||
"vec2 t(vec3 v)"
|
||||
"{"
|
||||
"return clamp(v,f,m);"
|
||||
"return vec2(v.y,0);"
|
||||
"}"
|
||||
"mat2 s()"
|
||||
"vec3 t(vec3 v,vec3 x,inout vec3 f)"
|
||||
"{"
|
||||
"float v=sin(.5),f=cos(.5);"
|
||||
"return mat2(f,-v,v,f);"
|
||||
"}"
|
||||
"float s(vec3 v,vec2 m)"
|
||||
"{"
|
||||
"v=abs(v);"
|
||||
"return max(v.y-m.y,max(v.x*sqrt(3.)*.5+v.z*.5,v.z)-m.x);"
|
||||
"}\n"
|
||||
"#define zclamp(a)max(a,0.0)\n"
|
||||
"struct HexData{vec3 local;vec2 axial;};"
|
||||
"HexData t(vec3 v)"
|
||||
"{"
|
||||
"float f=sqrt(3.)/3.*v.x-1./3.*v.z,m=2./3.*v.z,x=round(f),l=round(m),a=round(-f-m),d=abs(x-f),p=abs(l-m);"
|
||||
"f=abs(a+f+m);"
|
||||
"if(d>p&&d>f)"
|
||||
"x=-l-a;"
|
||||
"else if(p>f)"
|
||||
"l=-x-a;"
|
||||
"f=sqrt(3.)*(x+l*.5);"
|
||||
"m=1.5*l;"
|
||||
"HexData r;"
|
||||
"r.local=v-vec3(f,0,m);"
|
||||
"r.axial=vec2(x,l);"
|
||||
"return r;"
|
||||
"}"
|
||||
"struct HexData{vec3 local;vec2 axial;};"
|
||||
"float s(vec2 v)"
|
||||
"{"
|
||||
"float m=v.x,f=v.y;"
|
||||
"return max(abs(m),max(abs(f),abs(-m-f)));"
|
||||
"}"
|
||||
"vec3 p(vec3 v)"
|
||||
"{"
|
||||
"float f=1e9;"
|
||||
"HexData m=t(vec3(v.x,v.y-10.,v.z));"
|
||||
"float l=1.+H[int(clamp(s(m.axial)+1.,0.,511.))];"
|
||||
"v=m.local;"
|
||||
"v.xz*=s();"
|
||||
"l=s(vec3(v.x,v.y-l/2,v.z),vec2(.83,l/2));"
|
||||
"f=min(f,l);"
|
||||
"return vec3(f,0,0);"
|
||||
"}"
|
||||
"float p(vec3 v,vec3 f,int m)"
|
||||
"{"
|
||||
"vec3 l;"
|
||||
"float x=0.,r;"
|
||||
"for(int m=0;m<80;m++)"
|
||||
"float i=0.,e=0.,y=0.;"
|
||||
"for(int n=0;n<30;n++)"
|
||||
"{"
|
||||
"l=p(v+f*x);"
|
||||
"r=abs(l.x);"
|
||||
"if(r<1e-5*(x*.125+1.)||x>1e2)"
|
||||
"f=v+x*i;"
|
||||
"vec2 m=t(f);"
|
||||
"i+=m.x;"
|
||||
"e=m.y;"
|
||||
"if(i>6e2)"
|
||||
"break;"
|
||||
"x+=l.x;"
|
||||
"if(m.x<.001*i)"
|
||||
"{"
|
||||
"y=1.;"
|
||||
"break;"
|
||||
"}"
|
||||
"}"
|
||||
"x-=15.;"
|
||||
"for(int m=0;m<80;m++)"
|
||||
"return vec3(i,e,y);"
|
||||
"}"
|
||||
"float t(vec3 v,vec3 i,float f)"
|
||||
"{"
|
||||
"float m=1.,y=.02;"
|
||||
"for(int n=0;n<6;n++)"
|
||||
"{"
|
||||
"l=p(v+f*x);"
|
||||
"r=abs(l.x);"
|
||||
"if(r<x*.00125*1e-5||x>1e2)"
|
||||
"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;"
|
||||
"x+=min(l.x,.2);"
|
||||
"}"
|
||||
"if(r>=1e2)"
|
||||
"x=-1.;"
|
||||
"return x;"
|
||||
"m=max(m,-1.);"
|
||||
"return.25*(1.+m)*(1.+m)*(2.-m);"
|
||||
"}"
|
||||
"vec3 x(vec3 v)"
|
||||
"{"
|
||||
"vec2 m=vec2(.01,0);"
|
||||
"return s(p(v).x-vec3(p(v-m.xyy).x,p(v-m.yxy).x,p(v-m.yyx)));"
|
||||
"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));"
|
||||
"}"
|
||||
"float p(vec3 v,vec3 f,float m,float l,vec3 x,float y)"
|
||||
"vec3 t(vec3 v,vec3 m,float i,vec3 d,vec3 f,vec3 x,float y)"
|
||||
"{"
|
||||
"vec3 a=s(f-v);"
|
||||
"m=s(dot(x,a)*m,0.,m)/(1.+y*length(f-v));"
|
||||
"if(p(v+x*.025,a,1)<length(f-v))"
|
||||
"m*=l;"
|
||||
"return m;"
|
||||
"v-=d;"
|
||||
"float n=length(v);"
|
||||
"v=normalize(v);"
|
||||
"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 p(vec3 v,vec3 m,vec3 f)"
|
||||
"vec3 t(vec3 v,vec3 f,vec3 i,float m)"
|
||||
"{"
|
||||
"float l=pow(10.,2.);"
|
||||
"return pow(max(dot(reflect(f,v),m),0.),l)*((l+8.)/(acos(-1.)*8.));"
|
||||
"float y=.01;"
|
||||
"vec3 n=vec3(0);"
|
||||
"if(m==0.)"
|
||||
"n=vec3(.8314,.2941,.2941),y=.1;"
|
||||
"else if(m==1.)"
|
||||
"n=vec3(.6196,.6118,.6118),y=.7;"
|
||||
"else if(m==2.)"
|
||||
"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);"
|
||||
"}"
|
||||
"vec3 p(vec2 v,vec3 f,float m)"
|
||||
"vec3 t(vec2 m,vec3 v)"
|
||||
"{"
|
||||
"f=s(vec3(0,0,-5)-f);"
|
||||
"vec3 l=s(cross(vec3(0,1,0),f));"
|
||||
"return s(f*m+v.x*l+v.y*cross(f,l));"
|
||||
"v=normalize(vec3(0,10,0)-v);"
|
||||
"vec3 y=normalize(cross(vec3(0,1,0),v));"
|
||||
"return normalize(v+m.x*y+m.y*cross(v,y));"
|
||||
"}"
|
||||
"vec3 p(vec2 v)"
|
||||
"vec3 x(vec2 v)"
|
||||
"{"
|
||||
"vec3 f=vec3(0,25,25),m=p(v,f,s(1.,2.,25.)),l=vec3(0);"
|
||||
"float a=p(f,m,0),r=0.;"
|
||||
"if(a<5e2)"
|
||||
"vec3 f=vec3(-10,20,-20),y=t(v,f),i=vec3(0),n=vec3(0);"
|
||||
"f=t(f,y,n);"
|
||||
"if(f.x>0.)"
|
||||
"{"
|
||||
"vec3 v=f+m*a,i=x(v);"
|
||||
"r=p(v).y;"
|
||||
"l=l+vec3(.82,.5,.9)*p(v,vec3(10,15,25),1.,.2,i,1e-10)+vec3(.79,.66,.43)*p(v,vec3(4,2,-15),1.,1.,i,1e-10)+vec3(0,.06,.7)*p(v,vec3(0,0,5),s((d-29.)*1e2,0.,50.),0.,i,3.1)+vec3(.29,.28,.33)*s(dot(i,s(vec3(0,1,10))),0.,1.);"
|
||||
"if(r==0.)"
|
||||
"l*=vec3(.2,.3,.3)+vec3(p(i,s(vec3(0,.3,.8)),s(m)))*.5;"
|
||||
"vec3 v=x(n);"
|
||||
"i=t(n,v,y,f.y);"
|
||||
"}"
|
||||
"return smoothstep(0.,1.,pow(mix(l,mix(vec3(.34,.11,.34),vec3(.93,.37,.16),pow(max(dot(m,vec3(0,-.1,-1)),0.),8.)),1.-exp(-a*.01))*vec3(.9,.8,.7),vec3(.45)));"
|
||||
"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));"
|
||||
"}"
|
||||
"void main()"
|
||||
"{"
|
||||
"f=vec4(p((gl_FragCoord.xy*2.-n.xy)/n.y),1);"
|
||||
"vec3 v=x(gl_FragCoord.xy*vec2(.00104166667,.00185185185)-1.);"
|
||||
"f=vec4(v,1);"
|
||||
"}";
|
||||
|
||||
#endif // FRAGMENT_INL_
|
||||
|
||||
@ -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>
|
||||
|
||||
79
test.py
79
test.py
@ -1,79 +0,0 @@
|
||||
import numpy as np
|
||||
import matplotlib.pyplot as plt
|
||||
from matplotlib.animation import FuncAnimation
|
||||
|
||||
class DecayingSineWave:
|
||||
def __init__(self, freq=5, decay=0.05, sample_rate=60):
|
||||
self.freq = freq
|
||||
self.decay = decay
|
||||
self.sample_rate = sample_rate
|
||||
self.triggers = []
|
||||
|
||||
def trigger(self, t):
|
||||
self.triggers.append(t)
|
||||
|
||||
def sample(self, t):
|
||||
value = 0.0
|
||||
still_active = []
|
||||
for start_time in self.triggers:
|
||||
age = t - start_time
|
||||
if age >= 0:
|
||||
v = np.sin(2 * np.pi * self.freq * age / self.sample_rate) * np.exp(-self.decay * age)
|
||||
value += v
|
||||
if np.exp(-self.decay * age) > 1e-3:
|
||||
still_active.append(start_time)
|
||||
self.triggers = still_active
|
||||
return value
|
||||
|
||||
# --- Initialize ---
|
||||
wave = DecayingSineWave(freq=5, decay=0.05, sample_rate=60)
|
||||
wave_array = np.zeros(512)
|
||||
time = [0]
|
||||
max_len = 512
|
||||
|
||||
fig, ax = plt.subplots()
|
||||
line, = ax.plot(np.arange(512), wave_array, lw=2)
|
||||
trig_dots, = ax.plot([], [], 'ro', markersize=4)
|
||||
|
||||
ax.set_xlim(0, 511)
|
||||
ax.set_ylim(-1.2, 1.2)
|
||||
ax.set_title("Click to Trigger Decaying Sine Wave")
|
||||
ax.set_xlabel("Sample Index (0 = current)")
|
||||
ax.set_ylabel("Amplitude")
|
||||
ax.grid(True)
|
||||
|
||||
trigger_times = []
|
||||
|
||||
# --- Click handler ---
|
||||
def on_click(event):
|
||||
current_time = time[0]
|
||||
wave.trigger(current_time)
|
||||
trigger_times.append(current_time)
|
||||
|
||||
fig.canvas.mpl_connect('button_press_event', on_click)
|
||||
|
||||
# --- Animation update ---
|
||||
def update(frame):
|
||||
global wave_array
|
||||
current_time = time[0]
|
||||
|
||||
# Shift buffer to the right (older samples move toward the end)
|
||||
wave_array = wave_array * 0.995
|
||||
wave_array = np.roll(wave_array, 1)
|
||||
# Insert new sample at index 0
|
||||
wave_array[0] = wave.sample(current_time)
|
||||
print (wave_array)
|
||||
|
||||
line.set_data(np.arange(512), wave_array)
|
||||
|
||||
# Trigger markers
|
||||
visible_triggers = [tt for tt in trigger_times if current_time - 512 < tt <= current_time]
|
||||
x = [current_time - tt for tt in visible_triggers] # 0 = current time
|
||||
y = [1.0 for _ in x]
|
||||
trig_dots.set_data(x, y)
|
||||
|
||||
time[0] += 1
|
||||
return line, trig_dots
|
||||
|
||||
ani = FuncAnimation(fig, update, interval=1000 / 60, blit=True)
|
||||
plt.show()
|
||||
Reference in New Issue
Block a user