Skip to content

Commit

Permalink
refactor: clippy warnings
Browse files Browse the repository at this point in the history
  • Loading branch information
@nenikitov
nenikitov committed Oct 9, 2024
1 parent b75f1bf commit 0ef415c
Show file tree
Hide file tree
Showing 8 changed files with 91 additions and 92 deletions.
15 changes: 3 additions & 12 deletions engine/src/asset/sound/dat/finetune.rs
View file
Original file line number Diff line number Diff line change
@@ -1,9 +1,6 @@
use std::{
cmp::Ordering,
ops::{Add, AddAssign, Neg, Sub},
};
use std::ops::{Add, AddAssign, Neg, Sub};

#[derive(Debug, Clone, Copy, PartialEq, Eq, Ord)]
#[derive(Debug, Clone, Copy, PartialEq, Eq, PartialOrd, Ord)]
pub struct FineTune {
cents: i32,
}
Expand Down Expand Up @@ -51,7 +48,7 @@ impl Add for FineTune {

impl AddAssign for FineTune {
fn add_assign(&mut self, rhs: Self) {
self.cents = self.cents.saturating_add(rhs.cents)
self.cents = self.cents.saturating_add(rhs.cents);
}
}

Expand All @@ -71,12 +68,6 @@ impl Neg for FineTune {
}
}

impl PartialOrd for FineTune {
fn partial_cmp(&self, other: &Self) -> Option<Ordering> {
self.cents.partial_cmp(&other.cents)
}
}

#[cfg(test)]
mod tests {
use assert_approx_eq::assert_approx_eq;
Expand Down
53 changes: 23 additions & 30 deletions engine/src/asset/sound/dat/mixer.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ impl PlayerChannel {
envelope
.volume_beginning()
.get(self.pos_volume_envelope)
.cloned()
.copied()
.unwrap_or(envelope.volume_loop())
} else {
envelope
Expand All @@ -94,7 +94,7 @@ impl PlayerChannel {
self.pos_volume_envelope
.saturating_sub(envelope.volume_beginning().len()),
)
.cloned()
.copied()
.unwrap_or(0.)
}
}
Expand All @@ -112,21 +112,19 @@ impl PlayerChannel {
0.
};

let current_sample = if let Some((previous, position)) = &mut self.previous {
if let Some((previous, position)) = &mut self.previous {
let factor = (*position / Self::SAMPLE_BLEND) as f32;
let previous_sample = previous.generate_sample(step);

*position += step;
if *position >= Self::SAMPLE_BLEND {
self.previous = None
self.previous = None;
}

previous_sample + factor * (current_sample - previous_sample)
} else {
current_sample
};

current_sample
}
}

