WIP

xasopheno · Jun 23, 2023 · de0f8c0 · de0f8c0
1 parent b2e64d8
commit de0f8c0
Show file tree

Hide file tree

Showing 22 changed files with 689 additions and 183 deletions.
diff --git a/ast/src/ast.rs b/ast/src/ast.rs
@@ -12,6 +12,7 @@ pub struct FunDef {
 #[derive(Clone, PartialEq, Debug, Hash)]
 pub enum Op {
     AsIs,
+    Out,
     Id(String),
     Tag(String),
     //
@@ -24,6 +25,9 @@ pub enum Op {
         scales: Vec<Scale>,
     },
     //
+    FMOsc {
+        defs: Vec<FmOscDef>,
+    },
     Lowpass {
         hash: String,
         cutoff_frequency: Rational64,
@@ -125,7 +129,13 @@ pub enum Op {
     },
 }
 
-#[derive(Copy, Clone, Debug, PartialEq, Serialize, Deserialize, Ord, PartialOrd, Hash, Eq)]
+#[derive(Clone, Debug, PartialEq, Serialize, Deserialize, Hash, Ord, PartialOrd, Eq)]
+pub struct FmOscDef {
+    pub fm: Rational64,
+    pub depth: Rational64,
+}
+
+#[derive(Clone, Debug, PartialEq, Serialize, Deserialize, Hash, Ord, PartialOrd, Eq)]
 /// Oscillator Type
 pub enum OscType {
     None,
@@ -134,6 +144,7 @@ pub enum OscType {
     Square { width: Option<Rational64> },
     Noise,
     Saw,
+    Fm { defs: Vec<FmOscDef> },
 }
 
 impl OscType {

diff --git a/ast/src/datagen/mod_1d.rs b/ast/src/datagen/mod_1d.rs
@@ -116,6 +116,7 @@ pub fn eeg_datum_to_point_op(
         osc_type: OscType::None,
         names: nameset,
         filters: vec![],
+        is_out: false,
     }
 }
 

diff --git a/ast/src/lib.rs b/ast/src/lib.rs
@@ -8,7 +8,7 @@ pub mod nameset;
 pub mod operations;
 pub mod term;
 pub use crate::{
-    ast::{FunDef, Op, Op::*, OscType, ASR},
+    ast::{FmOscDef, FunDef, Op, Op::*, OscType, ASR},
     datagen::Scale,
     generator::{
         coefs::{Coef, Coefs},

diff --git a/ast/src/operations/get_length_ratio.rs b/ast/src/operations/get_length_ratio.rs
@@ -13,7 +13,9 @@ impl GetLengthRatio<Term> for Op {
     ) -> Result<Rational64, Error> {
         match self {
             Op::AsIs {}
+            | Op::Out {}
             | Op::Lowpass { .. }
+            | Op::FMOsc { .. }
             | Op::Highpass { .. }
             | Op::Bandpass { .. }
             | Op::AD { .. }

diff --git a/ast/src/operations/helpers.rs b/ast/src/operations/helpers.rs
@@ -82,6 +82,7 @@ pub fn pad_length(
                 osc_type: OscType::None,
                 names: NameSet::new(),
                 filters: vec![],
+                is_out: false,
             });
         }
     }
@@ -114,6 +115,7 @@ pub fn join_sequence(mut l: NormalForm, mut r: NormalForm) -> NormalForm {
                     osc_type: OscType::None,
                     names: NameSet::new(),
                     filters: vec![],
+                    is_out: false,
                 }])
             }
         }
@@ -134,6 +136,7 @@ pub fn join_sequence(mut l: NormalForm, mut r: NormalForm) -> NormalForm {
                     osc_type: OscType::None,
                     names: NameSet::new(),
                     filters: vec![],
+                    is_out: false,
                 }])
             }
         }

diff --git a/ast/src/operations/mod.rs b/ast/src/operations/mod.rs
@@ -50,6 +50,8 @@ pub struct PointOp {
     pub names: NameSet,
     /// Filters
     pub filters: Vec<BiquadFilterDef>,
+    /// Should fade out to nothing
+    pub is_out: bool,
 }
 
 impl Default for PointOp {
@@ -69,6 +71,7 @@ impl Default for PointOp {
             osc_type: OscType::None,
             names: NameSet::new(),
             filters: vec![],
+            is_out: false,
         }
     }
 }
@@ -229,6 +232,7 @@ impl Mul<PointOp> for PointOp {
                 .chain(&other.filters)
                 .map(|f| f.to_owned())
                 .collect(),
+            is_out: other.is_out,
         }
     }
 }
@@ -252,9 +256,9 @@ impl<'a, 'b> Mul<&'b PointOp> for &'a PointOp {
                 other.reverb
             },
             osc_type: if other.osc_type.is_none() {
-                self.osc_type
+                self.osc_type.clone()
             } else {
-                other.osc_type
+                other.osc_type.clone()
             },
             attack: self.attack * other.attack,
             decay: self.decay * other.decay,
@@ -267,6 +271,7 @@ impl<'a, 'b> Mul<&'b PointOp> for &'a PointOp {
                 .chain(&other.filters)
                 .map(|f| f.to_owned())
                 .collect(),
+            is_out: other.is_out,
         }
     }
 }
@@ -288,7 +293,7 @@ impl MulAssign for PointOp {
                 other.reverb
             },
             osc_type: if other.osc_type == OscType::None {
-                self.osc_type
+                self.osc_type.clone()
             } else {
                 other.osc_type
             },
@@ -303,6 +308,7 @@ impl MulAssign for PointOp {
                 .chain(&other.filters)
                 .map(|f| f.to_owned())
                 .collect(),
+            is_out: other.is_out,
         }
     }
 }
@@ -334,7 +340,7 @@ impl PointOp {
                 other.reverb
             },
             osc_type: if other.osc_type.is_none() {
-                self.osc_type
+                self.osc_type.clone()
             } else {
                 other.osc_type
             },
@@ -349,6 +355,7 @@ impl PointOp {
                 .chain(&other.filters)
                 .map(|f| f.to_owned())
                 .collect(),
+            is_out: other.is_out,
         }
     }
 
@@ -368,6 +375,7 @@ impl PointOp {
             osc_type: OscType::None,
             names: NameSet::new(),
             filters: vec![],
+            is_out: false,
         }
     }
     pub fn init_silent() -> PointOp {
@@ -386,6 +394,7 @@ impl PointOp {
             osc_type: OscType::None,
             names: NameSet::new(),
             filters: vec![],
+            is_out: false,
         }
     }
 

diff --git a/ast/src/operations/normalize.rs b/ast/src/operations/normalize.rs
@@ -20,6 +20,15 @@ impl Normalize<Term> for Op {
     ) -> Result<(), Error> {
         match self {
             Op::AsIs => {}
+            Op::Out => {
+                input.fmap_mut(|op| {
+                    op.is_out = true;
+                    op.fm = Ratio::new(0, 1);
+                    op.fa = Ratio::new(0, 1);
+                    op.g = Ratio::new(0, 1);
+                    op.l = Ratio::new(0, 1)
+                });
+            }
             Op::Lambda {
                 term,
                 input_name,
@@ -37,6 +46,11 @@ impl Normalize<Term> for Op {
                 handle_id_error(id, defs)?.apply_to_normal_form(input, defs)?;
             }
 
+            Op::FMOsc { defs } => input.fmap_mut(|op| {
+                op.osc_type = OscType::Fm {
+                    defs: defs.to_owned(),
+                }
+            }),
             Op::Lowpass {
                 hash,
                 cutoff_frequency,