feat: ecs keyboard interactions

.gitignore

@@ -1,8 +1,17 @@
+# IDE, Other files
+.vscode
+.idea
+rust-sdl2-emscripten/
+
+# Build files
 target/
 dist/
 emsdk/
-.idea
-rust-sdl2-emscripten/
-assets/site/build.css
+
+# Site build f iles
 tailwindcss-*
+assets/site/build.css
+
+# Coverage reports
 lcov.info
+coverage.html

Cargo.toml

@@ -23,6 +23,8 @@ serde_json = "1.0.142"
 smallvec = "1.15.1"
 strum = "0.27.2"
 strum_macros = "0.27.2"
+phf = { version = "0.11", features = ["macros"] }
+bevy_ecs = "0.16.1"
 
 [profile.release]
 lto = true
@@ -57,3 +59,8 @@ aarch64-apple-darwin = { triplet = "arm64-osx" }
 
 [target.'cfg(target_os = "emscripten")'.dependencies]
 libc = "0.2.175"
+
+[build-dependencies]
+serde = { version = "1.0", features = ["derive"] }
+serde_json = "1.0"
+phf = { version = "0.11", features = ["macros"] }

Justfile

@@ -1,17 +1,32 @@
 set shell := ["bash", "-c"]
 set windows-shell := ["powershell.exe", "-NoLogo", "-Command"]
 
-coverage_exclude_pattern := "app.rs|audio.rs"
+# Regex to exclude files from coverage report, double escapes for Justfile + CLI
+# You can use src\\\\..., but the filename alone is acceptable too
+coverage_exclude_pattern := "src\\\\app.rs|audio.rs|src\\\\error.rs|platform\\\\emscripten.rs"
+
+# !!! --ignore-filename-regex should be used on both reports & coverage testing
+# !!! --remap-path-prefix prevents the absolute path from being used in the generated report
+
+# Generate HTML report (for humans, source line inspection)
+html: coverage
+    cargo llvm-cov report \
+    --remap-path-prefix \
+    --ignore-filename-regex "{{ coverage_exclude_pattern }}" \
+    --html \
+    --open
 
 # Display report (for humans)
 report-coverage: coverage
     cargo llvm-cov report \
+    --remap-path-prefix \
     --ignore-filename-regex "{{ coverage_exclude_pattern }}"
 
 # Run & generate report (for CI)
 coverage:
     cargo llvm-cov \
     --lcov \
+    --remap-path-prefix \
     --ignore-filename-regex "{{ coverage_exclude_pattern }}" \
     --output-path lcov.info \
     --profile coverage \

README.md

@@ -1,6 +1,6 @@
 # Pac-Man
 
-[![Tests Status][badge-test]][test] [![Build Status][badge-build]][build] [![Code Coverage][badge-coverage]][coverage] [![Online Demo][badge-online-demo]][demo] [![Last Commit][badge-last-commit]][commits]
+[![Tests Status][badge-test]][test] [![Build Status][badge-build]][build] [![If you're seeing this, Coveralls.io is broken again and it's not my fault.][badge-coverage]][coverage] [![Online Demo][badge-online-demo]][demo] [![Last Commit][badge-last-commit]][commits]
 
 [badge-test]: https://github.com/Xevion/Pac-Man/actions/workflows/tests.yaml/badge.svg
 [badge-build]: https://github.com/Xevion/Pac-Man/actions/workflows/build.yaml/badge.svg

build.rs

@@ -0,0 +1,50 @@
+use std::collections::HashMap;
+use std::env;
+use std::fs::File;
+use std::io::{BufWriter, Write};
+use std::path::Path;
+
+use serde::Deserialize;
+
+#[derive(Debug, Deserialize)]
+struct AtlasMapper {
+    frames: HashMap<String, MapperFrame>,
+}
+
+#[derive(Copy, Clone, Debug, Deserialize)]
+struct MapperFrame {
+    x: u16,
+    y: u16,
+    width: u16,
+    height: u16,
+}
+
+fn main() {
+    let path = Path::new(&env::var("OUT_DIR").unwrap()).join("atlas_data.rs");
+    let mut file = BufWriter::new(File::create(&path).unwrap());
+
+    let atlas_json = include_str!("./assets/game/atlas.json");
+    let atlas_mapper: AtlasMapper = serde_json::from_str(atlas_json).unwrap();
+
+    writeln!(&mut file, "use phf::phf_map;").unwrap();
+
+    writeln!(&mut file, "use crate::texture::sprite::MapperFrame;").unwrap();
+
+    writeln!(
+        &mut file,
+        "pub static ATLAS_FRAMES: phf::Map<&'static str, MapperFrame> = phf_map! {{"
+    )
+    .unwrap();
+
+    for (name, frame) in atlas_mapper.frames {
+        writeln!(
+            &mut file,
+            "    \"{}\" => MapperFrame {{ x: {}, y: {}, width: {}, height: {} }},",
+            name, frame.x, frame.y, frame.width, frame.height
+        )
+        .unwrap();
+    }
+
+    writeln!(&mut file, "}};").unwrap();
+    println!("cargo:rerun-if-changed=assets/game/atlas.json");
+}

src/app.rs

@@ -1,13 +1,11 @@
 use std::time::{Duration, Instant};
 
 use glam::Vec2;
-use sdl2::event::{Event, WindowEvent};
-use sdl2::keyboard::Keycode;
 use sdl2::render::{Canvas, ScaleMode, Texture, TextureCreator};
 use sdl2::ttf::Sdl2TtfContext;
 use sdl2::video::{Window, WindowContext};
 use sdl2::{AudioSubsystem, EventPump, Sdl, VideoSubsystem};
-use tracing::{error, event};
+use tracing::{error, warn};
 
 use crate::error::{GameError, GameResult};
 
@@ -16,12 +14,9 @@ use crate::game::Game;
 use crate::platform::get_platform;
 
 pub struct App {
-    game: Game,
-    canvas: Canvas<Window>,
-    event_pump: &'static mut EventPump,
-    backbuffer: Texture<'static>,
-    paused: bool,
+    pub game: Game,
     last_tick: Instant,
+    focused: bool,
     cursor_pos: Vec2,
 }
 
