feat: stage sequence, ghost collisions & energizer logic, text color method, scheduler ordering

src/systems/render.rs

@@ -1,17 +1,26 @@
+use crate::constants::CANVAS_SIZE;
 use crate::error::{GameError, TextureError};
 use crate::map::builder::Map;
-use crate::systems::components::{DeltaTime, DirectionalAnimated, RenderDirty, Renderable, ScoreResource};
+use crate::systems::blinking::Blinking;
+use crate::systems::components::{
+    DeltaTime, DirectionalAnimated, EntityType, GhostCollider, PlayerControlled, Renderable, ScoreResource, StartupSequence,
+};
 use crate::systems::movement::{Position, Velocity};
 use crate::texture::sprite::SpriteAtlas;
 use crate::texture::text::TextTexture;
 use bevy_ecs::entity::Entity;
 use bevy_ecs::event::EventWriter;
-use bevy_ecs::prelude::{Changed, Or, RemovedComponents};
+use bevy_ecs::prelude::{Changed, Or, RemovedComponents, With, Without};
+use bevy_ecs::resource::Resource;
 use bevy_ecs::system::{NonSendMut, Query, Res, ResMut};
+use sdl2::pixels::Color;
 use sdl2::rect::{Point, Rect};
 use sdl2::render::{Canvas, Texture};
 use sdl2::video::Window;
 
+#[derive(Resource, Default)]
+pub struct RenderDirty(pub bool);
+
 #[allow(clippy::type_complexity)]
 pub fn dirty_render_system(
     mut dirty: ResMut<RenderDirty>,
@@ -62,16 +71,67 @@ pub struct MapTextureResource(pub Texture<'static>);
 /// A non-send resource for the backbuffer texture. This just wraps the texture with a type so it can be differentiated when exposed as a resource.
 pub struct BackbufferResource(pub Texture<'static>);
 
+/// Updates entity visibility based on StartupSequence stages
+pub fn ready_visibility_system(
+    startup: Res<StartupSequence>,
+    mut player_query: Query<&mut Renderable, (With<PlayerControlled>, Without<GhostCollider>)>,
+    mut ghost_query: Query<&mut Renderable, (With<GhostCollider>, Without<PlayerControlled>)>,
+    mut energizer_query: Query<(&mut Blinking, &EntityType)>,
+) {
+    match *startup {
+        StartupSequence::TextOnly { .. } => {
+            // Hide player and ghosts, disable energizer blinking
+            if let Ok(mut renderable) = player_query.single_mut() {
+                renderable.visible = false;
+            }
+
+            for mut renderable in ghost_query.iter_mut() {
+                renderable.visible = false;
+            }
+
+            // Disable energizer blinking in text-only stage
+            for (mut blinking, entity_type) in energizer_query.iter_mut() {
+                if matches!(entity_type, EntityType::PowerPellet) {
+                    blinking.timer = 0.0; // Reset timer to prevent blinking
+                }
+            }
+        }
+        StartupSequence::CharactersVisible { .. } => {
+            // Show player and ghosts, enable energizer blinking
+            if let Ok(mut renderable) = player_query.single_mut() {
+                renderable.visible = true;
+            }
+
+            for mut renderable in ghost_query.iter_mut() {
+                renderable.visible = true;
+            }
+
+            // Energizer blinking is handled by the blinking system
+        }
+        StartupSequence::GameActive => {
+            // All entities are visible and blinking is normal
+            if let Ok(mut renderable) = player_query.single_mut() {
+                renderable.visible = true;
+            }
+
+            for mut renderable in ghost_query.iter_mut() {
+                renderable.visible = true;
+            }
+        }
+    }
+}
+
 /// Renders the HUD (score, lives, etc.) on top of the game.
 pub fn hud_render_system(
     mut canvas: NonSendMut<&mut Canvas<Window>>,
     mut atlas: NonSendMut<SpriteAtlas>,
     score: Res<ScoreResource>,
+    startup: Res<StartupSequence>,
     mut errors: EventWriter<GameError>,
 ) {
     let mut text_renderer = TextTexture::new(1.0);
 
-    // Render lives and high score text
+    // Render lives and high score text in white
     let lives = 3; // TODO: Get from actual lives resource
     let lives_text = format!("{lives}UP   HIGH SCORE   ");
     let lives_position = glam::UVec2::new(4 + 8 * 3, 2); // x_offset + lives_offset * 8, y_offset
@@ -80,7 +140,7 @@ pub fn hud_render_system(
         errors.write(TextureError::RenderFailed(format!("Failed to render lives text: {}", e)).into());
     }
 
-    // Render score text
+    // Render score text in yellow (Pac-Man's color)
     let score_text = format!("{:02}", score.0);
     let score_offset = 7 - (score_text.len() as i32);
     let score_position = glam::UVec2::new(4 + 8 * score_offset as u32, 10); // x_offset + score_offset * 8, 8 + y_offset
@@ -88,6 +148,31 @@ pub fn hud_render_system(
     if let Err(e) = text_renderer.render(&mut canvas, &mut atlas, &score_text, score_position) {
         errors.write(TextureError::RenderFailed(format!("Failed to render score text: {}", e)).into());
     }
+
+    // Render text based on StartupSequence stage
+    if matches!(
+        *startup,
+        StartupSequence::TextOnly { .. } | StartupSequence::CharactersVisible { .. }
+    ) {
+        let ready_text = "READY!";
+        let ready_width = text_renderer.text_width(ready_text);
+        let ready_position = glam::UVec2::new((CANVAS_SIZE.x - ready_width) / 2, 160);
+        if let Err(e) = text_renderer.render_with_color(&mut canvas, &mut atlas, ready_text, ready_position, Color::YELLOW) {
+            errors.write(TextureError::RenderFailed(format!("Failed to render READY text: {}", e)).into());
+        }
+
+        if matches!(*startup, StartupSequence::TextOnly { .. }) {
+            let player_one_text = "PLAYER ONE";
+            let player_one_width = text_renderer.text_width(player_one_text);
+            let player_one_position = glam::UVec2::new((CANVAS_SIZE.x - player_one_width) / 2, 113);
+
+            if let Err(e) =
+                text_renderer.render_with_color(&mut canvas, &mut atlas, player_one_text, player_one_position, Color::CYAN)
+            {
+                errors.write(TextureError::RenderFailed(format!("Failed to render PLAYER ONE text: {}", e)).into());
+            }
+        }
+    }
 }
 
 #[allow(clippy::too_many_arguments)]