Clean up

Author: n-e-l

shaders/audio.comp

@@ -10,17 +10,83 @@ layout( push_constant ) uniform PushConstants
 {
     float time;
     int samples;
-    float amplitude;
     float frequency;
+    float a;
+    float b;
+    float c;
 } constants;
 
+float supersaw(float frequency, float t, float detune, int voices) {
+    float sum = 0.0;
+    for (int i = 0; i < voices; i++) {
+        float offset = (float(i) / float(voices) - 0.5) * detune;
+        float freq = frequency * (1.0 + offset);
+        float phase = mod(freq * t, 1.0);
+        sum += 2.0 * phase - 1.0;
+    }
+    return sum / float(voices);
+}
+
+float TAU = 3.14159 * 2;
+float additive(float frequency, float t) {
+    float sum = 0.0;
+    // Harmonic, Amplitude pairs
+    sum += 1.0 * sin(TAU * frequency * 1.0 * t);
+    sum += 0.5 * sin(TAU * frequency * 2.0 * t);
+    sum += 0.25 * sin(TAU * frequency * 3.0 * t);
+    sum += 0.125 * sin(TAU * frequency * 4.0 * t);
+    return sum;
+}
+
+float morph(float frequency, float t, float mix) {
+    float phase = frequency * t;
+    float sine = sin(TAU * phase);
+    float saw = 2.0 * mod(phase, 1.0) - 1.0;
+    return sine * (1.0 - mix) + saw * mix;
+}
+
+float sawtooth(float frequency, float t) {
+    float phase = mod(frequency * t, 1.0);
+    return 2.0 * phase - 1.0;
+}
+// Stereo supersaw with phase offset
+vec2 supersaw_stereo(float frequency, float t, float detune, int voices, float stereo_width) {
+    float left = 0.0;
+    float right = 0.0;
+
+    for (int i = 0; i < voices; i++) {
+        float offset = (float(i) / float(voices) - 0.5) * detune;
+        float freq = frequency * (1.0 + offset);
+        float phase = mod(freq * t, 1.0);
+
+        // Pan each voice differently
+        float pan = float(i) / float(voices - 1); // 0 to 1
+        float l_amp = cos(pan * 1.5708) * stereo_width + (1.0 - stereo_width);
+        float r_amp = sin(pan * 1.5708) * stereo_width + (1.0 - stereo_width);
+
+        float saw = 2.0 * phase - 1.0;
+        left += saw * l_amp;
+        right += saw * r_amp;
+    }
+
+    return vec2(left, right) / float(voices);
+}
+
 vec2 func(float t) {
-    float tau = 2.0 * 3.14169;
-    float n = sin( tau * constants.frequency * t );
-    float m = n * pow( 1.0 - t, 3.0 );
-    float a = ( sin( t * tau ) / 2.0 - 0.5 ) * m * constants.amplitude;
-    float b = ( sin( t * tau + tau * 0.5 ) / 2.0 - 0.5 ) * m * constants.amplitude;
-    return vec2(a, b);
+
+    float audio = sawtooth(constants.frequency, t);
+//    audio = supersaw(constants.frequency, t, constants.a, int(constants.b * 9));
+    audio = additive(constants.frequency, t);
+    audio = morph(constants.frequency, t, constants.a);
+    return supersaw_stereo(constants.frequency, t, constants.a, int(9 * constants.b), constants.c);
+    return vec2(audio);
+
+//    float tau = 2.0 * 3.14169;
+//    float n = sin( tau * constants.frequency * t );
+//    float m = n * pow( 1.0 - t, 3.0 );
+//    float a = ( sin( t * tau * constants.a ) / 2.0 * constants.b- 0.5 ) * m;
+//    float b = ( sin( t * tau + tau * 0.5 ) / 2.0 - 0.5 ) * m;
+//    return vec2(a, b);
 }
 
 void main()

src/main.rs

