alex/agb
1
0
Fork 0
mirror of https://github.com/italicsjenga/agb.git synced 2024-12-23 00:01:34 +11:00
Code Issues Packages Projects Releases Wiki Activity

Handle RampDown

Browse source
This commit is contained in:
Gwilym Inzani 2024-07-10 14:51:15 +01:00
parent 3bd8b9019d
commit 8fa595f7f7
2 changed files with 13 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
tracker/agb-tracker-interop/src/lib.rs
View file

@ -51,7 +51,7 @@ pub struct Envelope {
pub loop_end: Option<usize>,
pub vib_waveform: Waveform,
pub vib_amount: Num<u16, 12>,
pub vib_amount: Num<i16, 12>,
pub vib_speed: u8,
}

15
tracker/agb-xm-core/src/lib.rs
View file

@ -553,7 +553,7 @@ struct EnvelopeData {
vib_waveform: Waveform,
vib_speed: u8,
vib_amount: Num<u32, 12>,
vib_amount: Num<i32, 12>,
}
impl EnvelopeData {
@ -616,8 +616,17 @@ impl EnvelopeData {
let vib_depth = instrument.vibrato.depth * 16.0;
let c4_speed = note_to_speed(Note::C4, 0.0, 0, frequency_type);
let vib_amount =
note_to_speed(Note::C4, vib_depth.into(), 0, frequency_type) / c4_speed - 1;
let mut vib_amount =
(note_to_speed(Note::C4, vib_depth.into(), 0, frequency_type) / c4_speed - 1)
.try_change_base()
.unwrap();
if matches!(
instrument.vibrato.waveform,
xmrs::instr_vibrato::Waveform::RampDown
) {
vib_amount = -vib_amount;
}
EnvelopeData {
amounts,