From dd9d3013d260f27f86b268c203a290f91431d8e5 Mon Sep 17 00:00:00 2001 From: skal Date: Wed, 4 Feb 2026 22:08:56 +0100 Subject: feat: Optional sequence end times and comprehensive effect documentation This milestone implements several key enhancements to the sequencing system and developer documentation: ## Optional Sequence End Times (New Feature) - Added support for explicit sequence termination via [time] syntax - Example: SEQUENCE 0 0 [30.0] forcefully ends all effects at 30 seconds - Updated seq_compiler.cc to parse optional [time] parameter with brackets - Added end_time_ field to Sequence class (default -1.0 = no explicit end) - Modified update_active_list() to check sequence end time and deactivate all effects when reached - Fully backward compatible - existing sequences work unchanged ## Comprehensive Effect Documentation (demo.seq) - Documented all effect constructor parameters (standard: device, queue, format) - Added runtime parameter documentation (time, beat, intensity, aspect_ratio) - Created detailed effect catalog with specific behaviors: * Scene effects: HeptagonEffect, ParticlesEffect, Hybrid3DEffect, FlashCubeEffect * Post-process effects: GaussianBlurEffect, SolarizeEffect, ChromaAberrationEffect, ThemeModulationEffect, FadeEffect, FlashEffect - Added examples section showing common usage patterns - Documented exact parameter behaviors (e.g., blur pulsates 0.5x-2.5x, flash triggers at intensity > 0.7, theme cycles every 8 seconds) ## Code Quality & Verification - Audited all hardcoded 1280x720 dimensions throughout codebase - Verified all shaders use uniforms.resolution and uniforms.aspect_ratio - Confirmed Effect::resize() properly updates width_/height_ members - No issues found - dimension handling is fully dynamic and robust ## Files Changed - tools/seq_compiler.cc: Parse [end_time], generate set_end_time() calls - src/gpu/effect.h: Added end_time_, set_end_time(), get_end_time() - src/gpu/effect.cc: Check sequence end time in update_active_list() - assets/demo.seq: Comprehensive syntax and effect documentation - Generated files updated (timeline.cc, assets_data.cc, music_data.cc) This work establishes a more flexible sequencing system and provides developers with clear documentation for authoring demo timelines. handoff(Claude): Optional sequence end times implemented, effect documentation complete, dimension handling verified. Ready for next phase of development. --- src/generated/timeline.cc | 114 ++++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 106 insertions(+), 8 deletions(-) (limited to 'src/generated/timeline.cc') diff --git a/src/generated/timeline.cc b/src/generated/timeline.cc index f14ebd7..381c403 100644 --- a/src/generated/timeline.cc +++ b/src/generated/timeline.cc @@ -2,19 +2,117 @@ #include "gpu/demo_effects.h" #include "gpu/effect.h" +float GetDemoDuration() { + return 32.500000f; +} + void LoadTimeline(MainSequence& main_seq, WGPUDevice device, WGPUQueue queue, WGPUTextureFormat format) { { auto seq = std::make_shared(); - seq->add_effect(std::make_shared(device, queue, format), 0.0f, 60.0f, 0); - seq->add_effect(std::make_shared(device, queue, format), 0.0f, 60.0f, 1); - seq->add_effect(std::make_shared(device, queue, format), 0.0f, 60.0f, 2); - main_seq.add_sequence(seq, 0.0f, 0); + seq->add_effect(std::make_shared(device, queue, format), .2f, 1.500000f, -1); + seq->add_effect(std::make_shared(device, queue, format), 0.0f, 1.f, 0); + seq->add_effect(std::make_shared(device, queue, format), 0.1f, 1.f, 1); + seq->add_effect(std::make_shared(device, queue, format), 0.000000f, 2.000000f, 3); + main_seq.add_sequence(seq, 0.000000f, 0); + } + { + auto seq = std::make_shared(); + seq->add_effect(std::make_shared(device, queue, format), 0.1f, 3.f, -1); + seq->add_effect(std::make_shared(device, queue, format), 0.0f, 0.2f, 4); + main_seq.add_sequence(seq, 2.000000f, 0); + } + { + auto seq = std::make_shared(); + seq->add_effect(std::make_shared(device, queue, format), 0.0f, .2f, 0); + seq->add_effect(std::make_shared(device, queue, format), 0.1f, 1.0f, 5); + main_seq.add_sequence(seq, 3.500000f, 0); + } + { + auto seq = std::make_shared(); + seq->add_effect(std::make_shared(device, queue, format), 0.000000f, 2.000000f, 0); + seq->add_effect(std::make_shared(device, queue, format), 0.000000f, 8.000000f, 1); + seq->add_effect(std::make_shared(device, queue, format), 0.000000f, 8.000000f, 3); + seq->add_effect(std::make_shared(device, queue, format), 0.000000f, 4.000000f, 4); + main_seq.add_sequence(seq, 16.000000f, 0); + } + { + auto seq = std::make_shared(); + seq->add_effect(std::make_shared(device, queue, format), 0.000000f, 2.000000f, 0); + seq->add_effect(std::make_shared(device, queue, format), 0.2f, 2.0f, 1); + seq->add_effect(std::make_shared(device, queue, format), 0.000000f, 4.000000f, 3); + seq->add_effect(std::make_shared(device, queue, format), 0.000000f, 1.000000f, 5); + main_seq.add_sequence(seq, 24.000000f, 0); + } + { + auto seq = std::make_shared(); + seq->add_effect(std::make_shared(device, queue, format), 0.000000f, 4.000000f, 0); + seq->add_effect(std::make_shared(device, queue, format), 0.2f, 2.0f, 0); + seq->add_effect(std::make_shared(device, queue, format), 0.000000f, 2.000000f, 1); + seq->add_effect(std::make_shared(device, queue, format), 0.000000f, 8.000000f, 2); + seq->add_effect(std::make_shared(device, queue, format), 0.000000f, 8.000000f, 3); + seq->add_effect(std::make_shared(device, queue, format), 0.000000f, 4.000000f, 4); + main_seq.add_sequence(seq, 28.000000f, 0); + } + { + auto seq = std::make_shared(); + seq->add_effect(std::make_shared(device, queue, format), 0.000000f, 1.500000f, 0); + seq->add_effect(std::make_shared(device, queue, format), 0.000000f, 1.500000f, 5); + main_seq.add_sequence(seq, 31.000000f, 0); + } + { + auto seq = std::make_shared(); + seq->add_effect(std::make_shared(device, queue, format), 0.000000f, 2.000000f, 1); + seq->add_effect(std::make_shared(device, queue, format), 0.000000f, 4.000000f, 1); + main_seq.add_sequence(seq, 3.000000f, 1); + } + { + auto seq = std::make_shared(); + seq->add_effect(std::make_shared(device, queue, format), 0.000000f, 4.000000f, 0); + seq->add_effect(std::make_shared(device, queue, format), 0.2f, 2.0f, 1); + seq->add_effect(std::make_shared(device, queue, format), 0.000000f, 10.000000f, 2); + seq->add_effect(std::make_shared(device, queue, format), 0.000000f, 4.000000f, 3); + seq->add_effect(std::make_shared(device, queue, format), 0.000000f, 5.000000f, 4); + seq->add_effect(std::make_shared(device, queue, format), 0.000000f, 5.000000f, 5); + main_seq.add_sequence(seq, 12.000000f, 1); + } + { + auto seq = std::make_shared(); + seq->add_effect(std::make_shared(device, queue, format), .2f, 1.500000f, -1); + seq->add_effect(std::make_shared(device, queue, format), 0.000000f, 2.000000f, 0); + seq->add_effect(std::make_shared(device, queue, format), 0.000000f, 2.000000f, 1); + main_seq.add_sequence(seq, 6.000000f, 2); + } + { + auto seq = std::make_shared(); + seq->add_effect(std::make_shared(device, queue, format), .2f, 1.500000f, -1); + seq->add_effect(std::make_shared(device, queue, format), 0.0f, 0.500000f, 0); + main_seq.add_sequence(seq, 7.500000f, 2); + } + { + auto seq = std::make_shared(); + seq->add_effect(std::make_shared(device, queue, format), 0.000000f, 2.000000f, 0); + seq->add_effect(std::make_shared(device, queue, format), 0.2f, 2.0f, 1); + seq->add_effect(std::make_shared(device, queue, format), 0.000000f, 2.000000f, 1); + seq->add_effect(std::make_shared(device, queue, format), 0.000000f, 2.000000f, 2); + seq->add_effect(std::make_shared(device, queue, format), 0.000000f, 4.000000f, 3); + seq->add_effect(std::make_shared(device, queue, format), 0.000000f, 3.000000f, 4); + main_seq.add_sequence(seq, 8.500000f, 2); + } + { + auto seq = std::make_shared(); + seq->add_effect(std::make_shared(device, queue, format), 0.000000f, 2.000000f, 0); + seq->add_effect(std::make_shared(device, queue, format), 0.0f, 4.0f, 0); + seq->add_effect(std::make_shared(device, queue, format), 0.000000f, 4.000000f, 1); + seq->add_effect(std::make_shared(device, queue, format), 0.000000f, 3.000000f, 2); + seq->add_effect(std::make_shared(device, queue, format), 0.000000f, 5.000000f, 3); + main_seq.add_sequence(seq, 4.000000f, 3); } { auto seq = std::make_shared(); - seq->add_effect(std::make_shared(device, queue, format), 0.0f, 60.0f, 0); - seq->add_effect(std::make_shared(device, queue, format), 0.0f, 60.0f, 1); - seq->add_effect(std::make_shared(device, queue, format), 0.0f, 60.0f, 2); - main_seq.add_sequence(seq, 0.0f, 10); + seq->add_effect(std::make_shared(device, queue, format), .2f, 1.500000f, -1); + seq->add_effect(std::make_shared(device, queue, format), 0.000000f, 4.000000f, 1); + seq->add_effect(std::make_shared(device, queue, format), 0.0f, 0.2f, 4); + seq->add_effect(std::make_shared(device, queue, format), 0.500000f, 0.2f, 4); + main_seq.add_sequence(seq, 8.000000f, 10); } } -- cgit v1.2.3