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

Get the envelopes correct

Browse source
This commit is contained in:
Gwilym Inzani 2024-05-15 23:47:37 +01:00
parent 2e0f89978a
commit 5494ae29e1
1 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -71,7 +71,7 @@ pub fn parse_module(module: &Module) -> TokenStream {
let envelope = &instrument.volume_envelope; let envelope = &instrument.volume_envelope;
let envelope_id = if envelope.enabled { let envelope_id = if envelope.enabled {
let envelope: EnvelopeData = envelope.as_ref().into(); let envelope = EnvelopeData::new(envelope, module.default_bpm as u32);
let id = existing_envelopes let id = existing_envelopes
.entry(envelope) .entry(envelope)
.or_insert_with_key(|envelope| { .or_insert_with_key(|envelope| {
@ -520,23 +520,23 @@ struct EnvelopeData {
loop_end: Option<usize>, loop_end: Option<usize>,
} }
impl From<&xmrs::envelope::Envelope> for EnvelopeData { impl EnvelopeData {
fn from(e: &xmrs::envelope::Envelope) -> Self { fn new(e: &xmrs::envelope::Envelope, bpm: u32) -> Self {
let mut amounts = vec![]; let mut amounts = vec![];
// it should be sampled at 50fps, but we're sampling at 60fps, so need to do a bit of cheating here. // FT2 manual says number of ticks / second = BPM * 0.4 = BPM * 4 / 10. GBA runs at 60Hz
for frame in 0..(e.point.last().unwrap().frame * 60 / 50) { for frame in 0..(e.point.last().unwrap().frame as u32 * 60 * 10 / bpm / 4) {
let xm_frame = frame * 50 / 60; let xm_frame = frame * bpm * 4 / 60 / 10;
let index = e let index = e
.point .point
.iter() .iter()
.rposition(|point| point.frame < xm_frame) .rposition(|point| point.frame < xm_frame as u16)
.unwrap_or(0); .unwrap_or(0);
let first_point = &e.point[index]; let first_point = &e.point[index];
let second_point = &e.point[index + 1]; let second_point = &e.point[index + 1];
let amount = EnvelopePoint::lerp(first_point, second_point, xm_frame) / 64.0; let amount = EnvelopePoint::lerp(first_point, second_point, xm_frame as u16) / 64.0;
let amount = Num::from_f32(amount); let amount = Num::from_f32(amount);
amounts.push(amount); amounts.push(amount);