Implement rest of pulse synthesis

NibbleRealm · May 18, 2024 · 552bbc9 · 552bbc9
1 parent 3b66f6e
commit 552bbc9
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 3 deletions.
diff --git a/examples/triangle.rs b/examples/triangle.rs
@@ -6,7 +6,7 @@ mod wav;
 
 fn main() {
     // Define waveform
-    let waveform = const { Line(440.0).osc().pulse(Line(0.0), Line(0.5)) };
+    let waveform = const { Line(440.0).osc().pulse(Line(0.0), Line(1.0)) };
     // Initialize audio, and create synthesizer
     let mut audio = Audio::<Ch16, 2>::with_silence(48_000, 48_000 * 5);
     let mut synth = Synth::new(waveform);

diff --git a/src/tree/osc/pulse.rs b/src/tree/osc/pulse.rs
@@ -14,10 +14,20 @@ where
 {
     fn synthesize(&self, elapsed: u64, interval: u64, vars: &[f32]) -> Chunk {
         let chunk = self.0.synthesize(elapsed, interval, vars);
-        let _cycle = self.1.synthesize(elapsed, interval, vars);
+        let cycle = self.1.synthesize(elapsed, interval, vars);
         let alias = self.2.synthesize(elapsed, interval, vars);
         let clip = alias.recip();
+        let offset = cycle;
+        let pulse = chunk
+            .abs()
+            .gain(2.0)
+            .offset(-1.0)
+            .mix(offset)
+            .clip()
+            .amplify(clip)
+            .clip();
+        let scale = offset.gain(0.5).neg_abs().offset(1.0).recip();
 
-        chunk.abs().gain(2.0).offset(-1.0).amplify(clip).clip()
+        offset.gain(-0.5).mix(pulse).amplify(scale)
     }
 }