made the mapper easier to use

This commit is contained in:
Weird Constructor 2021-07-02 05:12:17 +02:00
parent f99bcfc348
commit 8b296ab407
2 changed files with 21 additions and 15 deletions

View file

@ -51,7 +51,7 @@ use crate::fa_sampl_dir;
use crate::fa_ad_mult; use crate::fa_ad_mult;
use crate::fa_delay_mode; use crate::fa_delay_mode;
use crate::fa_noise_mode; use crate::fa_noise_mode;
use crate::fa_map_k; use crate::fa_map_mode;
use node_amp::Amp; use node_amp::Amp;
use node_sin::Sin; use node_sin::Sin;
@ -432,10 +432,10 @@ macro_rules! node_list {
map => Map UIType::Generic UICategory::CV map => Map UIType::Generic UICategory::CV
(0 inp n_id d_id r_id f_def stp_d -1.0, 1.0, 0.0) (0 inp n_id d_id r_id f_def stp_d -1.0, 1.0, 0.0)
(1 atv n_id d_id r_id f_def stp_d -1.0, 1.0, 0.0) (1 atv n_id d_id r_id f_def stp_d -1.0, 1.0, 0.0)
(2 imin n_id d_id r_id f_def stp_d -1.0, 1.0, 0.0) (2 offs n_id d_id r_id f_def stp_d -1.0, 1.0, 0.0)
(3 imax n_id d_id r_id f_def stp_d -1.0, 1.0, 0.0) (3 min n_id d_id r_id f_def stp_d -1.0, 1.0, 0.0)
(4 omin n_id d_id r_id f_def stp_d -1.0, 1.0, 0.0) (4 max n_id d_id r_id f_def stp_d -1.0, 1.0, 0.0)
(5 omax n_id d_id r_id f_def stp_d -1.0, 1.0, 0.0) {5 0 mode setting(0) fa_map_mode 0 1}
[0 sig], [0 sig],
tseq => TSeq UIType::Generic UICategory::CV tseq => TSeq UIType::Generic UICategory::CV
(0 clock n_id d_id r_id f_def stp_d 0.0, 1.0, 0.0) (0 clock n_id d_id r_id f_def stp_d 0.0, 1.0, 0.0)

View file

@ -6,8 +6,14 @@ use crate::nodes::{NodeAudioContext, NodeExecContext};
use crate::dsp::{NodeId, SAtom, ProcBuf, DspNode, LedPhaseVals}; use crate::dsp::{NodeId, SAtom, ProcBuf, DspNode, LedPhaseVals};
#[macro_export] #[macro_export]
macro_rules! fa_map_k { ($formatter: expr, $v: expr, $denorm_v: expr) => { { macro_rules! fa_map_mode { ($formatter: expr, $v: expr, $denorm_v: expr) => { {
write!($formatter, "{}", $v) let s =
match ($v.round() as usize) {
0 => "Bipolar",
1 => "Unipolar",
_ => "?",
};
write!($formatter, "{}", s)
} } } } } }
/// A simple amplifier /// A simple amplifier
@ -24,14 +30,14 @@ impl Map {
"Map inp\nSignal input\nRange: (-1..1)\n"; "Map inp\nSignal input\nRange: (-1..1)\n";
pub const atv : &'static str = pub const atv : &'static str =
"Map atv\n\nRange: (0..1)\n"; "Map atv\n\nRange: (0..1)\n";
pub const imin : &'static str = pub const offs : &'static str =
"Map imin\n\nRange: (0..1)\n"; "Map offs\nSignal input offset\nRange: (-1..1)\n";
pub const imax : &'static str = pub const min : &'static str =
"Map imax\n\nRange: (0..1)\n"; "Map min\n\nRange: (0..1)\n";
pub const omin : &'static str = pub const max : &'static str =
"Map omin\n\nRange: (0..1)\n"; "Map max\n\nRange: (0..1)\n";
pub const omax : &'static str = pub const mode : &'static str =
"Map omax\n\nRange: (0..1)\n"; "Map mode\n";
pub const sig : &'static str = pub const sig : &'static str =
"Map sig\nMapped signal output\nRange: (-1..1)\n"; "Map sig\nMapped signal output\nRange: (-1..1)\n";
pub const DESC : &'static str = pub const DESC : &'static str =