From a7759cfa068a1aa0fd2369e27b03cab34a205f3f Mon Sep 17 00:00:00 2001 From: Alex Page Date: Sun, 27 Nov 2022 23:53:03 -0500 Subject: [PATCH 1/2] Fix wasm target --- Cargo.lock | 3 +++ Cargo.toml | 1 + 2 files changed, 4 insertions(+) diff --git a/Cargo.lock b/Cargo.lock index 170b0d5..8f9565a 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -827,8 +827,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "418d37c8b1d42553c93648be529cb70f920d3baf8ef469b74b9638df426e0b4c" dependencies = [ "cfg-if 1.0.0", + "js-sys", "libc", "wasi", + "wasm-bindgen", ] [[package]] @@ -1067,6 +1069,7 @@ dependencies = [ "bracket-lib", "console_error_panic_hook", "cpal", + "getrandom", "hecs", "instant", "oddio", diff --git a/Cargo.toml b/Cargo.toml index 4d39a67..6c96633 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -24,6 +24,7 @@ console_error_panic_hook = "0.1.7" wasm-bindgen = "0.2.79" instant = "0.1.12" rand = "0.8.5" +getrandom = { version = "0.2.4", features = ["js"] } [target.'cfg(windows)'.build-dependencies] winres = "0.1.12" From 3674e4c26a16f369f009ed918400e92e6f034bb5 Mon Sep 17 00:00:00 2001 From: Alex Page Date: Sun, 27 Nov 2022 23:53:27 -0500 Subject: [PATCH 2/2] Improve wall destruction sound --- src/resources/sound_effects.rs | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/src/resources/sound_effects.rs b/src/resources/sound_effects.rs index c3ae8c5..914b6b9 100644 --- a/src/resources/sound_effects.rs +++ b/src/resources/sound_effects.rs @@ -1,4 +1,4 @@ -use std::{iter, time::Duration}; +use std::{cmp, iter, time::Duration}; use bracket_lib::random::RandomNumberGenerator; @@ -44,6 +44,7 @@ pub struct SoundEffects { impl SoundEffects { pub fn new(sound_output: &SoundOutput) -> Self { + let mut rng = RandomNumberGenerator::new(); Self { startup: sound_output.render_sound_effect(&SoundEffect { sounds: (1..800) @@ -57,7 +58,7 @@ impl SoundEffects { sounds: vec![ Sound { sound_type: SoundType::Noise(350, 900), - duration: Duration::from_millis(6), + duration: Duration::from_millis(5), }, Sound { sound_type: SoundType::Silence, @@ -133,12 +134,12 @@ impl SoundEffects { }], }), whipping_hit_block: sound_output.render_sound_effect(&SoundEffect { - sounds: (20..=5700) + sounds: (20_i32..=5700_i32) .rev() - .step_by(100) + .step_by(5) .map(|x| Sound { - sound_type: SoundType::Noise(0, x), - duration: Duration::from_millis(18), + sound_type: SoundType::Tone(cmp::max(0, rng.range(0, x * 2) - x) as u32), + duration: Duration::from_micros(665), }) .collect(), }), @@ -190,7 +191,7 @@ impl SoundEffects { }) .collect(), }), - rng: RandomNumberGenerator::new(), + rng, } }