diff options
| author | skal <pascal.massimino@gmail.com> | 2026-02-16 09:50:11 +0100 |
|---|---|---|
| committer | skal <pascal.massimino@gmail.com> | 2026-02-16 09:50:11 +0100 |
| commit | b30d2153b603259deabcaa3a8773ff88a51f6e62 (patch) | |
| tree | f24c874e8fa2bf7dba7151095a9a8b6e3c131ed8 | |
| parent | 766c0b0a41ddb4ac1fae68f720a9176a1b5f6070 (diff) | |
feat(sequence): create v2 timeline with placeholder effects
- Add PlaceholderEffectV2 for unported effects (logs TODO warning)
- Create timeline_v2.seq with 8 sequences using v2 syntax
- Explicit node routing (source -> temp1 -> temp2 -> sink)
- Uses: HeptagonEffectV2, GaussianBlurEffectV2, PlaceholderEffectV2
- Compiler generates valid C++ for all sequences
- All tests passing (36/36)
Timeline structure validated. Placeholders allow demo to run while
complex effects (rotating_cube, hybrid_3d, particles) await porting.
handoff(Claude): V2 timeline operational, ready for MainSequence integration
| -rw-r--r-- | cmake/DemoSourceLists.cmake | 1 | ||||
| -rw-r--r-- | src/effects/placeholder_effect_v2.cc | 61 | ||||
| -rw-r--r-- | src/effects/placeholder_effect_v2.h | 24 | ||||
| -rw-r--r-- | workspaces/main/timeline_v2.seq | 50 |
4 files changed, 136 insertions, 0 deletions
diff --git a/cmake/DemoSourceLists.cmake b/cmake/DemoSourceLists.cmake index 8cd5f43..bb7cdbc 100644 --- a/cmake/DemoSourceLists.cmake +++ b/cmake/DemoSourceLists.cmake @@ -32,6 +32,7 @@ set(COMMON_GPU_EFFECTS src/gpu/sequence_v2.cc src/gpu/effect_v2.cc src/effects/passthrough_effect_v2.cc + src/effects/placeholder_effect_v2.cc src/effects/gaussian_blur_effect_v2.cc src/effects/heptagon_effect_v2.cc src/effects/heptagon_effect.cc diff --git a/src/effects/placeholder_effect_v2.cc b/src/effects/placeholder_effect_v2.cc new file mode 100644 index 0000000..12692fa --- /dev/null +++ b/src/effects/placeholder_effect_v2.cc @@ -0,0 +1,61 @@ +// Placeholder effect v2 implementation - logs TODO warning once + +#include "effects/placeholder_effect_v2.h" +#include "gpu/post_process_helper.h" +#include "gpu/shaders.h" +#include <cstdio> + +PlaceholderEffectV2::PlaceholderEffectV2(const GpuContext& ctx, + const std::vector<std::string>& inputs, + const std::vector<std::string>& outputs, + const char* placeholder_name) + : EffectV2(ctx, inputs, outputs), pipeline_(nullptr), bind_group_(nullptr), + sampler_(nullptr), name_(placeholder_name) { + // Log once on construction + fprintf(stderr, "TODO: %s not yet ported to v2, using passthrough\n", name_); + + uniforms_buffer_.init(ctx_.device); + pipeline_ = create_post_process_pipeline(ctx_.device, WGPUTextureFormat_RGBA8Unorm, + passthrough_v2_shader_wgsl); + + WGPUSamplerDescriptor sampler_desc = {}; + sampler_desc.addressModeU = WGPUAddressMode_ClampToEdge; + sampler_desc.addressModeV = WGPUAddressMode_ClampToEdge; + sampler_desc.addressModeW = WGPUAddressMode_ClampToEdge; + sampler_desc.magFilter = WGPUFilterMode_Linear; + sampler_desc.minFilter = WGPUFilterMode_Linear; + sampler_desc.mipmapFilter = WGPUMipmapFilterMode_Nearest; + sampler_desc.maxAnisotropy = 1; + sampler_ = wgpuDeviceCreateSampler(ctx_.device, &sampler_desc); +} + +void PlaceholderEffectV2::render(WGPUCommandEncoder encoder, + const UniformsSequenceParams& params, + NodeRegistry& nodes) { + WGPUTextureView input_view = nodes.get_view(input_nodes_[0]); + WGPUTextureView output_view = nodes.get_view(output_nodes_[0]); + + uniforms_buffer_.update(ctx_.queue, params); + + pp_update_bind_group(ctx_.device, pipeline_, &bind_group_, input_view, + uniforms_buffer_.get(), {nullptr, 0}); + + WGPURenderPassColorAttachment color_attachment = { + .view = output_view, + .depthSlice = WGPU_DEPTH_SLICE_UNDEFINED, + .loadOp = WGPULoadOp_Clear, + .storeOp = WGPUStoreOp_Store, + .clearValue = {0.0, 0.0, 0.0, 1.0} + }; + + WGPURenderPassDescriptor pass_desc = {}; + pass_desc.colorAttachmentCount = 1; + pass_desc.colorAttachments = &color_attachment; + + WGPURenderPassEncoder pass = wgpuCommandEncoderBeginRenderPass(encoder, &pass_desc); + wgpuRenderPassEncoderSetPipeline(pass, pipeline_); + wgpuRenderPassEncoderSetBindGroup(pass, 0, bind_group_, 0, nullptr); + wgpuRenderPassEncoderDraw(pass, 3, 1, 0, 0); + wgpuRenderPassEncoderEnd(pass); + wgpuRenderPassEncoderRelease(pass); +} diff --git a/src/effects/placeholder_effect_v2.h b/src/effects/placeholder_effect_v2.h new file mode 100644 index 0000000..aa9ed75 --- /dev/null +++ b/src/effects/placeholder_effect_v2.h @@ -0,0 +1,24 @@ +// Placeholder effect v2 - temporary passthrough for unported effects +// TODO: Replace with actual effect implementations + +#pragma once + +#include "gpu/effect_v2.h" +#include "gpu/uniform_helper.h" + +class PlaceholderEffectV2 : public EffectV2 { + public: + PlaceholderEffectV2(const GpuContext& ctx, const std::vector<std::string>& inputs, + const std::vector<std::string>& outputs, + const char* placeholder_name = "UnknownEffect"); + + void render(WGPUCommandEncoder encoder, const UniformsSequenceParams& params, + NodeRegistry& nodes) override; + + private: + WGPURenderPipeline pipeline_; + WGPUBindGroup bind_group_; + WGPUSampler sampler_; + UniformBuffer<UniformsSequenceParams> uniforms_buffer_; + const char* name_; +}; diff --git a/workspaces/main/timeline_v2.seq b/workspaces/main/timeline_v2.seq new file mode 100644 index 0000000..b0ab993 --- /dev/null +++ b/workspaces/main/timeline_v2.seq @@ -0,0 +1,50 @@ +# Demo Timeline v2 +# BPM 90 + +SEQUENCE 0.00 0 "intro" + # FlashCube (placeholder) -> Vignette -> sink + EFFECT + PlaceholderEffect source -> temp1 0.00 4.00 + EFFECT + PlaceholderEffect temp1 -> sink 0.00 4.00 + +SEQUENCE 4.00 0 "rotating_cube" + # CircleMask (placeholder) -> RotatingCube (placeholder) -> Blur -> sink + EFFECT + PlaceholderEffect source -> temp1 0.00 4.00 + EFFECT + PlaceholderEffect temp1 -> temp2 0.00 4.00 + EFFECT + GaussianBlurEffect temp2 -> sink 1.00 4.00 + +SEQUENCE 8.00 0 "flash_cube" + # FlashCube (placeholder) -> Flash (placeholder) -> sink + EFFECT - PlaceholderEffect source -> temp1 0.00 4.02 + EFFECT + PlaceholderEffect temp1 -> sink 0.00 0.40 + +SEQUENCE 12.00 1 "particles" + # ParticleSpray (placeholder) -> Particles (placeholder) -> Blur -> sink + EFFECT + PlaceholderEffect source -> temp1 0.00 2.00 + EFFECT + PlaceholderEffect temp1 -> temp2 2.00 4.00 + EFFECT = GaussianBlurEffect temp2 -> sink 0.00 4.00 + +SEQUENCE 16.00 2 "hybrid_heptagon" + # Theme (placeholder) -> Heptagon -> ParticleSpray (placeholder) -> Particles (placeholder) -> Hybrid3D (placeholder) -> sink + EFFECT + PlaceholderEffect source -> temp1 0.00 4.00 + EFFECT + HeptagonEffect temp1 -> temp2 0.00 4.00 + EFFECT + PlaceholderEffect temp2 -> temp3 0.00 2.00 + EFFECT = PlaceholderEffect temp3 -> temp4 2.00 4.00 + EFFECT + PlaceholderEffect temp4 -> sink 0.00 4.00 + +SEQUENCE 20.00 0 "heptagon_scene" + # Heptagon -> Scene1 (placeholder) -> sink + EFFECT + HeptagonEffect source -> temp1 0.00 8.00 + EFFECT + PlaceholderEffect temp1 -> sink 0.00 8.00 + +SEQUENCE 28.00 0 "fade_test" + # Heptagon -> Fade (placeholder) -> sink + EFFECT + HeptagonEffect source -> temp1 0.00 2.00 + EFFECT + PlaceholderEffect temp1 -> sink 0.00 2.00 + +SEQUENCE 30.00 3 "complex_chain" + # Theme (placeholder) -> Heptagon -> Blur -> ChromaAberration (placeholder) -> Solarize (placeholder) -> sink + EFFECT + PlaceholderEffect source -> temp1 0.00 10.00 + EFFECT = HeptagonEffect temp1 -> temp2 0.00 10.00 + EFFECT + GaussianBlurEffect temp2 -> temp3 0.00 10.00 + EFFECT + PlaceholderEffect temp3 -> temp4 0.00 10.00 + EFFECT + PlaceholderEffect temp4 -> sink 0.00 10.00 |
