refactor

nenikitov · Oct 9, 2024 · b1182dd · b1182dd
1 parent 6a5e62f
commit b1182dd
Show file tree

Hide file tree

Showing 8 changed files with 8 additions and 26 deletions.
diff --git a/engine/src/asset/sound/dat/mixer.rs b/engine/src/asset/sound/dat/mixer.rs
@@ -484,7 +484,6 @@ impl<'a> Player<'a> {
                         }
                     }
                     E::SampleOffset(Some(offset)) => {
-                        // TODO(nenikitov): Remove this hardcoded value
                         channel.pos_sample = offset as f64 / TSample::SAMPLE_RATE as f64;
                     }
                     E::NoteDelay(delay) => {

diff --git a/engine/src/asset/sound/dat/mod.rs b/engine/src/asset/sound/dat/mod.rs
@@ -52,6 +52,5 @@ fn uncompress(bytes: &[u8]) -> Vec<i16> {
 }
 
 fn convert_volume(volume: u8) -> f32 {
-    // TODO(nenikitov): Check if the volume should be limited to `1` max
-    volume as f32 / 64.0
+    volume as f32 / 64.
 }
diff --git a/engine/src/asset/sound/dat/pattern_effect.rs b/engine/src/asset/sound/dat/pattern_effect.rs
@@ -103,7 +103,7 @@ impl PatternEffect {
             PatternEffect::Volume(Volume::Bump { up: true, .. }) => {
                 Some(PatternEffectMemoryKey::VolumeBumpUp)
             }
-            PatternEffect::Volume(Volume::Bump { up: down, .. }) => {
+            PatternEffect::Volume(Volume::Bump { up: false, .. }) => {
                 Some(PatternEffectMemoryKey::VolumeBumpDown)
             }
             PatternEffect::SampleOffset(..) => Some(PatternEffectMemoryKey::SampleOffset),

diff --git a/engine/src/asset/sound/dat/pattern_event.rs b/engine/src/asset/sound/dat/pattern_event.rs
@@ -86,7 +86,7 @@ impl AssetParser<Wildcard> for Option<PatternEventInstrument> {
                 input,
                 should_parse.then(|| match instruments.get(instrument as usize) {
                     Some(instrument) => PatternEventInstrument::Instrument(instrument.clone()),
-                    None => PatternEventInstrument::Ghost,
+                    None => PatternEventInstrument::Previous,
                 }),
             ))
         }
@@ -131,14 +131,13 @@ impl AssetParser<Wildcard> for Option<PatternEventVolume> {
 #[derive(Default, Debug, Clone)]
 pub enum PatternEventInstrument {
     #[default]
-    Ghost,
+    Previous,
     Instrument(Rc<TInstrument>),
 }
 
 #[derive(Default, Debug)]
 pub struct PatternEvent {
     pub note: Option<PatternEventNote>,
-    // Option<Rc<TInstrument>>
     pub instrument: Option<PatternEventInstrument>,
     pub volume: Option<PatternEventVolume>,
     pub effects: [Option<PatternEffect>; 2],

diff --git a/engine/src/asset/sound/dat/t_instrument.rs b/engine/src/asset/sound/dat/t_instrument.rs
@@ -8,12 +8,11 @@ use crate::{
     utils::{iterator::CollectArray, nom::*},
 };
 
-// TODO(nenikitov): Double check these flags
 bitflags! {
     #[derive(Debug, Clone, Copy)]
     pub struct TInstrumentFlags: u8 {
         const HasVolumeEnvelope = 1 << 0;
-        const HasPanEnvelope = 1 << 1;
+        const HasPanEnvelope    = 1 << 1;
     }
 }
 
@@ -190,7 +189,6 @@ impl AssetParser<Wildcard> for TInstrument {
     }
 }
 
-// TODO(nenikitov): I'm not sure about this flag
 bitflags! {
     #[derive(Debug, Clone, Copy)]
     pub struct TSampleFlags: u8 {

diff --git a/engine/src/asset/sound/dat/t_song.rs b/engine/src/asset/sound/dat/t_song.rs
@@ -58,7 +58,9 @@ impl std::fmt::Debug for TSong {
                                         }
                                         if let Some(instrument) = &event.instrument {
                                             d.field_with("instrument", |f| match instrument {
-                                                PatternEventInstrument::Ghost => write!(f, "Ghost"),
+                                                PatternEventInstrument::Previous => {
+                                                    write!(f, "Previous")
+                                                }
                                                 PatternEventInstrument::Instrument(instrument) => {
                                                     write!(
                                                         f,

diff --git a/engine/src/asset/sound/mod.rs b/engine/src/asset/sound/mod.rs
@@ -82,20 +82,6 @@ mod tests {
 
         let output_dir = PathBuf::from(parsed_file_path!("sounds/songs/"));
 
-        // TODO(nenikitov): Remove this debug code
-        {
-            let i = 0x3;
-            let song = sounds
-                .iter()
-                .filter_map(|s| match s {
-                    Sound::Song(s) => Some(s),
-                    Sound::Effect(_) => None,
-                })
-                .collect::<Vec<_>>()[i];
-
-            //dbg!(song);
-        }
-
         sounds
             .iter()
             .filter_map(|s| {

diff --git a/engine/src/asset/sound/sample.rs b/engine/src/asset/sound/sample.rs
@@ -1,4 +1,3 @@
-// TODO(nenikitov): Remove this test code
 use std::{fmt::Debug, mem::size_of, ops::Index};
 
 pub enum AudioSamplePointFormat {