fix load
This commit is contained in:
@@ -1,4 +1,3 @@
|
|||||||
|
|
||||||
use crate::color::color_serde;
|
use crate::color::color_serde;
|
||||||
use std::f32::consts::PI;
|
use std::f32::consts::PI;
|
||||||
|
|
||||||
@@ -200,8 +199,13 @@ pub struct Polygon {
|
|||||||
impl Polygon {
|
impl Polygon {
|
||||||
pub fn update(&mut self, path_of_project: &str) {
|
pub fn update(&mut self, path_of_project: &str) {
|
||||||
let path = format!("{0}", &self.sound_name);
|
let path = format!("{0}", &self.sound_name);
|
||||||
self.sound = StaticSoundData::from_file(format!("{0}/{1}", path_of_project, path))
|
dbg!(path.clone());
|
||||||
.expect("fail to load the sound");
|
self.sound = if path == String::from("Default_Sound.ogg") {
|
||||||
|
StaticSoundData::from_file("assets/Default_Sound.ogg").expect("fail to load the sound")
|
||||||
|
} else {
|
||||||
|
StaticSoundData::from_file(format!("{0}/{1}", path_of_project, path))
|
||||||
|
.expect("fail to load the sound")
|
||||||
|
}
|
||||||
}
|
}
|
||||||
pub fn sound_to_play_btw(&self, before: f32, after: f32) -> Vec<&StaticSoundData> {
|
pub fn sound_to_play_btw(&self, before: f32, after: f32) -> Vec<&StaticSoundData> {
|
||||||
let mut sound_to_play: Vec<&StaticSoundData> = vec![];
|
let mut sound_to_play: Vec<&StaticSoundData> = vec![];
|
||||||
@@ -369,5 +373,5 @@ impl Polygon {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
fn dummy_sound() -> StaticSoundData {
|
fn dummy_sound() -> StaticSoundData {
|
||||||
StaticSoundData::from_file("assets/tick.ogg").expect("Fail to load audio")
|
StaticSoundData::from_file("assets/Default_Sound.ogg").expect("Fail to load audio")
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user