tuxmain/HexoDSP
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

rename oversample, tweaking limit_v

Browse source
This commit is contained in:
Weird Constructor 2021-08-05 06:57:31 +02:00
parent a0b22a49b1
commit 16dc1f01f4
2 changed files with 29 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/dsp/mod.rs
View file

@ -71,7 +71,7 @@ use crate::fa_sfilter_type;
use crate::fa_bosc_wtype; use crate::fa_bosc_wtype;
use crate::fa_biqfilt_type; use crate::fa_biqfilt_type;
use crate::fa_biqfilt_ord; use crate::fa_biqfilt_ord;
use crate::fa_vosc_ovr; use crate::fa_vosc_ovrsmpl;
use crate::fa_vosc_dist; use crate::fa_vosc_dist;
use node_amp::Amp; use node_amp::Amp;
@ -601,7 +601,7 @@ macro_rules! node_list {
(4 vs n_vps d_vps r_vps f_defvlp stp_d 0.0, 1.0, 0.0) (4 vs n_vps d_vps r_vps f_defvlp stp_d 0.0, 1.0, 0.0)
(5 damt n_id n_id r_id f_def stp_d 0.0, 1.0, 0.0) (5 damt n_id n_id r_id f_def stp_d 0.0, 1.0, 0.0)
{6 0 dist setting(0) fa_vosc_dist 0 3} {6 0 dist setting(0) fa_vosc_dist 0 3}
{7 1 ovr setting(0) fa_vosc_ovr 0 1} {7 1 ovrsmpl setting(0) fa_vosc_ovrsmpl 0 1}
[0 sig], [0 sig],
out => Out UIType::Generic UICategory::IOUtil out => Out UIType::Generic UICategory::IOUtil
(0 ch1 n_id d_id r_id f_def stp_d -1.0, 1.0, 0.0) (0 ch1 n_id d_id r_id f_def stp_d -1.0, 1.0, 0.0)

37
src/dsp/node_vosc.rs
View file

@ -11,7 +11,7 @@ use crate::dsp::{
}; };
#[macro_export] #[macro_export]
macro_rules! fa_vosc_ovr { ($formatter: expr, $v: expr, $denorm_v: expr) => { { macro_rules! fa_vosc_ovrsmpl { ($formatter: expr, $v: expr, $denorm_v: expr) => { {
let s = let s =
match ($v.round() as usize) { match ($v.round() as usize) {
0 => "Off", 0 => "Off",
@ -89,8 +89,8 @@ impl VOsc {
"VOsc dist\nDistortion."; "VOsc dist\nDistortion.";
pub const damt : &'static str = pub const damt : &'static str =
"VOsc damt\nDistortion amount."; "VOsc damt\nDistortion amount.";
pub const ovr : &'static str = pub const ovrsmpl : &'static str =
"VOsc ovr\nEnable/Disable oversampling."; "VOsc ovrsmpl\nEnable/Disable oversampling.";
pub const wtype : &'static str = pub const wtype : &'static str =
"VOsc wtype\nWaveform type\nAvailable waveforms:\n\ "VOsc wtype\nWaveform type\nAvailable waveforms:\n\
Sin - Sine Waveform\n\ Sin - Sine Waveform\n\
@ -135,9 +135,22 @@ fn limit_v(d: f32, v: f32) -> f32 {
let x = (0.05 - delta) * 19.99; let x = (0.05 - delta) * 19.99;
// println!("X: {}, d={}, v={}, delta={}", x, d, v, delta); // println!("X: {}, d={}, v={}, delta={}", x, d, v, delta);
if d < 0.5 { if d < 0.5 {
v.clamp(0.0, 1.0 - (x * 0.5)) let max = 1.0 - (x * 0.5);
if v > max && v < 1.0 {
max
} else if v >= 1.0 && v < (1.0 + max) {
1.0 + max
// v.clamp(0.0, max)
} else { } else {
v
}
} else {
if v < 1.0 {
v.clamp(x * 0.5, 1.0) v.clamp(x * 0.5, 1.0)
} else {
v
}
} }
} else { } else {
v v
@ -174,13 +187,13 @@ impl DspNode for VOsc {
let vs = inp::VOsc::vs(inputs); let vs = inp::VOsc::vs(inputs);
let damt = inp::VOsc::damt(inputs); let damt = inp::VOsc::damt(inputs);
let out = out::VOsc::sig(outputs); let out = out::VOsc::sig(outputs);
let ovr = at::VOsc::ovr(atoms); let ovrsmpl = at::VOsc::ovrsmpl(atoms);
let dist = at::VOsc::dist(atoms); let dist = at::VOsc::dist(atoms);
let israte = self.israte; let israte = self.israte;
let dist = dist.i() as u8; let dist = dist.i() as u8;
let oversample = ovr.i() == 1; let oversample = ovrsmpl.i() == 1;
if oversample { if oversample {
for frame in 0..ctx.nframes() { for frame in 0..ctx.nframes() {
@ -190,11 +203,11 @@ impl DspNode for VOsc {
let vs = denorm::VOsc::vs(vs, frame).clamp(0.0, 20.0); let vs = denorm::VOsc::vs(vs, frame).clamp(0.0, 20.0);
let damt = denorm::VOsc::damt(damt, frame).clamp(0.0, 1.0); let damt = denorm::VOsc::damt(damt, frame).clamp(0.0, 1.0);
let v = limit_v(d, v); let v = limit_v(d, v + vs);
let overbuf = self.oversampling.resample_buffer(); let overbuf = self.oversampling.resample_buffer();
for b in overbuf { for b in overbuf {
let s = s(phi_vps(self.phase, v + vs, d)); let s = s(phi_vps(self.phase, v, d));
*b = apply_distortion(s, damt, dist); *b = apply_distortion(s, damt, dist);
@ -213,7 +226,9 @@ impl DspNode for VOsc {
let vs = denorm::VOsc::vs(vs, frame).clamp(0.0, 20.0); let vs = denorm::VOsc::vs(vs, frame).clamp(0.0, 20.0);
let damt = denorm::VOsc::damt(damt, frame).clamp(0.0, 1.0); let damt = denorm::VOsc::damt(damt, frame).clamp(0.0, 1.0);
let s = s(phi_vps(self.phase, v + vs, d)); let v = limit_v(d, v + vs);
let s = s(phi_vps(self.phase, v, d));
let s = apply_distortion(s, damt, dist); let s = apply_distortion(s, damt, dist);
out.write(frame, s); out.write(frame, s);
@ -242,9 +257,9 @@ impl DspNode for VOsc {
let damt = gd.get_denorm(damt as u32); let damt = gd.get_denorm(damt as u32);
let dist = gd.get(dist as u32).map(|a| a.i()).unwrap_or(0); let dist = gd.get(dist as u32).map(|a| a.i()).unwrap_or(0);
let v = limit_v(d, v); let v = limit_v(d, v + vs);
let s = s(phi_vps(x, v + vs, d)); let s = s(phi_vps(x, v, d));
let s = apply_distortion(s, damt, dist as u8); let s = apply_distortion(s, damt, dist as u8);
(s + 1.0) * 0.5 (s + 1.0) * 0.5