sound fixes

mrDIMAS · Sep 14, 2019 · 02b016b · 02b016b
1 parent 43f8fae
commit 02b016b
Show file tree

Hide file tree

Showing 7 changed files with 513 additions and 929 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -11,6 +11,7 @@ lto = false
 
 [dependencies]
 rg3d-core = { path = "../rg3d-core" }
+rg3d-sound = { path = "../rg3d-sound" }
 rg3d = { path = "../rg3d" }
 rand = "0.7.0"
 glutin = "0.21.0"
diff --git a/data/Sonic_Mayhem_Collapse.wav b/data/Sonic_Mayhem_Collapse.wav
diff --git a/data/Sonic_Mayhem_Collapse_22050.wav b/data/Sonic_Mayhem_Collapse_22050.wav
diff --git a/save.bin b/save.bin
diff --git a/save.txt b/save.txt
diff --git a/src/main.rs b/src/main.rs
@@ -16,6 +16,7 @@ use std::{
     time::Instant,
     rc::Rc,
     io::Write,
+    sync::{Arc, Mutex}
 };
 
 use rg3d::{
@@ -46,6 +47,10 @@ use rg3d_core::{
         Visit,
     },
 };
+use rg3d_sound::{
+    buffer::{Buffer, BufferKind},
+    source::{Source, SourceKind}
+};
 
 pub struct MenuState {
     save_game: Option<()>,
@@ -84,6 +89,10 @@ impl Game {
             }))
         }
 
+        let buffer = Buffer::new(Path::new("data/Sonic_Mayhem_Collapse.wav"), BufferKind::Stream).unwrap();
+        let source = Source::new(SourceKind::Flat, Arc::new(Mutex::new(buffer))).unwrap();
+        engine.get_sound_context().lock().unwrap().add_source(source);
+
         let mut game = Game {
             menu: Menu {
                 state: Rc::new(RefCell::new(MenuState {