2 more sound effects

Author: Muhtasim-Rasheed

docs/looks.md

@@ -42,11 +42,13 @@ All the valid effects that can be used are:
 - `"grayscale-averaged"`: Changes the grayscale effect of the sprite, using the average method.
 - `"grayscale-weighted"`: Changes the grayscale effect of the sprite, using the weighted method.
 - `"invert"`: Inverts the colors of the sprite.
-- `"multiply"`: Multiplies the colors of the sprite by the specified value.
+- `"multiply"`: Multiplies the RGB excluding transparency of the sprite by the specified value.
 - `"multiply-r"`: Multiplies the red channel of the sprite by the specified value.
 - `"multiply-g"`: Multiplies the green channel of the sprite by the specified value.
 - `"multiply-b"`: Multiplies the blue channel of the sprite by the specified value.
-- `"add"`: Adds the specified value to the colors of the sprite.
+- `"multiply-a"`: Multiplies the transparency channel of the sprite by the specified value.
+- `"add"`: Adds the specified value to the RGB excluding transparency of the sprite.
 - `"add-r"`: Adds the specified value to the red channel of the sprite.
 - `"add-g"`: Adds the specified value to the green channel of the sprite.
 - `"add-b"`: Adds the specified value to the blue channel of the sprite.
+- `"add-a"`: Adds the specified value to the transparency channel of the sprite.

docs/sound.md

@@ -11,4 +11,6 @@ The sound functions are used to play and control sounds in the project. They can
 
 All the valid sound effects that can be used are:
 
-- `"volume"`: Changes the volume of the sound.
+- `"volume"`: Changes the volume of the sound (0 - 100).
+- `"pitch"`: Changes the pitch of the sound (0 - 100).
+- `"pan"`: Changes the stereo panning of the sound (0 - 100, where 0 is left, 50 is center, and 100 is right).

src/utils/helpers.rs

@@ -421,6 +421,13 @@ pub fn draw_convex_polygon_lines(
     }
 }
 
