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

fixed a bug in TriSawLFO when the reverse point was modulated

Browse source
This commit is contained in:
Weird Constructor 2022-07-19 05:22:29 +02:00
parent ed5d8f9cea
commit 5216a88cc8
1 changed files with 11 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
src/dsp/helpers.rs
View file

@ -2116,8 +2116,6 @@ pub struct TriSawLFO<F: Flt> {
phase: F, phase: F,
/// The point from where the falling edge will be used. /// The point from where the falling edge will be used.
rev: F, rev: F,
/// Whether the LFO is currently rising
rising: bool,
/// The frequency. /// The frequency.
freq: F, freq: F,
/// Precomputed rise/fall rate of the LFO. /// Precomputed rise/fall rate of the LFO.
@ -2133,7 +2131,6 @@ impl<F: Flt> TriSawLFO<F> {
israte: f(1.0 / 44100.0), israte: f(1.0 / 44100.0),
phase: f(0.0), phase: f(0.0),
rev: f(0.5), rev: f(0.5),
rising: true,
freq: f(1.0), freq: f(1.0),
fall_r: f(0.0), fall_r: f(0.0),
rise_r: f(0.0), rise_r: f(0.0),
@ -2163,7 +2160,6 @@ impl<F: Flt> TriSawLFO<F> {
pub fn reset(&mut self) { pub fn reset(&mut self) {
self.phase = self.init_phase; self.phase = self.init_phase;
self.rev = f(0.5); self.rev = f(0.5);
self.rising = true;
} }
#[inline] #[inline]
@ -2177,19 +2173,24 @@ impl<F: Flt> TriSawLFO<F> {
pub fn next_unipolar(&mut self) -> F { pub fn next_unipolar(&mut self) -> F {
if self.phase >= f(1.0) { if self.phase >= f(1.0) {
self.phase = self.phase - f(1.0); self.phase = self.phase - f(1.0);
self.rising = true;
} }
if self.phase >= self.rev { let s = if self.phase < self.rev {
self.rising = false;
}
let s = if self.rising {
self.phase * self.rise_r self.phase * self.rise_r
} else { } else {
self.phase * self.fall_r - self.fall_r self.phase * self.fall_r - self.fall_r
}; };
if s.abs() > f(1.0) {
println!(
"RECALC TRISAW: rev={}, rise={}, fall={}, phase={}",
self.rev.to_f64().unwrap_or(0.0),
self.rise_r.to_f64().unwrap_or(0.0) as f32,
self.fall_r.to_f64().unwrap_or(0.0) as f32,
self.phase.to_f64().unwrap_or(0.0) as f32
);
}
self.phase = self.phase + self.freq * self.israte; self.phase = self.phase + self.freq * self.israte;
s s