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

fixed potential out ranged values in the tracker

Browse source
This commit is contained in:
Weird Constructor 2021-05-30 12:44:12 +02:00
parent f7bf197a48
commit 2350db8e60
2 changed files with 4 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/dsp/mod.rs
View file

@ -46,7 +46,6 @@ pub trait GraphAtomData {
fn get_denorm(&self, node_id: usize, param_idx: u32) -> f32; fn get_denorm(&self, node_id: usize, param_idx: u32) -> f32;
} }
pub type GraphFun = Box<dyn FnMut(&dyn GraphAtomData, bool, f32) -> f32>; pub type GraphFun = Box<dyn FnMut(&dyn GraphAtomData, bool, f32) -> f32>;
/// This trait represents a DspNode for the [crate::matrix::Matrix] /// This trait represents a DspNode for the [crate::matrix::Matrix]

8
src/dsp/tracker/pattern.rs
View file

@ -152,11 +152,11 @@ impl PatternData {
end_idx -= 1; end_idx -= 1;
break_after_write = true; break_after_write = true;
Some(self.data[end_idx][col] Some(self.data[end_idx][col]
.map(|v| (v as f32) / (0xFFF as f32)) .map(|v| ((v & 0xFFF) as f32) / (0xFFF as f32))
.unwrap_or(0.0)) .unwrap_or(0.0))
} else { } else {
self.data[end_idx][col].map(|v| self.data[end_idx][col].map(|v|
(v as f32) / (0xFFF as f32)) ((v & 0xFFF) as f32) / (0xFFF as f32))
}; };
if let Some(end_value) = cur_value { if let Some(end_value) = cur_value {
@ -197,7 +197,7 @@ impl PatternData {
((new_value as i32 - 69) as f32 * 0.1) / 12.0; ((new_value as i32 - 69) as f32 * 0.1) / 12.0;
} }
out_col[row] = cur_value; out_col[row] = cur_value.clamp(-1.0, 1.0);
} }
}, },
PatternColType::Step => { PatternColType::Step => {
@ -205,7 +205,7 @@ impl PatternData {
for row in 0..self.rows { for row in 0..self.rows {
if let Some(new_value) = self.data[row][col] { if let Some(new_value) = self.data[row][col] {
cur_value = (new_value as f32) / (0xFFF as f32); cur_value = ((new_value & 0xFFF) as f32) / (0xFFF as f32);
} }
out_col[row] = cur_value; out_col[row] = cur_value;