+pub fn percentage_to_decibels(percentage: f32) -> f32 {
+    if percentage <= 0.0 {
+        return f32::NEG_INFINITY;
+    }
+    20.0 * percentage.log10()
+}
+
 // Helper functions that help other helper functions!!
 fn cubic_bezier(t: f32, p0: f32, p1: f32, p2: f32, p3: f32) -> f32 {
     let u = 1.0 - t;

src/utils/sprite/builtins/drawing.rs

@@ -19,7 +19,7 @@ pub fn set_color(state: &mut State, args: &[Value]) -> Result {
 
 pub fn change_r(state: &mut State, args: &[Value]) -> Result {
     if let [Value::Number(amount)] = args {
-state.sprite.draw_color.x = (state.sprite.draw_color.x + *amount / 255.0).clamp(0.0, 1.0);
+        state.sprite.draw_color.x = (state.sprite.draw_color.x + *amount / 255.0).clamp(0.0, 1.0);
         Ok(Value::Null)
     } else {
         Err("change_r() requires a single number argument".to_string())
@@ -360,13 +360,16 @@ pub fn textured_tri(state: &State, args: &[Value]) -> Result {
         Value::List(ys),
         Value::List(us),
         Value::List(vs),
-    ] = args {
+    ] = args
+    {
         if let [
             Value::Number(width),
             Value::Number(height),
             Value::List(pixels),
-        ] = parse_image_result.as_slice() {
-            if xs.len() != ys.len() || xs.len() != us.len() || xs.len() != vs.len() || xs.len() != 3 {
+        ] = parse_image_result.as_slice()
+        {
+            if xs.len() != ys.len() || xs.len() != us.len() || xs.len() != vs.len() || xs.len() != 3
+            {
                 return Err(
                     "textured_tri() requires three lists of equal length: x, y, u, v coordinates"
                         .to_string(),
@@ -377,7 +380,12 @@ pub fn textured_tri(state: &State, args: &[Value]) -> Result {
                 .chunks(4)
                 .map(|c| {
                     if c.len() == 4 {
-                        U8Vec4::new(c[0].to_number() as u8, c[1].to_number() as u8, c[2].to_number() as u8, c[3].to_number() as u8)
+                        U8Vec4::new(
+                            c[0].to_number() as u8,
+                            c[1].to_number() as u8,
+                            c[2].to_number() as u8,
+                            c[3].to_number() as u8,
+                        )
                     } else {
                         U8Vec4::new(0, 0, 0, 0)
                     }
@@ -415,10 +423,14 @@ pub fn textured_tri(state: &State, args: &[Value]) -> Result {
             mesh.draw();
             Ok(Value::Null)
         } else {
-            return Err("textured_tri() requires an image with width, height, and pixel data".to_string());
+            return Err(
+                "textured_tri() requires an image with width, height, and pixel data".to_string(),
+            );
         }
     } else {
-        return Err("textured_tri() requires an image and lists of x, y, u, v coordinates".to_string());
+        return Err(
+            "textured_tri() requires an image and lists of x, y, u, v coordinates".to_string(),
+        );
     }
 }
 

src/utils/sprite/builtins/sounds.rs

@@ -1,23 +1,27 @@
-use kira::Tween;
+use indexmap::IndexMap;
+use kira::{Tween, sound::static_sound::StaticSoundHandle};
 
 use crate::utils::{sprite::function::Result, *};
 
+fn update_sound_handle(sound_effects: &IndexMap<String, f32>, handle: &mut StaticSoundHandle) {
+    for (effect, value) in sound_effects {
+        match effect.as_str() {
+            "volume" => handle.set_volume(percentage_to_decibels(*value / 100.0), Tween::default()),
+            "pitch" => handle.set_playback_rate(*value as f64 / 100.0, Tween::default()),
+            "pan" => handle.set_panning((*value / 100.0) * 2.0 - 1.0, Tween::default()),
+            _ => continue,
+        }
+    }
+}
+
 pub fn play_sound(state: &mut State, args: &[Value]) -> Result {
     fn play_sound_inner(state: &mut State, name: &str) -> Result {
         if let Some(sound) = state.sprite.sounds.get(name) {
             let mut handle = state
                 .audio_manager
                 .play(sound.clone())
                 .map_err(|e| e.to_string())?;
-            handle.set_volume(
-                state
-                    .sprite
-                    .sound_effects
-                    .get("volume")
-                    .cloned()
-                    .unwrap_or(1.0),
-                Tween::default(),
-            );
+            update_sound_handle(&state.sprite.sound_effects, &mut handle);
             state.sprite.sound_handles.insert(name.to_string(), handle);
             Ok(Value::Null)
         } else {
@@ -64,6 +68,9 @@ pub fn change_sound_effect(state: &mut State, args: &[Value]) -> Result {
             .entry(effect.clone())
             .and_modify(|v| *v += *value)
             .or_insert(*value);
+        for sound_handle in state.sprite.sound_handles.values_mut() {
+            update_sound_handle(&state.sprite.sound_effects, sound_handle);
+        }
         Ok(Value::Null)
     } else {
         Err("change_sound_effect() requires a string and a numeric argument".to_string())
@@ -73,6 +80,9 @@ pub fn change_sound_effect(state: &mut State, args: &[Value]) -> Result {
 pub fn set_sound_effect(state: &mut State, args: &[Value]) -> Result {
     if let [Value::String(effect), Value::Number(value)] = args {
         state.sprite.sound_effects.insert(effect.clone(), *value);
+        for sound_handle in state.sprite.sound_handles.values_mut() {
+            update_sound_handle(&state.sprite.sound_effects, sound_handle);
+        }
         Ok(Value::Null)
     } else {
         Err("set_sound_effect() requires a string and a numeric argument".to_string())

src/utils/sprite/sprite.rs

@@ -137,7 +137,7 @@ pub struct Sprite {
     pub layer: isize,
     pub variables: HashMap<String, Value>,
     pub effects: IndexMap<String, f32>,
-    pub sound_effects: HashMap<String, f32>,
+    pub sound_effects: IndexMap<String, f32>,
     pub draw_color: Vec4,
     pub functions: HashMap<String, Callable>,
     pub clone_id: Option<usize>,
@@ -345,7 +345,7 @@ impl Sprite {
             rotation_style: RotationStyle::AllAround,
             variables: HashMap::new(),
             effects: IndexMap::new(),
-            sound_effects: HashMap::new(),
+            sound_effects: IndexMap::new(),
             time_waiting: 0,
             dialogue: None,
             glide: None,