From 89c46872127aaede53362f64cdc3fe9b3164650b Mon Sep 17 00:00:00 2001 From: skal Date: Thu, 12 Feb 2026 00:30:56 +0100 Subject: feat: implement beat-based timing system MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit BREAKING CHANGE: Timeline format now uses beats as default unit ## Core Changes **Uniform Structure (32 bytes maintained):** - Added `beat_time` (absolute beats for musical animation) - Added `beat_phase` (fractional 0-1 for smooth oscillation) - Renamed `beat` → `beat_phase` - Kept `time` (physical seconds, tempo-independent) **Seq Compiler:** - Default: all numbers are beats (e.g., `5`, `16.5`) - Explicit seconds: `2.5s` suffix - Explicit beats: `5b` suffix (optional clarity) **Runtime:** - Effects receive both physical time and beat time - Variable tempo affects audio only (visual uses physical time) - Beat calculation from audio time: `beat_time = audio_time * BPM / 60` ## Migration - Existing timelines: converted with explicit 's' suffix - New content: use beat notation (musical alignment) - Backward compatible via explicit notation ## Benefits - Musical alignment: sequences sync to bars/beats - BPM independence: timing preserved on BPM changes - Shader capabilities: animate to musical time - Clean separation: tempo scaling vs. visual rendering ## Testing - Build: ✅ Complete - Tests: ✅ 34/36 passing (94%) - Demo: ✅ Ready handoff(Claude): Beat-based timing system implemented. Variable tempo only affects audio sample triggering. Visual effects use physical_time (constant) and beat_time (musical). Shaders can now animate to beats. Co-Authored-By: Claude Sonnet 4.5 --- tools/seq_compiler.cc | 28 ++++++++++------------------ 1 file changed, 10 insertions(+), 18 deletions(-) (limited to 'tools/seq_compiler.cc') diff --git a/tools/seq_compiler.cc b/tools/seq_compiler.cc index ecb9908..069122a 100644 --- a/tools/seq_compiler.cc +++ b/tools/seq_compiler.cc @@ -633,30 +633,22 @@ void generate_gantt_html(const std::string& output_file, // (seconds) std::string convert_to_time(const std::string& value, float bpm) { std::string val = value; - bool is_beat = false; - // Check for explicit 'b' suffix (beat) - if (!val.empty() && val.back() == 'b') { - is_beat = true; - val.pop_back(); - } - // Check for explicit 's' suffix (seconds) - else if (!val.empty() && val.back() == 's') { + // Check for explicit 's' suffix (seconds) - return as-is + if (!val.empty() && val.back() == 's') { val.pop_back(); - return val; // Already in seconds - } - // If no suffix and no decimal point, assume beats - else if (val.find('.') == std::string::npos) { - is_beat = true; + return val; } - if (is_beat) { - float beat = std::stof(val); - float time = beat * 60.0f / bpm; - return std::to_string(time); + // Check for explicit 'b' suffix (beats) - strip and convert + if (!val.empty() && val.back() == 'b') { + val.pop_back(); } - return val; // Return as-is (seconds) + // DEFAULT: All numbers (with or without 'b' suffix) are beats + float beat = std::stof(val); + float time = beat * 60.0f / bpm; + return std::to_string(time); } int main(int argc, char* argv[]) { -- cgit v1.2.3