🐛 volume default

cyb3rpsych0s1s · Nov 29, 2024 · 90d67b3 · 90d67b3
1 parent 238bbfc
commit 90d67b3
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 4 deletions.
diff --git a/crates/audioware/reds/Settings.reds b/crates/audioware/reds/Settings.reds
@@ -9,7 +9,7 @@ public class AudioSettingsExt {
     public let startPosition: Float = 0.;
     public let region: ref<AudioRegion>;
     public let loop: Bool = false;
-    public let volume: Float = 100.;
+    public let volume: Float = 1.;
     public let fadeIn: ref<Tween>;
     public let panning: Float = 0.5;
     public let playbackRate: Float = 1.;

diff --git a/crates/audioware/src/abi/types.rs b/crates/audioware/src/abi/types.rs
@@ -47,7 +47,7 @@ impl Default for AudioSettingsExt {
             start_position: 0.,
             region: Ref::default(),
             r#loop: false,
-            volume: 100.,
+            volume: 1.,
             fade_in: Ref::default(),
             panning: 0.5,
             playback_rate: 1.,
@@ -165,7 +165,7 @@ impl ToSettings for Ref<AudioSettingsExt> {
         if r#loop {
             settings.r#loop = Some(true);
         }
-        if volume != 100. {
+        if volume != 1.0 {
             settings.volume = Some(volume as f64);
         }
         settings.fade_in_tween = fade_in.into_interpolation();

diff --git a/crates/audioware/src/engine/mod.rs b/crates/audioware/src/engine/mod.rs
@@ -1,4 +1,4 @@
-use std::fmt::Debug;
+use std::{fmt::Debug, ops::Div};
 
 use audioware_bank::{BankData, Banks, Id, Initialization, InitializationOutcome};
 use audioware_core::With;
@@ -536,6 +536,8 @@ where
     }
 
     pub fn set_volume(&mut self, setting: CName, value: f64) {
+        // default volume from game settings is 100.
+        let value = value.div(100.).clamp(0., 1.);
         match setting.as_str() {
             "MasterVolume" => self.manager.main_track().set_volume(value, DEFAULT),
             "SfxVolume" => self.modulators.sfx_volume.update(value, DEFAULT),