maybe now
This commit is contained in:
parent
7b20af0eec
commit
612660852a
2 changed files with 7 additions and 7 deletions
|
@ -973,10 +973,10 @@ macro_rules! node_list {
|
||||||
{2 0 mode setting(0) mode fa_noise_mode 0 1}
|
{2 0 mode setting(0) mode fa_noise_mode 0 1}
|
||||||
[0 sig],
|
[0 sig],
|
||||||
formant => Formant UIType::Generic UICategory::Osc
|
formant => Formant UIType::Generic UICategory::Osc
|
||||||
(0 freq n_pit d_pit r_fq f_freq stp_d 0.0, 1.0, 0.5)
|
(0 freq n_pit d_pit r_fq f_freq stp_d -1.0, 1.0, 440.0)
|
||||||
(1 form n_pit d_pit r_fq f_freq stp_d 0.0, 1.0, 0.5)
|
(1 form n_pit d_pit r_fq f_freq stp_d -1.0, 1.0, 440.0)
|
||||||
(2 atk n_pit d_pit r_fq f_freq stp_d 0.0, 1.0, 0.5)
|
(2 atk n_pit d_pit r_fq f_freq stp_d -1.0, 1.0, 44.0)
|
||||||
(3 dcy n_pit d_pit r_fq f_freq stp_d 0.0, 1.0, 0.5)
|
(3 dcy n_pit d_pit r_fq f_freq stp_d -1.0, 1.0, 44.0)
|
||||||
[0 sig],
|
[0 sig],
|
||||||
sfilter => SFilter UIType::Generic UICategory::Signal
|
sfilter => SFilter UIType::Generic UICategory::Signal
|
||||||
(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)
|
||||||
|
|
|
@ -64,9 +64,9 @@ impl DspNode for Formant {
|
||||||
for frame in 0..ctx.nframes() {
|
for frame in 0..ctx.nframes() {
|
||||||
// get the inputs
|
// get the inputs
|
||||||
let base_freq = denorm::Formant::freq(base_freq, frame);
|
let base_freq = denorm::Formant::freq(base_freq, frame);
|
||||||
let formant_freq = denorm::Formant::freq(formant_freq, frame);
|
let formant_freq = denorm::Formant::form(formant_freq, frame);
|
||||||
let attack_freq = denorm::Formant::freq(attack_freq, frame);
|
let attack_freq = denorm::Formant::atk(attack_freq, frame);
|
||||||
let decay_freq = denorm::Formant::freq(decay_freq, frame);
|
let decay_freq = denorm::Formant::dcy(decay_freq, frame);
|
||||||
|
|
||||||
// where the two decays meet
|
// where the two decays meet
|
||||||
let carrier_center = decay_freq / (attack_freq + decay_freq);
|
let carrier_center = decay_freq / (attack_freq + decay_freq);
|
||||||
|
|
Loading…
Reference in a new issue