@@ -51,33 +46,33 @@ impl App {
             .build()
             .map_err(|e| GameError::Sdl(e.to_string()))?;
 
-        let mut canvas = window.into_canvas().build().map_err(|e| GameError::Sdl(e.to_string()))?;
+        let mut canvas = Box::leak(Box::new(
+            window
+                .into_canvas()
+                .accelerated()
+                .present_vsync()
+                .build()
+                .map_err(|e| GameError::Sdl(e.to_string()))?,
+        ));
+
         canvas
             .set_logical_size(CANVAS_SIZE.x, CANVAS_SIZE.y)
             .map_err(|e| GameError::Sdl(e.to_string()))?;
 
-        let texture_creator: &'static TextureCreator<WindowContext> = Box::leak(Box::new(canvas.texture_creator()));
+        let texture_creator: &'static mut TextureCreator<WindowContext> = Box::leak(Box::new(canvas.texture_creator()));
 
-        let mut game = Game::new(texture_creator)?;
+        let game = Game::new(canvas, texture_creator, event_pump)?;
         // game.audio.set_mute(cfg!(debug_assertions));
 
-        let mut backbuffer = texture_creator
-            .create_texture_target(None, CANVAS_SIZE.x, CANVAS_SIZE.y)
-            .map_err(|e| GameError::Sdl(e.to_string()))?;
-        backbuffer.set_scale_mode(ScaleMode::Nearest);
-
         // Initial draw
-        game.draw(&mut canvas, &mut backbuffer)
-            .map_err(|e| GameError::Sdl(e.to_string()))?;
-        game.present_backbuffer(&mut canvas, &backbuffer, glam::Vec2::ZERO)
-            .map_err(|e| GameError::Sdl(e.to_string()))?;
+        // game.draw(&mut canvas, &mut backbuffer)
+        //     .map_err(|e| GameError::Sdl(e.to_string()))?;
+        // game.present_backbuffer(&mut canvas, &backbuffer, glam::Vec2::ZERO)
+        //     .map_err(|e| GameError::Sdl(e.to_string()))?;
 
-        Ok(Self {
+        Ok(App {
             game,
-            canvas,
-            event_pump,
-            backbuffer,
-            paused: false,
+            focused: true,
             last_tick: Instant::now(),
             cursor_pos: Vec2::ZERO,
         })
@@ -87,78 +82,51 @@ impl App {
         {
             let start = Instant::now();
 
-            for event in self.event_pump.poll_iter() {
-                match event {
-                    Event::Window { win_event, .. } => match win_event {
-                        WindowEvent::Hidden => {
-                            event!(tracing::Level::DEBUG, "Window hidden");
-                        }
-                        WindowEvent::Shown => {
-                            event!(tracing::Level::DEBUG, "Window shown");
-                        }
-                        _ => {}
-                    },
-                    // It doesn't really make sense to have this available in the browser
-                    #[cfg(not(target_os = "emscripten"))]
-                    Event::Quit { .. }
-                    | Event::KeyDown {
-                        keycode: Some(Keycode::Escape) | Some(Keycode::Q),
-                        ..
-                    } => {
-                        event!(tracing::Level::INFO, "Exit requested. Exiting...");
-                        return false;
-                    }
-                    Event::KeyDown {
-                        keycode: Some(Keycode::P),
-                        ..
-                    } => {
-                        self.paused = !self.paused;
-                        event!(tracing::Level::INFO, "{}", if self.paused { "Paused" } else { "Unpaused" });
-                    }
-                    Event::KeyDown {
-                        keycode: Some(Keycode::Space),
-                        ..
-                    } => {
-                        self.game.toggle_debug_mode();
-                    }
-                    Event::KeyDown { keycode: Some(key), .. } => {
-                        self.game.keyboard_event(key);
-                    }
-                    Event::MouseMotion { x, y, .. } => {
-                        // Convert window coordinates to logical coordinates
-                        self.cursor_pos = Vec2::new(x as f32, y as f32);
-                    }
-                    _ => {}
-                }
-            }
+            // for event in self
+            //     .game
+            //     .world
+            //     .get_non_send_resource_mut::<&'static mut EventPump>()
+            //     .unwrap()
+            //     .poll_iter()
+            // {
+            //     match event {
+            //         Event::Window { win_event, .. } => match win_event {
+            //             WindowEvent::FocusGained => {
+            //                 self.focused = true;
+            //             }
+            //             WindowEvent::FocusLost => {
+            //                 self.focused = false;
+            //             }
+            //             _ => {}
+            //         },
+            //         Event::MouseMotion { x, y, .. } => {
+            //             // Convert window coordinates to logical coordinates
+            //             self.cursor_pos = Vec2::new(x as f32, y as f32);
+            //         }
+            //         _ => {}
+            //     }
+            // }
 
             let dt = self.last_tick.elapsed().as_secs_f32();
             self.last_tick = Instant::now();
 
-            if !self.paused {
-                self.game.tick(dt);
-                if let Err(e) = self.game.draw(&mut self.canvas, &mut self.backbuffer) {
-                    error!("Failed to draw game: {}", e);
-                }
-                if let Err(e) = self
-                    .game
-                    .present_backbuffer(&mut self.canvas, &self.backbuffer, self.cursor_pos)
-                {
-                    error!("Failed to present backbuffer: {}", e);
-                }
+            let exit = self.game.tick(dt);
+
+            if exit {
+                return false;
             }
 
+            // if let Err(e) = self.game.draw(&mut self.canvas, &mut self.backbuffer) {
+            //     error!("Failed to draw game: {}", e);
+            // }
+
             if start.elapsed() < LOOP_TIME {
                 let time = LOOP_TIME.saturating_sub(start.elapsed());
                 if time != Duration::ZERO {
-                    get_platform().sleep(time);
+                    get_platform().sleep(time, self.focused);
                 }
             } else {
-                event!(
-                    tracing::Level::WARN,
-                    "Game loop behind schedule by: {:?}",
-                    start.elapsed() - LOOP_TIME
-                );
+                warn!("Game loop behind schedule by: {:?}", start.elapsed() - LOOP_TIME);
             }
 
             true

src/asset.rs

@@ -12,8 +12,6 @@ pub enum Asset {
     Wav3,
     Wav4,
     Atlas,
-    AtlasJson,
-    // Add more as needed
 }
 
 impl Asset {
@@ -26,7 +24,6 @@ impl Asset {
             Wav3 => "sound/waka/3.ogg",
             Wav4 => "sound/waka/4.ogg",
             Atlas => "atlas.png",
-            AtlasJson => "atlas.json",
         }
     }
 }
@@ -36,6 +33,7 @@ mod imp {
     use crate::error::AssetError;
     use crate::platform::get_platform;
 
+    /// Returns the raw bytes of the given asset.
     pub fn get_asset_bytes(asset: Asset) -> Result<Cow<'static, [u8]>, AssetError> {
         get_platform().get_asset_bytes(asset)
     }

src/constants.rs

@@ -18,8 +18,6 @@ pub const SCALE: f32 = 2.6;
 pub const BOARD_CELL_OFFSET: UVec2 = UVec2::new(0, 3);
 /// The offset of the game board from the top-left corner of the window, in pixels.
 pub const BOARD_PIXEL_OFFSET: UVec2 = UVec2::new(BOARD_CELL_OFFSET.x * CELL_SIZE, BOARD_CELL_OFFSET.y * CELL_SIZE);
-/// The size of the game board, in pixels.
-pub const BOARD_PIXEL_SIZE: UVec2 = UVec2::new(BOARD_CELL_SIZE.x * CELL_SIZE, BOARD_CELL_SIZE.y * CELL_SIZE);
 /// The size of the canvas, in pixels.
 pub const CANVAS_SIZE: UVec2 = UVec2::new(
     (BOARD_CELL_SIZE.x + BOARD_CELL_OFFSET.x) * CELL_SIZE,

src/ecs/interact.rs

@@ -0,0 +1,172 @@
+use bevy_ecs::{
+    event::{EventReader, EventWriter},
+    query::With,
+    system::{Query, Res, ResMut},
+};
+
+use crate::{
+    ecs::{DeltaTime, GlobalState, PlayerControlled, Position, Velocity},
+    error::{EntityError, GameError},
+    game::events::GameEvent,
+    input::commands::GameCommand,
+    map::builder::Map,
+};
+
+pub fn movement_system(
+    map: Res<Map>,
+    delta_time: Res<DeltaTime>,
+    mut entities: Query<(&PlayerControlled, &mut Velocity, &mut Position)>,
+    mut errors: EventWriter<GameError>,
+) {
+    for (player, mut velocity, mut position) in entities.iter_mut() {
+        let distance = velocity.speed.unwrap_or(0.0) * delta_time.0;
+
+        // Decrement the remaining frames for the next direction
+        if let Some((direction, remaining)) = velocity.next_direction {
+            if remaining > 0 {
+                velocity.next_direction = Some((direction, remaining - 1));
+            } else {
+                velocity.next_direction = None;
+            }
+        }
+
+        match *position {
+            Position::AtNode(node_id) => {
+                // We're not moving, but a buffered direction is available.
+                if let Some((next_direction, _)) = velocity.next_direction {
+                    if let Some(edge) = map.graph.find_edge_in_direction(node_id, next_direction) {
+                        // if edge.permissions.can_traverse(edge) {
+                        //     // Start moving in that direction
+                        *position = Position::BetweenNodes {
+                            from: node_id,
+                            to: edge.target,
+                            traversed: distance,
+                        };
+                        velocity.direction = next_direction;
+                        // } else {
+                        //     return Err(crate::error::GameError::Entity(crate::error::EntityError::InvalidMovement(
+                        //         format!(
+                        //             "Cannot traverse edge from {} to {} in direction {:?}",
+                        //             node_id, edge.target, next_direction
+                        //         ),
+                        //     )));
+                        // }
+                    } else {
+                        errors.write(
+                            EntityError::InvalidMovement(format!(
+                                "No edge found in direction {:?} from node {}",
+                                next_direction, node_id
+                            ))
+                            .into(),
+                        );
+                    }
+
+                    velocity.next_direction = None; // Consume the buffered direction regardless of whether we started moving with it
+                }
+            }
+            Position::BetweenNodes { from, to, traversed } => {
+                // There is no point in any of the next logic if we don't travel at all
+                if distance <= 0.0 {
+                    return;
+                }
+
+                let edge = map
+                    .graph
+                    .find_edge(from, to)
+                    .ok_or_else(|| {
+                        errors.write(
+                            EntityError::InvalidMovement(format!(
+                                "Inconsistent state: Traverser is on a non-existent edge from {} to {}.",
+                                from, to
+                            ))
+                            .into(),
+                        );
+                        return;
+                    })
+                    .unwrap();
+
+                let new_traversed = traversed + distance;
+
+                if new_traversed < edge.distance {
+                    // Still on the same edge, just update the distance.
+                    *position = Position::BetweenNodes {
+                        from,
+                        to,
+                        traversed: new_traversed,
+                    };
+                } else {
+                    let overflow = new_traversed - edge.distance;
+                    let mut moved = false;
+
+                    // If we buffered a direction, try to find an edge in that direction
+                    if let Some((next_dir, _)) = velocity.next_direction {
+                        if let Some(edge) = map.graph.find_edge_in_direction(to, next_dir) {
+                            // if edge.permissions.can_traverse(edge) {
+                            //     *position = Position::BetweenNodes {
+                            //         from: to,
+                            //         to: edge.target,
+                            //         traversed: overflow,
+                            //     };
+
+                            velocity.direction = next_dir; // Remember our new direction
+                            velocity.next_direction = None; // Consume the buffered direction
+                            moved = true;
+                            // }
+                        }
+                    }
+
+                    // If we didn't move, try to continue in the current direction
+                    if !moved {
+                        if let Some(edge) = map.graph.find_edge_in_direction(to, velocity.direction) {
+                            // if edge.permissions.can_traverse(edge) {
+                            *position = Position::BetweenNodes {
+                                from: to,
+                                to: edge.target,
+                                traversed: overflow,
+                            };
+                            // } else {
+                            //     *position = Position::AtNode(to);
+                            //     velocity.next_direction = None;
+                            // }
+                        } else {
+                            *position = Position::AtNode(to);
+                            velocity.next_direction = None;
+                        }
+                    }
+                }
+            }
+        }
+    }
+}
+
+// Handles
+pub fn interact_system(
+    mut events: EventReader<GameEvent>,
+    mut state: ResMut<GlobalState>,
+    mut players: Query<(&PlayerControlled, &mut Velocity)>,
+    mut errors: EventWriter<GameError>,
+) {
+    // Get the player's velocity (handling to ensure there is only one player)
+    let mut velocity = match players.single_mut() {
+        Ok((_, velocity)) => velocity,
+        Err(e) => {
+            errors.write(GameError::InvalidState(format!("Player not found: {}", e)).into());
+            return;
+        }
+    };
+
+    // Handle events
+    for event in events.read() {
+        match event {
+            GameEvent::Command(command) => match command {
+                GameCommand::MovePlayer(direction) => {
+                    velocity.direction = *direction;
+                }
+                GameCommand::Exit => {
+                    state.exit = true;
+                }
+                _ => {}
+            },
+        }
+    }
+}

src/ecs/mod.rs

@@ -0,0 +1,150 @@
+//! The Entity-Component-System (ECS) module.
+//!
+//! This module contains all the ECS-related logic, including components, systems,
+//! and resources.
+
+use bevy_ecs::{bundle::Bundle, component::Component, resource::Resource};
+use glam::Vec2;
+
+use crate::{
+    entity::{direction::Direction, graph::Graph, traversal},
+    error::{EntityError, GameResult},
+    texture::{
+        animated::AnimatedTexture,
+        directional::DirectionalAnimatedTexture,
+        sprite::{AtlasTile, Sprite},
+    },
+};
+
+/// A tag component for entities that are controlled by the player.
+#[derive(Default, Component)]
+pub struct PlayerControlled;
+
+/// A component for entities that have a sprite, with a layer for ordering.
+///
+/// This is intended to be modified by other entities allowing animation.
+#[derive(Component)]
+pub struct Renderable {
+    pub sprite: AtlasTile,
+    pub layer: u8,
+}
+
+/// A component for entities that have a directional animated texture.
+#[derive(Component)]
+pub struct DirectionalAnimated {
+    pub textures: [Option<AnimatedTexture>; 4],
+    pub stopped_textures: [Option<AnimatedTexture>; 4],
+}
+
+/// A unique identifier for a node, represented by its index in the graph's storage.
+pub type NodeId = usize;
+
+/// Represents the current position of an entity traversing the graph.
+///
+/// This enum allows for precise tracking of whether an entity is exactly at a node
+/// or moving along an edge between two nodes.
+#[derive(Component, Debug, Copy, Clone, PartialEq)]
+pub enum Position {
+    /// The traverser is located exactly at a node.
+    AtNode(NodeId),
+    /// The traverser is on an edge between two nodes.
+    BetweenNodes {
+        from: NodeId,
+        to: NodeId,
+        /// The floating-point distance traversed along the edge from the `from` node.
+        traversed: f32,
+    },
+}
+
+impl Position {
+    /// Calculates the current pixel position in the game world.
+    ///
+    /// Converts the graph position to screen coordinates, accounting for
+    /// the board offset and centering the sprite.
+    pub fn get_pixel_pos(&self, graph: &Graph) -> GameResult<Vec2> {
+        let pos = match self {
+            Position::AtNode(node_id) => {
+                let node = graph.get_node(*node_id).ok_or(EntityError::NodeNotFound(*node_id))?;
+                node.position
+            }
+            Position::BetweenNodes { from, to, traversed } => {
+                let from_node = graph.get_node(*from).ok_or(EntityError::NodeNotFound(*from))?;
+                let to_node = graph.get_node(*to).ok_or(EntityError::NodeNotFound(*to))?;
+                let edge = graph
+                    .find_edge(*from, *to)
+                    .ok_or(EntityError::EdgeNotFound { from: *from, to: *to })?;
+                from_node.position + (to_node.position - from_node.position) * (traversed / edge.distance)
+            }
+        };
+
+        Ok(Vec2::new(
+            pos.x + crate::constants::BOARD_PIXEL_OFFSET.x as f32,
+            pos.y + crate::constants::BOARD_PIXEL_OFFSET.y as f32,
+        ))
+    }
+}
+
+impl Default for Position {
+    fn default() -> Self {
+        Position::AtNode(0)
+    }
+}
+
+#[allow(dead_code)]
+impl Position {
+    /// Returns `true` if the position is exactly at a node.
+    pub fn is_at_node(&self) -> bool {
+        matches!(self, Position::AtNode(_))
+    }
+
+    /// Returns the `NodeId` of the current or most recently departed node.
+    #[allow(clippy::wrong_self_convention)]
+    pub fn from_node_id(&self) -> NodeId {
+        match self {
+            Position::AtNode(id) => *id,
+            Position::BetweenNodes { from, .. } => *from,
+        }
+    }
+
+    /// Returns the `NodeId` of the destination node, if currently on an edge.
+    #[allow(clippy::wrong_self_convention)]
+    pub fn to_node_id(&self) -> Option<NodeId> {
+        match self {
+            Position::AtNode(_) => None,
+            Position::BetweenNodes { to, .. } => Some(*to),
+        }
+    }
+
+    /// Returns `true` if the traverser is stopped at a node.
+    pub fn is_stopped(&self) -> bool {
+        matches!(self, Position::AtNode(_))
+    }
+}
+
+/// A component for entities that have a velocity, with a direction and speed.
+#[derive(Default, Component)]
+pub struct Velocity {
+    pub direction: Direction,
+    pub next_direction: Option<(Direction, u8)>,
+    pub speed: Option<f32>,
+}
+
+#[derive(Bundle)]
+pub struct PlayerBundle {
+    pub player: PlayerControlled,
+    pub position: Position,
+    pub velocity: Velocity,
+    pub sprite: Renderable,
+    pub directional_animated: DirectionalAnimated,
+}
+
+#[derive(Resource)]
+pub struct GlobalState {
+    pub exit: bool,
+}
+
+#[derive(Resource)]
+pub struct DeltaTime(pub f32);
+
+pub mod interact;
+pub mod render;

src/ecs/render.rs

@@ -0,0 +1,95 @@
+use crate::ecs::{DeltaTime, DirectionalAnimated, Position, Renderable, Velocity};
+use crate::error::{EntityError, GameError, TextureError};
+use crate::map::builder::Map;
+use crate::texture::sprite::SpriteAtlas;
+use bevy_ecs::entity::Entity;
+use bevy_ecs::event::EventWriter;
+use bevy_ecs::system::{NonSendMut, Query, Res};
+use sdl2::render::{Canvas, Texture};
+use sdl2::video::Window;
+
+/// Updates the directional animated texture of an entity.
+pub fn directional_render_system(
+    dt: Res<DeltaTime>,
+    mut renderables: Query<(&Velocity, &mut DirectionalAnimated, &mut Renderable)>,
+    mut errors: EventWriter<GameError>,
+) {
+    for (velocity, mut texture, mut renderable) in renderables.iter_mut() {
+        let texture = if velocity.speed.is_none() {
+            texture.stopped_textures[velocity.direction.as_usize()].as_mut()
+        } else {
+            texture.textures[velocity.direction.as_usize()].as_mut()
+        };
+
+        if let Some(texture) = texture {
+            texture.tick(dt.0);
+            renderable.sprite = *texture.current_tile();
+        } else {
+            errors.write(TextureError::RenderFailed(format!("Entity has no texture")).into());
+            continue;
+        }
+    }
+}
+
+pub struct MapTextureResource(pub Texture<'static>);
+pub struct BackbufferResource(pub Texture<'static>);
+
+pub fn render_system(
+    mut canvas: NonSendMut<&mut Canvas<Window>>,
+    map_texture: NonSendMut<MapTextureResource>,
+    mut backbuffer: NonSendMut<BackbufferResource>,
+    mut atlas: NonSendMut<SpriteAtlas>,
+    map: Res<Map>,
+    mut renderables: Query<(Entity, &mut Renderable, &Position)>,
+    mut errors: EventWriter<GameError>,
+) {
+    // Clear the main canvas first
+    canvas.set_draw_color(sdl2::pixels::Color::BLACK);
+    canvas.clear();
+
+    // Render to backbuffer
+    canvas
+        .with_texture_canvas(&mut backbuffer.0, |backbuffer_canvas| {
+            // Clear the backbuffer
+            backbuffer_canvas.set_draw_color(sdl2::pixels::Color::BLACK);
+            backbuffer_canvas.clear();
+
+            // Copy the pre-rendered map texture to the backbuffer
+            backbuffer_canvas
+                .copy(&map_texture.0, None, None)
+                .err()
+                .map(|e| errors.write(TextureError::RenderFailed(e.to_string()).into()));
+
+            // Render all entities to the backbuffer
+            for (_, mut renderable, position) in renderables.iter_mut() {
+                let pos = position.get_pixel_pos(&map.graph);
+                match pos {
+                    Ok(pos) => {
+                        let dest = crate::helpers::centered_with_size(
+                            glam::IVec2::new(pos.x as i32, pos.y as i32),
+                            glam::UVec2::new(renderable.sprite.size.x as u32, renderable.sprite.size.y as u32),
+                        );
+
+                        renderable
+                            .sprite
+                            .render(backbuffer_canvas, &mut atlas, dest)
+                            .err()
+                            .map(|e| errors.write(TextureError::RenderFailed(e.to_string()).into()));
+                    }
+                    Err(e) => {
+                        errors.write(e.into());
+                    }
+                }
+            }
+        })
+        .err()
+        .map(|e| errors.write(TextureError::RenderFailed(e.to_string()).into()));
+
+    // Copy backbuffer to main canvas and present
+    canvas
+        .copy(&backbuffer.0, None, None)
+        .err()
+        .map(|e| errors.write(TextureError::RenderFailed(e.to_string()).into()));
+
+    canvas.present();
+}

src/entity/collision.rs

@@ -1,128 +1,128 @@
-use smallvec::SmallVec;
-use std::collections::HashMap;
+// use smallvec::SmallVec;
+// use std::collections::HashMap;
 
-use crate::entity::traversal::Position;
+// use crate::entity::{graph::NodeId, traversal::Position};
 
-/// Trait for entities that can participate in collision detection.
-pub trait Collidable {
-    /// Returns the current position of this entity.
-    fn position(&self) -> Position;
+// /// Trait for entities that can participate in collision detection.
+// pub trait Collidable {
+//     /// Returns the current position of this entity.
+//     fn position(&self) -> Position;
 
-    /// Checks if this entity is colliding with another entity.
-    #[allow(dead_code)]
-    fn is_colliding_with(&self, other: &dyn Collidable) -> bool {
-        positions_overlap(&self.position(), &other.position())
-    }
-}
+//     /// Checks if this entity is colliding with another entity.
+//     #[allow(dead_code)]
+//     fn is_colliding_with(&self, other: &dyn Collidable) -> bool {
+//         positions_overlap(&self.position(), &other.position())
+//     }
+// }
 
-/// System for tracking entities by their positions for efficient collision detection.
-#[derive(Default)]
-pub struct CollisionSystem {
-    /// Maps node IDs to lists of entity IDs that are at that node
-    node_entities: HashMap<usize, Vec<EntityId>>,
-    /// Maps entity IDs to their current positions
-    entity_positions: HashMap<EntityId, Position>,
-    /// Next available entity ID
-    next_id: EntityId,
-}
+// /// System for tracking entities by their positions for efficient collision detection.
+// #[derive(Default)]
+// pub struct CollisionSystem {
+//     /// Maps node IDs to lists of entity IDs that are at that node
+//     node_entities: HashMap<NodeId, Vec<EntityId>>,
+//     /// Maps entity IDs to their current positions
+//     entity_positions: HashMap<EntityId, Position>,
+//     /// Next available entity ID
+//     next_id: EntityId,
+// }
 
-/// Unique identifier for an entity in the collision system
-pub type EntityId = u32;
+// /// Unique identifier for an entity in the collision system
+// pub type EntityId = u32;
 
-impl CollisionSystem {
-    /// Registers an entity with the collision system and returns its ID
-    pub fn register_entity(&mut self, position: Position) -> EntityId {
-        let id = self.next_id;
-        self.next_id += 1;
+// impl CollisionSystem {
+//     /// Registers an entity with the collision system and returns its ID
+//     pub fn register_entity(&mut self, position: Position) -> EntityId {
+//         let id = self.next_id;
+//         self.next_id += 1;
 
-        self.entity_positions.insert(id, position);
-        self.update_node_entities(id, position);
+//         self.entity_positions.insert(id, position);
+//         self.update_node_entities(id, position);
 
-        id
-    }
+//         id
+//     }
 
-    /// Updates an entity's position
-    pub fn update_position(&mut self, entity_id: EntityId, new_position: Position) {
-        if let Some(old_position) = self.entity_positions.get(&entity_id) {
-            // Remove from old nodes
-            self.remove_from_nodes(entity_id, *old_position);
-        }
+//     /// Updates an entity's position
+//     pub fn update_position(&mut self, entity_id: EntityId, new_position: Position) {
+//         if let Some(old_position) = self.entity_positions.get(&entity_id) {
+//             // Remove from old nodes
+//             self.remove_from_nodes(entity_id, *old_position);
+//         }
 
-        // Update position and add to new nodes
-        self.entity_positions.insert(entity_id, new_position);
-        self.update_node_entities(entity_id, new_position);
-    }
+//         // Update position and add to new nodes
+//         self.entity_positions.insert(entity_id, new_position);
+//         self.update_node_entities(entity_id, new_position);
+//     }
 
-    /// Removes an entity from the collision system
-    #[allow(dead_code)]
-    pub fn remove_entity(&mut self, entity_id: EntityId) {
-        if let Some(position) = self.entity_positions.remove(&entity_id) {
-            self.remove_from_nodes(entity_id, position);
-        }
-    }
+//     /// Removes an entity from the collision system
+//     #[allow(dead_code)]
+//     pub fn remove_entity(&mut self, entity_id: EntityId) {
+//         if let Some(position) = self.entity_positions.remove(&entity_id) {
+//             self.remove_from_nodes(entity_id, position);
+//         }
+//     }
 
-    /// Gets all entity IDs at a specific node
-    pub fn entities_at_node(&self, node: usize) -> &[EntityId] {
-        self.node_entities.get(&node).map(|v| v.as_slice()).unwrap_or(&[])
-    }
+//     /// Gets all entity IDs at a specific node
+//     pub fn entities_at_node(&self, node: NodeId) -> &[EntityId] {
+//         self.node_entities.get(&node).map(|v| v.as_slice()).unwrap_or(&[])
+//     }
 
-    /// Gets all entity IDs that could collide with an entity at the given position
-    pub fn potential_collisions(&self, position: &Position) -> Vec<EntityId> {
-        let mut collisions = Vec::new();
-        let nodes = get_nodes(position);
+//     /// Gets all entity IDs that could collide with an entity at the given position
+//     pub fn potential_collisions(&self, position: &Position) -> Vec<EntityId> {
+//         let mut collisions = Vec::new();
+//         let nodes = get_nodes(position);
 
-        for node in nodes {
-            collisions.extend(self.entities_at_node(node));
-        }
+//         for node in nodes {
+//             collisions.extend(self.entities_at_node(node));
+//         }
 
-        // Remove duplicates
-        collisions.sort_unstable();
-        collisions.dedup();
-        collisions
-    }
+//         // Remove duplicates
+//         collisions.sort_unstable();
+//         collisions.dedup();
+//         collisions
+//     }
 
-    /// Updates the node_entities map when an entity's position changes
-    fn update_node_entities(&mut self, entity_id: EntityId, position: Position) {
-        let nodes = get_nodes(&position);
-        for node in nodes {
-            self.node_entities.entry(node).or_default().push(entity_id);
-        }
-    }
+//     /// Updates the node_entities map when an entity's position changes
+//     fn update_node_entities(&mut self, entity_id: EntityId, position: Position) {
+//         let nodes = get_nodes(&position);
+//         for node in nodes {
+//             self.node_entities.entry(node).or_default().push(entity_id);
+//         }
+//     }
 
-    /// Removes an entity from all nodes it was previously at
-    fn remove_from_nodes(&mut self, entity_id: EntityId, position: Position) {
-        let nodes = get_nodes(&position);
-        for node in nodes {
-            if let Some(entities) = self.node_entities.get_mut(&node) {
-                entities.retain(|&id| id != entity_id);
-                if entities.is_empty() {
-                    self.node_entities.remove(&node);
-                }
-            }
-        }
-    }
-}
+//     /// Removes an entity from all nodes it was previously at
+//     fn remove_from_nodes(&mut self, entity_id: EntityId, position: Position) {
+//         let nodes = get_nodes(&position);
+//         for node in nodes {
+//             if let Some(entities) = self.node_entities.get_mut(&node) {
+//                 entities.retain(|&id| id != entity_id);
+//                 if entities.is_empty() {
+//                     self.node_entities.remove(&node);
+//                 }
+//             }
+//         }
+//     }
+// }
 
-/// Checks if two positions overlap (entities are at the same location).
-fn positions_overlap(a: &Position, b: &Position) -> bool {
-    let a_nodes = get_nodes(a);
-    let b_nodes = get_nodes(b);
+// /// Checks if two positions overlap (entities are at the same location).
+// fn positions_overlap(a: &Position, b: &Position) -> bool {
+//     let a_nodes = get_nodes(a);
+//     let b_nodes = get_nodes(b);
 
-    // Check if any nodes overlap
-    a_nodes.iter().any(|a_node| b_nodes.contains(a_node))
+//     // Check if any nodes overlap
+//     a_nodes.iter().any(|a_node| b_nodes.contains(a_node))
 
-    // TODO: More complex overlap detection, the above is a simple check, but it could become an early filter for more precise calculations later
-}
+//     // TODO: More complex overlap detection, the above is a simple check, but it could become an early filter for more precise calculations later
+// }
 
-/// Gets all nodes that an entity is currently at or between.
-fn get_nodes(pos: &Position) -> SmallVec<[usize; 2]> {
-    let mut nodes = SmallVec::new();
-    match pos {
-        Position::AtNode(node) => nodes.push(*node),
-        Position::BetweenNodes { from, to, .. } => {
-            nodes.push(*from);
-            nodes.push(*to);
-        }
-    }
-    nodes
-}
+// /// Gets all nodes that an entity is currently at or between.
+// fn get_nodes(pos: &Position) -> SmallVec<[NodeId; 2]> {
+//     let mut nodes = SmallVec::new();
+//     match pos {
+//         Position::AtNode(node) => nodes.push(*node),
+//         Position::BetweenNodes { from, to, .. } => {
+//             nodes.push(*from);
+//             nodes.push(*to);
+//         }
+//     }
+//     nodes
+// }

src/entity/direction.rs

@@ -1,11 +1,13 @@
 use glam::IVec2;
 
 /// The four cardinal directions.
-#[derive(Debug, Copy, Clone, PartialEq, Eq, Hash)]
+#[derive(Debug, Clone, Copy, PartialEq, Eq, Hash, Default)]
+#[repr(usize)]
 pub enum Direction {
     Up,
     Down,
     Left,
+    #[default]
     Right,
 }
 

src/entity/ghost.rs

@@ -1,254 +1,254 @@
-//! Ghost entity implementation.
-//!
-//! This module contains the ghost character logic, including movement,
-//! animation, and rendering. Ghosts move through the game graph using
-//! a traverser and display directional animated textures.
+// //! Ghost entity implementation.
+// //!
+// //! This module contains the ghost character logic, including movement,
+// //! animation, and rendering. Ghosts move through the game graph using
+// //! a traverser and display directional animated textures.
 
-use pathfinding::prelude::dijkstra;
-use rand::prelude::*;
-use smallvec::SmallVec;
-use tracing::error;
+// use pathfinding::prelude::dijkstra;
+// use rand::prelude::*;
+// use smallvec::SmallVec;
+// use tracing::error;
 
-use crate::entity::{
-    collision::Collidable,
-    direction::Direction,
-    graph::{Edge, EdgePermissions, Graph, NodeId},
-    r#trait::Entity,
-    traversal::Traverser,
-};
-use crate::texture::animated::AnimatedTexture;
-use crate::texture::directional::DirectionalAnimatedTexture;
-use crate::texture::sprite::SpriteAtlas;
+// use crate::entity::{
+//     collision::Collidable,
+//     direction::Direction,
+//     graph::{Edge, EdgePermissions, Graph, NodeId},
+//     r#trait::Entity,
+//     traversal::Traverser,
+// };
+// use crate::texture::animated::AnimatedTexture;
+// use crate::texture::directional::DirectionalAnimatedTexture;
+// use crate::texture::sprite::SpriteAtlas;
 
-use crate::error::{EntityError, GameError, GameResult, TextureError};
+// use crate::error::{EntityError, GameError, GameResult, TextureError};
 
-/// Determines if a ghost can traverse a given edge.
-///
-/// Ghosts can move through edges that allow all entities or ghost-only edges.
-fn can_ghost_traverse(edge: Edge) -> bool {
-    matches!(edge.permissions, EdgePermissions::All | EdgePermissions::GhostsOnly)
-}
+// /// Determines if a ghost can traverse a given edge.
+// ///
+// /// Ghosts can move through edges that allow all entities or ghost-only edges.
+// fn can_ghost_traverse(edge: Edge) -> bool {
+//     matches!(edge.permissions, EdgePermissions::All | EdgePermissions::GhostsOnly)
+// }
 
-/// The four classic ghost types.
-#[derive(Debug, Clone, Copy, PartialEq, Eq)]
-pub enum GhostType {
-    Blinky,
-    Pinky,
-    Inky,
-    Clyde,
-}
+// /// The four classic ghost types.
+// #[derive(Debug, Clone, Copy, PartialEq, Eq)]
+// pub enum GhostType {
+//     Blinky,
+//     Pinky,
+//     Inky,
+//     Clyde,
+// }
 
-impl GhostType {
-    /// Returns the ghost type name for atlas lookups.
-    pub fn as_str(self) -> &'static str {
-        match self {
-            GhostType::Blinky => "blinky",
-            GhostType::Pinky => "pinky",
-            GhostType::Inky => "inky",
-            GhostType::Clyde => "clyde",
-        }
-    }
+// impl GhostType {
+//     /// Returns the ghost type name for atlas lookups.
+//     pub fn as_str(self) -> &'static str {
+//         match self {
+//             GhostType::Blinky => "blinky",
+//             GhostType::Pinky => "pinky",
+//             GhostType::Inky => "inky",
+//             GhostType::Clyde => "clyde",
+//         }
+//     }
 
-    /// Returns the base movement speed for this ghost type.
-    pub fn base_speed(self) -> f32 {
-        match self {
-            GhostType::Blinky => 1.0,
-            GhostType::Pinky => 0.95,
-            GhostType::Inky => 0.9,
-            GhostType::Clyde => 0.85,
-        }
-    }
-}
+//     /// Returns the base movement speed for this ghost type.
+//     pub fn base_speed(self) -> f32 {
+//         match self {
+//             GhostType::Blinky => 1.0,
+//             GhostType::Pinky => 0.95,
+//             GhostType::Inky => 0.9,
+//             GhostType::Clyde => 0.85,
+//         }
+//     }
+// }
 
-/// A ghost entity that roams the game world.
-///
-/// Ghosts move through the game world using a graph-based navigation system
-/// and display directional animated sprites. They randomly choose directions
-/// at each intersection.
-pub struct Ghost {
-    /// Handles movement through the game graph
-    pub traverser: Traverser,
-    /// The type of ghost (affects appearance and speed)
-    pub ghost_type: GhostType,
-    /// Manages directional animated textures for different movement states
-    texture: DirectionalAnimatedTexture,
-    /// Current movement speed
-    speed: f32,
-}
+// /// A ghost entity that roams the game world.
+// ///
+// /// Ghosts move through the game world using a graph-based navigation system
+// /// and display directional animated sprites. They randomly choose directions
+// /// at each intersection.
+// pub struct Ghost {
+//     /// Handles movement through the game graph
+//     pub traverser: Traverser,
+//     /// The type of ghost (affects appearance and speed)
+//     pub ghost_type: GhostType,
+//     /// Manages directional animated textures for different movement states
+//     texture: DirectionalAnimatedTexture,
+//     /// Current movement speed
+//     speed: f32,
+// }
 
-impl Entity for Ghost {
-    fn traverser(&self) -> &Traverser {
-        &self.traverser
-    }
+// impl Entity for Ghost {
+//     fn traverser(&self) -> &Traverser {
+//         &self.traverser
+//     }
 
-    fn traverser_mut(&mut self) -> &mut Traverser {
-        &mut self.traverser
-    }
+//     fn traverser_mut(&mut self) -> &mut Traverser {
+//         &mut self.traverser
+//     }
 
-    fn texture(&self) -> &DirectionalAnimatedTexture {
-        &self.texture
-    }
+//     fn texture(&self) -> &DirectionalAnimatedTexture {
+//         &self.texture
+//     }
 
-    fn texture_mut(&mut self) -> &mut DirectionalAnimatedTexture {
-        &mut self.texture
-    }
+//     fn texture_mut(&mut self) -> &mut DirectionalAnimatedTexture {
+//         &mut self.texture
+//     }
 
-    fn speed(&self) -> f32 {
-        self.speed
-    }
+//     fn speed(&self) -> f32 {
+//         self.speed
+//     }
 
-    fn can_traverse(&self, edge: Edge) -> bool {
-        can_ghost_traverse(edge)
-    }
+//     fn can_traverse(&self, edge: Edge) -> bool {
+//         can_ghost_traverse(edge)
+//     }
 
-    fn tick(&mut self, dt: f32, graph: &Graph) {
-        // Choose random direction when at a node
-        if self.traverser.position.is_at_node() {
-            self.choose_random_direction(graph);
-        }
+//     fn tick(&mut self, dt: f32, graph: &Graph) {
+//         // Choose random direction when at a node
+//         if self.traverser.position.is_at_node() {
+//             self.choose_random_direction(graph);
+//         }
 
-        if let Err(e) = self.traverser.advance(graph, dt * 60.0 * self.speed, &can_ghost_traverse) {
-            error!("Ghost movement error: {}", e);
-        }
-        self.texture.tick(dt);
-    }
-}
+//         if let Err(e) = self.traverser.advance(graph, dt * 60.0 * self.speed, &can_ghost_traverse) {
+//             error!("Ghost movement error: {}", e);
+//         }
+//         self.texture.tick(dt);
+//     }
+// }
 
-impl Ghost {
-    /// Creates a new ghost instance at the specified starting node.
-    ///
-    /// Sets up animated textures for all four directions with moving and stopped states.
-    /// The moving animation cycles through two sprite variants.
-    pub fn new(graph: &Graph, start_node: NodeId, ghost_type: GhostType, atlas: &SpriteAtlas) -> GameResult<Self> {
-        let mut textures = [None, None, None, None];
-        let mut stopped_textures = [None, None, None, None];
+// impl Ghost {
+//     /// Creates a new ghost instance at the specified starting node.
+//     ///
+//     /// Sets up animated textures for all four directions with moving and stopped states.
+//     /// The moving animation cycles through two sprite variants.
+//     pub fn new(graph: &Graph, start_node: NodeId, ghost_type: GhostType, atlas: &SpriteAtlas) -> GameResult<Self> {
+//         let mut textures = [None, None, None, None];
+//         let mut stopped_textures = [None, None, None, None];
 
-        for direction in Direction::DIRECTIONS {
-            let moving_prefix = match direction {
-                Direction::Up => "up",
-                Direction::Down => "down",
-                Direction::Left => "left",
-                Direction::Right => "right",
-            };
-            let moving_tiles = vec![
-                SpriteAtlas::get_tile(atlas, &format!("ghost/{}/{}_{}.png", ghost_type.as_str(), moving_prefix, "a"))
-                    .ok_or_else(|| {
-                        GameError::Texture(TextureError::AtlasTileNotFound(format!(
-                            "ghost/{}/{}_{}.png",
-                            ghost_type.as_str(),
-                            moving_prefix,
-                            "a"
-                        )))
-                    })?,
-                SpriteAtlas::get_tile(atlas, &format!("ghost/{}/{}_{}.png", ghost_type.as_str(), moving_prefix, "b"))
-                    .ok_or_else(|| {
-                        GameError::Texture(TextureError::AtlasTileNotFound(format!(
-                            "ghost/{}/{}_{}.png",
-                            ghost_type.as_str(),
-                            moving_prefix,
-                            "b"
-                        )))
-                    })?,
-            ];
+//         for direction in Direction::DIRECTIONS {
+//             let moving_prefix = match direction {
+//                 Direction::Up => "up",
+//                 Direction::Down => "down",
+//                 Direction::Left => "left",
+//                 Direction::Right => "right",
+//             };
+//             let moving_tiles = vec![
+//                 SpriteAtlas::get_tile(atlas, &format!("ghost/{}/{}_{}.png", ghost_type.as_str(), moving_prefix, "a"))
+//                     .ok_or_else(|| {
+//                         GameError::Texture(TextureError::AtlasTileNotFound(format!(
+//                             "ghost/{}/{}_{}.png",
+//                             ghost_type.as_str(),
+//                             moving_prefix,
+//                             "a"
+//                         )))
+//                     })?,
+//                 SpriteAtlas::get_tile(atlas, &format!("ghost/{}/{}_{}.png", ghost_type.as_str(), moving_prefix, "b"))
+//                     .ok_or_else(|| {
+//                         GameError::Texture(TextureError::AtlasTileNotFound(format!(
+//                             "ghost/{}/{}_{}.png",
+//                             ghost_type.as_str(),
+//                             moving_prefix,
+//                             "b"
+//                         )))
+//                     })?,
+//             ];
 
-            let stopped_tiles =
-                vec![
-                    SpriteAtlas::get_tile(atlas, &format!("ghost/{}/{}_{}.png", ghost_type.as_str(), moving_prefix, "a"))
-                        .ok_or_else(|| {
-                            GameError::Texture(TextureError::AtlasTileNotFound(format!(
-                                "ghost/{}/{}_{}.png",
-                                ghost_type.as_str(),
-                                moving_prefix,
-                                "a"
-                            )))
-                        })?,
-                ];
+//             let stopped_tiles =
+//                 vec![
+//                     SpriteAtlas::get_tile(atlas, &format!("ghost/{}/{}_{}.png", ghost_type.as_str(), moving_prefix, "a"))
+//                         .ok_or_else(|| {
+//                             GameError::Texture(TextureError::AtlasTileNotFound(format!(
+//                                 "ghost/{}/{}_{}.png",
+//                                 ghost_type.as_str(),
+//                                 moving_prefix,
+//                                 "a"
+//                             )))
+//                         })?,
+//                 ];
 
-            textures[direction.as_usize()] = Some(AnimatedTexture::new(moving_tiles, 0.2)?);
-            stopped_textures[direction.as_usize()] = Some(AnimatedTexture::new(stopped_tiles, 0.1)?);
-        }
+//             textures[direction.as_usize()] = Some(AnimatedTexture::new(moving_tiles, 0.2)?);
+//             stopped_textures[direction.as_usize()] = Some(AnimatedTexture::new(stopped_tiles, 0.1)?);
+//         }
 
-        Ok(Self {
-            traverser: Traverser::new(graph, start_node, Direction::Left, &can_ghost_traverse),
-            ghost_type,
-            texture: DirectionalAnimatedTexture::new(textures, stopped_textures),
-            speed: ghost_type.base_speed(),
-        })
-    }
+//         Ok(Self {
+//             traverser: Traverser::new(graph, start_node, Direction::Left, &can_ghost_traverse),
+//             ghost_type,
+//             texture: DirectionalAnimatedTexture::new(textures, stopped_textures),
+//             speed: ghost_type.base_speed(),
+//         })
+//     }
 
-    /// Chooses a random available direction at the current intersection.
-    fn choose_random_direction(&mut self, graph: &Graph) {
-        let current_node = self.traverser.position.from_node_id();
-        let intersection = &graph.adjacency_list[current_node];
+//     /// Chooses a random available direction at the current intersection.
+//     fn choose_random_direction(&mut self, graph: &Graph) {
+//         let current_node = self.traverser.position.from_node_id();
+//         let intersection = &graph.adjacency_list[current_node];
 
-        // Collect all available directions
-        let mut available_directions = SmallVec::<[_; 4]>::new();
-        for direction in Direction::DIRECTIONS {
-            if let Some(edge) = intersection.get(direction) {
-                if can_ghost_traverse(edge) {
-                    available_directions.push(direction);
-                }
-            }
-        }
-        // Choose a random direction (avoid reversing unless necessary)
-        if !available_directions.is_empty() {
-            let mut rng = SmallRng::from_os_rng();
+//         // Collect all available directions
+//         let mut available_directions = SmallVec::<[_; 4]>::new();
+//         for direction in Direction::DIRECTIONS {
+//             if let Some(edge) = intersection.get(direction) {
+//                 if can_ghost_traverse(edge) {
+//                     available_directions.push(direction);
+//                 }
+//             }
+//         }
+//         // Choose a random direction (avoid reversing unless necessary)
+//         if !available_directions.is_empty() {
+//             let mut rng = SmallRng::from_os_rng();
 
-            // Filter out the opposite direction if possible, but allow it if we have limited options
-            let opposite = self.traverser.direction.opposite();
-            let filtered_directions: Vec<_> = available_directions
-                .iter()
-                .filter(|&&dir| dir != opposite || available_directions.len() <= 2)
-                .collect();
+//             // Filter out the opposite direction if possible, but allow it if we have limited options
+//             let opposite = self.traverser.direction.opposite();
+//             let filtered_directions: Vec<_> = available_directions
+//                 .iter()
+//                 .filter(|&&dir| dir != opposite || available_directions.len() <= 2)
+//                 .collect();
 
-            if let Some(&random_direction) = filtered_directions.choose(&mut rng) {
-                self.traverser.set_next_direction(*random_direction);
-            }
-        }
-    }
+//             if let Some(&random_direction) = filtered_directions.choose(&mut rng) {
+//                 self.traverser.set_next_direction(*random_direction);
+//             }
+//         }
+//     }
 
-    /// Calculates the shortest path from the ghost's current position to a target node using Dijkstra's algorithm.
-    ///
-    /// Returns a vector of NodeIds representing the path, or an error if pathfinding fails.
-    /// The path includes the current node and the target node.
-    pub fn calculate_path_to_target(&self, graph: &Graph, target: NodeId) -> GameResult<Vec<NodeId>> {
-        let start_node = self.traverser.position.from_node_id();
+//     /// Calculates the shortest path from the ghost's current position to a target node using Dijkstra's algorithm.
+//     ///
+//     /// Returns a vector of NodeIds representing the path, or an error if pathfinding fails.
+//     /// The path includes the current node and the target node.
+//     pub fn calculate_path_to_target(&self, graph: &Graph, target: NodeId) -> GameResult<Vec<NodeId>> {
+//         let start_node = self.traverser.position.from_node_id();
 
-        // Use Dijkstra's algorithm to find the shortest path
-        let result = dijkstra(
-            &start_node,
-            |&node_id| {
-                // Get all edges from the current node
-                graph.adjacency_list[node_id]
-                    .edges()
-                    .filter(|edge| can_ghost_traverse(*edge))
-                    .map(|edge| (edge.target, (edge.distance * 100.0) as u32))
-                    .collect::<Vec<_>>()
-            },
-            |&node_id| node_id == target,
-        );
+//         // Use Dijkstra's algorithm to find the shortest path
+//         let result = dijkstra(
+//             &start_node,
+//             |&node_id| {
+//                 // Get all edges from the current node
+//                 graph.adjacency_list[node_id]
+//                     .edges()
+//                     .filter(|edge| can_ghost_traverse(*edge))
+//                     .map(|edge| (edge.target, (edge.distance * 100.0) as u32))
+//                     .collect::<Vec<_>>()
+//             },
+//             |&node_id| node_id == target,
+//         );
 
-        result.map(|(path, _cost)| path).ok_or_else(|| {
-            GameError::Entity(EntityError::PathfindingFailed(format!(
-                "No path found from node {} to target {}",
-                start_node, target
-            )))
-        })
-    }
+//         result.map(|(path, _cost)| path).ok_or_else(|| {
+//             GameError::Entity(EntityError::PathfindingFailed(format!(
+//                 "No path found from node {} to target {}",
+//                 start_node, target
+//             )))
+//         })
+//     }
 
-    /// Returns the ghost's color for debug rendering.
-    pub fn debug_color(&self) -> sdl2::pixels::Color {
-        match self.ghost_type {
-            GhostType::Blinky => sdl2::pixels::Color::RGB(255, 0, 0),    // Red
-            GhostType::Pinky => sdl2::pixels::Color::RGB(255, 182, 255), // Pink
-            GhostType::Inky => sdl2::pixels::Color::RGB(0, 255, 255),    // Cyan
-            GhostType::Clyde => sdl2::pixels::Color::RGB(255, 182, 85),  // Orange
-        }
-    }
-}
+//     /// Returns the ghost's color for debug rendering.
+//     pub fn debug_color(&self) -> sdl2::pixels::Color {
+//         match self.ghost_type {
+//             GhostType::Blinky => sdl2::pixels::Color::RGB(255, 0, 0),    // Red
+//             GhostType::Pinky => sdl2::pixels::Color::RGB(255, 182, 255), // Pink
+//             GhostType::Inky => sdl2::pixels::Color::RGB(0, 255, 255),    // Cyan
+//             GhostType::Clyde => sdl2::pixels::Color::RGB(255, 182, 85),  // Orange
+//         }
+//     }
+// }
 
-impl Collidable for Ghost {
-    fn position(&self) -> crate::entity::traversal::Position {
-        self.traverser.position
-    }
-}
+// impl Collidable for Ghost {
+//     fn position(&self) -> crate::entity::traversal::Position {
+//         self.traverser.position
+//     }
+// }

src/entity/graph.rs

@@ -1,9 +1,8 @@
 use glam::Vec2;
 
-use super::direction::Direction;
+use crate::ecs::NodeId;
 
-/// A unique identifier for a node, represented by its index in the graph's storage.
-pub type NodeId = usize;
+use super::direction::Direction;
 
 /// Defines who can traverse a given edge.
 #[derive(Debug, Clone, Copy, PartialEq, Eq, Default)]
@@ -192,14 +191,15 @@ impl Graph {
 
         // Check if the edge already exists in this direction or to the same target
         if let Some(err) = adjacency_list.edges().find_map(|e| {
-            // If we're not replacing the edge, we don't want to replace an edge that already exists in this direction
-            if !replace && e.direction == direction {
-                Some(Err("Edge already exists in this direction."))
-            } else if e.target == to {
-                Some(Err("Edge already exists."))
-            } else {
-                None
+            if !replace {
+                // If we're not replacing the edge, we don't want to replace an edge that already exists in this direction
+                if e.direction == direction {
+                    return Some(Err("Edge already exists in this direction."));
+                } else if e.target == to {
+                    return Some(Err("Edge already exists."));
+                }
             }
+            None
         }) {
             return err;
         }

src/entity/item.rs

@@ -1,117 +1,117 @@
-use crate::{
-    constants,
-    entity::{collision::Collidable, graph::Graph},
-    error::{EntityError, GameResult},
-    texture::sprite::{Sprite, SpriteAtlas},
-};
-use sdl2::render::{Canvas, RenderTarget};
-use strum_macros::{EnumCount, EnumIter};
+// use crate::{
+//     constants,
+//     entity::{collision::Collidable, graph::Graph},
+//     error::{EntityError, GameResult},
+//     texture::sprite::{Sprite, SpriteAtlas},
+// };
+// use sdl2::render::{Canvas, RenderTarget};
+// use strum_macros::{EnumCount, EnumIter};
 
-#[derive(Debug, Clone, Copy, PartialEq, Eq)]
-pub enum ItemType {
-    Pellet,
-    Energizer,
-    #[allow(dead_code)]
-    Fruit {
-        kind: FruitKind,
-    },
-}
+// #[derive(Debug, Clone, Copy, PartialEq, Eq)]
+// pub enum ItemType {
+//     Pellet,
+//     Energizer,
+//     #[allow(dead_code)]
+//     Fruit {
+//         kind: FruitKind,
+//     },
+// }
 
-impl ItemType {
-    pub fn get_score(self) -> u32 {
-        match self {
-            ItemType::Pellet => 10,
-            ItemType::Energizer => 50,
-            ItemType::Fruit { kind } => kind.get_score(),
-        }
-    }
-}
+// impl ItemType {
+//     pub fn get_score(self) -> u32 {
+//         match self {
+//             ItemType::Pellet => 10,
+//             ItemType::Energizer => 50,
+//             ItemType::Fruit { kind } => kind.get_score(),
+//         }
+//     }
+// }
 
-#[derive(Debug, Clone, Copy, PartialEq, Eq, EnumIter, EnumCount)]
-#[allow(dead_code)]
-pub enum FruitKind {
-    Apple,
-    Strawberry,
-    Orange,
-    Melon,
-    Bell,
-    Key,
-    Galaxian,
-}
+// #[derive(Debug, Clone, Copy, PartialEq, Eq, EnumIter, EnumCount)]
+// #[allow(dead_code)]
+// pub enum FruitKind {
+//     Apple,
+//     Strawberry,
+//     Orange,
+//     Melon,
+//     Bell,
+//     Key,
+//     Galaxian,
+// }
 
-impl FruitKind {
-    #[allow(dead_code)]
-    pub fn index(self) -> u8 {
-        match self {
-            FruitKind::Apple => 0,
-            FruitKind::Strawberry => 1,
-            FruitKind::Orange => 2,
-            FruitKind::Melon => 3,
-            FruitKind::Bell => 4,
-            FruitKind::Key => 5,
-            FruitKind::Galaxian => 6,
-        }
-    }
+// impl FruitKind {
+//     #[allow(dead_code)]
+//     pub fn index(self) -> u8 {
+//         match self {
+//             FruitKind::Apple => 0,
+//             FruitKind::Strawberry => 1,
+//             FruitKind::Orange => 2,
+//             FruitKind::Melon => 3,
+//             FruitKind::Bell => 4,
+//             FruitKind::Key => 5,
+//             FruitKind::Galaxian => 6,
+//         }
+//     }
 
-    pub fn get_score(self) -> u32 {
-        match self {
-            FruitKind::Apple => 100,
-            FruitKind::Strawberry => 300,
-            FruitKind::Orange => 500,
-            FruitKind::Melon => 700,
-            FruitKind::Bell => 1000,
-            FruitKind::Key => 2000,
-            FruitKind::Galaxian => 3000,
-        }
-    }
-}
+//     pub fn get_score(self) -> u32 {
+//         match self {
+//             FruitKind::Apple => 100,
+//             FruitKind::Strawberry => 300,
+//             FruitKind::Orange => 500,
+//             FruitKind::Melon => 700,
+//             FruitKind::Bell => 1000,
+//             FruitKind::Key => 2000,
+//             FruitKind::Galaxian => 3000,
+//         }
+//     }
+// }
 
-pub struct Item {
-    pub node_index: usize,
-    pub item_type: ItemType,
-    pub sprite: Sprite,
-    pub collected: bool,
-}
+// pub struct Item {
+//     pub node_index: usize,
+//     pub item_type: ItemType,
+//     pub sprite: Sprite,
+//     pub collected: bool,
+// }
 
-impl Item {
-    pub fn new(node_index: usize, item_type: ItemType, sprite: Sprite) -> Self {
-        Self {
-            node_index,
-            item_type,
-            sprite,
-            collected: false,
-        }
-    }
+// impl Item {
+//     pub fn new(node_index: usize, item_type: ItemType, sprite: Sprite) -> Self {
+//         Self {
+//             node_index,
+//             item_type,
+//             sprite,
+//             collected: false,
+//         }
+//     }
 
-    pub fn is_collected(&self) -> bool {
-        self.collected
-    }
+//     pub fn is_collected(&self) -> bool {
+//         self.collected
+//     }
 
-    pub fn collect(&mut self) {
-        self.collected = true;
-    }
+//     pub fn collect(&mut self) {
+//         self.collected = true;
+//     }
 
-    pub fn get_score(&self) -> u32 {
-        self.item_type.get_score()
-    }
+//     pub fn get_score(&self) -> u32 {
+//         self.item_type.get_score()
+//     }
 
-    pub fn render<T: RenderTarget>(&self, canvas: &mut Canvas<T>, atlas: &mut SpriteAtlas, graph: &Graph) -> GameResult<()> {
-        if self.collected {
-            return Ok(());
-        }
+//     pub fn render<T: RenderTarget>(&self, canvas: &mut Canvas<T>, atlas: &mut SpriteAtlas, graph: &Graph) -> GameResult<()> {
+//         if self.collected {
+//             return Ok(());
+//         }
 
-        let node = graph
-            .get_node(self.node_index)
-            .ok_or(EntityError::NodeNotFound(self.node_index))?;
-        let position = node.position + constants::BOARD_PIXEL_OFFSET.as_vec2();
+//         let node = graph
+//             .get_node(self.node_index)
+//             .ok_or(EntityError::NodeNotFound(self.node_index))?;
+//         let position = node.position + constants::BOARD_PIXEL_OFFSET.as_vec2();
 
-        self.sprite.render(canvas, atlas, position)?;
-        Ok(())
-    }
-}
+//         self.sprite.render(canvas, atlas, position)?;
+//         Ok(())
+//     }
+// }
 
-impl Collidable for Item {
-    fn position(&self) -> crate::entity::traversal::Position {
-        crate::entity::traversal::Position::AtNode(self.node_index)
-    }
-}
+// impl Collidable for Item {
+//     fn position(&self) -> crate::entity::traversal::Position {
+//         crate::entity::traversal::Position::AtNode(self.node_index)
+//     }
+// }

src/entity/pacman.rs

@@ -1,134 +1,115 @@
-//! Pac-Man entity implementation.
-//!
-//! This module contains the main player character logic, including movement,
-//! animation, and rendering. Pac-Man moves through the game graph using
-//! a traverser and displays directional animated textures.
+// //! Pac-Man entity implementation.
+// //!
+// //! This module contains the main player character logic, including movement,
+// //! animation, and rendering. Pac-Man moves through the game graph using
+// //! a traverser and displays directional animated textures.
 
-use crate::entity::{
-    collision::Collidable,
-    direction::Direction,
-    graph::{Edge, EdgePermissions, Graph, NodeId},
-    r#trait::Entity,
-    traversal::Traverser,
-};
-use crate::texture::animated::AnimatedTexture;
-use crate::texture::directional::DirectionalAnimatedTexture;
-use crate::texture::sprite::SpriteAtlas;
-use sdl2::keyboard::Keycode;
-use tracing::error;
+// use crate::entity::{
+//     collision::Collidable,
+//     direction::Direction,
+//     graph::{Edge, EdgePermissions, Graph, NodeId},
+//     r#trait::Entity,
+//     traversal::Traverser,
+// };
+// use crate::texture::animated::AnimatedTexture;
+// use crate::texture::directional::DirectionalAnimatedTexture;
+// use crate::texture::sprite::SpriteAtlas;
+// use tracing::error;
 
-use crate::error::{GameError, GameResult, TextureError};
+// use crate::error::{GameError, GameResult, TextureError};
 
-/// Determines if Pac-Man can traverse a given edge.
-///
-/// Pac-Man can only move through edges that allow all entities.
-fn can_pacman_traverse(edge: Edge) -> bool {
-    matches!(edge.permissions, EdgePermissions::All)
-}
+// /// Determines if Pac-Man can traverse a given edge.
+// ///
+// /// Pac-Man can only move through edges that allow all entities.
+// fn can_pacman_traverse(edge: Edge) -> bool {
+//     matches!(edge.permissions, EdgePermissions::All)
+// }
 
-/// The main player character entity.
-///
-/// Pac-Man moves through the game world using a graph-based navigation system
-/// and displays directional animated sprites based on movement state.
-pub struct Pacman {
-    /// Handles movement through the game graph
-    pub traverser: Traverser,
-    /// Manages directional animated textures for different movement states
-    texture: DirectionalAnimatedTexture,
-}
+// /// The main player character entity.
+// ///
+// /// Pac-Man moves through the game world using a graph-based navigation system
+// /// and displays directional animated sprites based on movement state.
+// pub struct Pacman {
+//     /// Handles movement through the game graph
+//     pub traverser: Traverser,
+//     /// Manages directional animated textures for different movement states
+//     texture: DirectionalAnimatedTexture,
+// }
 
-impl Entity for Pacman {
-    fn traverser(&self) -> &Traverser {
-        &self.traverser
-    }
+// impl Entity for Pacman {
+//     fn traverser(&self) -> &Traverser {
+//         &self.traverser
+//     }
 
-    fn traverser_mut(&mut self) -> &mut Traverser {
-        &mut self.traverser
-    }
+//     fn traverser_mut(&mut self) -> &mut Traverser {
+//         &mut self.traverser
+//     }
 
-    fn texture(&self) -> &DirectionalAnimatedTexture {
-        &self.texture
-    }
+//     fn texture(&self) -> &DirectionalAnimatedTexture {
+//         &self.texture
+//     }
 
-    fn texture_mut(&mut self) -> &mut DirectionalAnimatedTexture {
-        &mut self.texture
-    }
+//     fn texture_mut(&mut self) -> &mut DirectionalAnimatedTexture {
+//         &mut self.texture
+//     }
 
-    fn speed(&self) -> f32 {
-        1.125
-    }
+//     fn speed(&self) -> f32 {
+//         1.125
+//     }
 
-    fn can_traverse(&self, edge: Edge) -> bool {
-        can_pacman_traverse(edge)
-    }
+//     fn can_traverse(&self, edge: Edge) -> bool {
+//         can_pacman_traverse(edge)
+//     }
 
-    fn tick(&mut self, dt: f32, graph: &Graph) {
-        if let Err(e) = self.traverser.advance(graph, dt * 60.0 * 1.125, &can_pacman_traverse) {
-            error!("Pac-Man movement error: {}", e);
-        }
-        self.texture.tick(dt);
-    }
-}
+//     fn tick(&mut self, dt: f32, graph: &Graph) {
+//         if let Err(e) = self.traverser.advance(graph, dt * 60.0 * 1.125, &can_pacman_traverse) {
+//             error!("Pac-Man movement error: {}", e);
+//         }
+//         self.texture.tick(dt);
+//     }
+// }
 
-impl Pacman {
-    /// Creates a new Pac-Man instance at the specified starting node.
-    ///
-    /// Sets up animated textures for all four directions with moving and stopped states.
-    /// The moving animation cycles through open mouth, closed mouth, and full sprites.
-    pub fn new(graph: &Graph, start_node: NodeId, atlas: &SpriteAtlas) -> GameResult<Self> {
-        let mut textures = [None, None, None, None];
-        let mut stopped_textures = [None, None, None, None];
+// impl Pacman {
+//     /// Creates a new Pac-Man instance at the specified starting node.
+//     ///
+//     /// Sets up animated textures for all four directions with moving and stopped states.
+//     /// The moving animation cycles through open mouth, closed mouth, and full sprites.
+//     pub fn new(graph: &Graph, start_node: NodeId, atlas: &SpriteAtlas) -> GameResult<Self> {
+//         let mut textures = [None, None, None, None];
+//         let mut stopped_textures = [None, None, None, None];
 
-        for direction in Direction::DIRECTIONS {
-            let moving_prefix = match direction {
-                Direction::Up => "pacman/up",
-                Direction::Down => "pacman/down",
-                Direction::Left => "pacman/left",
-                Direction::Right => "pacman/right",
-            };
-            let moving_tiles = vec![
-                SpriteAtlas::get_tile(atlas, &format!("{moving_prefix}_a.png"))
-                    .ok_or_else(|| GameError::Texture(TextureError::AtlasTileNotFound(format!("{moving_prefix}_a.png"))))?,
-                SpriteAtlas::get_tile(atlas, &format!("{moving_prefix}_b.png"))
-                    .ok_or_else(|| GameError::Texture(TextureError::AtlasTileNotFound(format!("{moving_prefix}_b.png"))))?,
-                SpriteAtlas::get_tile(atlas, "pacman/full.png")
-                    .ok_or_else(|| GameError::Texture(TextureError::AtlasTileNotFound("pacman/full.png".to_string())))?,
-            ];
+//         for direction in Direction::DIRECTIONS {
+//             let moving_prefix = match direction {
+//                 Direction::Up => "pacman/up",
+//                 Direction::Down => "pacman/down",
+//                 Direction::Left => "pacman/left",
+//                 Direction::Right => "pacman/right",
+//             };
+//             let moving_tiles = vec![
+//                 SpriteAtlas::get_tile(atlas, &format!("{moving_prefix}_a.png"))
+//                     .ok_or_else(|| GameError::Texture(TextureError::AtlasTileNotFound(format!("{moving_prefix}_a.png"))))?,
+//                 SpriteAtlas::get_tile(atlas, &format!("{moving_prefix}_b.png"))
+//                     .ok_or_else(|| GameError::Texture(TextureError::AtlasTileNotFound(format!("{moving_prefix}_b.png"))))?,
+//                 SpriteAtlas::get_tile(atlas, "pacman/full.png")
+//                     .ok_or_else(|| GameError::Texture(TextureError::AtlasTileNotFound("pacman/full.png".to_string())))?,
+//             ];
 
-            let stopped_tiles = vec![SpriteAtlas::get_tile(atlas, &format!("{moving_prefix}_b.png"))
-                .ok_or_else(|| GameError::Texture(TextureError::AtlasTileNotFound(format!("{moving_prefix}_b.png"))))?];
+//             let stopped_tiles = vec![SpriteAtlas::get_tile(atlas, &format!("{moving_prefix}_b.png"))
+//                 .ok_or_else(|| GameError::Texture(TextureError::AtlasTileNotFound(format!("{moving_prefix}_b.png"))))?];
 
-            textures[direction.as_usize()] = Some(AnimatedTexture::new(moving_tiles, 0.08)?);
-            stopped_textures[direction.as_usize()] = Some(AnimatedTexture::new(stopped_tiles, 0.1)?);
-        }
+//             textures[direction.as_usize()] = Some(AnimatedTexture::new(moving_tiles, 0.08)?);
+//             stopped_textures[direction.as_usize()] = Some(AnimatedTexture::new(stopped_tiles, 0.1)?);
+//         }
 
-        Ok(Self {
-            traverser: Traverser::new(graph, start_node, Direction::Left, &can_pacman_traverse),
-            texture: DirectionalAnimatedTexture::new(textures, stopped_textures),
-        })
-    }
+//         Ok(Self {
+//             traverser: Traverser::new(graph, start_node, Direction::Left, &can_pacman_traverse),
+//             texture: DirectionalAnimatedTexture::new(textures, stopped_textures),
+//         })
+//     }
+// }
 
-    /// Handles keyboard input to change Pac-Man's direction.
-    ///
-    /// Maps arrow keys to directions and queues the direction change
-    /// for the next valid intersection.
-    pub fn handle_key(&mut self, keycode: Keycode) {
-        let direction = match keycode {
-            Keycode::Up => Some(Direction::Up),
-            Keycode::Down => Some(Direction::Down),
-            Keycode::Left => Some(Direction::Left),
-            Keycode::Right => Some(Direction::Right),
-            _ => None,
-        };
-
-        if let Some(direction) = direction {
-            self.traverser.set_next_direction(direction);
-        }
-    }
-}
-
-impl Collidable for Pacman {
-    fn position(&self) -> crate::entity::traversal::Position {
-        self.traverser.position
-    }
-}
+// impl Collidable for Pacman {
+//     fn position(&self) -> crate::entity::traversal::Position {
+//         self.traverser.position
+//     }
+// }