From 3b54ab896ce6aff1424dab81e9aca4dd80704e44 Mon Sep 17 00:00:00 2001 From: skal Date: Thu, 5 Mar 2026 00:46:09 +0100 Subject: music = one big drum sample (for now!) --- workspaces/main/assets.txt | 1 + workspaces/main/music.track | 6 ++++-- workspaces/main/music/drum.mp3 | Bin 0 -> 725504 bytes workspaces/main/workspace.cfg | 3 ++- 4 files changed, 7 insertions(+), 3 deletions(-) create mode 100644 workspaces/main/music/drum.mp3 diff --git a/workspaces/main/assets.txt b/workspaces/main/assets.txt index a324cfd..625dc22 100644 --- a/workspaces/main/assets.txt +++ b/workspaces/main/assets.txt @@ -25,6 +25,7 @@ BASS_1, NONE, music/BASS_GUITAR_FEEL.spec, "Bass Guitar" BASS_2, NONE, music/BASS_SYNTH_1.spec, "Synth Bass 1" BASS_3, NONE, music/SYNTH_BASS_DISTORT.spec, "Distorted Synth Bass" NEVER_MP3, MP3, music/never.mp3, "MP3 Sample" +DRUM_MP3, MP3, music/drum.mp3, "Drum Sample" # --- Procedural Textures --- NOISE_TEX, PROC(gen_noise, 1234, 16), _, "Procedural noise texture for bump mapping" diff --git a/workspaces/main/music.track b/workspaces/main/music.track index 0857f26..7ac016c 100644 --- a/workspaces/main/music.track +++ b/workspaces/main/music.track @@ -19,10 +19,11 @@ SAMPLE ASSET_SNARE_2 SAMPLE ASSET_SNARE_3 SAMPLE ASSET_RIDE_1 SAMPLE ASSET_NEVER_MP3 +SAMPLE ASSET_DRUM_MP3 # === MP3 PATTERN === PATTERN mp3 LENGTH 10.0 - 0.00, ASSET_NEVER_MP3, 0.7, 0.0 + 0.00, ASSET_DRUM_MP3, 0.7, 0.0 # === KICK PATTERNS === # Steady kick on beats 0 and 2 (quarter notes) @@ -61,7 +62,7 @@ PATTERN ride LENGTH 1.0 SCORE # 0s : start mp3 0.0, mp3 - +/* # 0-4s (0-2 units): KICK_1 + SNARE_1 0.00, kick_1 0.00, snare_1 @@ -157,3 +158,4 @@ SCORE 15.50, kick_2 15.50, snare_2 15.50, ride +*/ diff --git a/workspaces/main/music/drum.mp3 b/workspaces/main/music/drum.mp3 new file mode 100644 index 0000000..57be024 Binary files /dev/null and b/workspaces/main/music/drum.mp3 differ diff --git a/workspaces/main/workspace.cfg b/workspaces/main/workspace.cfg index 5eff423..07600a5 100644 --- a/workspaces/main/workspace.cfg +++ b/workspaces/main/workspace.cfg @@ -7,7 +7,8 @@ version = "1.0" target = "demo64k" timeline = "timeline.seq" # music = "pop_punk_drums.track" -music = "beat_test.track" +#music = "beat_test.track" +music = "music.track" assets = "assets.txt" asset_dirs = ["music/", "weights/", "obj/"] shader_dirs = ["shaders/"] -- cgit v1.2.3