Fix case on AsteroidSize enum variants

Closes #9: "Fix case on AsteroidSize enum variants"

Cargo.toml

@@ -1,7 +1,8 @@
 [package]
 name = "asteroids"
-version = "0.1.0"
+version = "0.2.0"
 edition = "2021"
 
 [dependencies]
-bevy = "0.14.2"
+bevy = { version = "0.16", features = ["dynamic_linking"] }
+bevy-inspector-egui = "0.32.0"

src/asteroids.rs

@@ -0,0 +1,78 @@
+use std::time::Duration;
+
+/// This is the module containing all the rock-related things
+/// not... not the whole game.
+use bevy::{math::VectorSpace, prelude::*};
+
+use crate::{GameAssets, Position, Rotation, Velocity};
+
+#[derive(Component, Deref, DerefMut)]
+pub struct Asteroid(AsteroidSize);
+
+pub enum AsteroidSize {
+    Small,
+    Medium,
+    Large,
+}
+
+#[derive(Resource)]
+pub struct AsteroidSpawner {
+    timer: Timer,
+    // TODO: Configurables?
+    // - interval
+    // - density
+    // - size distribution
+}
+
+impl AsteroidSpawner {
+    pub fn new() -> Self {
+        Self {
+            timer: Timer::new(Duration::from_secs(3), TimerMode::Repeating),
+        }
+    }
+}
+
+#[derive(Event)]
+pub struct SpawnAsteroid {
+    pos: Vec2,
+    vel: Vec2,
+    size: AsteroidSize,
+}
+
+/// Update the asteroid spawn timer and spawn any asteroids
+/// that are due this frame.
+pub fn tick_asteroid_manager(
+    mut events: EventWriter<SpawnAsteroid>,
+    mut spawner: ResMut<AsteroidSpawner>,
+    time: Res<Time>,
+) {
+    spawner.timer.tick(time.delta());
+    if spawner.timer.just_finished() {
+        events.write(SpawnAsteroid {
+            pos: Vec2::ZERO,
+            vel: Vec2::ZERO,
+            size: AsteroidSize::Small,
+        });
+    }
+}
+
+/// Utility function to spawn a single asteroid of a given type
+/// TODO: convert to an event listener monitoring for "spawn asteroid" events
+/// from the `fn tick_asteroid_manager(...)` system.
+pub fn spawn_asteroid(
+    mut events: EventReader<SpawnAsteroid>,
+    mut commands: Commands,
+    game_assets: Res<GameAssets>,
+) {
+    for spawn in events.read() {
+        // TODO: Use the asteroid properties defined in the event to spawn the entity
+        commands.spawn((
+            Asteroid(AsteroidSize::Small),
+            Position(Vec2::new(40.0, 40.0)),
+            Velocity(Vec2::new(10.0, 0.0)),
+            Rotation(0.0),
+            Mesh2d(game_assets.asteroid_small().0),
+            MeshMaterial2d(game_assets.asteroid_small().1),
+        ));
+    }
+}

src/config.rs

@@ -11,6 +11,8 @@ pub(crate) const BACKGROUND_COLOR: Color = Color::srgb(0.3, 0.3, 0.3);
 pub(crate) const PLAYER_SHIP_COLOR: Color = Color::srgb(1.0, 1.0, 1.0);
 pub(crate) const SHIP_THRUSTER_COLOR_ACTIVE: Color = Color::srgb(1.0, 0.2, 0.2);
 pub(crate) const SHIP_THRUSTER_COLOR_INACTIVE: Color = Color::srgb(0.5, 0.5, 0.5);
+pub(crate) const ASTEROID_SMALL_COLOR: Color = Color::srgb(1.0, 0., 0.);
+// TODO: asteroid medium & large
 
 pub(crate) const SHIP_THRUST: f32 = 1.0;
 pub(crate) const SHIP_ROTATION: f32 = 0.1; // +/- rotation speed in... radians per frame

src/lib.rs