fn trigger_note(&mut self) {
Expand All @@ -139,8 +137,8 @@ impl PlayerChannel {
self.pos_reset();
}

fn change_instrument(&mut self, instrument: Option<Rc<TInstrument>>) {
if let Some(instrument) = instrument {
fn change_instrument(&mut self, instrument: PatternEventInstrument) {
if let PatternEventInstrument::Instrument(instrument) = instrument {
self.instrument = Some(instrument);
}

Expand All @@ -164,7 +162,8 @@ impl PlayerChannel {
self.note.finetune = Some(note);
self.note.finetune_initial = Some(note);
self.note.on = true;
self.sample = instrument.samples[note.note() as usize].clone();
self.sample
.clone_from(&instrument.samples[note.note() as usize]);
}
}
} else {
Expand Down Expand Up @@ -204,15 +203,12 @@ impl PlayerChannel {
fn advance_envelopes(&mut self) {
if let Some(instrument) = &self.instrument
&& let TInstrumentVolume::Envelope(envelope) = &instrument.volume
&& (!self.note.on
|| envelope
.sustain
.map_or(true, |s| self.pos_volume_envelope < s))
{
if !self.note.on
|| (self.note.on
&& envelope
.sustain
.map_or(true, |s| self.pos_volume_envelope < s))
{
self.pos_volume_envelope += 1;
}
self.pos_volume_envelope += 1;
}
}

Expand Down Expand Up @@ -322,11 +318,12 @@ impl<'a> Player<'a> {
self.row();
}

for channel in self.channels.iter_mut() {
for channel in &mut self.channels {
channel.advance_envelopes();

for effect in channel.effects.iter().flatten() {
use PatternEffect as E;

match *effect {
// Tick effects
E::Volume(Volume::Slide(Some(volume))) => {
Expand Down Expand Up @@ -364,10 +361,8 @@ impl<'a> Player<'a> {
E::Speed(..)
| E::PatternBreak
| E::PatternJump(..)
| E::Volume(Volume::Set(..))
| E::Volume(Volume::Bump { .. })
| E::Porta(Porta::Tone(..))
| E::Porta(Porta::Bump { .. })
| E::Volume(Volume::Set(..) | Volume::Bump { .. })
| E::Porta(Porta::Tone(..) | Porta::Bump { .. })
| E::GlobalVolume(..)
| E::SampleOffset(..)
| E::PlaybackDirection(..) => {}
Expand Down Expand Up @@ -445,9 +440,9 @@ impl<'a> Player<'a> {
.enumerate()
.filter_map(|(i, e)| e.map(|e| (i, e)))
{
channel.change_effect(i, effect.clone());

use PatternEffect as E;

channel.change_effect(i, effect);
match channel.effects[i].expect("`change_effect` sets the effect") {
// Init effects
E::Speed(Speed::Bpm(bpm)) => {
Expand Down Expand Up @@ -485,7 +480,7 @@ impl<'a> Player<'a> {
if let Some(sample) = &channel.sample
&& direction == PlaybackDirection::Backwards
{
channel.pos_sample = sample.buffer.len_seconds() as f64
channel.pos_sample = sample.buffer.len_seconds();
}
}
E::SampleOffset(Some(offset)) => {
Expand All @@ -497,13 +492,11 @@ impl<'a> Player<'a> {
}
// Noops - no init
E::Volume(Volume::Slide(..))
| E::Porta(Porta::Tone(..))
| E::Porta(Porta::Slide { .. })
| E::Porta(Porta::Tone(..) | Porta::Slide { .. })
| E::RetriggerNote(..) => {}
// Unreachable because memory has to be initialized
E::Volume(Volume::Bump { volume: None, .. })
| E::Porta(Porta::Tone(None))
| E::Porta(Porta::Bump { finetune: None, .. })
| E::Porta(Porta::Tone(None) | Porta::Bump { finetune: None, .. })
| E::SampleOffset(None) => {
unreachable!("Effects should have their memory initialized")
}
Expand Down
20 changes: 12 additions & 8 deletions engine/src/asset/sound/dat/pattern_effect.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -115,15 +115,19 @@ impl PatternEffect {
self.memory_key().is_some()
}

#[rustfmt::skip]
pub fn is_empty(&self) -> bool {
use PatternEffect as E;

matches!(
self,
PatternEffect::Porta(Porta::Tone(None))
| PatternEffect::Porta(Porta::Slide { finetune: None, .. })
| PatternEffect::Porta(Porta::Bump { finetune: None, .. })
| PatternEffect::Volume(Volume::Slide(None))
| PatternEffect::Volume(Volume::Bump { volume: None, .. })
| PatternEffect::SampleOffset(None)
E::Porta(
Porta::Tone(None)
| Porta::Slide { finetune: None, .. }
| Porta::Bump { finetune: None, .. }
)
| E::Volume(Volume::Slide(None) | Volume::Bump { volume: None, .. })
| E::SampleOffset(None)
)
}
}
Expand All @@ -135,10 +139,10 @@ impl AssetParser<Wildcard> for Option<PatternEffect> {

fn parser(should_parse: Self::Context<'_>) -> impl Fn(Input) -> Result<Self::Output> {
move |input| {
use PatternEffect as E;

let (input, kind) = number::le_u8(input)?;
let (input, value) = number::le_u8(input)?;

use PatternEffect as E;
Ok((
input,
should_parse.then(|| match kind {
Expand Down
25 changes: 18 additions & 7 deletions engine/src/asset/sound/dat/pattern_event.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -63,15 +63,15 @@ impl AssetParser<Wildcard> for PatternEventFlags {
Ok((
input,
// TODO(nenikitov): Should be a `Result`
PatternEventFlags::from_bits(flags).expect(&format!(
"PatternEvent flags should be valid: received: {flags:b}"
)),
PatternEventFlags::from_bits(flags).unwrap_or_else(|| {
panic!("PatternEvent flags should be valid: received: {flags:b}")
}),
))
}
}
}

impl AssetParser<Wildcard> for Option<Option<Rc<TInstrument>>> {
impl AssetParser<Wildcard> for Option<PatternEventInstrument> {
type Output = Self;

type Context<'ctx> = (bool, &'ctx [Rc<TInstrument>]);
Expand All @@ -84,7 +84,10 @@ impl AssetParser<Wildcard> for Option<Option<Rc<TInstrument>>> {

Ok((
input,
should_parse.then(|| instruments.get(instrument as usize).map(Rc::clone)),
should_parse.then(|| match instruments.get(instrument as usize) {
Some(instrument) => PatternEventInstrument::Instrument(instrument.clone()),
None => PatternEventInstrument::Ghost,
}),
))
}
}
Expand Down Expand Up @@ -125,10 +128,18 @@ impl AssetParser<Wildcard> for Option<PatternEventVolume> {
}
}

#[derive(Default, Debug, Clone)]
pub enum PatternEventInstrument {
#[default]
Ghost,
Instrument(Rc<TInstrument>),
}

#[derive(Default, Debug)]
pub struct PatternEvent {
pub note: Option<PatternEventNote>,
pub instrument: Option<Option<Rc<TInstrument>>>,
// Option<Rc<TInstrument>>
pub instrument: Option<PatternEventInstrument>,
pub volume: Option<PatternEventVolume>,
pub effects: [Option<PatternEffect>; 2],
}
Expand Down Expand Up @@ -158,7 +169,7 @@ impl AssetParser<Wildcard> for PatternEvent {
flags.contains(PatternEventFlags::ChangeNote),
)(input)?;

let (input, instrument) = <Option<Option<Rc<TInstrument>>>>::parser((
let (input, instrument) = <Option<PatternEventInstrument>>::parser((
(flags.contains(PatternEventFlags::ChangeInstrument)),
instruments,
))(input)?;
Expand Down
15 changes: 7 additions & 8 deletions engine/src/asset/sound/dat/t_instrument.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,9 +29,9 @@ impl AssetParser<Wildcard> for TInstrumentFlags {
Ok((
input,
// TODO(nenikitov): Should be a `Result`
TInstrumentFlags::from_bits(flags).expect(&format!(
"PatternEvent flags should be valid: received: {flags:b}"
)),
TInstrumentFlags::from_bits(flags).unwrap_or_else(|| {
panic!("PatternEvent flags should be valid: received: {flags:b}")
}),
))
}
}
Expand Down Expand Up @@ -261,13 +261,12 @@ impl TSample {
let position = Self::SAMPLE_RATE as f64 * position;

let frac = position.fract() as f32;
let Some(prev) = self.normalize(position as usize) else {
return None;
};
let next = self.normalize(position as usize + 1);

let prev = self.normalize(position as usize)?;
let prev = self.buffer[prev] as f32;
let next = next.map(|next| self.buffer[next] as f32).unwrap_or(0.);

let next = self.normalize(position as usize + 1);
let next = next.map_or(0., |next| self.buffer[next] as f32);

Some((prev + frac * (next - prev)) as i16)
}
Expand Down
43 changes: 21 additions & 22 deletions engine/src/asset/sound/dat/t_song.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ impl std::fmt::Debug for TSong {
d.value_with(|f| {
let mut d = f.debug_map();
for (r, row) in pattern.iter().enumerate() {
if !row.iter().any(|c| c.has_content()) {
if !row.iter().any(PatternEvent::has_content) {
continue;
}

Expand All @@ -50,31 +50,30 @@ impl std::fmt::Debug for TSong {
d.key(&format!("C 0x{e:X}"));
d.value_with(|f| {
let mut d = f.debug_struct("Event");
event.note.map(|note| {
d.field_with("note", |f| {
f.write_fmt(format_args!("{:?}", note))
});
});
event.volume.map(|volume| {
d.field_with("volume", |f| {
f.write_fmt(format_args!("{:?}", volume))
});
});
event.instrument.as_ref().map(|instrument| {
if let Some(note) = event.note {
d.field_with("note", |f| write!(f, "{note:?}"));
}
if let Some(volume) = event.volume {
d.field_with("volume", |f| write!(f, "{volume:?}"));
}
if let Some(instrument) = &event.instrument {
d.field_with("instrument", |f| match instrument {
None => f.write_fmt(format_args!("None")),
Some(instrument) => f.write_fmt(format_args!(
"Some({})",
self.instruments
.iter()
.position(|i| Rc::ptr_eq(i, instrument))
.unwrap()
)),
PatternEventInstrument::Ghost => write!(f, "Ghost"),
PatternEventInstrument::Instrument(instrument) => {
write!(
f,
"Instrument({})",
self.instruments
.iter()
.position(|i| Rc::ptr_eq(i, instrument))
.unwrap()
)
}
});
});
}
if event.effects.iter().any(Option::is_some) {
d.field_with("effects", |f| {
f.write_fmt(format_args!("{:?}", event.effects))
write!(f, "{:?}", event.effects)
});
}
d.finish()
Expand Down
10 changes: 5 additions & 5 deletions engine/src/asset/sound/sample.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,19 +18,19 @@ impl AudioSamplePointFormat {
pub trait AudioSamplePoint: Default + Clone + Copy {
const SIZE_BYTES: usize = size_of::<Self>();

fn into_normalized_f32(&self) -> f32;
fn into_normalized_f32(self) -> f32;
fn from_normalized_f32(value: f32) -> Self;

fn wave_format() -> AudioSamplePointFormat;
fn wave_le_bytes(&self) -> [u8; Self::SIZE_BYTES];
}

impl AudioSamplePoint for i16 {
fn into_normalized_f32(&self) -> f32 {
if *self < 0 {
-(*self as f32 / Self::MIN as f32)
fn into_normalized_f32(self) -> f32 {
if self < 0 {
-(self as f32 / Self::MIN as f32)
} else {
(*self as f32 / Self::MAX as f32)
(self as f32 / Self::MAX as f32)
}
}

Expand Down
Loading

0 comments on commit 0ef415c

Please sign in to comment.