From b8d4a815453acac752c6fb3c56d047e39a76fd05 Mon Sep 17 00:00:00 2001 From: skal Date: Sat, 14 Feb 2026 19:05:34 +0100 Subject: feat(gpu): add SDF camera infrastructure and effect base class Add unified camera system for SDF raymarching effects: - CameraParams struct (80 bytes): inv_view matrix + FOV/near/far/aspect - SDFEffect base class: manages camera uniform, provides update_camera() helpers - camera_common.wgsl: getCameraRay(), position/forward/up/right extractors - SDFTestEffect: working example with orbiting camera + animated sphere Refactor effect headers: - Extract class definitions from demo_effects.h to individual .h files - Update includes in .cc files to use specific headers - Cleaner compilation dependencies, faster incremental builds Documentation: - Add SDF_EFFECT_GUIDE.md with complete workflow - Update ARCHITECTURE.md, UNIFORM_BUFFER_GUIDELINES.md - Update EFFECT_WORKFLOW.md, CONTRIBUTING.md Tests: 34/34 passing, SDFTestEffect validated Co-Authored-By: Claude Sonnet 4.5 --- src/gpu/demo_effects.h | 203 ++++++++----------------------------------------- 1 file changed, 32 insertions(+), 171 deletions(-) (limited to 'src/gpu/demo_effects.h') diff --git a/src/gpu/demo_effects.h b/src/gpu/demo_effects.h index 72c8e6e..85498ad 100644 --- a/src/gpu/demo_effects.h +++ b/src/gpu/demo_effects.h @@ -1,192 +1,53 @@ // This file is part of the 64k demo project. -// It declares the concrete effects used in the demo. +// It includes all concrete effects used in the demo. #pragma once + +// Core 3D #include "3d/camera.h" #include "3d/renderer.h" #include "3d/scene.h" + +// Base effect classes #include "effect.h" -#include "effects/circle_mask_effect.h" -#include "effects/fade_effect.h" // FadeEffect with full definition -#include "effects/flash_cube_effect.h" -#include "effects/flash_effect.h" // FlashEffect with params support -#include "effects/hybrid_3d_effect.h" -#include "effects/rotating_cube_effect.h" -#include "effects/scene1_effect.h" -#include "effects/theme_modulation_effect.h" // ThemeModulationEffect with full definition -#include "gpu/gpu.h" #include "gpu/post_process_helper.h" #include "gpu/shaders.h" #include "gpu/texture_manager.h" #include "gpu/uniform_helper.h" -#include - -static const int NUM_PARTICLES = 10000; - -struct Particle { - float pos[4]; - float vel[4]; - float rot[4]; - float color[4]; -}; - -class HeptagonEffect : public Effect { - public: - HeptagonEffect(const GpuContext& ctx); - void render(WGPURenderPassEncoder pass, - const CommonPostProcessUniforms& uniforms) override; - - private: - RenderPass pass_; -}; - -class ParticlesEffect : public Effect { - public: - ParticlesEffect(const GpuContext& ctx); - void compute(WGPUCommandEncoder encoder, - const CommonPostProcessUniforms& uniforms) override; - void render(WGPURenderPassEncoder pass, - const CommonPostProcessUniforms& uniforms) override; - - private: - ComputePass compute_pass_; - RenderPass render_pass_; - GpuBuffer particles_buffer_; -}; - -class PassthroughEffect : public PostProcessEffect { - public: - PassthroughEffect(const GpuContext& ctx); - void update_bind_group(WGPUTextureView input_view) override; - - private: -}; - -class MovingEllipseEffect : public Effect { - public: - MovingEllipseEffect(const GpuContext& ctx); - void render(WGPURenderPassEncoder pass, - const CommonPostProcessUniforms& uniforms) override; - - private: - RenderPass pass_; -}; - -class ParticleSprayEffect : public Effect { - public: - ParticleSprayEffect(const GpuContext& ctx); - void compute(WGPUCommandEncoder encoder, - const CommonPostProcessUniforms& uniforms) override; - void render(WGPURenderPassEncoder pass, - const CommonPostProcessUniforms& uniforms) override; - private: - ComputePass compute_pass_; - RenderPass render_pass_; - GpuBuffer particles_buffer_; -}; - -// Parameters for GaussianBlurEffect (set at construction time) -struct GaussianBlurParams { - float strength = 1.0f; // Default - float strength_audio = 0.5f; // how much to pulse with audio - float stretch = 1.f; // y/x axis ratio - float _pad = 0.; -}; -static_assert(sizeof(GaussianBlurParams) == 16, - "GaussianBlurParams must be 16 bytes for WGSL alignment"); - -class GaussianBlurEffect : public PostProcessEffect { - public: - // Backward compatibility constructor (uses default params) - GaussianBlurEffect(const GpuContext& ctx); - // New parameterized constructor - GaussianBlurEffect(const GpuContext& ctx, const GaussianBlurParams& params); - void render(WGPURenderPassEncoder pass, - const CommonPostProcessUniforms& uniforms) override; - void update_bind_group(WGPUTextureView input_view) override; - - private: - GaussianBlurParams params_; - UniformBuffer params_buffer_; -}; - -class SolarizeEffect : public PostProcessEffect { - public: - SolarizeEffect(const GpuContext& ctx); - void render(WGPURenderPassEncoder pass, - const CommonPostProcessUniforms& uniforms) override; - void update_bind_group(WGPUTextureView input_view) override; - - private: -}; - -// Parameters for VignetteEffect -struct VignetteParams { - float radius = 0.5f; // Radius of the clear center - float softness = 0.5f; // Softness of the vignette edge -}; - -class VignetteEffect : public PostProcessEffect { - public: - VignetteEffect(const GpuContext& ctx); - VignetteEffect(const GpuContext& ctx, const VignetteParams& params); - void render(WGPURenderPassEncoder pass, - const CommonPostProcessUniforms& uniforms) override; - void update_bind_group(WGPUTextureView input_view) override; - - private: - VignetteParams params_; - UniformBuffer params_buffer_; -}; +// Individual Effect Headers +#include "effects/chroma_aberration_effect.h" +#include "effects/circle_mask_effect.h" +#include "effects/cnn_effect.h" +#include "effects/cnn_v2_effect.h" +#include "effects/distort_effect.h" +#include "effects/fade_effect.h" +#include "effects/flash_cube_effect.h" +#include "effects/flash_effect.h" +#include "effects/gaussian_blur_effect.h" +#include "effects/heptagon_effect.h" +#include "effects/hybrid_3d_effect.h" +#include "effects/moving_ellipse_effect.h" +#include "effects/particle_spray_effect.h" +#include "effects/particles_effect.h" +#include "effects/passthrough_effect.h" +#include "effects/rotating_cube_effect.h" +#include "effects/scene1_effect.h" +#include "effects/sdf_test_effect.h" +#include "effects/solarize_effect.h" +#include "effects/theme_modulation_effect.h" +#include "effects/vignette_effect.h" -// Parameters for ChromaAberrationEffect (set at construction time) -struct ChromaAberrationParams { - float offset_scale = 0.02f; // Default: 2% screen offset - float angle = 0.0f; // Default: horizontal (0 radians) -}; +#include -class ChromaAberrationEffect : public PostProcessEffect { - public: - // Backward compatibility constructor (uses default params) - ChromaAberrationEffect(const GpuContext& ctx); - // New parameterized constructor - ChromaAberrationEffect(const GpuContext& ctx, - const ChromaAberrationParams& params); - void render(WGPURenderPassEncoder pass, - const CommonPostProcessUniforms& uniforms) override; - void update_bind_group(WGPUTextureView input_view) override; - private: - ChromaAberrationParams params_; - UniformBuffer params_buffer_; -}; -// Parameters for DistortEffect -struct DistortParams { - float strength = 0.01f; // Default distortion strength - float speed = 1.0f; // Default distortion speed -}; -static_assert(sizeof(DistortParams) == 8, - "DistortParams must be 8 bytes for WGSL alignment"); +// Common particle definition is now in effects/particle_defs.h -class DistortEffect : public PostProcessEffect { - public: - DistortEffect(const GpuContext& ctx); - DistortEffect(const GpuContext& ctx, const DistortParams& params); - void render(WGPURenderPassEncoder pass, - const CommonPostProcessUniforms& uniforms) override; - void update_bind_group(WGPUTextureView input_view) override; - private: - DistortParams params_; - UniformBuffer params_buffer_; -}; -#include "effects/cnn_effect.h" -#include "effects/cnn_v2_effect.h" +// Auto-generated functions from sequence compiler -// Auto-generated functions void LoadTimeline(MainSequence& main_seq, const GpuContext& ctx); -float GetDemoDuration(); // Returns demo end time in seconds, or -1 if not - // specified \ No newline at end of file + +float GetDemoDuration(); -- cgit v1.2.3