🐛 emitter settings conversion

cyb3rpsych0s1s · Dec 28, 2024 · 33d2d24 · 33d2d24
1 parent 91de836
commit 33d2d24
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 9 deletions.
diff --git a/crates/audioware/src/abi/mod.rs b/crates/audioware/src/abi/mod.rs
@@ -302,7 +302,7 @@ impl SceneLifecycle for AudioSystemExt {
             }
         };
         let emitter_settings = match TargetFootprint::try_new(emitter_settings, *entity_id) {
-            Ok(emitter_settings) => Some(emitter_settings),
+            Ok(emitter_settings) => emitter_settings,
             Err(e) => {
                 warns!(
                     "{}",

diff --git a/crates/audioware/src/abi/types.rs b/crates/audioware/src/abi/types.rs
@@ -395,13 +395,9 @@ impl TargetFootprint {
     pub fn try_new(
         value: Ref<super::EmitterSettings>,
         entity_id: EntityId,
-    ) -> Result<Self, Vec<ValidationError>> {
+    ) -> Result<Option<Self>, Vec<ValidationError>> {
         use crate::engine::ToDistances;
-        let value = value.into_settings_ext(entity_id.to_distances());
-        if value.is_none() {
-            return Err(vec![ValidationError::InvalidEmitterSettings]);
-        }
-        Ok(Self(value.unwrap()))
+        Ok(value.into_settings_ext(entity_id.to_distances()).map(Self))
     }
 }
 

diff --git a/crates/audioware/src/error.rs b/crates/audioware/src/error.rs
@@ -64,8 +64,6 @@ pub enum ValidationError {
     InvalidTagName,
     #[snafu(display("entity_id cannot be undefined or V."))]
     InvalidTargetId,
-    #[snafu(display("invalid emitter_settings."))]
-    InvalidEmitterSettings,
 }
 
 impl From<InternalError> for Error {