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

fixed inner workings of AD envelope

Browse source
This commit is contained in:
Weird Constructor 2021-06-15 19:51:33 +02:00
parent 52ce2f26af
commit 152f193388
1 changed files with 25 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
src/dsp/node_ad.rs
View file

@ -139,20 +139,17 @@ impl DspNode for Ad {
2 => (dcy_shape, dcy, 0.0), 2 => (dcy_shape, dcy, 0.0),
_ => (atk_shape, atk, 0.0), _ => (atk_shape, atk, 0.0),
}; };
let mut mult : f64 = let mult : f64 =
match mult.i() { match mult.i() {
1 => 10.0, 1 => 10.0,
2 => 100.0, 2 => 100.0,
_ => 1.0, _ => 1.0,
}; };
for frame in 0..ctx.nframes() { // let mut cnt : usize = 0;
// each frame:
let is_triggered =
self.trig.check_trigger(denorm::Ad::trig(trig, frame));
if self.stage == 0 && is_triggered { for frame in 0..ctx.nframes() {
// transition to stage 1 (attack): if self.trig.check_trigger(denorm::Ad::trig(trig, frame)) {
self.stage = 1; self.stage = 1;
self.last_time = -1.0; self.last_time = -1.0;
target = 1.0; target = 1.0;
@ -162,14 +159,25 @@ impl DspNode for Ad {
let cur_time = denorm::Ad::atk(inc_time_src, frame); let cur_time = denorm::Ad::atk(inc_time_src, frame);
if self.last_time != cur_time { if self.last_time != cur_time {
let delta =
match self.stage {
1 => 1.0,
2 => -1.0,
_ => 0.0,
};
self.inc = self.inc =
if cur_time <= 0.0001 { if cur_time <= 0.0001 {
target - self.value delta
} else { } else {
(target - self.value) delta
/ ((cur_time as f64) * mult * self.samples_ms) / ((cur_time as f64) * mult * self.samples_ms)
}; };
self.last_time = cur_time; self.last_time = cur_time;
// if cnt % 32 == 0 {
// println!("** v={:8.3}, inc={:8.3}, tar={:8.3}, time={:8.3}",
// self.value, self.inc, target, self.last_time);
// }
} }
self.value += self.inc; self.value += self.inc;
@ -177,9 +185,15 @@ impl DspNode for Ad {
denorm::Ad::ashp(shape_src, frame) denorm::Ad::ashp(shape_src, frame)
.clamp(0.0, 1.0); .clamp(0.0, 1.0);
// if cnt % 32 == 0 {
// println!("v={:8.3}, inc={:8.3}, tar={:8.3}, time={:8.3}",
// self.value, self.inc, target, self.last_time);
// }
// cnt += 1;
match self.stage { match self.stage {
1 => { 1 => {
if self.value >= target { if self.value >= (target - 0.0001) {
self.stage = 2; self.stage = 2;
self.last_time = -1.0; self.last_time = -1.0;
self.value = target; self.value = target;
@ -189,7 +203,7 @@ impl DspNode for Ad {
} }
}, },
2 => { 2 => {
if self.value <= target { if self.value <= (target + 0.0001) {
self.stage = 0; self.stage = 0;
self.last_time = -1.0; self.last_time = -1.0;
self.value = target; self.value = target;