@@ -35,6 +35,7 @@ struct AudioController {
     b: f32,
     c: f32,
     audio: Vec<AudioPacket>,
+    repeat: bool
 }
 
 impl AudioController {
@@ -96,7 +97,6 @@ struct App
 {
     player: AudioPlayer,
     controller: Arc<Mutex<AudioController>>,
-    samples_per_second: u32,
     pipeline: PipelineKey,
     buffer: Buffer,
     frame_index: u32,
@@ -107,8 +107,10 @@ struct App
 struct PushConstants {
     time: f32,
     samples: u32,
-    amplitude: f32,
-    frequency: f32
+    frequency: f32,
+    a: f32,
+    b: f32,
+    c: f32,
 }
 
 impl App {
@@ -118,6 +120,7 @@ impl App {
             a: 1.0,
             b: 0.0,
             c: 1.0,
+            repeat: false,
             engine_start_time: SystemTime::now(),
             play_start_time: SystemTime::now(),
             frequency: 440.,
@@ -158,7 +161,6 @@ impl App {
         );
 
         Self {
-            samples_per_second: 1000,
             player,
             controller,
             pipeline,
@@ -188,8 +190,10 @@ impl RenderComponent for App {
         let push_constants = PushConstants {
             time: 0.0,
             samples: BUFFER_SAMPLES as u32,
-            amplitude: lock.a,
-            frequency: lock.frequency
+            frequency: lock.frequency,
+            a: lock.a,
+            b: lock.b,
+            c: lock.c,
         };
         ctx.command_buffer.push_constants(
             &pipeline,
@@ -226,23 +230,11 @@ impl GuiComponent for App {
     fn gui(&mut self, _: &mut GuiHandler, ctx: &Context) {
         let mut lock = self.controller.lock().unwrap();
         egui::CentralPanel::default().show(ctx, |ui| {
-            if ui.button("play").clicked() {
-                lock.play_start_time = SystemTime::now() + Duration::new(0, 5000000);
-            }
-            ui.add(Slider::new(&mut lock.volume, 0.0..=1.0));
-            ui.add(Slider::new(&mut lock.frequency, 0.0..=1000.0));
-            ui.add(Slider::new(&mut lock.a, 0.0..=2.0));
-            ui.add(Slider::new(&mut lock.b, -1.0..=1.0));
-            ui.add(Slider::new(&mut lock.c, 0.0..=2.0));
-
-            ui.label("Samples per second");
-            ui.add(Slider::new(&mut self.samples_per_second, 100..=100000));
 
             if let Some(audio) = lock.audio.first() {
                 Plot::new("audio_plot")
                     .view_aspect(2.0)
                     .show(ui, |plot_ui| {
-                        // let total_samples = (duration * self.samples_per_second as f32) as i32;
                         let total_samples = BUFFER_SAMPLES;
                         // Convert audio samples to plot points
                         let points = (0..total_samples)
@@ -255,6 +247,21 @@ impl GuiComponent for App {
                         plot_ui.line(Line::new("audio", plot_points));
                     });
             }
+
+            if ui.button("play").clicked() {
+                lock.play_start_time = SystemTime::now() + Duration::new(0, 5000000);
+            }
+            ui.checkbox(&mut lock.repeat, "");
+            if lock.repeat && SystemTime::now().duration_since(lock.play_start_time).unwrap().as_secs_f64() > 0.9 {
+                lock.play_start_time = SystemTime::now() + Duration::new(0, 0);
+            }
+
+            ui.style_mut().spacing.slider_width = 190.;
+            ui.add(Slider::new(&mut lock.volume, 0.0..=1.0).text("Volume"));
+            ui.add(Slider::new(&mut lock.frequency, 0.0..=1000.0).text("Frequency"));
+            ui.add(Slider::new(&mut lock.a, 0.0..=2.0).text("a"));
+            ui.add(Slider::new(&mut lock.b, -1.0..=1.0).text("b"));
+            ui.add(Slider::new(&mut lock.c, 0.0..=2.0).text("c"));
         });
 
         // The gui isn't the correct call for this, but there's no other place right now