diff --git a/.gitignore b/.gitignore index 1803bb0..cff8396 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,5 @@ target assets/tmp +assets/external *.blend *.blend1 diff --git a/src/audio.rs b/src/audio.rs index d37efc3..c971f5f 100644 --- a/src/audio.rs +++ b/src/audio.rs @@ -4,11 +4,13 @@ use crate::settings; const ASSET_CLICK: &str = "sounds/click-button-140881-crop.ogg"; const ASSET_SWITCH: &str = "sounds/typosonic-typing-192811-crop.ogg"; -const ASSET_INCOMING_MESSAGE: &str = "tmp/beep-6-96243.ogg"; -const ASSET_PING: &str = "tmp/glitch-sound-fx-pack-04-118236.ogg"; -const ASSET_CONNECT: &str = "tmp/friend-request-14878.ogg"; -const ASSET_RADIO: &str = "tmp/LP - Girls Go Wild (Official Music Video)-M7XRN0oHGIM.ogg"; -const ASSET_BGM: &str = "tmp/FTL - Faster Than Light (2012) OST - 12 - Void (Explore)-edQw2yYXQJM.ogg"; +const ASSET_INCOMING_MESSAGE: &str = "external/beep-6-96243.ogg"; +const ASSET_PING: &str = "external/glitch-sound-fx-pack-04-118236.ogg"; +const ASSET_CONNECT: &str = "external/friend-request-14878.ogg"; +const ASSET_RADIO: &str = "external/LP - Girls Go Wild (Official Music Video)-M7XRN0oHGIM.ogg"; +const ASSET_BGM: &str = "external/FTL - Faster Than Light (2012) OST - 12 - Void (Explore)-edQw2yYXQJM.ogg"; +const ASSET_THRUSTER: &str = "external/loopingthrust-95548.ogg"; +const ASSET_WAKEUP: &str = "sounds/wakeup.ogg"; pub struct AudioPlugin; impl Plugin for AudioPlugin { @@ -74,7 +76,7 @@ pub fn setup( if !settings.mute_sfx { commands.spawn(( AudioBundle { - source: asset_server.load("sounds/wakeup.ogg"), + source: asset_server.load(ASSET_WAKEUP), settings: PlaybackSettings::DESPAWN, }, )); @@ -82,7 +84,7 @@ pub fn setup( commands.spawn(( ComponentThrusterSound, AudioBundle { - source: asset_server.load("tmp/loopingthrust-95548.ogg"), + source: asset_server.load(ASSET_THRUSTER), settings: PlaybackSettings { mode: PlaybackMode::Loop, paused: true, diff --git a/src/hud.rs b/src/hud.rs index 7f4aa71..e810f71 100644 --- a/src/hud.rs +++ b/src/hud.rs @@ -6,7 +6,7 @@ use std::collections::VecDeque; use std::time::SystemTime; const HUD_REFRESH_TIME: f32 = 0.5; -const FONT: &str = "tmp/fonts/NotoSansSC-Thin.ttf"; +const FONT: &str = "external/NotoSansSC-Thin.ttf"; const LOG_MAX: usize = 20; const LOG_MAX_TIME_S: u64 = 20; diff --git a/src/world.rs b/src/world.rs index 5ad4ba4..bb1adf6 100644 --- a/src/world.rs +++ b/src/world.rs @@ -18,7 +18,7 @@ const PIZZERIA_SIZE: f32 = 30.0; //const ASSET_CUBEMAP: &str = "textures/cubemap-fs8.png"; //const ASSET_CUBEMAP_AR: &str = "textures/out.png"; -const ASSET_ASTRONAUT: &str = "tmp/alien.glb#Scene0"; +const ASSET_ASTRONAUT: &str = "external/alien.glb#Scene0"; const ASSET_PIZZERIA: &str = "models/pizzeria.glb#Scene0"; pub struct WorldPlugin; @@ -204,9 +204,9 @@ pub fn setup( SceneBundle { transform: Transform { translation: Vec3::new( + -40.0, 0.0, - 0.0, - 100.0, + 40.0, ), rotation: Quat::from_rotation_y(-PI / 3.), scale: Vec3::splat(ASTRONAUT_SIZE), @@ -227,7 +227,7 @@ pub fn setup( SceneBundle { transform: Transform { translation: Vec3::new( - -65.0, + -2265.0, 10.0, 0.0, ), @@ -249,7 +249,7 @@ pub fn setup( SceneBundle { transform: Transform { translation: Vec3::new( - -100.0, + -2300.0, 10.0, 0.0, ),