@@ -1,31 +1,66 @@
+mod asteroids;
 pub mod config;
+mod preparation_widget;
+mod title_screen;
 
 use crate::config::{BACKGROUND_COLOR, PLAYER_SHIP_COLOR, SHIP_ROTATION, SHIP_THRUST, WINDOW_SIZE};
 
-use bevy::{prelude::*, sprite::MaterialMesh2dBundle};
-use config::{SHIP_THRUSTER_COLOR_ACTIVE, SHIP_THRUSTER_COLOR_INACTIVE};
+use asteroids::AsteroidSpawner;
+use bevy::prelude::*;
+use bevy_inspector_egui::prelude::ReflectInspectorOptions;
+use bevy_inspector_egui::InspectorOptions;
+
+use config::{ASTEROID_SMALL_COLOR, SHIP_THRUSTER_COLOR_ACTIVE, SHIP_THRUSTER_COLOR_INACTIVE};
 
 pub struct AsteroidPlugin;
 
 impl Plugin for AsteroidPlugin {
     fn build(&self, app: &mut App) {
-        app.add_systems(Startup, (spawn_camera, spawn_player))
-            .insert_resource(ClearColor(BACKGROUND_COLOR))
-            .insert_resource(WorldSize {
-                width: WINDOW_SIZE.x,
-                height: WINDOW_SIZE.y,
-            })
-            .add_systems(
-                FixedUpdate,
-                (input_ship_thruster, input_ship_rotation, wrap_entities),
+        app.add_plugins((
+            title_screen::GameMenuPlugin,
+            preparation_widget::preparation_widget_plugin,
+        ))
+        .insert_resource(ClearColor(BACKGROUND_COLOR))
+        .insert_resource(WorldSize {
+            width: WINDOW_SIZE.x,
+            height: WINDOW_SIZE.y,
+        })
+        .insert_resource(Lives(3))
+        .register_type::<Lives>()
+        .insert_resource(Score(0))
+        .insert_resource(AsteroidSpawner::new())
+        .init_resource::<GameAssets>()
+        .add_systems(Startup, spawn_camera)
+        .add_systems(OnEnter(GameState::Playing), (spawn_player, spawn_ui))
+        .add_systems(
+            FixedUpdate,
+            (
+                input_ship_thruster,
+                input_ship_rotation,
+                wrap_entities,
+                asteroids::tick_asteroid_manager,
+                asteroids::spawn_asteroid.after(asteroids::tick_asteroid_manager),
             )
-            .add_systems(
-                FixedPostUpdate,
-                (integrate_velocity, update_positions, apply_rotation_to_mesh),
-            );
+                .run_if(in_state(GameState::Playing)),
+        )
+        .add_systems(
+            FixedPostUpdate,
+            (integrate_velocity, update_positions, apply_rotation_to_mesh)
+                .run_if(in_state(GameState::Playing)),
+        )
+        .add_event::<asteroids::SpawnAsteroid>();
+        app.insert_state(GameState::TitleScreen);
     }
 }
 
+#[derive(Clone, Debug, Eq, Hash, PartialEq, States)]
+pub enum GameState {
+    TitleScreen, // Program is started. Present title screen and await user start
+    GetReady,    // Short timer to let the player get ready after pressing start
+    Playing,     // Player has started the game. Run the main loop
+    GameOver,    // Game has ended. Present game over dialogue and await user restart
+}
+
 #[derive(Component)]
 struct Position(bevy::math::Vec2);
 
@@ -38,11 +73,28 @@ struct Rotation(f32);
 #[derive(Component)]
 struct Ship;
 
-// Data component to store color properties attached to an entity
-// This was easier (and imo better) than holding global consts with
-// UUID assets.
+/// Marker for any entity that should wrap on screen edges
 #[derive(Component)]
-struct ThrusterColors(Handle<ColorMaterial>, Handle<ColorMaterial>);
+struct Wrapping;
+
+#[derive(Resource, Debug, Deref, Clone, Copy)]
+struct Score(i32);
+
+impl From<Score> for String {
+    fn from(value: Score) -> Self {
+        value.to_string()
+    }
+}
+
+#[derive(InspectorOptions, Reflect, Resource, Debug, Deref, Clone, Copy)]
+#[reflect(Resource, InspectorOptions)]
+struct Lives(i32);
+
+impl From<Lives> for String {
+    fn from(value: Lives) -> Self {
+        value.to_string()
+    }
+}
 
 #[derive(Resource)]
 struct WorldSize {
@@ -50,51 +102,96 @@ struct WorldSize {
     height: f32,
 }
 
-fn spawn_camera(mut commands: Commands) {
-    commands.spawn(Camera2dBundle::default());
+#[derive(Resource)]
+struct GameAssets {
+    meshes: [Handle<Mesh>; 4],
+    materials: [Handle<ColorMaterial>; 6],
 }
 
-fn spawn_player(
-    mut commands: Commands,
-    mut meshes: ResMut<Assets<Mesh>>,
-    mut materials: ResMut<Assets<ColorMaterial>>,
-) {
-    let triangle = Triangle2d::new(
-        Vec2::new(0.5, 0.0),
-        Vec2::new(-0.5, 0.45),
-        Vec2::new(-0.5, -0.45),
-    );
-    let thruster_firing_id = materials.add(SHIP_THRUSTER_COLOR_ACTIVE);
-    let thruster_stopped_id = materials.add(SHIP_THRUSTER_COLOR_INACTIVE);
+impl GameAssets {
+    fn ship(&self) -> (Handle<Mesh>, Handle<ColorMaterial>) {
+        (self.meshes[0].clone(), self.materials[0].clone())
+    }
 
-    let ship_mesh = MaterialMesh2dBundle {
-        mesh: meshes.add(triangle).into(),
-        material: materials.add(PLAYER_SHIP_COLOR),
-        transform: Transform::default().with_scale(Vec3::new(20.0, 20.0, 20.0)),
-        ..default()
-    };
+    // The thruster mesh is actually just the ship mesh
+    fn thruster_mesh(&self) -> Handle<Mesh> {
+        self.meshes[0].clone()
+    }
 
-    let thruster_mesh = MaterialMesh2dBundle {
-        mesh: meshes.add(triangle).into(),
-        material: materials.add(PLAYER_SHIP_COLOR),
-        transform: Transform::default()
-            .with_scale(Vec3::splat(0.5))
-            .with_translation(Vec3::new(-0.5, 0.0, -0.1)),
-        ..default()
-    };
+    // TODO: Look into parameterizing the material
+    // A shader uniform should be able to do this, but I don't know how to
+    // load those in Bevy.
+    fn thruster_mat_inactive(&self) -> Handle<ColorMaterial> {
+        self.materials[1].clone()
+    }
 
-    let thruster = commands.spawn(thruster_mesh).id();
+    fn thruster_mat_active(&self) -> Handle<ColorMaterial> {
+        self.materials[2].clone()
+    }
 
-    let mut ship_id = commands.spawn((
-        Ship,
-        Position(Vec2::default()),
-        Velocity(Vec2::ZERO),
-        Rotation(0.0),
-        ship_mesh,
-        ThrusterColors(thruster_firing_id, thruster_stopped_id),
-    ));
+    fn asteroid_small(&self) -> (Handle<Mesh>, Handle<ColorMaterial>) {
+        (self.meshes[1].clone(), self.materials[1].clone())
+    }
 
-    ship_id.add_child(thruster);
+    fn asteroid_medium(&self) -> (Handle<Mesh>, Handle<ColorMaterial>) {
+        (self.meshes[2].clone(), self.materials[2].clone())
+    }
+
+    fn asteroid_large(&self) -> (Handle<Mesh>, Handle<ColorMaterial>) {
+        (self.meshes[3].clone(), self.materials[3].clone())
+    }
+}
+
+impl FromWorld for GameAssets {
+    fn from_world(world: &mut World) -> Self {
+        let mut world_meshes = world.resource_mut::<Assets<Mesh>>();
+        let meshes = [
+            world_meshes.add(Triangle2d::new(
+                Vec2::new(0.5, 0.0),
+                Vec2::new(-0.5, 0.45),
+                Vec2::new(-0.5, -0.45),
+            )),
+            world_meshes.add(Circle::new(10.0)),
+            world_meshes.add(Circle::new(20.0)),
+            world_meshes.add(Circle::new(40.0)),
+        ];
+        let mut world_materials = world.resource_mut::<Assets<ColorMaterial>>();
+        let materials = [
+            world_materials.add(PLAYER_SHIP_COLOR),
+            world_materials.add(SHIP_THRUSTER_COLOR_INACTIVE),
+            world_materials.add(SHIP_THRUSTER_COLOR_ACTIVE),
+            world_materials.add(ASTEROID_SMALL_COLOR),
+            // TODO: asteroid medium and large colors
+            world_materials.add(ASTEROID_SMALL_COLOR),
+            world_materials.add(ASTEROID_SMALL_COLOR),
+        ];
+        GameAssets { meshes, materials }
+    }
+}
+
+fn spawn_camera(mut commands: Commands) {
+    commands.spawn(Camera2d);
+}
+
+fn spawn_player(mut commands: Commands, game_assets: Res<GameAssets>) {
+    commands
+        .spawn((
+            Ship,
+            Wrapping,
+            Position(Vec2::default()),
+            Velocity(Vec2::ZERO),
+            Rotation(0.0),
+            Mesh2d(game_assets.ship().0),
+            MeshMaterial2d(game_assets.ship().1),
+            Transform::default().with_scale(Vec3::new(20.0, 20.0, 20.0)),
+        ))
+        .with_child((
+            Mesh2d(game_assets.thruster_mesh()),
+            MeshMaterial2d(game_assets.thruster_mat_inactive()),
+            Transform::default()
+                .with_scale(Vec3::splat(0.5))
+                .with_translation(Vec3::new(-0.5, 0.0, -0.1)),
+        ));
 }
 
 /*
@@ -102,10 +199,14 @@ fn spawn_player(
 */
 fn input_ship_thruster(
     keyboard_input: Res<ButtonInput<KeyCode>>,
-    mut query: Query<(&mut Velocity, &Rotation, &mut Children, &ThrusterColors), With<Ship>>,
+    mut query: Query<(&mut Velocity, &Rotation, &mut Children), With<Ship>>,
     mut commands: Commands,
+    game_assets: Res<GameAssets>,
 ) {
-    let Ok((mut velocity, rotation, children, colors)) = query.get_single_mut() else {
+    // TODO: Maybe change for a Single<Ship>> so this only runs for the one ship
+    // buuut... that would silently do nothing if there are 0 or >1 ships, and
+    // I might want to crash on purpose in that case.
+    let Ok((mut velocity, rotation, children)) = query.single_mut() else {
         let count = query.iter().count();
         panic!("There should be exactly one player ship! Instead, there seems to be {count}.");
     };
@@ -116,9 +217,13 @@ fn input_ship_thruster(
 
     if keyboard_input.pressed(KeyCode::KeyW) {
         velocity.0 += Vec2::from_angle(rotation.0) * SHIP_THRUST;
-        commands.entity(*thrusters).insert(colors.0.clone());
+        commands
+            .entity(*thrusters)
+            .insert(MeshMaterial2d(game_assets.thruster_mat_active()));
     } else {
-        commands.entity(*thrusters).insert(colors.1.clone());
+        commands
+            .entity(*thrusters)
+            .insert(MeshMaterial2d(game_assets.thruster_mat_inactive()));
     }
 }
 
@@ -130,7 +235,7 @@ fn input_ship_rotation(
     keyboard_input: Res<ButtonInput<KeyCode>>,
     mut query: Query<&mut Rotation, With<Ship>>,
 ) {
-    let Ok(mut rotation) = query.get_single_mut() else {
+    let Ok(mut rotation) = query.single_mut() else {
         let count = query.iter().count();
         panic!("There should be exactly one player ship! Instead, there seems to be {count}.");
     };
@@ -142,12 +247,16 @@ fn input_ship_rotation(
     }
 }
 
+// TODO: Combine movement integration steps into one function
+// They need to be ordered so the physics is deterministic. Bevy can enforce
+// order, but it makes more sense to cut out the extra machinery and have one
+// single function. Probably better for cache locality or whatever, too.
 /*
  Add velocity to position
 */
 fn integrate_velocity(mut query: Query<(&mut Position, &Velocity)>, time: Res<Time>) {
     for (mut position, velocity) in &mut query {
-        position.0 += velocity.0 * time.delta_seconds();
+        position.0 += velocity.0 * time.delta_secs();
     }
 }
 
@@ -167,7 +276,7 @@ fn apply_rotation_to_mesh(mut query: Query<(&mut Transform, &Rotation)>) {
     }
 }
 
-fn wrap_entities(mut query: Query<&mut Position>, world_size: Res<WorldSize>) {
+fn wrap_entities(mut query: Query<&mut Position, With<Wrapping>>, world_size: Res<WorldSize>) {
     let right = world_size.width / 2.0;
     let left = -right;
     let top = world_size.height / 2.0;
@@ -187,3 +296,10 @@ fn wrap_entities(mut query: Query<&mut Position>, world_size: Res<WorldSize>) {
         }
     }
 }
+
+fn spawn_ui(mut commands: Commands, score: Res<Score>, lives: Res<Lives>) {
+    commands.spawn((
+        Text::new(format!("Score: {score:?} | Lives: {lives:?}")),
+        TextFont::from_font_size(25.0),
+    ));
+}

src/main.rs

@@ -1,6 +1,7 @@
 use bevy::{prelude::*, window::WindowResolution};
 
 use asteroids::{config::WINDOW_SIZE, AsteroidPlugin};
+use bevy_inspector_egui::{bevy_egui::EguiPlugin, quick::WorldInspectorPlugin};
 
 fn main() {
     App::new()
@@ -12,5 +13,7 @@ fn main() {
             ..default()
         }))
         .add_plugins(AsteroidPlugin)
+        .add_plugins(EguiPlugin::default())
+        .add_plugins(WorldInspectorPlugin::new())
         .run();
 }

src/preparation_widget.rs

@@ -0,0 +1,99 @@
+use bevy::{
+    color::palettes::css::{BLACK, GREEN, LIGHT_BLUE, RED},
+    prelude::*,
+};
+
+use crate::GameState;
+
+pub fn preparation_widget_plugin(app: &mut App) {
+    app.add_systems(OnEnter(GameState::GetReady), spawn_get_ready)
+        .add_systems(OnExit(GameState::GetReady), despawn_get_ready)
+        .add_systems(
+            Update,
+            (animate_get_ready_widget).run_if(in_state(GameState::GetReady)),
+        )
+        .insert_resource(ReadySetGoTimer(Timer::from_seconds(3.0, TimerMode::Once)));
+}
+
+/// Marker component for things on the get-ready indicator
+#[derive(Component)]
+struct OnReadySetGo;
+
+/// Newtype wrapper for `Timer`. Used to count down during the "get ready" phase.
+#[derive(Deref, DerefMut, Resource)]
+struct ReadySetGoTimer(Timer);
+
+/// Marker for the counter text segment
+#[derive(Component)]
+struct CountdownText;
+
+/// Marker for the counter bar segment
+#[derive(Component)]
+struct CountdownBar;
+
+fn spawn_get_ready(mut commands: Commands) {
+    commands.spawn((
+        OnReadySetGo, // marker, so this can be de-spawned properly
+        Node {
+            align_self: AlignSelf::Center,
+            justify_self: JustifySelf::Center,
+            align_items: AlignItems::Center,
+            justify_content: JustifyContent::Center,
+            flex_direction: FlexDirection::Column,
+            width: Val::Percent(30.),
+            height: Val::Percent(30.),
+            ..default()
+        },
+        BackgroundColor(LIGHT_BLUE.into()),
+        children![
+            (Text::new("Get Ready!"), TextColor(BLACK.into())),
+            (
+                CountdownBar,
+                Node {
+                    width: Val::Percent(90.0),
+                    height: Val::Percent(10.),
+                    ..default()
+                },
+                BackgroundColor(GREEN.into()),
+            ),
+            (
+                CountdownText,
+                Text::new("<uninit timer>"),
+                TextColor(RED.into()),
+            )
+        ],
+    ));
+}
+
+// TODO: Replace this with a generic somewhere else in the crate
+// want: `despawn_screen::<OnReadySetGo>>()`
+fn despawn_get_ready(mut commands: Commands, to_despawn: Query<Entity, With<OnReadySetGo>>) {
+    for entity in to_despawn {
+        commands.entity(entity).despawn();
+    }
+}
+
+fn animate_get_ready_widget(
+    mut text_segment: Single<&mut Text, With<CountdownText>>,
+    mut bar_segment: Single<&mut Node, With<CountdownBar>>,
+    time: Res<Time>,
+    mut timer: ResMut<ReadySetGoTimer>,
+    mut game_state: ResMut<NextState<GameState>>,
+) {
+    // Advance the timer, read the remaining time and write it onto the label.
+    timer.tick(time.delta());
+
+    // Add one to the visual value so the countdown starts at 3 and stops at 1.
+    // Otherwise it starts at 2 and disappears after showing 0.
+    // That feels wrong even though it's functionally identical.
+    let tval = timer.0.remaining().as_secs() + 1;
+    **text_segment = format!("{tval}").into();
+
+    // Shrink the progress bar Node
+    bar_segment.width = Val::Percent(100.0 * (1.0 - timer.fraction()));
+
+    // If the timer has expired, change state to playing.
+    if timer.finished() {
+        game_state.set(GameState::Playing);
+    }
+}

src/title_screen.rs

@@ -0,0 +1,54 @@
+use crate::GameState;
+
+use bevy::prelude::*;
+
+pub struct GameMenuPlugin;
+
+impl Plugin for GameMenuPlugin {
+    fn build(&self, app: &mut App) {
+        app.add_systems(OnEnter(GameState::TitleScreen), spawn_menu)
+            .add_systems(OnExit(GameState::TitleScreen), despawn_menu)
+            .add_systems(
+                Update,
+                handle_spacebar.run_if(in_state(GameState::TitleScreen)),
+            );
+    }
+}
+
+// Marker component for the title screen UI entity.
+// This way, a query for the TitleUI can be used to despawn the title screen
+#[derive(Component)]
+struct TitleUI;
+
+fn spawn_menu(mut commands: Commands) {
+    commands
+        .spawn((
+            TitleUI,
+            Node {
+                flex_direction: FlexDirection::Column,
+                ..Default::default()
+            },
+        ))
+        .with_children(|cmds| {
+            cmds.spawn((
+                Text::new("Robert's Bad Asteroids Game"),
+                TextFont::from_font_size(50.0),
+            ));
+            cmds.spawn((
+                Text::new("Press space to begin"),
+                TextFont::from_font_size(40.0),
+            ));
+        });
+}
+
+fn despawn_menu(mut commands: Commands, to_despawn: Query<Entity, With<TitleUI>>) {
+    for entity in &to_despawn {
+        commands.entity(entity).despawn();
+    }
+}
+
+fn handle_spacebar(input: Res<ButtonInput<KeyCode>>, mut game_state: ResMut<NextState<GameState>>) {
+    if input.just_pressed(KeyCode::Space) {
+        game_state.set(GameState::GetReady);
+    }
+}