hut/outfly
hut/outfly
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

cleanup

Browse source
This commit is contained in:
yuni 2024-03-19 18:27:13 +01:00
parent 38307776df
commit d9b014f673
4 changed files with 16 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
.gitignore vendored
View file

@ -1,4 +1,5 @@
target target
assets/tmp assets/tmp
assets/external
*.blend *.blend
*.blend1 *.blend1

16
src/audio.rs
View file

@ -4,11 +4,13 @@ use crate::settings;
const ASSET_CLICK: &str = "sounds/click-button-140881-crop.ogg"; const ASSET_CLICK: &str = "sounds/click-button-140881-crop.ogg";
const ASSET_SWITCH: &str = "sounds/typosonic-typing-192811-crop.ogg"; const ASSET_SWITCH: &str = "sounds/typosonic-typing-192811-crop.ogg";
const ASSET_INCOMING_MESSAGE: &str = "tmp/beep-6-96243.ogg"; const ASSET_INCOMING_MESSAGE: &str = "external/beep-6-96243.ogg";
const ASSET_PING: &str = "tmp/glitch-sound-fx-pack-04-118236.ogg"; const ASSET_PING: &str = "external/glitch-sound-fx-pack-04-118236.ogg";
const ASSET_CONNECT: &str = "tmp/friend-request-14878.ogg"; const ASSET_CONNECT: &str = "external/friend-request-14878.ogg";
const ASSET_RADIO: &str = "tmp/LP - Girls Go Wild (Official Music Video)-M7XRN0oHGIM.ogg"; const ASSET_RADIO: &str = "external/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_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; pub struct AudioPlugin;
impl Plugin for AudioPlugin { impl Plugin for AudioPlugin {
@ -74,7 +76,7 @@ pub fn setup(
if !settings.mute_sfx { if !settings.mute_sfx {
commands.spawn(( commands.spawn((
AudioBundle { AudioBundle {
source: asset_server.load("sounds/wakeup.ogg"), source: asset_server.load(ASSET_WAKEUP),
settings: PlaybackSettings::DESPAWN, settings: PlaybackSettings::DESPAWN,
}, },
)); ));
@ -82,7 +84,7 @@ pub fn setup(
commands.spawn(( commands.spawn((
ComponentThrusterSound, ComponentThrusterSound,
AudioBundle { AudioBundle {
source: asset_server.load("tmp/loopingthrust-95548.ogg"), source: asset_server.load(ASSET_THRUSTER),
settings: PlaybackSettings { settings: PlaybackSettings {
mode: PlaybackMode::Loop, mode: PlaybackMode::Loop,
paused: true, paused: true,

2
src/hud.rs
View file

@ -6,7 +6,7 @@ use std::collections::VecDeque;
use std::time::SystemTime; use std::time::SystemTime;
const HUD_REFRESH_TIME: f32 = 0.5; 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: usize = 20;
const LOG_MAX_TIME_S: u64 = 20; const LOG_MAX_TIME_S: u64 = 20;

10
src/world.rs
View file

@ -18,7 +18,7 @@ const PIZZERIA_SIZE: f32 = 30.0;
//const ASSET_CUBEMAP: &str = "textures/cubemap-fs8.png"; //const ASSET_CUBEMAP: &str = "textures/cubemap-fs8.png";
//const ASSET_CUBEMAP_AR: &str = "textures/out.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"; const ASSET_PIZZERIA: &str = "models/pizzeria.glb#Scene0";
pub struct WorldPlugin; pub struct WorldPlugin;
@ -204,9 +204,9 @@ pub fn setup(
SceneBundle { SceneBundle {
transform: Transform { transform: Transform {
translation: Vec3::new( translation: Vec3::new(
-40.0,
0.0, 0.0,
0.0, 40.0,
100.0,
), ),
rotation: Quat::from_rotation_y(-PI / 3.), rotation: Quat::from_rotation_y(-PI / 3.),
scale: Vec3::splat(ASTRONAUT_SIZE), scale: Vec3::splat(ASTRONAUT_SIZE),
@ -227,7 +227,7 @@ pub fn setup(
SceneBundle { SceneBundle {
transform: Transform { transform: Transform {
translation: Vec3::new( translation: Vec3::new(
-65.0, -2265.0,
10.0, 10.0,
0.0, 0.0,
), ),
@ -249,7 +249,7 @@ pub fn setup(
SceneBundle { SceneBundle {
transform: Transform { transform: Transform {
translation: Vec3::new( translation: Vec3::new(
-100.0, -2300.0,
10.0, 10.0,
0.0, 0.0,
), ),