Sounds

rewin123 · Dec 10, 2023 · 4a45872 · 4a45872
1 parent 72ffe87
commit 4a45872
Show file tree

Hide file tree

Showing 12 changed files with 224 additions and 159 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -30,29 +30,7 @@ default = ["dev"]
 # All of Bevy's default features exept for the audio related ones (bevy_audio, vorbis), since they clash with bevy_kira_audio
 #   and android_shared_stdcxx, since that is covered in `mobile`
 [dependencies]
-bevy = { version = "0.12.1", default-features = false, features = [
-    "animation",
-    "bevy_asset",
-    "bevy_gilrs",
-    "bevy_scene",
-    "bevy_winit",
-    "bevy_core_pipeline",
-    "bevy_pbr",
-    "bevy_gltf",
-    "bevy_render",
-    "bevy_sprite",
-    "bevy_text",
-    "bevy_ui",
-    "multi-threaded",
-    "png",
-    "hdr",
-    "x11",
-    "bevy_gizmos",
-    "tonemapping_luts",
-    "default_font",
-    "webgl2",
-] }
-bevy_kira_audio = { version = "0.18" }
+bevy = { version = "0.12.1" }
 bevy_asset_loader = { version = "0.18" }
 rand = { version = "0.8.3" }
 webbrowser = { version = "0.8", features = ["hardened"] }

diff --git a/assets/audio/barking.ogg b/assets/audio/barking.ogg
diff --git a/assets/audio/forest.ogg b/assets/audio/forest.ogg
diff --git a/assets/audio/kill_sound.ogg b/assets/audio/kill_sound.ogg
diff --git a/assets/audio/running-in-grass.ogg b/assets/audio/running-in-grass.ogg
diff --git a/assets/audio/sheep.ogg b/assets/audio/sheep.ogg
diff --git a/src/ambient.rs b/src/ambient.rs
@@ -0,0 +1,37 @@
+use bevy::{prelude::*, audio::{PlaybackMode, VolumeLevel, Volume}};
+
+pub struct AmbientPlugin;
+
+#[derive(Resource)]
+pub struct ForestAmbient;
+
+impl Plugin for AmbientPlugin {
+    fn build(&self, app: &mut App) {
+        app.
+            add_systems(Startup, startup);
+    }
+}
+
+fn startup(
+    mut commands: Commands,
+    asset_server: Res<AssetServer>,
+) {
+    commands.spawn(AudioBundle {
+        source: asset_server.load("audio/forest.ogg"),
+        settings: PlaybackSettings {
+            mode: PlaybackMode::Loop,
+            ..Default::default()
+        },
+        ..default()
+    });
+
+    commands.spawn(AudioBundle {
+        source: asset_server.load("audio/sheep.ogg"),
+        settings: PlaybackSettings {
+            mode: PlaybackMode::Loop,
+            ..Default::default()
+        },
+        ..default()
+    });
+}
+
diff --git a/src/lib.rs b/src/lib.rs
@@ -17,6 +17,7 @@ pub mod sunday;
 pub mod test_level;
 pub mod torch;
 pub mod wolf;
+pub mod ambient;
 
 use std::f32::consts::PI;
 
@@ -102,6 +103,10 @@ impl Plugin for GamePlugin {
             global_task::GlobalTaskPlugin,
         ));
 
+        app.add_plugins(
+            ambient::AmbientPlugin
+        );
+
         //For long term updates
         app.insert_resource(Time::<Fixed>::from_seconds(1.0));