Refactor Effect class to centralize common uniforms management

Moved  to Effect base class. Updated all subclasses to use the base member, removing redundant declarations and initializations. Cleaned up  by removing redundant class definitions and including specific headers. Fixed a typo in DistortEffect constructor.

1 files changed, 4 insertions, 6 deletions

diff --git a/src/gpu/effects/circle_mask_effect.cc b/src/gpu/effects/circle_mask_effect.cc
index 2368631..720b6ea 100644
--- a/src/gpu/effects/circle_mask_effect.cc
+++ b/src/gpu/effects/circle_mask_effect.cc
@@ -30,9 +30,7 @@ void CircleMaskEffect::init(MainSequence* demo) {
 
   demo_->register_auxiliary_texture("circle_mask", width, height);
 
-  compute_uniforms_.init(ctx_.device);
   compute_params_.init(ctx_.device);
-  render_uniforms_.init(ctx_.device);
 
   WGPUSamplerDescriptor sampler_desc = {};
   sampler_desc.addressModeU = WGPUAddressMode_ClampToEdge;
@@ -82,7 +80,7 @@ void CircleMaskEffect::init(MainSequence* demo) {
 
   const WGPUBindGroupEntry compute_entries[] = {
       {.binding = 0,
-       .buffer = compute_uniforms_.get().buffer,
+       .buffer = uniforms_.get().buffer,
        .size = sizeof(CommonPostProcessUniforms)},
       {.binding = 1,
        .buffer = compute_params_.get().buffer,
@@ -139,7 +137,7 @@ void CircleMaskEffect::init(MainSequence* demo) {
       {.binding = 0, .textureView = mask_view},
       {.binding = 1, .sampler = mask_sampler_},
       {.binding = 2,
-       .buffer = render_uniforms_.get().buffer,
+       .buffer = uniforms_.get().buffer,
        .size = sizeof(CommonPostProcessUniforms)},
   };
   const WGPUBindGroupDescriptor render_bg_desc = {
@@ -160,7 +158,7 @@ void CircleMaskEffect::compute(WGPUCommandEncoder encoder, float time,
       .beat = beat,
       .audio_intensity = intensity,
   };
-  compute_uniforms_.update(ctx_.queue, uniforms);
+  uniforms_.update(ctx_.queue, uniforms);
 
   const CircleMaskParams params = {
       .radius = radius_,
@@ -199,7 +197,7 @@ void CircleMaskEffect::render(WGPURenderPassEncoder pass, float time,
       .beat = beat,
       .audio_intensity = intensity,
   };
-  render_uniforms_.update(ctx_.queue, uniforms);
+  uniforms_.update(ctx_.queue, uniforms);
 
   wgpuRenderPassEncoderSetPipeline(pass, render_pipeline_);
   wgpuRenderPassEncoderSetBindGroup(pass, 0, render_bind_group_, 0, nullptr);