Accumulators progress

exa04 · Dec 17, 2024 · c0c464b · c0c464b
1 parent 2f296ed
commit c0c464b
Show file tree

Hide file tree

Showing 6 changed files with 124 additions and 201 deletions.
diff --git a/examples/visualizers/src/editor.rs b/examples/visualizers/src/editor.rs
@@ -1,5 +1,4 @@
 use cyma::prelude::*;
-use cyma::utils::accumulators::{PeakAccumulator, RMSAccumulator};
 use cyma::utils::MonoChannel;
 use nih_plug::editor::Editor;
 use nih_plug_vizia::widgets::ResizeHandle;
@@ -42,19 +41,21 @@ pub(crate) fn create(
                     .border_width(Pixels(0.5))
                     .color(Color::rgb(30, 30, 30));
 
-                    Graph::new(
+                    Graph::peak(
                         cx,
-                        PeakAccumulator::new(10.0, 50.0),
+                        10.0,
+                        50.0,
                         (-32.0, 8.0),
                         ValueScaling::Decibels,
                         channel.clone(),
                     )
                     .color(Color::rgba(255, 255, 255, 60))
                     .background_color(Color::rgba(255, 255, 255, 30));
 
-                    Graph::new(
+                    Graph::rms(
                         cx,
-                        RMSAccumulator::new(10.0, 250.0),
+                        10.0,
+                        250.0,
                         (-32.0, 8.0),
                         ValueScaling::Decibels,
                         channel.clone(),
@@ -81,6 +82,37 @@ pub(crate) fn create(
                     .right(Pixels(8.0))
                     .left(Stretch(1.0));
                 });
+                ZStack::new(cx, |cx| {
+                    Meter::rms(
+                        cx,
+                        800.0,
+                        (-32.0, 8.0),
+                        ValueScaling::Decibels,
+                        Orientation::Vertical,
+                        channel.clone(),
+                    )
+                    .background_color(Color::rgba(64, 128, 255, 50));
+                    Meter::peak(
+                        cx,
+                        160.0,
+                        (-32.0, 8.0),
+                        ValueScaling::Decibels,
+                        Orientation::Vertical,
+                        channel.clone(),
+                    )
+                    .background_color(Color::rgba(255, 255, 255, 30));
+                    Meter::peak(
+                        cx,
+                        500.0,
+                        (-32.0, 8.0),
+                        ValueScaling::Decibels,
+                        Orientation::Vertical,
+                        channel.clone(),
+                    )
+                    .color(Color::rgba(255, 255, 255, 120));
+                })
+                .background_color(Color::rgb(8, 8, 8))
+                .width(Pixels(24.0));
             })
             .background_color(Color::rgb(16, 16, 16))
             .border_width(Pixels(1.0))

diff --git a/src/utils/accumulators.rs b/src/utils/accumulators.rs
@@ -1,8 +1,9 @@
 use crate::utils::RingBuffer;
 
-pub trait ValueAccumulator {
+pub trait Accumulator {
     #[inline]
     fn accumulate(&mut self, sample: f32) -> Option<f32>;
+    fn prev(&self) -> f32;
     #[inline]
     fn set_sample_rate(&mut self, sample_rate: f32);
     #[inline]
@@ -57,7 +58,7 @@ impl PeakAccumulator {
     }
 }
 
-impl ValueAccumulator for PeakAccumulator {
+impl Accumulator for PeakAccumulator {
     fn accumulate(&mut self, sample: f32) -> Option<f32> {
         self.max_acc = self.max_acc.max(sample.abs());
         self.t += 1.0;
@@ -82,6 +83,10 @@ impl ValueAccumulator for PeakAccumulator {
         }
     }
 
+    fn prev(&self) -> f32 {
+        self.prev
+    }
+
     fn set_sample_rate(&mut self, sample_rate: f32) {
         self.sample_rate = sample_rate;
         self.update();
@@ -131,7 +136,7 @@ impl MinimumAccumulator {
     }
 }
 
-impl ValueAccumulator for MinimumAccumulator {
+impl Accumulator for MinimumAccumulator {
     fn accumulate(&mut self, sample: f32) -> Option<f32> {
         self.min_acc = self.min_acc.min(sample.abs());
         self.t += 1.0;
@@ -156,6 +161,10 @@ impl ValueAccumulator for MinimumAccumulator {
         }
     }
 
+    fn prev(&self) -> f32 {
+        self.prev
+    }
+
     fn set_sample_rate(&mut self, sample_rate: f32) {
         self.sample_rate = sample_rate;
         self.update();
@@ -170,6 +179,7 @@ impl ValueAccumulator for MinimumAccumulator {
 pub struct RMSAccumulator {
     duration: f32,
     rms_window: f32,
+    prev: f32,
 
     size: usize,
     sample_rate: f32,
@@ -184,6 +194,7 @@ impl RMSAccumulator {
         Self {
             duration,
             rms_window,
+            prev: 0.0,
 
             size: 1,
             sample_delta: 0.0,
@@ -203,7 +214,7 @@ impl RMSAccumulator {
     }
 }
 
-impl ValueAccumulator for RMSAccumulator {
+impl Accumulator for RMSAccumulator {
     fn accumulate(&mut self, sample: f32) -> Option<f32> {
         let squared_value = sample * sample;
 
@@ -217,12 +228,20 @@ impl ValueAccumulator for RMSAccumulator {
             let rms = (self.sum_acc / self.squared_buffer.len() as f32).sqrt();
             self.t += self.sample_delta;
 
-            Some(if rms.is_nan() { 0.0 } else { rms })
+            let value = if rms.is_nan() { 0.0 } else { rms };
+
+            self.prev = value;
+
+            Some(value)
         } else {
             None
         }
     }
 
+    fn prev(&self) -> f32 {
+        self.prev
+    }
+
     fn set_sample_rate(&mut self, sample_rate: f32) {
         self.sample_rate = sample_rate;
         self.update();

diff --git a/src/utils/buffers/mod.rs b/src/utils/buffers/mod.rs
diff --git a/src/utils/buffers/peak_buffer.rs b/src/utils/buffers/peak_buffer.rs
diff --git a/src/utils/mod.rs b/src/utils/mod.rs
@@ -1,7 +1,6 @@
 //! Generic utility functions and structures.
 
 pub mod accumulators;
-pub mod buffers;
 mod channel;
 mod ring_buffer;
 mod spectrum;