diff options
| -rw-r--r-- | .gitignore | 15 | ||||
| -rw-r--r-- | CMakeLists.txt | 11 | ||||
| -rw-r--r-- | assets/music.track | 41 | ||||
| -rw-r--r-- | src/audio/audio.cc | 18 | ||||
| -rw-r--r-- | src/audio/audio.h | 11 | ||||
| -rw-r--r-- | src/audio/tracker.cc | 75 | ||||
| -rw-r--r-- | src/audio/tracker.h | 2 | ||||
| -rw-r--r-- | src/main.cc | 43 | ||||
| -rw-r--r-- | src/tests/test_spectool.cc | 9 | ||||
| -rw-r--r-- | src/tests/test_tracker.cc | 27 | ||||
| -rw-r--r-- | tools/spectool.cc | 7 | ||||
| -rw-r--r-- | tools/tracker_compiler.cc | 58 |
12 files changed, 161 insertions, 156 deletions
@@ -13,15 +13,14 @@ build_strip/ Thumbs.db .gemini/ +.gemini/.env -# Generated assets -src/assets.h -src/assets_data.cc -src/test_assets.h -src/test_assets_data.cc - -# Generated spectrograms -assets/final/*.spec +# Generated assets and spectrograms +src/generated/assets.h +src/generated/assets_data.cc +src/generated/test_assets.h +src/generated/test_assets_data.cc +src/generated/ assets/wav/ build_native/ diff --git a/CMakeLists.txt b/CMakeLists.txt index 706f1c0..16f6451 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -227,16 +227,15 @@ if(DEMO_BUILD_TESTS) add_executable(test_synth src/tests/test_synth.cc src/audio/synth.cc src/audio/idct.cc src/audio/window.cc) add_test(NAME SynthEngineTest COMMAND test_synth) - add_executable(test_tracker src/tests/test_tracker.cc src/audio/synth.cc src/audio/gen.cc src/audio/tracker.cc src/audio/window.cc src/audio/fdct.cc src/audio/idct.cc ${GENERATED_MUSIC_DATA_CC}) + add_executable(test_tracker src/tests/test_tracker.cc ${AUDIO_SOURCES} ${UTIL_SOURCES} ${GEN_DEMO_CC} ${GENERATED_MUSIC_DATA_CC} ${PROCEDURAL_SOURCES}) target_link_libraries(test_tracker PRIVATE ${DEMO_LIBS}) add_dependencies(test_tracker generate_tracker_music) add_test(NAME TrackerSystemTest COMMAND test_tracker) - add_executable(test_spectool src/tests/test_spectool.cc ${AUDIO_SOURCES} ${PLATFORM_SOURCES} ${GENERATED_MUSIC_DATA_CC}) + add_executable(test_spectool src/tests/test_spectool.cc ${AUDIO_SOURCES} ${PLATFORM_SOURCES} ${UTIL_SOURCES} ${GEN_DEMO_CC} ${GENERATED_MUSIC_DATA_CC} ${PROCEDURAL_SOURCES}) target_compile_definitions(test_spectool PRIVATE DEMO_BUILD_TOOLS) target_link_libraries(test_spectool PRIVATE ${DEMO_LIBS}) - add_dependencies(test_spectool generate_tracker_music) - add_test(NAME SpectoolEndToEndTest COMMAND test_spectool) + add_dependencies(test_spectool generate_tracker_music generate_demo_assets) add_executable(test_assets src/tests/test_assets.cc ${UTIL_SOURCES} ${PROCEDURAL_SOURCES} ${GEN_TEST_CC}) target_include_directories(test_assets PRIVATE ${CMAKE_CURRENT_BINARY_DIR}/src/generated_test) @@ -270,10 +269,10 @@ endif() #-- - Extra Tools -- - if(DEMO_BUILD_TOOLS OR DEMO_BUILD_TESTS) - add_executable(spectool tools/spectool.cc ${PLATFORM_SOURCES} ${AUDIO_SOURCES} ${GENERATED_MUSIC_DATA_CC}) + add_executable(spectool tools/spectool.cc ${PLATFORM_SOURCES} ${AUDIO_SOURCES} ${UTIL_SOURCES} ${GEN_DEMO_CC} ${GENERATED_MUSIC_DATA_CC} ${PROCEDURAL_SOURCES}) target_compile_definitions(spectool PRIVATE DEMO_BUILD_TOOLS) target_link_libraries(spectool PRIVATE ${DEMO_LIBS}) - add_dependencies(spectool generate_tracker_music) + add_dependencies(spectool generate_tracker_music generate_demo_assets) add_executable(specview tools/specview.cc) endif() diff --git a/assets/music.track b/assets/music.track index ea9f0d3..bb6e4ba 100644 --- a/assets/music.track +++ b/assets/music.track @@ -1,34 +1,29 @@ -# Music Score for 64k Demo - -BPM 120 - -# Samples: name, freq, duration, amp, attack, harmonics, harmonic_decay +# Samples: name, freq, duration, amp, attack, harmonics, harmonic_decay (for generated) +# OR SAMPLE ASSET_ASSETID (for assets) SAMPLE kick, 50, 0.2, 1.0, 0.01, 1, 0.5 SAMPLE snare, 200, 0.2, 0.8, 0.01, 5, 0.7 SAMPLE hihat, 1000, 0.05, 0.3, 0.005, 10, 0.4 -SAMPLE E4, 293.66, 0.5, 0.6, 0.02, 4, 0.6 -SAMPLE G4, 349.23, 0.5, 0.6, 0.02, 4, 0.6 -SAMPLE B4, 440.00, 0.5, 0.6, 0.02, 4, 0.6 -SAMPLE D5, 587.33, 0.5, 0.6, 0.02, 4, 0.6 -SAMPLE E5, 587.33, 0.5, 0.6, 0.02, 4, 0.6 +SAMPLE ASSET_KICK_1 +SAMPLE ASSET_SNARE_1 +SAMPLE ASSET_HIHAT_1 # Patterns: beat, sample, volume, pan PATTERN drum_loop - 0.0, kick, 1.0, 0.0 - 1.0, snare, 0.7, 0.0 - 2.0, kick, 1.0, 0.0 - 2.5, kick, 0.6, 0.2 - 3.0, snare, 0.7, 0.0 + 0.0, ASSET_KICK_1, 1.0, 0.0 + 1.0, ASSET_SNARE_1, 0.7, 0.0 + 2.0, ASSET_KICK_1, 1.0, 0.0 + 2.5, ASSET_KICK_1, 0.6, 0.2 + 3.0, ASSET_SNARE_1, 0.7, 0.0 PATTERN hihat_roll - 0.0, hihat, 0.5, -0.5 - 0.5, hihat, 0.4, 0.5 - 1.0, hihat, 0.5, -0.5 - 1.5, hihat, 0.4, 0.5 - 2.0, hihat, 0.5, -0.5 - 2.5, hihat, 0.4, 0.5 - 3.0, hihat, 0.5, -0.5 - 3.5, hihat, 0.4, 0.5 + 0.0, ASSET_HIHAT_1, 0.5, -0.5 + 0.5, ASSET_HIHAT_1, 0.4, 0.5 + 1.0, ASSET_HIHAT_1, 0.5, -0.5 + 1.5, ASSET_HIHAT_1, 0.4, 0.5 + 2.0, ASSET_HIHAT_1, 0.5, -0.5 + 2.5, ASSET_HIHAT_1, 0.4, 0.5 + 3.0, ASSET_HIHAT_1, 0.5, -0.5 + 3.5, ASSET_HIHAT_1, 0.4, 0.5 PATTERN em_melody 0.0, E4, 0.7, 0.0 diff --git a/src/audio/audio.cc b/src/audio/audio.cc index e4abbf8..ad324c0 100644 --- a/src/audio/audio.cc +++ b/src/audio/audio.cc @@ -3,6 +3,7 @@ // Implementation uses miniaudio for cross-platform support. #include "audio.h" +#include "util/asset_manager.h" #if !defined(DEMO_BUILD_TOOLS) #define MA_NO_FLAC @@ -16,6 +17,23 @@ #include <stdio.h> +int register_spec_asset(AssetId id) { + size_t size; + const uint8_t* data = GetAsset(id, &size); + if (!data || size < sizeof(SpecHeader)) + return -1; + + const SpecHeader* header = (const SpecHeader*)data; + const float* spectral_data = (const float*)(data + sizeof(SpecHeader)); + + Spectrogram spec; + spec.spectral_data_a = spectral_data; + spec.spectral_data_b = spectral_data; // No double-buffer for static assets + spec.num_frames = header->num_frames; + + return synth_register_spectrogram(&spec); +} + static ma_device g_device; void audio_data_callback(ma_device* pDevice, void* pOutput, const void* pInput, diff --git a/src/audio/audio.h b/src/audio/audio.h index 24db18f..a1ddb44 100644 --- a/src/audio/audio.h +++ b/src/audio/audio.h @@ -3,6 +3,15 @@ // Includes initialization, shutdown, and frame updates. #pragma once +#include "generated/assets.h" +#include <cstdint> + +struct SpecHeader { + char magic[4]; + int32_t version; + int32_t dct_size; + int32_t num_frames; +}; void audio_init(); void audio_start(); // Starts the audio device callback @@ -11,3 +20,5 @@ void audio_render_silent(float duration_sec); // Fast-forwards audio state #endif /* !defined(STRIP_ALL) */ void audio_update(); void audio_shutdown(); + +int register_spec_asset(AssetId id); diff --git a/src/audio/tracker.cc b/src/audio/tracker.cc index 9f9263d..5d99a45 100644 --- a/src/audio/tracker.cc +++ b/src/audio/tracker.cc @@ -1,8 +1,7 @@ -// This file is part of the 64k demo project. -// It implements the tracker runtime logic. - #include "tracker.h" +#include "audio.h" #include "audio/synth.h" +#include "util/asset_manager.h" #include <cstring> #include <vector> @@ -31,9 +30,6 @@ static int get_free_pool_slot() { if (!g_spec_pool[i].active) return i; } - // If no free slot, find one where the synth voice is inactive - // (In a real implementation, we'd check if any voice is still using this) - // For now, just wrap around or return -1 return -1; } @@ -45,10 +41,8 @@ void tracker_update(float time_sec) { if (trigger.time_sec > time_sec) break; - // Trigger pattern! const TrackerPattern& pattern = g_tracker_patterns[trigger.pattern_id]; - // Generate spectrogram for the pattern int dest_num_frames = 0; std::vector<float> pattern_data; @@ -56,39 +50,54 @@ void tracker_update(float time_sec) { for (uint32_t i = 0; i < pattern.num_events; ++i) { const TrackerEvent& event = pattern.events[i]; - const NoteParams& params = g_tracker_samples[event.sample_id]; - + + std::vector<float> note_data; int note_frames = 0; - std::vector<float> note_data = - generate_note_spectrogram(params, ¬e_frames); - int frame_offset = (int)(event.beat * beat_to_sec * 32000.0f / DCT_SIZE); - paste_spectrogram(pattern_data, &dest_num_frames, note_data, note_frames, - frame_offset); - } + AssetId aid = g_tracker_sample_assets[event.sample_id]; + if (aid != AssetId::ASSET_LAST_ID) { + size_t size; + const uint8_t* data = GetAsset(aid, &size); + if (data && size >= sizeof(SpecHeader)) { + const SpecHeader* header = (const SpecHeader*)data; + note_frames = header->num_frames; + const float* src_spectral_data = (const float*)(data + sizeof(SpecHeader)); + note_data.assign(src_spectral_data, src_spectral_data + (size_t)note_frames * DCT_SIZE); + } + } else { + const NoteParams& params = g_tracker_samples[event.sample_id]; + note_data = generate_note_spectrogram(params, ¬e_frames); + } - // Register with synth - int slot = get_free_pool_slot(); - if (slot != -1) { - // Clean up old if needed - if (g_spec_pool[slot].synth_id != -1) { - synth_unregister_spectrogram(g_spec_pool[slot].synth_id); - delete[] g_spec_pool[slot].data; + if (note_frames > 0) { + int frame_offset = (int)(event.beat * beat_to_sec * 32000.0f / DCT_SIZE); + paste_spectrogram(pattern_data, &dest_num_frames, note_data, note_frames, + frame_offset); } + } + + if (dest_num_frames > 0) { + int slot = get_free_pool_slot(); + if (slot != -1) { + if (g_spec_pool[slot].synth_id != -1) { + synth_unregister_spectrogram(g_spec_pool[slot].synth_id); + delete[] g_spec_pool[slot].data; + } - g_spec_pool[slot].data = new float[pattern_data.size()]; - memcpy(g_spec_pool[slot].data, pattern_data.data(), - pattern_data.size() * sizeof(float)); + g_spec_pool[slot].data = new float[pattern_data.size()]; + memcpy(g_spec_pool[slot].data, pattern_data.data(), + pattern_data.size() * sizeof(float)); - Spectrogram spec; - spec.spectral_data_a = g_spec_pool[slot].data; - spec.spectral_data_b = g_spec_pool[slot].data; - spec.num_frames = dest_num_frames; + Spectrogram spec; + spec.spectral_data_a = g_spec_pool[slot].data; + spec.spectral_data_b = g_spec_pool[slot].data; + spec.num_frames = dest_num_frames; - g_spec_pool[slot].synth_id = synth_register_spectrogram(&spec); - g_spec_pool[slot].active = true; + g_spec_pool[slot].synth_id = synth_register_spectrogram(&spec); + g_spec_pool[slot].active = true; - synth_trigger_voice(g_spec_pool[slot].synth_id, 1.0f, 0.0f); + synth_trigger_voice(g_spec_pool[slot].synth_id, 1.0f, 0.0f); + } } g_last_trigger_idx++; diff --git a/src/audio/tracker.h b/src/audio/tracker.h index d97b483..49fcd3c 100644 --- a/src/audio/tracker.h +++ b/src/audio/tracker.h @@ -4,6 +4,7 @@ #pragma once #include "audio/gen.h" +#include "generated/assets.h" #include <cstdint> struct TrackerEvent { @@ -34,6 +35,7 @@ struct TrackerScore { // Global music data generated by tracker_compiler extern const NoteParams g_tracker_samples[]; extern const uint32_t g_tracker_samples_count; +extern const AssetId g_tracker_sample_assets[]; extern const TrackerPattern g_tracker_patterns[]; extern const uint32_t g_tracker_patterns_count; extern const TrackerScore g_tracker_score; diff --git a/src/main.cc b/src/main.cc index 97732da..7114460 100644 --- a/src/main.cc +++ b/src/main.cc @@ -19,30 +19,6 @@ #define SPEC_FRAMES 16 -struct SpecHeader { - char magic[4]; - int32_t version; - int32_t dct_size; - int32_t num_frames; -}; - -int register_spec_asset(AssetId id) { - size_t size; - const uint8_t* data = GetAsset(id, &size); - if (!data || size < sizeof(SpecHeader)) - return -1; - - const SpecHeader* header = (const SpecHeader*)data; - const float* spectral_data = (const float*)(data + sizeof(SpecHeader)); - - Spectrogram spec; - spec.spectral_data_a = spectral_data; - spec.spectral_data_b = spectral_data; // No double-buffer for static assets - spec.num_frames = header->num_frames; - - return synth_register_spectrogram(&spec); -} - static float* g_spec_buffer_a[SPEC_FRAMES * DCT_SIZE] = {0}; static float* g_spec_buffer_b[SPEC_FRAMES * DCT_SIZE] = {0}; @@ -107,10 +83,6 @@ int main(int argc, char** argv) { synth_init(); tracker_init(); - int kick_id = register_spec_asset(AssetId::ASSET_KICK_1); - int snare_id = register_spec_asset(AssetId::ASSET_SNARE_1); - int hihat_id = register_spec_asset(AssetId::ASSET_HIHAT_1); - // Still keep the dynamic tone for bass (can be integrated into tracker too) const float* g_spec_buffer_a = generate_tone(nullptr, 110.0f); // A2 const float* g_spec_buffer_b = generate_tone(nullptr, 110.0f); @@ -130,21 +102,6 @@ int main(int argc, char** argv) { const int step = beat_count % 16; - // Kick on 1, 9, 11, 14... - if (step == 0 || step == 8 || step == 10 || step == 13) { - synth_trigger_voice(kick_id, 0.6f, 0.0f); - } - - // Snare on 4, 12 - if (step == 4 || step == 12) { - synth_trigger_voice(snare_id, 0.48f, step & 8 ? -1.0f : 1.0f); - } - - // Hihat on every offbeat - if (step % 2 == 1) { - synth_trigger_voice(hihat_id, 0.3f, 0.3f); - } - // Bass pattern if (step % 4 == 0) { float* back_buffer = synth_begin_update(bass_id); diff --git a/src/tests/test_spectool.cc b/src/tests/test_spectool.cc index 37a74b7..984322a 100644 --- a/src/tests/test_spectool.cc +++ b/src/tests/test_spectool.cc @@ -11,14 +11,7 @@ #include "miniaudio.h" -// Redefine SpecHeader to avoid including spectool internals if possible, -// but for an E2E test we need to know the format. -struct SpecHeader { - char magic[4]; - int32_t version; - int32_t dct_size; - int32_t num_frames; -}; +// struct SpecHeader { ... } -> now in audio.h void generate_test_wav(const char* path, int duration_seconds) { ma_encoder_config config = diff --git a/src/tests/test_tracker.cc b/src/tests/test_tracker.cc index 95e746b..ad84163 100644 --- a/src/tests/test_tracker.cc +++ b/src/tests/test_tracker.cc @@ -25,28 +25,15 @@ void test_tracker_pattern_triggering() { synth_init(); tracker_init(); - // Need a minimal set of samples for generation - // These values should match what's expected by the music.track file - // For testing purposes, we define dummy data here. In a real scenario, - // we'd rely on the generated g_tracker_samples, g_tracker_patterns, etc. - // This test focuses on the logic of tracker_update, not the full audio generation pipeline. - - // Assuming g_tracker_score, g_tracker_patterns, and g_tracker_samples are available globally - // after tracker_compiler has run. - - // Test 1: No triggers initially, active voices should be 0 + // Test 1: Trigger patterns at 0.0f tracker_update(0.0f); - assert(synth_get_active_voice_count() == 2); // Expect 2 voices (one for each pattern triggered at 0.0f) - - // Test 2: Advance time to first trigger (0.0f in music.track for drum_loop and hihat_roll) - // In our dummy music.track, there are two patterns triggered at 0.0f - // Each pattern has multiple events which trigger voices. - tracker_update(0.1f); // Advance just past the 0.0f trigger point + printf("Actual active voice count: %d\n", synth_get_active_voice_count()); + // Expect 3 voices (one for each pattern triggered at 0.0f: drum_loop, hihat_roll, em_melody) + assert(synth_get_active_voice_count() == 3); - // The exact number of voices depends on the music.track content. - // For the given music.track, two patterns are triggered at 0.0f. - // Each pattern registers one spectrogram and triggers one voice. - assert(synth_get_active_voice_count() == 2); + // Test 2: Advance time slightly + tracker_update(0.1f); + assert(synth_get_active_voice_count() == 3); // Test 3: Advance further, no new triggers until 4.0f tracker_update(3.0f); diff --git a/tools/spectool.cc b/tools/spectool.cc index aa28a0b..a069bfe 100644 --- a/tools/spectool.cc +++ b/tools/spectool.cc @@ -24,12 +24,7 @@ // int32_t dct_size // int32_t num_frames // float[num_frames * dct_size] data -struct SpecHeader { - char magic[4]; - int32_t version; - int32_t dct_size; - int32_t num_frames; -}; +// struct SpecHeader { ... } -> now in audio.h int analyze_audio(const char* in_path, const char* out_path) { printf("Analyzing %s -> %s\n", in_path, out_path); diff --git a/tools/tracker_compiler.cc b/tools/tracker_compiler.cc index 9f0d6b4..b4c72b2 100644 --- a/tools/tracker_compiler.cc +++ b/tools/tracker_compiler.cc @@ -6,8 +6,18 @@ #include <string> #include <vector> +// Enum to differentiate between sample types +enum SampleType { + GENERATED, + ASSET +}; + struct Sample { std::string name; + SampleType type = GENERATED; // Default to GENERATED + std::string asset_id_name; // Store AssetId name for asset samples + + // Parameters for generated samples float freq, dur, amp, attack, harmonic_decay; int harmonics; }; @@ -68,10 +78,20 @@ int main(int argc, char** argv) { name.pop_back(); s.name = name; - // Very simple parsing: freq, dur, amp, attack, harmonics, harmonic_decay - char comma; - ss >> s.freq >> comma >> s.dur >> comma >> s.amp >> comma >> s.attack >> - comma >> s.harmonics >> comma >> s.harmonic_decay; + if (name.rfind("ASSET_", 0) == 0) { + s.type = ASSET; + s.asset_id_name = name; + // Parameters for asset samples are ignored, so we don't parse them here. + // However, we must consume the rest of the line to avoid issues if a comma is present. + std::string dummy; + while (ss >> dummy) {} // Consume rest of line + } else { + s.type = GENERATED; + // Very simple parsing: freq, dur, amp, attack, harmonics, harmonic_decay + char comma; + ss >> s.freq >> comma >> s.dur >> comma >> s.amp >> comma >> s.attack >> + comma >> s.harmonics >> comma >> s.harmonic_decay; + } sample_map[s.name] = samples.size(); samples.push_back(s); @@ -123,23 +143,43 @@ int main(int argc, char** argv) { } fprintf(out_file, "// Generated by tracker_compiler. Do not edit.\n\n"); fprintf(out_file, "#include \"audio/tracker.h\"\n\n"); + // Need to include assets.h for AssetId enum + fprintf(out_file, "#include \"generated/assets.h\"\n\n"); fprintf(out_file, "const NoteParams g_tracker_samples[] = {\n"); for (const auto& s : samples) { - fprintf(out_file, - " { %.1ff, %.2ff, %.1ff, %.2ff, 0.0f, 0.0f, 0.0f, %d, %.1ff, " - "0.0f, 0.0f }, // %s\n", - s.freq, s.dur, s.amp, s.attack, s.harmonics, s.harmonic_decay, - s.name.c_str()); + if (s.type == GENERATED) { + fprintf(out_file, + " { %.1ff, %.2ff, %.1ff, %.2ff, 0.0f, 0.0f, 0.0f, %d, %.1ff, " + "0.0f, 0.0f }, // %s\n", + s.freq, s.dur, s.amp, s.attack, s.harmonics, s.harmonic_decay, + s.name.c_str()); + } else { + fprintf(out_file, " { 0 }, // %s (ASSET)\n", s.name.c_str()); + } } fprintf(out_file, "};\n"); fprintf(out_file, "const uint32_t g_tracker_samples_count = %zu;\n\n", samples.size()); + fprintf(out_file, "const AssetId g_tracker_sample_assets[] = {\n"); + for (const auto& s : samples) { + if (s.type == ASSET) { + fprintf(out_file, " AssetId::%s,\n", s.asset_id_name.c_str()); + } else { + fprintf(out_file, " AssetId::ASSET_LAST_ID,\n"); + } + } + fprintf(out_file, "};\n\n"); + for (const auto& p : patterns) { fprintf(out_file, "static const TrackerEvent PATTERN_EVENTS_%s[] = {\n", p.name.c_str()); for (const auto& e : p.events) { + // When referencing a sample, we need to get its index or synth_id. + // If it's an asset, the name starts with ASSET_. + // For now, assume sample_map is used for both generated and asset samples. + // This will need refinement if asset samples are not in sample_map directly. fprintf(out_file, " { %.1ff, %d, %.1ff, %.1ff },\n", e.beat, sample_map[e.sample_name], e.volume, e.pan); } |