diff options
| -rw-r--r-- | assets/music.track | 80 | ||||
| -rw-r--r-- | src/generated/music_data.cc | 17 | ||||
| -rw-r--r-- | src/main.cc | 1 |
3 files changed, 47 insertions, 51 deletions
diff --git a/assets/music.track b/assets/music.track index d1d1ee7..4159372 100644 --- a/assets/music.track +++ b/assets/music.track @@ -23,12 +23,12 @@ SAMPLE ASSET_BASS_1 PATTERN kick_basic 0.0, ASSET_KICK_1, 1.0, 0.0 2.0, ASSET_KICK_1, 1.0, 0.0 - 2.5, ASSET_KICK_2, 0.7, -0.2 +# 2.5, ASSET_KICK_2, 0.7, -0.2 PATTERN kick_varied 0.0, ASSET_KICK_2, 1.0, 0.0 2.0, ASSET_KICK_3, 0.95, 0.0 - 2.5, ASSET_KICK_1, 0.7, 0.2 +# 2.5, ASSET_KICK_1, 0.7, 0.2 PATTERN kick_dense 0.0, ASSET_KICK_1, 1.0, 0.0 @@ -51,11 +51,11 @@ PATTERN snare_varied 3.0, ASSET_SNARE_4, 1.1, 0.1 PATTERN snare_dense - 0.5, ASSET_SNARE_3, 0.9, 0.0 +# 0.5, ASSET_SNARE_3, 0.9, 0.0 1.0, ASSET_SNARE_1, 1.1, 0.1 - 1.5, ASSET_SNARE_4, 0.85, 0.0 +# 1.5, ASSET_SNARE_4, 0.85, 0.0 2.5, ASSET_SNARE_3, 0.9, 0.0 - 3.0, ASSET_SNARE_2, 1.05, 0.1 +# 3.0, ASSET_SNARE_2, 1.05, 0.1 3.5, ASSET_SNARE_4, 0.85, 0.0 # === HIHAT PATTERNS === @@ -106,58 +106,58 @@ PATTERN splash # === BASS PATTERNS === # Progressive bass introduction with reduced volumes PATTERN bass_e_soft - 0.0, NOTE_E2, 0.4, 0.0 - 2.0, NOTE_E2, 0.35, 0.0 + 0.0, NOTE_E3, 0.4, 0.0 + 2.0, NOTE_E3, 0.35, 0.0 PATTERN bass_e - 0.0, NOTE_E2, 0.5, 0.0 - 1.0, NOTE_E2, 0.4, 0.0 - 2.0, NOTE_E2, 0.5, 0.0 - 2.5, NOTE_E2, 0.35, 0.0 - 3.0, NOTE_E2, 0.4, 0.0 + 0.0, NOTE_E3, 0.5, 0.0 + 1.0, NOTE_E3, 0.4, 0.0 + 2.0, NOTE_E3, 0.5, 0.0 + 2.5, NOTE_E3, 0.35, 0.0 + 3.0, NOTE_E3, 0.4, 0.0 PATTERN bass_eg - 0.0, NOTE_E2, 0.5, 0.0 - 1.0, NOTE_E2, 0.4, 0.0 - 2.0, NOTE_G2, 0.5, 0.0 - 3.0, NOTE_G2, 0.4, 0.0 + 0.0, NOTE_E3, 0.5, 0.0 + 1.0, NOTE_E3, 0.4, 0.0 + 2.0, NOTE_G3, 0.5, 0.0 + 3.0, NOTE_G3, 0.4, 0.0 PATTERN bass_progression - 0.0, NOTE_E2, 0.5, 0.0 - 1.0, NOTE_D2, 0.45, 0.0 + 0.0, NOTE_E3, 0.5, 0.0 + 1.0, NOTE_D3, 0.45, 0.0 2.0, NOTE_C2, 0.5, 0.0 - 3.0, NOTE_G2, 0.4, 0.0 + 3.0, NOTE_G3, 0.4, 0.0 # === SYNCOPATED BASS PATTERNS === # Punchy, syncopated bass with short notes for final section PATTERN bass_synco_1 - 0.0, NOTE_E2, 0.6, 0.0 - 0.25, NOTE_E2, 0.5, 0.1 - 0.75, NOTE_E2, 0.55, -0.1 - 1.5, NOTE_E2, 0.5, 0.0 - 2.0, NOTE_E2, 0.6, 0.0 - 2.75, NOTE_G2, 0.55, 0.1 - 3.25, NOTE_E2, 0.5, 0.0 + 0.0, NOTE_E3, 0.6, 0.0 + 0.25, NOTE_E3, 0.5, 0.1 + 0.75, NOTE_E3, 0.55, -0.1 + 1.5, NOTE_E3, 0.5, 0.0 + 2.0, NOTE_E3, 0.6, 0.0 + 2.75, NOTE_G3, 0.55, 0.1 + 3.25, NOTE_E3, 0.5, 0.0 PATTERN bass_synco_2 - 0.0, NOTE_E2, 0.6, 0.0 - 0.5, NOTE_D2, 0.55, -0.1 - 1.25, NOTE_E2, 0.5, 0.1 - 1.75, NOTE_D2, 0.5, 0.0 + 0.0, NOTE_E3, 0.6, 0.0 + 0.5, NOTE_D3, 0.55, -0.1 + 1.25, NOTE_E3, 0.5, 0.1 + 1.75, NOTE_D3, 0.5, 0.0 2.0, NOTE_C2, 0.6, 0.0 - 2.5, NOTE_E2, 0.5, 0.1 - 3.0, NOTE_G2, 0.6, 0.0 - 3.5, NOTE_E2, 0.5, -0.1 + 2.5, NOTE_E3, 0.5, 0.1 + 3.0, NOTE_G3, 0.6, 0.0 + 3.5, NOTE_E3, 0.5, -0.1 PATTERN bass_synco_3 - 0.0, NOTE_E2, 0.65, 0.0 - 0.25, NOTE_E2, 0.5, 0.0 - 0.5, NOTE_E2, 0.55, 0.1 - 1.0, NOTE_G2, 0.6, 0.0 - 1.5, NOTE_E2, 0.5, -0.1 + 0.0, NOTE_E3, 0.65, 0.0 + 0.25, NOTE_E3, 0.5, 0.0 + 0.5, NOTE_E3, 0.55, 0.1 + 1.0, NOTE_G3, 0.6, 0.0 + 1.5, NOTE_E3, 0.5, -0.1 2.25, NOTE_D2, 0.55, 0.0 - 2.75, NOTE_E2, 0.5, 0.1 - 3.5, NOTE_E2, 0.55, 0.0 + 2.75, NOTE_E3, 0.5, 0.1 + 3.5, NOTE_E3, 0.55, 0.0 # === SCORE === SCORE diff --git a/src/generated/music_data.cc b/src/generated/music_data.cc index 0852e93..ee28402 100644 --- a/src/generated/music_data.cc +++ b/src/generated/music_data.cc @@ -20,9 +20,9 @@ const NoteParams g_tracker_samples[] = { { 0 }, // ASSET_RIDE_1 (ASSET) { 0 }, // ASSET_SPLASH_1 (ASSET) { 0 }, // ASSET_BASS_1 (ASSET) - { 82.4f, 0.50f, 1.0f, 0.01f, 0.0f, 0.0f, 0.0f, 3, 0.6f, 0.0f, 0.0f }, // NOTE_E2 - { 98.0f, 0.50f, 1.0f, 0.01f, 0.0f, 0.0f, 0.0f, 3, 0.6f, 0.0f, 0.0f }, // NOTE_G2 - { 73.4f, 0.50f, 1.0f, 0.01f, 0.0f, 0.0f, 0.0f, 3, 0.6f, 0.0f, 0.0f }, // NOTE_D2 + { 164.8f, 0.50f, 1.0f, 0.01f, 0.0f, 0.0f, 0.0f, 3, 0.6f, 0.0f, 0.0f }, // NOTE_E3 + { 196.0f, 0.50f, 1.0f, 0.01f, 0.0f, 0.0f, 0.0f, 3, 0.6f, 0.0f, 0.0f }, // NOTE_G3 + { 146.8f, 0.50f, 1.0f, 0.01f, 0.0f, 0.0f, 0.0f, 3, 0.6f, 0.0f, 0.0f }, // NOTE_D3 { 65.4f, 0.50f, 1.0f, 0.01f, 0.0f, 0.0f, 0.0f, 3, 0.6f, 0.0f, 0.0f }, // NOTE_C2 }; const uint32_t g_tracker_samples_count = 19; @@ -52,12 +52,10 @@ const AssetId g_tracker_sample_assets[] = { static const TrackerEvent PATTERN_EVENTS_kick_basic[] = { { 0.0f, 0, 1.0f, 0.0f }, { 2.0f, 0, 1.0f, 0.0f }, - { 2.5f, 2, 0.7f, -0.2f }, }; static const TrackerEvent PATTERN_EVENTS_kick_varied[] = { { 0.0f, 2, 1.0f, 0.0f }, { 2.0f, 0, 0.9f, 0.0f }, - { 2.5f, 0, 0.7f, 0.2f }, }; static const TrackerEvent PATTERN_EVENTS_kick_dense[] = { { 0.0f, 0, 1.0f, 0.0f }, @@ -78,11 +76,8 @@ static const TrackerEvent PATTERN_EVENTS_snare_varied[] = { { 3.0f, 0, 1.1f, 0.1f }, }; static const TrackerEvent PATTERN_EVENTS_snare_dense[] = { - { 0.5f, 6, 0.9f, 0.0f }, { 1.0f, 3, 1.1f, 0.1f }, - { 1.5f, 0, 0.9f, 0.0f }, { 2.5f, 6, 0.9f, 0.0f }, - { 3.0f, 4, 1.0f, 0.1f }, { 3.5f, 0, 0.9f, 0.0f }, }; static const TrackerEvent PATTERN_EVENTS_hihat_basic[] = { @@ -178,12 +173,12 @@ static const TrackerEvent PATTERN_EVENTS_bass_synco_3[] = { }; const TrackerPattern g_tracker_patterns[] = { - { PATTERN_EVENTS_kick_basic, 3, 4.0f }, // kick_basic - { PATTERN_EVENTS_kick_varied, 3, 4.0f }, // kick_varied + { PATTERN_EVENTS_kick_basic, 2, 4.0f }, // kick_basic + { PATTERN_EVENTS_kick_varied, 2, 4.0f }, // kick_varied { PATTERN_EVENTS_kick_dense, 8, 4.0f }, // kick_dense { PATTERN_EVENTS_snare_basic, 2, 4.0f }, // snare_basic { PATTERN_EVENTS_snare_varied, 2, 4.0f }, // snare_varied - { PATTERN_EVENTS_snare_dense, 6, 4.0f }, // snare_dense + { PATTERN_EVENTS_snare_dense, 3, 4.0f }, // snare_dense { PATTERN_EVENTS_hihat_basic, 8, 4.0f }, // hihat_basic { PATTERN_EVENTS_hihat_varied, 8, 4.0f }, // hihat_varied { PATTERN_EVENTS_crash, 1, 4.0f }, // crash diff --git a/src/main.cc b/src/main.cc index 0e6fd71..89e21f1 100644 --- a/src/main.cc +++ b/src/main.cc @@ -115,6 +115,7 @@ int main(int argc, char** argv) { } else { g_tempo_scale = 1.0f; // Reset to normal } + g_tempo_scale = 1.0f; #if !defined(STRIP_ALL) // Debug output when tempo changes significantly |
