diff --git a/src/asteroids.rs b/src/asteroids.rs index 31562b1..9da08e1 100644 --- a/src/asteroids.rs +++ b/src/asteroids.rs @@ -8,7 +8,7 @@ use std::time::Duration; use bevy::prelude::*; use crate::{ - GameAssets, Lifetime, WorldSize, config::ASTEROID_LIFETIME, event::AsteroidDestroy, + GameAssets, Lifetime, WorldSize, config::ASTEROID_LIFETIME, events::AsteroidDestroy, physics::Velocity, }; diff --git a/src/event.rs b/src/events.rs similarity index 100% rename from src/event.rs rename to src/events.rs diff --git a/src/lib.rs b/src/lib.rs index 2ff9c00..46c788d 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -1,6 +1,6 @@ mod asteroids; pub mod config; -mod event; +mod events; mod physics; mod preparation_widget; mod ship; @@ -74,9 +74,9 @@ impl Plugin for AsteroidPlugin { .run_if(in_state(GameState::Playing)), ) .add_event::() - .add_event::() - .add_event::() - .add_event::(); + .add_event::() + .add_event::() + .add_event::(); app.insert_state(GameState::Playing); } } @@ -101,9 +101,9 @@ fn debug_collision_event_printer(mut collision_events: EventReader, - mut ship_writer: EventWriter, - mut asteroid_writer: EventWriter, - mut bullet_writer: EventWriter, + mut ship_writer: EventWriter, + mut asteroid_writer: EventWriter, + mut bullet_writer: EventWriter, player: Single>, bullets: Query<&Bullet>, rocks: Query<&Asteroid>, @@ -123,12 +123,12 @@ fn collision_listener( if rocks.contains(*two) { // player-asteroid collision dbg!("Writing ShipDestroy event"); - ship_writer.write(event::ShipDestroy); + ship_writer.write(events::ShipDestroy); } // else, we don't care } else if *two == *player { if rocks.contains(*one) { dbg!("Writing ShipDestroy event"); - ship_writer.write(event::ShipDestroy); + ship_writer.write(events::ShipDestroy); } } @@ -136,14 +136,14 @@ fn collision_listener( if bullets.contains(*one) { if rocks.contains(*two) { dbg!("Writing AsteroidDestroy & BulletDestroy events"); - asteroid_writer.write(event::AsteroidDestroy(*two)); - bullet_writer.write(event::BulletDestroy(*one)); + asteroid_writer.write(events::AsteroidDestroy(*two)); + bullet_writer.write(events::BulletDestroy(*one)); } } else if rocks.contains(*one) { if bullets.contains(*two) { dbg!("Writing AsteroidDestroy & BulletDestroy events"); - asteroid_writer.write(event::AsteroidDestroy(*one)); - bullet_writer.write(event::BulletDestroy(*two)); + asteroid_writer.write(events::AsteroidDestroy(*one)); + bullet_writer.write(events::BulletDestroy(*two)); } } } diff --git a/src/ship.rs b/src/ship.rs index 0675d1f..507c49f 100644 --- a/src/ship.rs +++ b/src/ship.rs @@ -1,7 +1,7 @@ use crate::{ AngularVelocity, GameAssets, GameState, Lives, asteroids::Asteroid, - event::{BulletDestroy, ShipDestroy}, + events::{BulletDestroy, ShipDestroy}, physics::{Velocity, Wrapping}, };