diff --git a/src/bin/flappy/main.rs b/src/bin/flappy/main.rs index 9314b6a..36493bd 100644 --- a/src/bin/flappy/main.rs +++ b/src/bin/flappy/main.rs @@ -1,7 +1,6 @@ // Bevy basically forces "complex types" with Querys #![allow(clippy::type_complexity)] -use bevy::audio::PlaybackMode; use bevy::image::{ImageLoaderSettings, ImageSampler}; use bevy::render::view::ColorGrading; use games::physics2d::*; @@ -42,7 +41,7 @@ fn main() { ) .add_systems(OnEnter(PlayerState::Alive), alive_bird) .add_systems(OnEnter(PlayerState::Alive), reset_button::) - .add_systems(OnEnter(PlayerState::Rewind), (start_rewinding, alive_bird)) + .add_systems(OnEnter(PlayerState::Rewind), alive_bird) .add_systems(OnEnter(PlayerState::Pause), pause_bird) .add_systems(OnEnter(PlayerState::Stasis), pause_bird) .add_systems(OnExit(PlayerState::Stasis), reset_button::) @@ -494,18 +493,9 @@ fn init_assets( bird_assets.mesh = Mesh2d(meshes.add(Rectangle::new(1.0, 1.2))); } -#[derive(Component)] -struct FlapSfx; - #[derive(Component)] struct FlapButton; -#[derive(Component)] -struct BonkSfx; - -#[derive(Component)] -struct RewindSfx; - #[derive(Component)] struct RewindButton; @@ -816,8 +806,6 @@ fn flap( trigger: Trigger, mut bird: Query<&mut ExternalImpulse, With>, mut flaps: ResMut, - server: ResMut, - mut commands: Commands, ) { debug!("real flap for {:?}", trigger.target()); // Increment flap stat @@ -826,16 +814,6 @@ fn flap( // Flap birds wings if let Ok(mut f) = bird.get_mut(trigger.target()) { f.apply_impulse(Vec2::Y * 5000.0 + Vec2::X * 1000.0); - - // Play flap sfx - commands.spawn(( - AudioPlayer::new(server.load("flappy/bonk.ogg")), - PlaybackSettings { - mode: PlaybackMode::Despawn, - ..default() - }, - BonkSfx, - )); } } @@ -947,8 +925,6 @@ fn detect_dead( bird: Single<&ColliderAabb, With>, obstacles: Query<&ColliderAabb, Or<(With, With, With)>>, mut next: ResMut>, - server: ResMut, - mut commands: Commands, ) { #[cfg(debug_assertions)] debug_assert!( @@ -958,16 +934,6 @@ fn detect_dead( if obstacles.iter().any(|obstacle| bird.intersects(obstacle)) { next.set(PlayerState::Stasis); - - // Play bonk sfx - commands.spawn(( - AudioPlayer::new(server.load("flappy/flap.ogg")), - PlaybackSettings { - mode: PlaybackMode::Despawn, - ..default() - }, - FlapSfx, - )); } } @@ -1173,17 +1139,6 @@ fn debug_trail( }) } -fn start_rewinding(server: ResMut, mut commands: Commands) { - commands.spawn(( - AudioPlayer::new(server.load("flappy/rewind-start.ogg")), - PlaybackSettings { - mode: PlaybackMode::Despawn, - ..default() - }, - RewindSfx, - )); -} - fn shimmer_button(mut bg: Single<&mut BackgroundColor, With>, time: Res