diff --git a/src/lib.rs b/src/lib.rs index eaf7d66..744836b 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -3,7 +3,7 @@ //! Compile-time configurables can be found in the [`config`] module. pub mod config; -mod events; +mod messages; mod machinery; mod objects; mod physics; @@ -77,10 +77,10 @@ impl Plugin for AsteroidPlugin { ) .run_if(in_state(GameState::Playing)), ) - .add_event::() - .add_event::() - .add_event::() - .add_event::(); + .add_event::() + .add_event::() + .add_event::() + .add_event::(); app.insert_state(GameState::TitleScreen); } } diff --git a/src/machinery.rs b/src/machinery.rs index 08448e5..748e0df 100644 --- a/src/machinery.rs +++ b/src/machinery.rs @@ -8,7 +8,7 @@ use std::time::Duration; use bevy::prelude::*; -use crate::{WorldSize, events::{AsteroidDestroy, SpawnAsteroid}, objects::AsteroidSize, resources::Score}; +use crate::{WorldSize, messages::{AsteroidDestroy, SpawnAsteroid}, objects::AsteroidSize, resources::Score}; /// Asteroid spawning parameters and state. /// diff --git a/src/events.rs b/src/messages.rs similarity index 100% rename from src/events.rs rename to src/messages.rs diff --git a/src/objects.rs b/src/objects.rs index 0a00d1b..49bf143 100644 --- a/src/objects.rs +++ b/src/objects.rs @@ -23,7 +23,7 @@ use bevy_rapier2d::prelude::{ActiveCollisionTypes, ActiveEvents, Collider, Senso use crate::{ AngularVelocity, GameAssets, GameState, Lives, config::{ASTEROID_LIFETIME, DEBRIS_LIFETIME, SHIP_FIRE_RATE}, - events::{AsteroidDestroy, BulletDestroy, ShipDestroy, SpawnAsteroid}, + messages::{AsteroidDestroy, BulletDestroy, ShipDestroy, SpawnAsteroid}, machinery::{Lifetime, Sparkler}, physics::{Velocity, Wrapping}, }; diff --git a/src/physics.rs b/src/physics.rs index 11d9174..5617696 100644 --- a/src/physics.rs +++ b/src/physics.rs @@ -16,7 +16,7 @@ //! to detect them for me (so that I don't have to write clipping code). use crate::{ - WorldSize, events, + WorldSize, messages, objects::{Asteroid, Bullet, Ship}, }; @@ -90,9 +90,9 @@ pub(crate) fn wrap_entities( /// | Bullet & Ship | Nothing. The player shouldn't be able to shoot themselves (and the Flying Saucer hasn't been impl.'d, so it's bullets don't count) | pub fn collision_listener( mut collisions: 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>, @@ -112,12 +112,12 @@ pub fn collision_listener( if rocks.contains(*two) { // player-asteroid collision dbg!("Writing ShipDestroy event"); - ship_writer.write(events::ShipDestroy); + ship_writer.write(messages::ShipDestroy); } // else, we don't care } else if *two == *player { if rocks.contains(*one) { dbg!("Writing ShipDestroy event"); - ship_writer.write(events::ShipDestroy); + ship_writer.write(messages::ShipDestroy); } } @@ -125,14 +125,14 @@ pub fn collision_listener( if bullets.contains(*one) { if rocks.contains(*two) { dbg!("Writing AsteroidDestroy & BulletDestroy events"); - asteroid_writer.write(events::AsteroidDestroy(*two)); - bullet_writer.write(events::BulletDestroy(*one)); + asteroid_writer.write(messages::AsteroidDestroy(*two)); + bullet_writer.write(messages::BulletDestroy(*one)); } } else if rocks.contains(*one) { if bullets.contains(*two) { dbg!("Writing AsteroidDestroy & BulletDestroy events"); - asteroid_writer.write(events::AsteroidDestroy(*one)); - bullet_writer.write(events::BulletDestroy(*two)); + asteroid_writer.write(messages::AsteroidDestroy(*one)); + bullet_writer.write(messages::BulletDestroy(*two)); } } }