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

Better tracking of speed

Browse source
This commit is contained in:
Gwilym Inzani 2023-07-19 13:53:46 +01:00
parent b6cccf3b5a
commit ff0e8f659e
1 changed files with 23 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

48
tracker/agb-tracker/src/lib.rs
View file

@ -61,7 +61,7 @@ impl Tracker {
tick: 0, tick: 0,
current_row: 0, current_row: 0,
current_pattern: 31, current_pattern: 0,
} }
} }
@ -78,24 +78,18 @@ impl Tracker {
let pattern_slots = let pattern_slots =
&self.track.pattern_data[pattern_data_pos..pattern_data_pos + self.track.num_channels]; &self.track.pattern_data[pattern_data_pos..pattern_data_pos + self.track.num_channels];
for (channel, pattern_slot) in self.channels.iter_mut().zip(pattern_slots).skip(3) { for (channel, pattern_slot) in self.channels.iter_mut().zip(pattern_slots) {
if pattern_slot.sample != 0 && self.tick == 0 { if pattern_slot.sample != 0 && self.tick == 0 {
let sample = &self.track.samples[pattern_slot.sample as usize - 1]; let sample = &self.track.samples[pattern_slot.sample as usize - 1];
channel.play_sound(mixer, sample); channel.play_sound(mixer, sample);
} }
channel.apply_effect( if self.tick == 0 {
mixer, channel.set_speed(mixer, pattern_slot.speed.change_base());
&pattern_slot.effect1, }
self.tick,
pattern_slot.speed.change_base(), channel.apply_effect(mixer, &pattern_slot.effect1, self.tick);
); channel.apply_effect(mixer, &pattern_slot.effect2, self.tick);
channel.apply_effect(
mixer,
&pattern_slot.effect2,
self.tick,
pattern_slot.speed.change_base(),
);
} }
self.increment_step(); self.increment_step();
@ -160,25 +154,26 @@ impl TrackerChannel {
self.volume = 1.into(); self.volume = 1.into();
} }
fn apply_effect( fn set_speed(&mut self, mixer: &mut Mixer<'_>, speed: Num<u32, 8>) {
&mut self,
mixer: &mut Mixer<'_>,
effect: &PatternEffect,
tick: u32,
speed: Num<u32, 8>,
) {
if let Some(channel) = self if let Some(channel) = self
.channel_id .channel_id
.as_ref() .as_ref()
.and_then(|channel_id| mixer.channel(&channel_id)) .and_then(|channel_id| mixer.channel(&channel_id))
{ {
if speed != 0.into() { if speed != 0.into() {
channel.playback(speed);
self.base_speed = speed; self.base_speed = speed;
} }
channel.playback(self.base_speed); channel.playback(self.base_speed);
}
}
fn apply_effect(&mut self, mixer: &mut Mixer<'_>, effect: &PatternEffect, tick: u32) {
if let Some(channel) = self
.channel_id
.as_ref()
.and_then(|channel_id| mixer.channel(&channel_id))
{
match effect { match effect {
PatternEffect::None => {} PatternEffect::None => {}
PatternEffect::Stop => { PatternEffect::Stop => {
@ -215,10 +210,13 @@ impl TrackerChannel {
} }
} }
PatternEffect::Portamento(amount) => { PatternEffect::Portamento(amount) => {
if tick != 0 { let mut new_speed = self.base_speed;
self.base_speed *= amount.change_base();
channel.playback(self.base_speed); for _ in 0..tick {
new_speed *= amount.change_base();
} }
channel.playback(new_speed);
} }
} }
} }