ci: VCPKG_SYSTEM_LIBRARIES off, cache emsdk, raw jq output

ci: use cargo metadata with jq for acquiring workspace package version, drop binstall
ci: add build-essential dependency, apt-get update before
2025-12-06 15:15:48 -06:00 · 2025-07-23 23:23:41 -05:00 · 2025-07-23 23:12:58 -05:00 · 2025-07-23 23:05:06 -05:00 · 2025-07-23 22:58:09 -05:00 · 2025-07-23 22:46:57 -05:00
22 changed files with 1023 additions and 952 deletions
--- a/.gitattributes
+++ b/.gitattributes
@@ -0,0 +1 @@
+* text=auto eol=lf
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -0,0 +1,113 @@
+name: Build
+
+on: [push]
+
+permissions:
+  contents: write
+
+env:
+  RUST_TOOLCHAIN: 1.86.0
+
+jobs:
+  build:
+    name: Build (${{ matrix.target }})
+    env:
+      VCPKG_SYSTEM_LIBRARIES: "OFF"
+    strategy:
+      fail-fast: false
+      matrix:
+        include:
+          - os: ubuntu-latest
+            target: x86_64-unknown-linux-gnu
+            artifact_name: pacman
+          - os: macos-13
+            target: x86_64-apple-darwin
+            artifact_name: pacman
+          - os: windows-latest
+            target: x86_64-pc-windows-gnu
+            artifact_name: pacman.exe
+    runs-on: ${{ matrix.os }}
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+
+      - name: Setup Rust Toolchain
+        uses: dtolnay/rust-toolchain@master
+        with:
+          target: ${{ matrix.target }}
+          toolchain: ${{ env.RUST_TOOLCHAIN }}
+
+      - name: Rust Cache
+        uses: Swatinem/rust-cache@v2
+
+      - name: Vcpkg Linux Dependencies
+        if: runner.os == 'Linux'
+        run: |
+          sudo apt-get update
+          sudo apt-get install -y build-essential autoconf automake libtool pkg-config gettext m4 libtool libltdl-dev
+
+      - name: Vcpkg
+        run: |
+          cargo install cargo-vcpkg
+          cargo vcpkg -v build
+
+      - name: Build
+        run: cargo build --release
+
+      - name: Acquire Package Version
+        shell: bash
+        run: |
+          PACKAGE_VERSION=$(cargo metadata --format-version 1 --no-deps | jq '.packages[0].version' -r)
+          echo "PACKAGE_VERSION=${PACKAGE_VERSION}" >> $GITHUB_ENV
+
+      - name: Upload Artifact
+        uses: actions/upload-artifact@v4
+        with:
+          name: "pacman-${{ env.PACKAGE_VERSION }}-${{ matrix.target }}"
+          path: ./target/release/${{ matrix.artifact_name }}
+          retention-days: 7
+          if-no-files-found: error
+
+  wasm:
+    name: Build (wasm32-unknown-emscripten)
+    runs-on: ubuntu-latest
+    permissions:
+      pages: write
+      id-token: write
+
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+
+      - name: Setup Emscripten SDK
+        uses: mymindstorm/setup-emsdk@v14
+        with:
+          version: 3.1.43
+          actions-cache-folder: "emsdk-cache"
+
+      - name: Setup Rust (WASM32 Emscripten)
+        uses: dtolnay/rust-toolchain@master
+        with:
+          target: wasm32-unknown-emscripten
+          toolchain: ${{ env.RUST_TOOLCHAIN }}
+
+      - name: Rust Cache
+        uses: Swatinem/rust-cache@v2
+
+      - name: Install pnpm
+        uses: pnpm/action-setup@v3
+        with:
+          version: 8
+          run_install: true
+
+      - name: Build
+        run: ./build.sh -er # release mode, skip emsdk
+
+      - name: Upload Artifact
+        uses: actions/upload-pages-artifact@v3
+        with:
+          path: "./dist/"
+          retention-days: 7
+
+      - name: Deploy
+        uses: actions/deploy-pages@v4
--- a/.github/workflows/deploy.yaml
+++ b/.github/workflows/deploy.yaml
@@ -1,225 +0,0 @@
-name: Build
-
-on: [push]
-
-permissions:
-  contents: write
-
-jobs:
-  wasm:
-    runs-on: ubuntu-latest
-
-    permissions:
-      pages: write
-      id-token: write
-
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v4
-
-      - name: Setup Emscripten SDK
-        uses: mymindstorm/setup-emsdk@v14
-        with:
-          version: 3.1.43
-
-      - name: Setup Rust (WASM32 Emscripten)
-        uses: dtolnay/rust-toolchain@stable
-        with:
-          target: wasm32-unknown-emscripten
-
-      - name: Rust Cache
-        uses: Swatinem/rust-cache@v2
-
-      - name: Install pnpm
-        uses: pnpm/action-setup@v3
-        with:
-          version: 8
-          run_install: true
-
-      - name: Build
-        run: ./scripts/build.sh -er # release mode, skip emsdk
-
-      - name: Upload Artifact
-        uses: actions/upload-pages-artifact@v3
-        with:
-          path: "./dist/"
-          retention-days: 7
-
-      - name: Deploy
-        uses: actions/deploy-pages@v4
-
-  linux:
-    runs-on: ubuntu-latest
-    env:
-      TARGET: x86_64-unknown-linux-gnu
-
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v4
-
-      - name: Install SDL2 Packages
-        run: sudo apt-get install libsdl2-dev libsdl2-image-dev libsdl2-mixer-dev libsdl2-ttf-dev libsdl2-gfx-dev
-
-      - name: Setup Rust Toolchain (Linux)
-        uses: dtolnay/rust-toolchain@stable
-        with:
-          target: ${{ env.TARGET }}
-
-      - name: Rust Cache
-        uses: Swatinem/rust-cache@v2
-
-      - name: Build
-        run: cargo build --release
-
-      - name: Assemble Archive
-        run: |
-          mkdir /tmp/example/
-          cp ./target/release/pacman /tmp/example/
-          chmod a+x /tmp/example/pacman
-          mkdir /tmp/example/assets
-          cp ./assets/TerminalVector.ttf ./assets/fruit.png /tmp/example/assets
-
-      - name: Install Cargo Binstall
-        uses: cargo-bins/cargo-binstall@main
-
-      - name: Acquire Package Version
-        run: |
-          cargo binstall toml-cli -y
-          PACKAGE_VERSION=$(toml get ./Cargo.toml package.version --raw)
-          echo "PACKAGE_VERSION=${PACKAGE_VERSION}" >> $GITHUB_ENV
-
-      - name: Upload Artifact
-        uses: actions/upload-artifact@v4
-        with:
-          name: "pacman-${{ env.PACKAGE_VERSION }}-${{ env.TARGET }}"
-          path: /tmp/example/
-          retention-days: 7
-          if-no-files-found: error
-
-  macos:
-    runs-on: macos-13
-    env:
-      TARGET: x86_64-apple-darwin
-
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v4
-
-      - name: Install SDL2 Packages
-        run: brew install sdl2 sdl2_image sdl2_mixer sdl2_ttf sdl2_gfx
-
-      - name: Setup Rust Toolchain (MacOS)
-        uses: dtolnay/rust-toolchain@stable
-        with:
-          target: ${{ env.TARGET }}
-
-      - name: Rust Cache
-        uses: Swatinem/rust-cache@v2
-
-      - name: Build
-        run: cargo build --release
-
-      - name: Assemble Archive
-        run: |
-          mkdir /tmp/example/
-          cp ./target/release/pacman /tmp/example/
-          mkdir /tmp/example/assets
-          cp ./assets/TerminalVector.ttf ./assets/fruit.png /tmp/example/assets
-
-      - name: Install Cargo Binstall
-        uses: cargo-bins/cargo-binstall@main
-
-      - name: Acquire Package Version
-        run: |
-          cargo binstall toml-cli -y
-          PACKAGE_VERSION=$(toml get ./Cargo.toml package.version --raw)
-          echo "PACKAGE_VERSION=${PACKAGE_VERSION}" >> $GITHUB_ENV
-
-      - name: Upload Artifact
-        uses: actions/upload-artifact@v4
-        with:
-          name: "pacman-${{ env.PACKAGE_VERSION }}-${{ env.TARGET }}"
-          path: /tmp/example/
-          retention-days: 7
-          if-no-files-found: error
-
-  windows:
-    env:
-      TARGET: x86_64-pc-windows-gnu
-      SDL2: 2.30.2
-      SDL2_TTF: 2.22.0
-      SDL2_MIXER: 2.8.0
-      SDL2_IMAGE: 2.8.2
-      # SDL2_GFX: 1.0.4
-    runs-on: windows-latest
-
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v4
-
-      - name: Download SDL2 Libraries
-        run: |
-          curl -L "https://github.com/libsdl-org/SDL/releases/download/release-${{ env.SDL2 }}/SDL2-devel-${{ env.SDL2 }}-VC.zip" -o "sdl2_devel.zip"
-          curl -L "https://github.com/libsdl-org/SDL_mixer/releases/download/release-${{ env.SDL2_MIXER }}/SDL2_mixer-devel-${{ env.SDL2_MIXER }}-VC.zip" -o "sdl2_mixer_devel.zip"
-          curl -L "https://github.com/libsdl-org/SDL_ttf/releases/download/release-${{ env.SDL2_TTF }}/SDL2_ttf-devel-${{ env.SDL2_TTF }}-VC.zip" -o "sdl2_ttf_devel.zip"
-          curl -L "https://github.com/libsdl-org/SDL_image/releases/download/release-${{ env.SDL2_IMAGE }}/SDL2_image-devel-${{ env.SDL2_IMAGE }}-VC.zip" -o "sdl2_image_devel.zip"
-
-      - name: Extract SDL2 DLLs
-        run: |
-          7z x ./sdl2_devel.zip -o"./tmp/"
-          mv ./tmp/SDL2-${{ env.SDL2 }}/lib/x64/SDL2.dll ./
-          mv ./tmp/SDL2-${{ env.SDL2 }}/lib/x64/SDL2.lib ./
-
-          7z x ./sdl2_mixer_devel.zip -o"./tmp/"
-          mv ./tmp/SDL2_mixer-${{ env.SDL2_MIXER }}/lib/x64/SDL2_mixer.dll ./
-          mv ./tmp/SDL2_mixer-${{ env.SDL2_MIXER }}/lib/x64/SDL2_mixer.lib ./
-
-          7z x ./sdl2_ttf_devel.zip -o"./tmp/"
-          mv ./tmp/SDL2_ttf-${{ env.SDL2_TTF }}/lib/x64/SDL2_ttf.dll ./
-          mv ./tmp/SDL2_ttf-${{ env.SDL2_TTF }}/lib/x64/SDL2_ttf.lib ./
-
-          7z x ./sdl2_image_devel.zip -o"./tmp/"
-          mv ./tmp/SDL2_image-${{ env.SDL2_IMAGE }}/lib/x64/SDL2_image.dll ./
-          mv ./tmp/SDL2_image-${{ env.SDL2_IMAGE }}/lib/x64/SDL2_image.lib ./
-
-      - name: Install SDL2_gfx
-        run: |
-          C:\vcpkg\vcpkg.exe install sdl2-gfx:x64-windows-release
-          cp C:\vcpkg\packages\sdl2-gfx_x64-windows-release\bin\SDL2_gfx.dll ./
-          cp C:\vcpkg\packages\sdl2-gfx_x64-windows-release\lib\SDL2_gfx.lib ./
-
-      - name: Setup Rust (Windows)
-        uses: dtolnay/rust-toolchain@stable
-        with:
-          targets: ${{ env.TARGET }}
-
-      - name: Rust Cache
-        uses: Swatinem/rust-cache@v2
-
-      - name: Build
-        run: cargo build --release
-
-      - name: Prepare Archive
-        run: |
-          New-Item -Type Directory ./release/
-          Move-Item -Path ./target/release/pacman.exe -Destination ./release/
-          Move-Item -Path ./SDL2.dll, ./SDL2_image.dll, ./SDL2_ttf.dll, ./SDL2_mixer.dll, ./SDL2_gfx.dll -Destination ./release/
-          New-Item -Type Directory ./release/assets/
-          Move-Item -Path ./assets/TerminalVector.ttf, ./assets/fruit.png -Destination ./release/assets/
-
-      - name: Install Cargo Binstall
-        uses: cargo-bins/cargo-binstall@main
-
-      - name: Acquire Package Version
-        run: |
-          cargo binstall toml-cli -y
-          PACKAGE_VERSION=$(toml get ./Cargo.toml package.version --raw)
-          echo "PACKAGE_VERSION=${PACKAGE_VERSION}" >> $env:GITHUB_ENV
-
-      - name: Upload Artifact
-        uses: actions/upload-artifact@v4
-        with:
-          name: "pacman-${{ env.PACKAGE_VERSION }}-${{ env.TARGET }}"
-          path: ./release/
-          retention-days: 7
-          if-no-files-found: error
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -0,0 +1,22 @@
+repos:
+  - repo: https://github.com/pre-commit/pre-commit-hooks
+    rev: v5.0.0
+    hooks:
+      - id: trailing-whitespace
+      - id: end-of-file-fixer
+      - id: check-added-large-files
+      - id: check-merge-conflict
+      - id: check-case-conflict
+      - id: check-toml
+      - id: check-yaml
+      - id: forbid-submodules
+      - id: mixed-line-ending
+
+  - repo: local
+    hooks:
+      - id: cargo-fmt
+        name: cargo fmt
+        entry: cargo fmt --all --
+        language: system
+        types: [rust]
+        pass_filenames: false
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -11,6 +11,12 @@ dependencies = [
 "memchr",
 ]

+[[package]]
+name = "anyhow"
+version = "1.0.98"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e16d2d3311acee920a9eb8d33b8cbc1787ce4a264e85f964c2404b969bdcd487"
+
 [[package]]
 name = "autocfg"
 version = "1.5.0"
@@ -71,6 +77,12 @@ dependencies = [
 "wasi",
 ]

+[[package]]
+name = "glam"
+version = "0.30.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "50a99dbe56b72736564cfa4b85bf9a33079f16ae8b74983ab06af3b1a3696b11"
+
 [[package]]
 name = "hashbrown"
 version = "0.15.4"
@@ -150,9 +162,9 @@ dependencies = [

 [[package]]
 name = "once_cell"
-version = "1.18.0"
+version = "1.21.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d"
+checksum = "42f5e15c9953c5e4ccceeb2e7382a716482c34515315f7b03532b8b4e8393d2d"

 [[package]]
 name = "overload"
@@ -164,12 +176,16 @@ checksum = "b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39"
 name = "pacman"
 version = "0.1.0"
 dependencies = [
+ "anyhow",
+ "glam",
 "lazy_static",
 "libc",
+ "once_cell",
 "pathfinding",
 "rand",
 "sdl2",
 "spin_sleep",
+ "thiserror 1.0.69",
 "tracing",
 "tracing-error",
 "tracing-subscriber",
@@ -187,7 +203,7 @@ dependencies = [
 "integer-sqrt",
 "num-traits",
 "rustc-hash",
- "thiserror",
+ "thiserror 2.0.12",
 ]

 [[package]]
@@ -374,13 +390,33 @@ dependencies = [
 "unicode-ident",
 ]

+[[package]]
+name = "thiserror"
+version = "1.0.69"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b6aaf5339b578ea85b50e080feb250a3e8ae8cfcdff9a461c9ec2904bc923f52"
+dependencies = [
+ "thiserror-impl 1.0.69",
+]
+
 [[package]]
 name = "thiserror"
 version = "2.0.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "567b8a2dae586314f7be2a752ec7474332959c6460e02bde30d702a66d488708"
 dependencies = [
- "thiserror-impl",
+ "thiserror-impl 2.0.12",
+]
+
+[[package]]
+name = "thiserror-impl"
+version = "1.0.69"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4fee6c4efc90059e10f81e6d42c60a18f76588c3d74cb83a0b242a2b6c7504c1"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
 ]

 [[package]]
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -14,6 +14,10 @@ sdl2 = { version = "0.38.0", features = ["image", "ttf"] }
 spin_sleep = "1.3.2"
 rand = "0.9.2"
 pathfinding = "4.14"
+once_cell = "1.21.3"
+thiserror = "1.0"
+anyhow = "1.0"
+glam = "0.30.4"

 [target.'cfg(target_os = "windows")'.dependencies.winapi]
 version = "0.3"
@@ -31,7 +35,7 @@ default-features = false
 features = ["ttf","image","gfx","mixer","static-link","use-vcpkg"]

 [package.metadata.vcpkg]
-dependencies = ["sdl2", "sdl2-image[libjpeg-turbo,tiff,libwebp]", "sdl2-ttf", "sdl2-gfx", "sdl2-mixer"]
+dependencies = ["sdl2", "sdl2-image", "sdl2-ttf", "sdl2-gfx", "sdl2-mixer"]
 git = "https://github.com/microsoft/vcpkg"
 rev = "2024.05.24" # release 2024.05.24 # to check for a new one, check https://github.com/microsoft/vcpkg/releases

--- a/build.sh
+++ b/build.sh
--- a/rustfmt.toml
+++ b/rustfmt.toml
@@ -0,0 +1,6 @@
+# Rustfmt configuration
+edition = "2021"
+max_width = 130
+tab_spaces = 4
+newline_style = "Unix"
+use_small_heuristics = "Default"
--- a/src/animation.rs
+++ b/src/animation.rs
@@ -9,13 +9,7 @@ use crate::direction::Direction;

 /// Trait for drawable atlas-based textures
 pub trait FrameDrawn {
-    fn render(
-        &mut self,
-        canvas: &mut Canvas<Window>,
-        position: (i32, i32),
-        direction: Direction,
-        frame: Option<u32>,
-    );
+    fn render(&self, canvas: &mut Canvas<Window>, position: (i32, i32), direction: Direction, frame: Option<u32>);
 }

 /// A texture atlas abstraction for static (non-animated) rendering.
@@ -28,13 +22,7 @@ pub struct AtlasTexture<'a> {
 }

 impl<'a> AtlasTexture<'a> {
-    pub fn new(
-        texture: Texture<'a>,
-        frame_count: u32,
-        frame_width: u32,
-        frame_height: u32,
-        offset: Option<(i32, i32)>,
-    ) -> Self {
+    pub fn new(texture: Texture<'a>, frame_count: u32, frame_width: u32, frame_height: u32, offset: Option<(i32, i32)>) -> Self {
        AtlasTexture {
            raw_texture: texture,
            frame_count,
@@ -62,13 +50,7 @@ impl<'a> AtlasTexture<'a> {
 }

 impl<'a> FrameDrawn for AtlasTexture<'a> {
-    fn render(
-        &mut self,
-        canvas: &mut Canvas<Window>,
-        position: (i32, i32),
-        direction: Direction,
-        frame: Option<u32>,
-    ) {
+    fn render(&self, canvas: &mut Canvas<Window>, position: (i32, i32), direction: Direction, frame: Option<u32>) {
        let texture_source_frame_rect = self.get_frame_rect(frame.unwrap_or(0));
        let canvas_destination_rect = Rect::new(
            position.0 + self.offset.0,
@@ -141,35 +123,14 @@ impl<'a> AnimatedAtlasTexture<'a> {
        }
    }

-    pub fn pause(&mut self) {
-        self.paused = true;
-    }
-    pub fn resume(&mut self) {
-        self.paused = false;
-    }
-    pub fn is_paused(&self) -> bool {
-        self.paused
-    }
-
    pub fn set_color_modulation(&mut self, r: u8, g: u8, b: u8) {
        self.atlas.set_color_modulation(r, g, b);
    }
 }

 impl<'a> FrameDrawn for AnimatedAtlasTexture<'a> {
-    fn render(
-        &mut self,
-        canvas: &mut Canvas<Window>,
-        position: (i32, i32),
-        direction: Direction,
-        frame: Option<u32>,
-    ) {
-        self.atlas.render(
-            canvas,
-            position,
-            direction,
-            frame.or(Some(self.current_frame())),
-        );
-        self.tick();
+    fn render(&self, canvas: &mut Canvas<Window>, position: (i32, i32), direction: Direction, frame: Option<u32>) {
+        let frame = frame.unwrap_or_else(|| self.current_frame());
+        self.atlas.render(canvas, position, direction, Some(frame));
    }
 }
--- a/src/asset.rs
+++ b/src/asset.rs
@@ -0,0 +1,93 @@
+//! Cross-platform asset loading abstraction.
+//! On desktop, assets are embedded using include_bytes!; on Emscripten, assets are loaded from the filesystem.
+
+use std::borrow::Cow;
+use std::io;
+use thiserror::Error;
+
+#[derive(Error, Debug)]
+pub enum AssetError {
+    #[error("IO error: {0}")]
+    Io(#[from] io::Error),
+    #[error("Asset not found: {0}")]
+    NotFound(String),
+    #[error("Invalid asset format: {0}")]
+    InvalidFormat(String),
+}
+
+#[derive(Debug, Clone, Copy, PartialEq, Eq, Hash)]
+pub enum Asset {
+    Wav1,
+    Wav2,
+    Wav3,
+    Wav4,
+    Pacman,
+    Pellet,
+    Energizer,
+    Map,
+    FontKonami,
+    GhostBody,
+    GhostEyes,
+    // Add more as needed
+}
+
+impl Asset {
+    pub fn path(&self) -> &str {
+        use Asset::*;
+        match self {
+            Wav1 => "wav/1.ogg",
+            Wav2 => "wav/2.ogg",
+            Wav3 => "wav/3.ogg",
+            Wav4 => "wav/4.ogg",
+            Pacman => "32/pacman.png",
+            Pellet => "24/pellet.png",
+            Energizer => "24/energizer.png",
+            Map => "map.png",
+            FontKonami => "font/konami.ttf",
+            GhostBody => "32/ghost_body.png",
+            GhostEyes => "32/ghost_eyes.png",
+        }
+    }
+}
+
+#[cfg(not(target_os = "emscripten"))]
+mod imp {
+    use super::*;
+    macro_rules! asset_bytes_enum {
+        ( $asset:expr ) => {
+            match $asset {
+                Asset::Wav1 => Cow::Borrowed(include_bytes!("../assets/wav/1.ogg")),
+                Asset::Wav2 => Cow::Borrowed(include_bytes!("../assets/wav/2.ogg")),
+                Asset::Wav3 => Cow::Borrowed(include_bytes!("../assets/wav/3.ogg")),
+                Asset::Wav4 => Cow::Borrowed(include_bytes!("../assets/wav/4.ogg")),
+                Asset::Pacman => Cow::Borrowed(include_bytes!("../assets/32/pacman.png")),
+                Asset::Pellet => Cow::Borrowed(include_bytes!("../assets/24/pellet.png")),
+                Asset::Energizer => Cow::Borrowed(include_bytes!("../assets/24/energizer.png")),
+                Asset::Map => Cow::Borrowed(include_bytes!("../assets/map.png")),
+                Asset::FontKonami => Cow::Borrowed(include_bytes!("../assets/font/konami.ttf")),
+                Asset::GhostBody => Cow::Borrowed(include_bytes!("../assets/32/ghost_body.png")),
+                Asset::GhostEyes => Cow::Borrowed(include_bytes!("../assets/32/ghost_eyes.png")),
+            }
+        };
+    }
+    pub fn get_asset_bytes(asset: Asset) -> Result<Cow<'static, [u8]>, AssetError> {
+        Ok(asset_bytes_enum!(asset))
+    }
+}
+
+#[cfg(target_os = "emscripten")]
+mod imp {
+    use super::*;
+    use std::fs;
+    use std::path::Path;
+    pub fn get_asset_bytes(asset: Asset) -> Result<Cow<'static, [u8]>, AssetError> {
+        let path = Path::new("assets").join(asset.path());
+        if !path.exists() {
+            return Err(AssetError::NotFound(asset.path().to_string()));
+        }
+        let bytes = fs::read(&path)?;
+        Ok(Cow::Owned(bytes))
+    }
+}
+
+pub use imp::get_asset_bytes;
--- a/src/audio.rs
+++ b/src/audio.rs
@@ -1,16 +1,11 @@
 //! This module handles the audio playback for the game.
+use crate::asset::{get_asset_bytes, Asset};
 use sdl2::{
    mixer::{self, Chunk, InitFlag, LoaderRWops, DEFAULT_FORMAT},
    rwops::RWops,
 };

-const SOUND_1_DATA: &[u8] = include_bytes!("../assets/wav/1.ogg");
-const SOUND_2_DATA: &[u8] = include_bytes!("../assets/wav/2.ogg");
-const SOUND_3_DATA: &[u8] = include_bytes!("../assets/wav/3.ogg");
-const SOUND_4_DATA: &[u8] = include_bytes!("../assets/wav/4.ogg");
-
-/// An array of all the sound effect data.
-const SOUND_DATA: [&[u8]; 4] = [SOUND_1_DATA, SOUND_2_DATA, SOUND_3_DATA, SOUND_4_DATA];
+const SOUND_ASSETS: [Asset; 4] = [Asset::Wav1, Asset::Wav2, Asset::Wav3, Asset::Wav4];

 /// The audio system for the game.
 ///
@@ -20,6 +15,7 @@ pub struct Audio {
    _mixer_context: mixer::Sdl2MixerContext,
    sounds: Vec<Chunk>,
    next_sound_index: usize,
+    muted: bool,
 }

 impl Audio {
@@ -29,26 +25,26 @@ impl Audio {
        let format = DEFAULT_FORMAT;
        let channels = 4;
        let chunk_size = 128;
+
        mixer::open_audio(frequency, format, 1, chunk_size).expect("Failed to open audio");
        mixer::allocate_channels(channels);

        // set channel volume
        for i in 0..channels {
-            mixer::Channel(i as i32).set_volume(32);
+            mixer::Channel(i).set_volume(32);
        }

        let mixer_context = mixer::init(InitFlag::OGG).expect("Failed to initialize SDL2_mixer");

-        let sounds: Vec<Chunk> = SOUND_DATA
+        let sounds: Vec<Chunk> = SOUND_ASSETS
            .iter()
            .enumerate()
-            .map(|(i, data)| {
-                let rwops = RWops::from_bytes(data)
-                    .expect(&format!("Failed to create RWops for sound {}", i + 1));
-                rwops.load_wav().expect(&format!(
-                    "Failed to load sound {} from embedded data",
-                    i + 1
-                ))
+            .map(|(i, asset)| {
+                let data = get_asset_bytes(*asset).expect("Failed to load sound asset");
+                let rwops = RWops::from_bytes(&data).unwrap_or_else(|_| panic!("Failed to create RWops for sound {}", i + 1));
+                rwops
+                    .load_wav()
+                    .unwrap_or_else(|_| panic!("Failed to load sound {} from asset API", i + 1))
            })
            .collect();

@@ -56,21 +52,16 @@ impl Audio {
            _mixer_context: mixer_context,
            sounds,
            next_sound_index: 0,
+            muted: false,
        }
    }

    /// Plays the "eat" sound effect.
-    ///
-    /// This function also logs the time since the last sound effect was played.
    pub fn eat(&mut self) {
        if let Some(chunk) = self.sounds.get(self.next_sound_index) {
            match mixer::Channel(0).play(chunk, 0) {
                Ok(channel) => {
-                    tracing::info!(
-                        "Playing sound #{} on channel {:?}",
-                        self.next_sound_index + 1,
-                        channel
-                    );
+                    tracing::trace!("Playing sound #{} on channel {:?}", self.next_sound_index + 1, channel);
                }
                Err(e) => {
                    tracing::warn!("Could not play sound #{}: {}", self.next_sound_index + 1, e);
@@ -79,4 +70,18 @@ impl Audio {
        }
        self.next_sound_index = (self.next_sound_index + 1) % self.sounds.len();
    }
+
+    /// Instantly mute or unmute all channels.
+    pub fn set_mute(&mut self, mute: bool) {
+        let channels = 4;
+        let volume = if mute { 0 } else { 32 };
+        for i in 0..channels {
+            mixer::Channel(i).set_volume(volume);
+        }
+        self.muted = mute;
+    }
+
+    pub fn is_muted(&self) -> bool {
+        self.muted
+    }
 }
--- a/src/constants.rs
+++ b/src/constants.rs
@@ -36,6 +36,58 @@ pub enum MapTile {
    Tunnel,
 }

+#[derive(Debug, Clone, Copy, PartialEq, Eq, Hash)]
+#[repr(u8)]
+pub enum FruitType {
+    Cherry,
+    Strawberry,
+    Orange,
+    Apple,
+    Melon,
+    Galaxian,
+    Bell,
+    Key,
+}
+
+impl FruitType {
+    pub const ALL: [FruitType; 8] = [
+        FruitType::Cherry,
+        FruitType::Strawberry,
+        FruitType::Orange,
+        FruitType::Apple,
+        FruitType::Melon,
+        FruitType::Galaxian,
+        FruitType::Bell,
+        FruitType::Key,
+    ];
+
+    pub fn score(self) -> u32 {
+        match self {
+            FruitType::Cherry => 100,
+            FruitType::Strawberry => 300,
+            FruitType::Orange => 500,
+            FruitType::Apple => 700,
+            FruitType::Melon => 1000,
+            FruitType::Galaxian => 2000,
+            FruitType::Bell => 3000,
+            FruitType::Key => 5000,
+        }
+    }
+
+    pub fn index(self) -> usize {
+        match self {
+            FruitType::Cherry => 0,
+            FruitType::Strawberry => 1,
+            FruitType::Orange => 2,
+            FruitType::Apple => 3,
+            FruitType::Melon => 4,
+            FruitType::Galaxian => 5,
+            FruitType::Bell => 6,
+            FruitType::Key => 7,
+        }
+    }
+}
+
 /// The raw layout of the game board, as a 2D array of characters.
 pub const RAW_BOARD: [&str; BOARD_HEIGHT as usize] = [
    "############################",
--- a/src/debug.rs
+++ b/src/debug.rs
@@ -0,0 +1,73 @@
+//! Debug rendering utilities for Pac-Man.
+use crate::{
+    constants::{MapTile, BOARD_HEIGHT, BOARD_WIDTH},
+    ghosts::blinky::Blinky,
+    map::Map,
+};
+use glam::{IVec2, UVec2};
+use sdl2::{pixels::Color, render::Canvas, video::Window};
+
+#[derive(PartialEq, Eq, Clone, Copy)]
+pub enum DebugMode {
+    None,
+    Grid,
+    Pathfinding,
+    ValidPositions,
+}
+
+pub struct DebugRenderer;
+
+impl DebugRenderer {
+    pub fn draw_cell(canvas: &mut Canvas<Window>, _map: &Map, cell: UVec2, color: Color) {
+        let position = Map::cell_to_pixel(cell);
+        canvas.set_draw_color(color);
+        canvas
+            .draw_rect(sdl2::rect::Rect::new(position.x, position.y, 24, 24))
+            .expect("Could not draw rectangle");
+    }
+
+    pub fn draw_debug_grid(canvas: &mut Canvas<Window>, map: &Map, pacman_cell: UVec2) {
+        for x in 0..BOARD_WIDTH {
+            for y in 0..BOARD_HEIGHT {
+                let tile = map.get_tile(IVec2::new(x as i32, y as i32)).unwrap_or(MapTile::Empty);
+                let cell = UVec2::new(x, y);
+                let mut color = None;
+                if cell == pacman_cell {
+                    Self::draw_cell(canvas, map, cell, Color::CYAN);
+                } else {
+                    color = match tile {
+                        MapTile::Empty => None,
+                        MapTile::Wall => Some(Color::BLUE),
+                        MapTile::Pellet => Some(Color::RED),
+                        MapTile::PowerPellet => Some(Color::MAGENTA),
+                        MapTile::StartingPosition(_) => Some(Color::GREEN),
+                        MapTile::Tunnel => Some(Color::CYAN),
+                    };
+                }
+                if let Some(color) = color {
+                    Self::draw_cell(canvas, map, cell, color);
+                }
+            }
+        }
+    }
+
+    pub fn draw_next_cell(canvas: &mut Canvas<Window>, map: &Map, next_cell: UVec2) {
+        Self::draw_cell(canvas, map, next_cell, Color::YELLOW);
+    }
+
+    pub fn draw_valid_positions(canvas: &mut Canvas<Window>, map: &mut Map) {
+        let valid_positions_vec = map.get_valid_playable_positions().clone();
+        for &pos in &valid_positions_vec {
+            Self::draw_cell(canvas, map, pos, Color::RGB(255, 140, 0));
+        }
+    }
+
+    pub fn draw_pathfinding(canvas: &mut Canvas<Window>, blinky: &Blinky, map: &Map) {
+        let target = blinky.get_target_tile();
+        if let Some((path, _)) = blinky.get_path_to_target(target.as_uvec2()) {
+            for pos in &path {
+                Self::draw_cell(canvas, map, *pos, Color::YELLOW);
+            }
+        }
+    }
+}
--- a/src/edible.rs
+++ b/src/edible.rs
@@ -0,0 +1,82 @@
+//! Edible entity for Pac-Man: pellets, power pellets, and fruits.
+use crate::animation::{AtlasTexture, FrameDrawn};
+use crate::constants::{FruitType, MapTile, BOARD_HEIGHT, BOARD_WIDTH};
+use crate::direction::Direction;
+use crate::entity::{Entity, Renderable, StaticEntity};
+use crate::map::Map;
+use glam::{IVec2, UVec2};
+use sdl2::{render::Canvas, video::Window};
+use std::cell::RefCell;
+use std::rc::Rc;
+
+#[derive(Debug, Clone, Copy, PartialEq, Eq)]
+pub enum EdibleKind {
+    Pellet,
+    PowerPellet,
+    Fruit(FruitType),
+}
+
+pub struct Edible<'a> {
+    pub base: StaticEntity,
+    pub kind: EdibleKind,
+    pub sprite: Rc<AtlasTexture<'a>>,
+}
+
+impl<'a> Edible<'a> {
+    pub fn new(kind: EdibleKind, cell_position: UVec2, sprite: Rc<AtlasTexture<'a>>) -> Self {
+        let pixel_position = Map::cell_to_pixel(cell_position);
+        Edible {
+            base: StaticEntity::new(pixel_position, cell_position),
+            kind,
+            sprite,
+        }
+    }
+
+    /// Checks collision with Pac-Man (or any entity)
+    pub fn collide(&self, pacman: &dyn Entity) -> bool {
+        self.base.is_colliding(pacman)
+    }
+}
+
+impl<'a> Entity for Edible<'a> {
+    fn base(&self) -> &StaticEntity {
+        &self.base
+    }
+}
+
+impl<'a> Renderable for Edible<'a> {
+    fn render(&self, canvas: &mut Canvas<Window>) {
+        let pos = self.base.pixel_position;
+        self.sprite.render(canvas, (pos.x, pos.y), Direction::Right, Some(0));
+    }
+}
+
+/// Reconstruct all edibles from the original map layout
+pub fn reconstruct_edibles<'a>(
+    map: Rc<RefCell<Map>>,
+    pellet_sprite: Rc<AtlasTexture<'a>>,
+    power_pellet_sprite: Rc<AtlasTexture<'a>>,
+    _fruit_sprite: Rc<AtlasTexture<'a>>,
+) -> Vec<Edible<'a>> {
+    let mut edibles = Vec::new();
+    for x in 0..BOARD_WIDTH {
+        for y in 0..BOARD_HEIGHT {
+            let tile = map.borrow().get_tile(IVec2::new(x as i32, y as i32));
+            match tile {
+                Some(MapTile::Pellet) => {
+                    edibles.push(Edible::new(EdibleKind::Pellet, UVec2::new(x, y), Rc::clone(&pellet_sprite)));
+                }
+                Some(MapTile::PowerPellet) => {
+                    edibles.push(Edible::new(
+                        EdibleKind::PowerPellet,
+                        UVec2::new(x, y),
+                        Rc::clone(&power_pellet_sprite),
+                    ));
+                }
+                // Fruits can be added here if you have fruit positions
+                _ => {}
+            }
+        }
+    }
+    edibles
+}
--- a/src/entity.rs
+++ b/src/entity.rs
@@ -4,56 +4,70 @@ use crate::{
    map::Map,
    modulation::SimpleTickModulator,
 };
+use glam::{IVec2, UVec2};
 use std::cell::RefCell;
 use std::rc::Rc;

 /// A trait for game objects that can be moved and rendered.
 pub trait Entity {
-    /// Returns a reference to the base MovableEntity.
-    fn base(&self) -> &MovableEntity;
+    /// Returns a reference to the base entity (position, etc).
+    fn base(&self) -> &StaticEntity;

    /// Returns true if the entity is colliding with the other entity.
    fn is_colliding(&self, other: &dyn Entity) -> bool {
-        let (x, y) = self.base().pixel_position;
-        let (other_x, other_y) = other.base().pixel_position;
-        x == other_x && y == other_y
+        let a = self.base().pixel_position;
+        let b = other.base().pixel_position;
+        a == b
    }
+}

-    /// Ticks the entity, which updates its state and position.
-    fn tick(&mut self);
+/// A trait for entities that can move and interact with the map.
+pub trait Moving {
+    fn move_forward(&mut self);
+    fn update_cell_position(&mut self);
+    fn next_cell(&self, direction: Option<Direction>) -> IVec2;
+    fn is_wall_ahead(&self, direction: Option<Direction>) -> bool;
+    fn handle_tunnel(&mut self) -> bool;
+    fn is_grid_aligned(&self) -> bool;
+    fn set_direction_if_valid(&mut self, new_direction: Direction) -> bool;
+}
+
+/// A struct for static (non-moving) entities with position only.
+pub struct StaticEntity {
+    pub pixel_position: IVec2,
+    pub cell_position: UVec2,
+}
+
+impl StaticEntity {
+    pub fn new(pixel_position: IVec2, cell_position: UVec2) -> Self {
+        Self {
+            pixel_position,
+            cell_position,
+        }
+    }
 }

 /// A struct for movable game entities with position, direction, speed, and modulation.
 pub struct MovableEntity {
-    /// The absolute position of the entity on the board, in pixels.
-    pub pixel_position: (i32, i32),
-    /// The position of the entity on the board, in grid coordinates.
-    pub cell_position: (u32, u32),
-    /// The current direction of the entity.
+    pub base: StaticEntity,
    pub direction: Direction,
-    /// Movement speed (pixels per tick).
    pub speed: u32,
-    /// Movement modulator for controlling speed.
    pub modulation: SimpleTickModulator,
-    /// Whether the entity is currently in a tunnel.
    pub in_tunnel: bool,
-    /// Reference to the game map.
    pub map: Rc<RefCell<Map>>,
 }

 impl MovableEntity {
-    /// Creates a new MovableEntity.
    pub fn new(
-        pixel_position: (i32, i32),
-        cell_position: (u32, u32),
+        pixel_position: IVec2,
+        cell_position: UVec2,
        direction: Direction,
        speed: u32,
        modulation: SimpleTickModulator,
        map: Rc<RefCell<Map>>,
    ) -> Self {
        Self {
-            pixel_position,
-            cell_position,
+            base: StaticEntity::new(pixel_position, cell_position),
            direction,
            speed,
            modulation,
@@ -63,91 +77,76 @@ impl MovableEntity {
    }

    /// Returns the position within the current cell, in pixels.
-    pub fn internal_position(&self) -> (u32, u32) {
-        (
-            self.pixel_position.0 as u32 % CELL_SIZE,
-            self.pixel_position.1 as u32 % CELL_SIZE,
+    pub fn internal_position(&self) -> UVec2 {
+        UVec2::new(
+            (self.base.pixel_position.x as u32) % CELL_SIZE,
+            (self.base.pixel_position.y as u32) % CELL_SIZE,
        )
    }
+}

-    /// Move the entity in its current direction by its speed.
-    pub fn move_forward(&mut self) {
+impl Entity for MovableEntity {
+    fn base(&self) -> &StaticEntity {
+        &self.base
+    }
+}
+
+impl Moving for MovableEntity {
+    fn move_forward(&mut self) {
        let speed = self.speed as i32;
        match self.direction {
-            Direction::Right => self.pixel_position.0 += speed,
-            Direction::Left => self.pixel_position.0 -= speed,
-            Direction::Up => self.pixel_position.1 -= speed,
-            Direction::Down => self.pixel_position.1 += speed,
+            Direction::Right => self.base.pixel_position.x += speed,
+            Direction::Left => self.base.pixel_position.x -= speed,
+            Direction::Up => self.base.pixel_position.y -= speed,
+            Direction::Down => self.base.pixel_position.y += speed,
        }
    }
-
-    /// Updates the cell position based on the current pixel position.
-    pub fn update_cell_position(&mut self) {
-        self.cell_position = (
-            (self.pixel_position.0 as u32 / CELL_SIZE) - BOARD_OFFSET.0,
-            (self.pixel_position.1 as u32 / CELL_SIZE) - BOARD_OFFSET.1,
+    fn update_cell_position(&mut self) {
+        self.base.cell_position = UVec2::new(
+            (self.base.pixel_position.x as u32 / CELL_SIZE) - BOARD_OFFSET.0,
+            (self.base.pixel_position.y as u32 / CELL_SIZE) - BOARD_OFFSET.1,
        );
    }
-
-    /// Calculates the next cell in the given direction.
-    pub fn next_cell(&self, direction: Option<Direction>) -> (i32, i32) {
+    fn next_cell(&self, direction: Option<Direction>) -> IVec2 {
        let (x, y) = direction.unwrap_or(self.direction).offset();
-        (
-            self.cell_position.0 as i32 + x,
-            self.cell_position.1 as i32 + y,
-        )
+        IVec2::new(self.base.cell_position.x as i32 + x, self.base.cell_position.y as i32 + y)
    }
-
-    /// Returns true if the next cell in the given direction is a wall.
-    pub fn is_wall_ahead(&self, direction: Option<Direction>) -> bool {
+    fn is_wall_ahead(&self, direction: Option<Direction>) -> bool {
        let next_cell = self.next_cell(direction);
        matches!(self.map.borrow().get_tile(next_cell), Some(MapTile::Wall))
    }
-
-    /// Handles tunnel movement and wrapping.
-    /// Returns true if the entity is in a tunnel and was handled.
-    pub fn handle_tunnel(&mut self) -> bool {
+    fn handle_tunnel(&mut self) -> bool {
        if !self.in_tunnel {
            let current_tile = self
                .map
                .borrow()
-                .get_tile((self.cell_position.0 as i32, self.cell_position.1 as i32));
+                .get_tile(IVec2::new(self.base.cell_position.x as i32, self.base.cell_position.y as i32));
            if matches!(current_tile, Some(MapTile::Tunnel)) {
                self.in_tunnel = true;
            }
        }
-
        if self.in_tunnel {
-            // If out of bounds, teleport to the opposite side and exit tunnel
-            if self.cell_position.0 == 0 {
-                self.cell_position.0 = BOARD_WIDTH - 2;
-                self.pixel_position =
-                    Map::cell_to_pixel((self.cell_position.0, self.cell_position.1));
+            if self.base.cell_position.x == 0 {
+                self.base.cell_position.x = BOARD_WIDTH - 2;
+                self.base.pixel_position = Map::cell_to_pixel(self.base.cell_position);
                self.in_tunnel = false;
                true
-            } else if self.cell_position.0 == BOARD_WIDTH - 1 {
-                self.cell_position.0 = 1;
-                self.pixel_position =
-                    Map::cell_to_pixel((self.cell_position.0, self.cell_position.1));
+            } else if self.base.cell_position.x == BOARD_WIDTH - 1 {
+                self.base.cell_position.x = 1;
+                self.base.pixel_position = Map::cell_to_pixel(self.base.cell_position);
                self.in_tunnel = false;
                true
            } else {
-                // Still in tunnel, keep moving
                true
            }
        } else {
            false
        }
    }
-
-    /// Returns true if the entity is aligned with the grid.
-    pub fn is_grid_aligned(&self) -> bool {
-        self.internal_position() == (0, 0)
+    fn is_grid_aligned(&self) -> bool {
+        self.internal_position() == UVec2::ZERO
    }
-
-    /// Attempts to set the direction if the next cell is not a wall.
-    /// Returns true if the direction was changed.
-    pub fn set_direction_if_valid(&mut self, new_direction: Direction) -> bool {
+    fn set_direction_if_valid(&mut self, new_direction: Direction) -> bool {
        if new_direction == self.direction {
            return false;
        }
@@ -159,8 +158,13 @@ impl MovableEntity {
    }
 }

+impl Entity for StaticEntity {
+    fn base(&self) -> &StaticEntity {
+        self
+    }
+}
+
 /// A trait for entities that can be rendered to the screen.
 pub trait Renderable {
-    /// Renders the entity to the canvas.
-    fn render(&mut self, canvas: &mut sdl2::render::Canvas<sdl2::video::Window>);
+    fn render(&self, canvas: &mut sdl2::render::Canvas<sdl2::video::Window>);
 }
--- a/src/game.rs
+++ b/src/game.rs
@@ -1,7 +1,9 @@
 //! This module contains the main game logic and state.
 use std::cell::RefCell;
+use std::ops::Not;
 use std::rc::Rc;

+use glam::UVec2;
 use rand::seq::IteratorRandom;
 use sdl2::image::LoadTexture;
 use sdl2::keyboard::Keycode;
@@ -10,58 +12,39 @@ use sdl2::rwops::RWops;
 use sdl2::ttf::Font;
 use sdl2::video::WindowContext;
 use sdl2::{pixels::Color, render::Canvas, video::Window};
-use tracing::event;

+use crate::animation::AtlasTexture;
+use crate::asset::{get_asset_bytes, Asset};
 use crate::audio::Audio;
-use crate::{
-    animation::{AtlasTexture, FrameDrawn},
-    constants::{MapTile, BOARD_HEIGHT, BOARD_WIDTH, RAW_BOARD},
-    direction::Direction,
-    entity::{Entity, Renderable},
-    ghosts::blinky::Blinky,
-    map::Map,
-    pacman::Pacman,
-};
-
-// Embed texture data directly into the executable
-static PACMAN_TEXTURE_DATA: &[u8] = include_bytes!("../assets/32/pacman.png");
-static PELLET_TEXTURE_DATA: &[u8] = include_bytes!("../assets/24/pellet.png");
-static POWER_PELLET_TEXTURE_DATA: &[u8] = include_bytes!("../assets/24/energizer.png");
-static MAP_TEXTURE_DATA: &[u8] = include_bytes!("../assets/map.png");
-static FONT_DATA: &[u8] = include_bytes!("../assets/font/konami.ttf");
-
-// Add ghost texture data
-static GHOST_BODY_TEXTURE_DATA: &[u8] = include_bytes!("../assets/32/ghost_body.png");
-static GHOST_EYES_TEXTURE_DATA: &[u8] = include_bytes!("../assets/32/ghost_eyes.png");
+use crate::constants::RAW_BOARD;
+use crate::debug::{DebugMode, DebugRenderer};
+use crate::direction::Direction;
+use crate::edible::{reconstruct_edibles, Edible, EdibleKind};
+use crate::entity::Renderable;
+use crate::ghosts::blinky::Blinky;
+use crate::map::Map;
+use crate::pacman::Pacman;

 /// The main game state.
 ///
 /// This struct contains all the information necessary to run the game, including
 /// the canvas, textures, fonts, game objects, and the current score.
-#[derive(PartialEq, Eq, Clone, Copy)]
-pub enum DebugMode {
-    None,
-    Grid,
-    Pathfinding,
-    ValidPositions,
-}
-
 pub struct Game<'a> {
    canvas: &'a mut Canvas<Window>,
    map_texture: Texture<'a>,
-    pellet_texture: AtlasTexture<'a>,
-    power_pellet_texture: AtlasTexture<'a>,
+    pellet_texture: Rc<AtlasTexture<'a>>,
+    power_pellet_texture: Rc<AtlasTexture<'a>>,
    font: Font<'a, 'static>,
    pacman: Rc<RefCell<Pacman<'a>>>,
-    map: Rc<std::cell::RefCell<Map>>,
+    map: Rc<RefCell<Map>>,
    debug_mode: DebugMode,
    score: u32,
-    audio: crate::audio::Audio,
-    // Add ghost
+    pub audio: Audio,
    blinky: Blinky<'a>,
+    edibles: Vec<Edible<'a>>,
 }

-impl Game<'_> {
+impl<'a> Game<'a> {
    /// Creates a new `Game` instance.
    ///
    /// # Arguments
@@ -70,75 +53,88 @@ impl Game<'_> {
    /// * `texture_creator` - The SDL texture creator.
    /// * `ttf_context` - The SDL TTF context.
    /// * `_audio_subsystem` - The SDL audio subsystem (currently unused).
-    pub fn new<'a>(
+    pub fn new(
        canvas: &'a mut Canvas<Window>,
        texture_creator: &'a TextureCreator<WindowContext>,
        ttf_context: &'a sdl2::ttf::Sdl2TtfContext,
        _audio_subsystem: &'a sdl2::AudioSubsystem,
    ) -> Game<'a> {
-        let map = Rc::new(std::cell::RefCell::new(Map::new(RAW_BOARD)));
+        let map = Rc::new(RefCell::new(Map::new(RAW_BOARD)));

-        // Load Pacman texture from embedded data
+        // Load Pacman texture from asset API
+        let pacman_bytes = get_asset_bytes(Asset::Pacman).expect("Failed to load asset");
        let pacman_atlas = texture_creator
-            .load_texture_bytes(PACMAN_TEXTURE_DATA)
-            .expect("Could not load pacman texture from embedded data");
-        let pacman = Rc::new(std::cell::RefCell::new(Pacman::new(
-            (1, 1),
-            pacman_atlas,
-            Rc::clone(&map),
-        )));
+            .load_texture_bytes(&pacman_bytes)
+            .expect("Could not load pacman texture from asset API");
+        let pacman = Rc::new(RefCell::new(Pacman::new(UVec2::new(1, 1), pacman_atlas, Rc::clone(&map))));

        // Load ghost textures
+        let ghost_body_bytes = get_asset_bytes(Asset::GhostBody).expect("Failed to load asset");
        let ghost_body = texture_creator
-            .load_texture_bytes(GHOST_BODY_TEXTURE_DATA)
-            .expect("Could not load ghost body texture from embedded data");
+            .load_texture_bytes(&ghost_body_bytes)
+            .expect("Could not load ghost body texture from asset API");
+        let ghost_eyes_bytes = get_asset_bytes(Asset::GhostEyes).expect("Failed to load asset");
        let ghost_eyes = texture_creator
-            .load_texture_bytes(GHOST_EYES_TEXTURE_DATA)
-            .expect("Could not load ghost eyes texture from embedded data");
+            .load_texture_bytes(&ghost_eyes_bytes)
+            .expect("Could not load ghost eyes texture from asset API");

        // Create Blinky
        let blinky = Blinky::new(
-            (13, 11), // Starting position just above ghost house
+            UVec2::new(13, 11), // Starting position just above ghost house
            ghost_body,
            ghost_eyes,
            Rc::clone(&map),
            Rc::clone(&pacman),
        );

-        // Load pellet texture from embedded data
-        let pellet_texture = AtlasTexture::new(
+        // Load pellet texture from asset API
+        let pellet_bytes = get_asset_bytes(Asset::Pellet).expect("Failed to load asset");
+        let pellet_texture = Rc::new(AtlasTexture::new(
            texture_creator
-                .load_texture_bytes(PELLET_TEXTURE_DATA)
-                .expect("Could not load pellet texture from embedded data"),
+                .load_texture_bytes(&pellet_bytes)
+                .expect("Could not load pellet texture from asset API"),
            1,
            24,
            24,
            None,
-        );
-        let power_pellet_texture = AtlasTexture::new(
+        ));
+        let power_pellet_bytes = get_asset_bytes(Asset::Energizer).expect("Failed to load asset");
+        let power_pellet_texture = Rc::new(AtlasTexture::new(
            texture_creator
-                .load_texture_bytes(POWER_PELLET_TEXTURE_DATA)
-                .expect("Could not load power pellet texture from embedded data"),
+                .load_texture_bytes(&power_pellet_bytes)
+                .expect("Could not load power pellet texture from asset API"),
            1,
            24,
            24,
            None,
+        ));
+
+        // Load map texture from asset API
+        let map_bytes = get_asset_bytes(Asset::Map).expect("Failed to load asset");
+        let mut map_texture = texture_creator
+            .load_texture_bytes(&map_bytes)
+            .expect("Could not load map texture from asset API");
+        map_texture.set_color_mod(0, 0, 255);
+
+        let edibles = reconstruct_edibles(
+            Rc::clone(&map),
+            Rc::clone(&pellet_texture),
+            Rc::clone(&power_pellet_texture),
+            Rc::clone(&pellet_texture), // placeholder for fruit sprite
        );

-        // Load font from embedded data
-        let font_rwops = RWops::from_bytes(FONT_DATA).expect("Failed to create RWops for font");
-        let font = ttf_context
-            .load_font_from_rwops(font_rwops, 24)
-            .expect("Could not load font from embedded data");
+        // Load font from asset API
+        let font = {
+            let font_bytes = get_asset_bytes(Asset::FontKonami).expect("Failed to load asset").into_owned();
+            let font_bytes_static: &'static [u8] = Box::leak(font_bytes.into_boxed_slice());
+            let font_rwops = RWops::from_bytes(font_bytes_static).expect("Failed to create RWops for font");
+            ttf_context
+                .load_font_from_rwops(font_rwops, 24)
+                .expect("Could not load font from asset API")
+        };

        let audio = Audio::new();

-        // Load map texture from embedded data
-        let mut map_texture = texture_creator
-            .load_texture_bytes(MAP_TEXTURE_DATA)
-            .expect("Could not load map texture from embedded data");
-        map_texture.set_color_mod(0, 0, 255);
-
        Game {
            canvas,
            pacman,
@@ -151,6 +147,7 @@ impl Game<'_> {
            score: 0,
            audio,
            blinky,
+            edibles,
        }
    }

@@ -162,7 +159,10 @@ impl Game<'_> {
    pub fn keyboard_event(&mut self, keycode: Keycode) {
        // Change direction
        let direction = Direction::from_keycode(keycode);
-        self.pacman.borrow_mut().next_direction = direction;
+        if direction.is_some() {
+            self.pacman.borrow_mut().next_direction = direction;
+            return;
+        }

        // Toggle debug mode
        if keycode == Keycode::Space {
@@ -172,6 +172,13 @@ impl Game<'_> {
                DebugMode::Pathfinding => DebugMode::ValidPositions,
                DebugMode::ValidPositions => DebugMode::None,
            };
+            return;
+        }
+
+        // Toggle mute
+        if keycode == Keycode::M {
+            self.audio.set_mute(self.audio.is_muted().not());
+            return;
        }

        // Reset game
@@ -200,72 +207,76 @@ impl Game<'_> {
        // Reset the score
        self.score = 0;

-        // Get valid positions from the cached flood fill
-        let mut map = self.map.borrow_mut();
-        let valid_positions = map.get_valid_playable_positions();
-        let mut rng = rand::rng();
+        // Get valid positions from the cached flood fill and randomize positions in a single block
+        {
+            let mut map = self.map.borrow_mut();
+            let valid_positions = map.get_valid_playable_positions();
+            let mut rng = rand::rng();

-        // Randomize Pac-Man position
-        if let Some(pos) = valid_positions.iter().choose(&mut rng) {
-            let mut pacman = self.pacman.borrow_mut();
-            pacman.base.pixel_position = Map::cell_to_pixel((pos.x, pos.y));
-            pacman.base.cell_position = (pos.x, pos.y);
-            pacman.base.in_tunnel = false;
-            pacman.base.direction = Direction::Right;
-            pacman.next_direction = None;
-            pacman.stopped = false;
+            // Randomize Pac-Man position
+            if let Some(pos) = valid_positions.iter().choose(&mut rng) {
+                let mut pacman = self.pacman.borrow_mut();
+                pacman.base.base.pixel_position = Map::cell_to_pixel(*pos);
+                pacman.base.base.cell_position = *pos;
+                pacman.base.in_tunnel = false;
+                pacman.base.direction = Direction::Right;
+                pacman.next_direction = None;
+                pacman.stopped = false;
+            }
+
+            // Randomize ghost position
+            if let Some(pos) = valid_positions.iter().choose(&mut rng) {
+                self.blinky.base.base.pixel_position = Map::cell_to_pixel(*pos);
+                self.blinky.base.base.cell_position = *pos;
+                self.blinky.base.in_tunnel = false;
+                self.blinky.base.direction = Direction::Left;
+                self.blinky.mode = crate::ghost::GhostMode::Chase;
+            }
        }

-        // Randomize ghost position
-        if let Some(pos) = valid_positions.iter().choose(&mut rng) {
-            self.blinky.base.pixel_position = Map::cell_to_pixel((pos.x, pos.y));
-            self.blinky.base.cell_position = (pos.x, pos.y);
-            self.blinky.base.in_tunnel = false;
-            self.blinky.base.direction = Direction::Left;
-            self.blinky.mode = crate::ghost::GhostMode::Chase;
-        }
+        self.edibles = reconstruct_edibles(
+            Rc::clone(&self.map),
+            Rc::clone(&self.pellet_texture),
+            Rc::clone(&self.power_pellet_texture),
+            Rc::clone(&self.pellet_texture), // placeholder for fruit sprite
+        );
    }

    /// Advances the game by one tick.
    pub fn tick(&mut self) {
-        self.check_pellet_eating();
-        self.pacman.borrow_mut().tick();
-        self.blinky.tick();
-    }
+        // Advance animation frames for Pacman and Blinky
+        self.pacman.borrow_mut().sprite.tick();
+        self.blinky.body_sprite.tick();
+        self.blinky.eyes_sprite.tick();

-    /// Checks if Pac-Man is currently eating a pellet and updates the game state
-    /// accordingly.
-    fn check_pellet_eating(&mut self) {
-        let cell_pos = self.pacman.borrow().base.cell_position;
-
-        // Check if there's a pellet at the current position
-        let tile = {
-            let map = self.map.borrow();
-            map.get_tile((cell_pos.0 as i32, cell_pos.1 as i32))
-        };
-
-        if let Some(tile) = tile {
-            let pellet_value = match tile {
-                MapTile::Pellet => Some(10),
-                MapTile::PowerPellet => Some(50),
-                _ => None,
-            };
-
-            if let Some(value) = pellet_value {
-                {
-                    let mut map = self.map.borrow_mut();
-                    map.set_tile((cell_pos.0 as i32, cell_pos.1 as i32), MapTile::Empty);
-                }
-                self.add_score(value);
-                self.audio.eat();
-                event!(
-                    tracing::Level::DEBUG,
-                    "Pellet eaten at ({}, {})",
-                    cell_pos.0,
-                    cell_pos.1
-                );
+        let pacman = self.pacman.borrow();
+        let mut eaten_indices = vec![];
+        for (i, edible) in self.edibles.iter().enumerate() {
+            if edible.collide(&*pacman) {
+                eaten_indices.push(i);
            }
        }
+        drop(pacman); // Release immutable borrow before mutably borrowing self
+        for &i in eaten_indices.iter().rev() {
+            let edible = &self.edibles[i];
+            match edible.kind {
+                EdibleKind::Pellet => {
+                    self.add_score(10);
+                    self.audio.eat();
+                }
+                EdibleKind::PowerPellet => {
+                    self.add_score(50);
+                    self.audio.eat();
+                }
+                EdibleKind::Fruit(_fruit) => {
+                    self.add_score(100);
+                    self.audio.eat();
+                }
+            }
+            self.edibles.remove(i);
+        }
+        self.pacman.borrow_mut().tick();
+        self.blinky.tick();
    }

    /// Draws the entire game to the canvas.
@@ -279,41 +290,13 @@ impl Game<'_> {
            .copy(&self.map_texture, None, None)
            .expect("Could not render texture on canvas");

-        // Render pellets
-        for x in 0..BOARD_WIDTH {
-            for y in 0..BOARD_HEIGHT {
-                let tile = self
-                    .map
-                    .borrow()
-                    .get_tile((x as i32, y as i32))
-                    .unwrap_or(MapTile::Empty);
-
-                match tile {
-                    MapTile::Pellet => {
-                        let position = Map::cell_to_pixel((x, y));
-                        self.pellet_texture.render(
-                            self.canvas,
-                            position,
-                            Direction::Right,
-                            Some(0),
-                        );
-                    }
-                    MapTile::PowerPellet => {
-                        let position = Map::cell_to_pixel((x, y));
-                        self.power_pellet_texture.render(
-                            self.canvas,
-                            position,
-                            Direction::Right,
-                            Some(0),
-                        );
-                    }
-                    _ => {}
-                }
-            }
+        // Render all edibles
+        for edible in &self.edibles {
+            edible.render(self.canvas);
        }

        // Render Pac-Man
-        self.pacman.borrow_mut().render(self.canvas);
+        self.pacman.borrow().render(self.canvas);

        // Render ghost
        self.blinky.render(self.canvas);
@@ -322,88 +305,25 @@ impl Game<'_> {
        self.render_ui();

        // Draw the debug grid
-        if self.debug_mode == DebugMode::Grid {
-            for x in 0..BOARD_WIDTH {
-                for y in 0..BOARD_HEIGHT {
-                    let tile = self
-                        .map
-                        .borrow()
-                        .get_tile((x as i32, y as i32))
-                        .unwrap_or(MapTile::Empty);
-                    let mut color = None;
-
-                    if (x, y) == self.pacman.borrow().base.cell_position {
-                        self.draw_cell((x, y), Color::CYAN);
-                    } else {
-                        color = match tile {
-                            MapTile::Empty => None,
-                            MapTile::Wall => Some(Color::BLUE),
-                            MapTile::Pellet => Some(Color::RED),
-                            MapTile::PowerPellet => Some(Color::MAGENTA),
-                            MapTile::StartingPosition(_) => Some(Color::GREEN),
-                            MapTile::Tunnel => Some(Color::CYAN),
-                        };
-                    }
-
-                    if let Some(color) = color {
-                        self.draw_cell((x, y), color);
-                    }
-                }
+        match self.debug_mode {
+            DebugMode::Grid => {
+                DebugRenderer::draw_debug_grid(self.canvas, &self.map.borrow(), self.pacman.borrow().base.base.cell_position);
+                let next_cell = <Pacman as crate::entity::Moving>::next_cell(&*self.pacman.borrow(), None);
+                DebugRenderer::draw_next_cell(self.canvas, &self.map.borrow(), next_cell.as_uvec2());
            }
-
-            // Draw the next cell
-            let next_cell = self.pacman.borrow().base.next_cell(None);
-            self.draw_cell((next_cell.0 as u32, next_cell.1 as u32), Color::YELLOW);
-        }
-
-        // Show valid playable positions
-        if self.debug_mode == DebugMode::ValidPositions {
-            let valid_positions_vec = {
-                let mut map = self.map.borrow_mut();
-                map.get_valid_playable_positions().clone()
-            };
-            for &pos in &valid_positions_vec {
-                self.draw_cell((pos.x, pos.y), Color::RGB(255, 140, 0)); // ORANGE
+            DebugMode::ValidPositions => {
+                DebugRenderer::draw_valid_positions(self.canvas, &mut self.map.borrow_mut());
            }
-        }
-
-        // Pathfinding debug mode
-        if self.debug_mode == DebugMode::Pathfinding {
-            // Show the current path for Blinky
-            if let Some((path, _)) = self.blinky.get_path_to_target({
-                let (tx, ty) = self.blinky.get_target_tile();
-                (tx as u32, ty as u32)
-            }) {
-                for &(x, y) in &path {
-                    self.draw_cell((x, y), Color::YELLOW);
-                }
+            DebugMode::Pathfinding => {
+                DebugRenderer::draw_pathfinding(self.canvas, &self.blinky, &self.map.borrow());
            }
+            DebugMode::None => {}
        }

        // Present the canvas
        self.canvas.present();
    }

-    /// Draws a single cell to the canvas with the given color.
-    ///
-    /// # Arguments
-    ///
-    /// * `cell` - The cell to draw, in grid coordinates.
-    /// * `color` - The color to draw the cell with.
-    fn draw_cell(&mut self, cell: (u32, u32), color: Color) {
-        let position = Map::cell_to_pixel(cell);
-
-        self.canvas.set_draw_color(color);
-        self.canvas
-            .draw_rect(sdl2::rect::Rect::new(
-                position.0 as i32,
-                position.1 as i32,
-                24,
-                24,
-            ))
-            .expect("Could not draw rectangle");
-    }
-
    /// Renders the user interface, including the score and lives.
    fn render_ui(&mut self) {
        let lives = 3;
@@ -417,7 +337,7 @@ impl Game<'_> {

        // Render the score and high score
        self.render_text(
-            &format!("{}UP   HIGH SCORE   ", lives),
+            &format!("{lives}UP   HIGH SCORE   "),
            (24 * lives_offset + x_offset, y_offset),
            Color::WHITE,
        );
@@ -430,11 +350,7 @@ impl Game<'_> {

    /// Renders text to the screen at the given position.
    fn render_text(&mut self, text: &str, position: (i32, i32), color: Color) {
-        let surface = self
-            .font
-            .render(text)
-            .blended(color)
-            .expect("Could not render text surface");
+        let surface = self.font.render(text).blended(color).expect("Could not render text surface");

        let texture_creator = self.canvas.texture_creator();
        let texture = texture_creator
--- a/src/ghost.rs
+++ b/src/ghost.rs
@@ -1,15 +1,17 @@
-use pathfinding::prelude::dijkstra;
 use rand::Rng;

-use crate::{
-    animation::{AnimatedAtlasTexture, FrameDrawn},
-    constants::{MapTile, BOARD_WIDTH},
-    direction::Direction,
-    entity::{Entity, MovableEntity, Renderable},
-    map::Map,
-    modulation::{SimpleTickModulator, TickModulator},
-    pacman::Pacman,
-};
+use crate::animation::{AnimatedAtlasTexture, FrameDrawn};
+use crate::constants::{MapTile, BOARD_WIDTH};
+use crate::direction::Direction;
+use crate::entity::{Entity, MovableEntity, Moving, Renderable};
+use crate::map::Map;
+use crate::modulation::{SimpleTickModulator, TickModulator};
+use crate::pacman::Pacman;
+use glam::{IVec2, UVec2};
+use sdl2::pixels::Color;
+use sdl2::render::Texture;
+use std::cell::RefCell;
+use std::rc::Rc;

 /// The different modes a ghost can be in
 #[derive(Debug, Clone, Copy, PartialEq)]
@@ -37,12 +39,12 @@ pub enum GhostType {

 impl GhostType {
    /// Returns the color of the ghost.
-    pub fn color(&self) -> sdl2::pixels::Color {
+    pub fn color(&self) -> Color {
        match self {
-            GhostType::Blinky => sdl2::pixels::Color::RGB(255, 0, 0),
-            GhostType::Pinky => sdl2::pixels::Color::RGB(255, 184, 255),
-            GhostType::Inky => sdl2::pixels::Color::RGB(0, 255, 255),
-            GhostType::Clyde => sdl2::pixels::Color::RGB(255, 184, 82),
+            GhostType::Blinky => Color::RGB(255, 0, 0),
+            GhostType::Pinky => Color::RGB(255, 184, 255),
+            GhostType::Inky => Color::RGB(0, 255, 255),
+            GhostType::Clyde => Color::RGB(255, 184, 82),
        }
    }
 }
@@ -56,22 +58,20 @@ pub struct Ghost<'a> {
    /// The type/personality of this ghost
    pub ghost_type: GhostType,
    /// Reference to Pac-Man for targeting
-    pub pacman: std::rc::Rc<std::cell::RefCell<Pacman<'a>>>,
-    /// Ghost body sprite
-    body_sprite: AnimatedAtlasTexture<'a>,
-    /// Ghost eyes sprite
-    eyes_sprite: AnimatedAtlasTexture<'a>,
+    pub pacman: Rc<RefCell<Pacman<'a>>>,
+    pub body_sprite: AnimatedAtlasTexture<'a>,
+    pub eyes_sprite: AnimatedAtlasTexture<'a>,
 }

 impl Ghost<'_> {
    /// Creates a new ghost instance
    pub fn new<'a>(
        ghost_type: GhostType,
-        starting_position: (u32, u32),
-        body_texture: sdl2::render::Texture<'a>,
-        eyes_texture: sdl2::render::Texture<'a>,
-        map: std::rc::Rc<std::cell::RefCell<Map>>,
-        pacman: std::rc::Rc<std::cell::RefCell<Pacman<'a>>>,
+        starting_position: UVec2,
+        body_texture: Texture<'a>,
+        eyes_texture: Texture<'a>,
+        map: Rc<RefCell<Map>>,
+        pacman: Rc<RefCell<Pacman<'a>>>,
    ) -> Ghost<'a> {
        let color = ghost_type.color();
        let mut body_sprite = AnimatedAtlasTexture::new(body_texture, 8, 2, 32, 32, Some((-4, -4)));
@@ -95,7 +95,7 @@ impl Ghost<'_> {
    }

    /// Gets the target tile for this ghost based on its current mode
-    pub fn get_target_tile(&self) -> (i32, i32) {
+    pub fn get_target_tile(&self) -> IVec2 {
        match self.mode {
            GhostMode::Scatter => self.get_scatter_target(),
            GhostMode::Chase => self.get_chase_target(),
@@ -106,37 +106,29 @@ impl Ghost<'_> {
    }

    /// Gets this ghost's home corner target for scatter mode
-    fn get_scatter_target(&self) -> (i32, i32) {
+    fn get_scatter_target(&self) -> IVec2 {
        match self.ghost_type {
-            GhostType::Blinky => (25, 0), // Top right
-            GhostType::Pinky => (2, 0),   // Top left
-            GhostType::Inky => (27, 35),  // Bottom right
-            GhostType::Clyde => (0, 35),  // Bottom left
+            GhostType::Blinky => IVec2::new(25, 0), // Top right
+            GhostType::Pinky => IVec2::new(2, 0),   // Top left
+            GhostType::Inky => IVec2::new(27, 35),  // Bottom right
+            GhostType::Clyde => IVec2::new(0, 35),  // Bottom left
        }
    }

    /// Gets a random adjacent tile for frightened mode
-    fn get_random_target(&self) -> (i32, i32) {
+    fn get_random_target(&self) -> IVec2 {
        let mut rng = rand::rng();
        let mut possible_moves = Vec::new();

        // Check all four directions
-        for dir in &[
-            Direction::Up,
-            Direction::Down,
-            Direction::Left,
-            Direction::Right,
-        ] {
+        for dir in &[Direction::Up, Direction::Down, Direction::Left, Direction::Right] {
            // Don't allow reversing direction
            if *dir == self.base.direction.opposite() {
                continue;
            }

            let next_cell = self.base.next_cell(Some(*dir));
-            if !matches!(
-                self.base.map.borrow().get_tile(next_cell),
-                Some(MapTile::Wall)
-            ) {
+            if !matches!(self.base.map.borrow().get_tile(next_cell), Some(MapTile::Wall)) {
                possible_moves.push(next_cell);
            }
        }
@@ -151,54 +143,49 @@ impl Ghost<'_> {
    }

    /// Gets the ghost house target for returning eyes
-    fn get_house_target(&self) -> (i32, i32) {
-        (13, 14) // Center of ghost house
+    fn get_house_target(&self) -> IVec2 {
+        IVec2::new(13, 14) // Center of ghost house
    }

    /// Gets the exit point target when leaving house
-    fn get_house_exit_target(&self) -> (i32, i32) {
-        (13, 11) // Just above ghost house
+    fn get_house_exit_target(&self) -> IVec2 {
+        IVec2::new(13, 11) // Just above ghost house
    }

    /// Gets this ghost's chase mode target (to be implemented by each ghost type)
-    fn get_chase_target(&self) -> (i32, i32) {
-        // Default implementation just targets Pac-Man directly
+    fn get_chase_target(&self) -> IVec2 {
        let pacman = self.pacman.borrow();
        let cell = pacman.base().cell_position;
-        (cell.0 as i32, cell.1 as i32)
+        IVec2::new(cell.x as i32, cell.y as i32)
    }

    /// Calculates the path to the target tile using the A* algorithm.
-    pub fn get_path_to_target(&self, target: (u32, u32)) -> Option<(Vec<(u32, u32)>, u32)> {
-        let start = self.base.cell_position;
+    pub fn get_path_to_target(&self, target: UVec2) -> Option<(Vec<UVec2>, u32)> {
+        let start = self.base.base.cell_position;
        let map = self.base.map.borrow();
-
+        use pathfinding::prelude::dijkstra;
        dijkstra(
            &start,
            |&p| {
                let mut successors = vec![];
-                let tile = map.get_tile((p.0 as i32, p.1 as i32));
+                let tile = map.get_tile(IVec2::new(p.x as i32, p.y as i32));
                // Tunnel wrap: if currently in a tunnel, add the opposite exit as a neighbor
                if let Some(MapTile::Tunnel) = tile {
-                    if p.0 == 0 {
-                        successors.push(((BOARD_WIDTH - 2, p.1), 1));
-                    } else if p.0 == BOARD_WIDTH - 1 {
-                        successors.push(((1, p.1), 1));
+                    if p.x == 0 {
+                        successors.push((UVec2::new(BOARD_WIDTH - 2, p.y), 1));
+                    } else if p.x == BOARD_WIDTH - 1 {
+                        successors.push((UVec2::new(1, p.y), 1));
                    }
                }
-                for dir in &[
-                    Direction::Up,
-                    Direction::Down,
-                    Direction::Left,
-                    Direction::Right,
-                ] {
+                for dir in &[Direction::Up, Direction::Down, Direction::Left, Direction::Right] {
                    let (dx, dy) = dir.offset();
-                    let next_p = (p.0 as i32 + dx, p.1 as i32 + dy);
+                    let next_p = IVec2::new(p.x as i32 + dx, p.y as i32 + dy);
                    if let Some(tile) = map.get_tile(next_p) {
                        if tile == MapTile::Wall {
                            continue;
                        }
-                        successors.push(((next_p.0 as u32, next_p.1 as u32), 1));
+                        let next_u = UVec2::new(next_p.x as u32, next_p.y as u32);
+                        successors.push((next_u, 1));
                    }
                }
                successors
@@ -210,9 +197,8 @@ impl Ghost<'_> {
    /// Changes the ghost's mode and handles direction reversal
    pub fn set_mode(&mut self, new_mode: GhostMode) {
        // Don't reverse if going to/from frightened or if in house
-        let should_reverse = self.mode != GhostMode::House
-            && new_mode != GhostMode::Frightened
-            && self.mode != GhostMode::Frightened;
+        let should_reverse =
+            self.mode != GhostMode::House && new_mode != GhostMode::Frightened && self.mode != GhostMode::Frightened;

        self.mode = new_mode;

@@ -225,18 +211,11 @@ impl Ghost<'_> {
        };

        if should_reverse {
-            self.base
-                .set_direction_if_valid(self.base.direction.opposite());
+            self.base.set_direction_if_valid(self.base.direction.opposite());
        }
    }
-}

-impl Entity for Ghost<'_> {
-    fn base(&self) -> &MovableEntity {
-        &self.base
-    }
-
-    fn tick(&mut self) {
+    pub fn tick(&mut self) {
        if self.mode == GhostMode::House {
            // For now, do nothing in the house
            return;
@@ -248,14 +227,13 @@ impl Entity for Ghost<'_> {
            if !self.base.handle_tunnel() {
                // Pathfinding logic (only if not in tunnel)
                let target_tile = self.get_target_tile();
-                if let Some((path, _)) =
-                    self.get_path_to_target((target_tile.0 as u32, target_tile.1 as u32))
-                {
+                if let Some((path, _)) = self.get_path_to_target(target_tile.as_uvec2()) {
                    if path.len() > 1 {
                        let next_move = path[1];
-                        let (x, y) = self.base.cell_position;
-                        let dx = next_move.0 as i32 - x as i32;
-                        let dy = next_move.1 as i32 - y as i32;
+                        let x = self.base.base.cell_position.x;
+                        let y = self.base.base.cell_position.y;
+                        let dx = next_move.x as i32 - x as i32;
+                        let dy = next_move.y as i32 - y as i32;
                        let new_direction = if dx > 0 {
                            Direction::Right
                        } else if dx < 0 {
@@ -286,23 +264,35 @@ impl Entity for Ghost<'_> {
    }
 }

-impl Renderable for Ghost<'_> {
-    fn render(&mut self, canvas: &mut sdl2::render::Canvas<sdl2::video::Window>) {
-        // Render body
-        if self.mode != GhostMode::Eyes {
-            let color = if self.mode == GhostMode::Frightened {
-                sdl2::pixels::Color::RGB(0, 0, 255)
-            } else {
-                self.ghost_type.color()
-            };
+impl<'a> Moving for Ghost<'a> {
+    fn move_forward(&mut self) {
+        self.base.move_forward();
+    }
+    fn update_cell_position(&mut self) {
+        self.base.update_cell_position();
+    }
+    fn next_cell(&self, direction: Option<Direction>) -> IVec2 {
+        self.base.next_cell(direction)
+    }
+    fn is_wall_ahead(&self, direction: Option<Direction>) -> bool {
+        self.base.is_wall_ahead(direction)
+    }
+    fn handle_tunnel(&mut self) -> bool {
+        self.base.handle_tunnel()
+    }
+    fn is_grid_aligned(&self) -> bool {
+        self.base.is_grid_aligned()
+    }
+    fn set_direction_if_valid(&mut self, new_direction: Direction) -> bool {
+        self.base.set_direction_if_valid(new_direction)
+    }
+}

-            self.body_sprite
-                .set_color_modulation(color.r, color.g, color.b);
-            self.body_sprite
-                .render(canvas, self.base.pixel_position, Direction::Right, None);
-        }
-
-        // Always render eyes on top
+impl<'a> Renderable for Ghost<'a> {
+    fn render(&self, canvas: &mut sdl2::render::Canvas<sdl2::video::Window>) {
+        let pos = self.base.base.pixel_position;
+        self.body_sprite.render(canvas, (pos.x, pos.y), Direction::Right, None);
+        // Inline the eye_frame logic here
        let eye_frame = if self.mode == GhostMode::Frightened {
            4 // Frightened frame
        } else {
@@ -313,12 +303,7 @@ impl Renderable for Ghost<'_> {
                Direction::Down => 3,
            }
        };
-
-        self.eyes_sprite.render(
-            canvas,
-            self.base.pixel_position,
-            Direction::Right,
-            Some(eye_frame),
-        );
+        self.eyes_sprite
+            .render(canvas, (pos.x, pos.y), Direction::Right, Some(eye_frame));
    }
 }
--- a/src/ghosts/blinky.rs
+++ b/src/ghosts/blinky.rs
@@ -4,12 +4,12 @@ use std::rc::Rc;
 use sdl2::render::{Canvas, Texture};
 use sdl2::video::Window;

-use crate::{
-    entity::{Entity, MovableEntity, Renderable},
-    ghost::{Ghost, GhostMode, GhostType},
-    map::Map,
-    pacman::Pacman,
-};
+use crate::direction::Direction;
+use crate::entity::{Entity, Moving, Renderable, StaticEntity};
+use crate::ghost::{Ghost, GhostMode, GhostType};
+use crate::map::Map;
+use crate::pacman::Pacman;
+use glam::{IVec2, UVec2};

 pub struct Blinky<'a> {
    ghost: Ghost<'a>,
@@ -17,51 +17,66 @@ pub struct Blinky<'a> {

 impl<'a> Blinky<'a> {
    pub fn new(
-        starting_position: (u32, u32),
+        starting_position: UVec2,
        body_texture: Texture<'a>,
        eyes_texture: Texture<'a>,
        map: Rc<RefCell<Map>>,
        pacman: Rc<RefCell<Pacman<'a>>>,
    ) -> Blinky<'a> {
        Blinky {
-            ghost: Ghost::new(
-                GhostType::Blinky,
-                starting_position,
-                body_texture,
-                eyes_texture,
-                map,
-                pacman,
-            ),
+            ghost: Ghost::new(GhostType::Blinky, starting_position, body_texture, eyes_texture, map, pacman),
        }
    }

    /// Gets Blinky's chase target - directly targets Pac-Man's current position
-    fn get_chase_target(&self) -> (i32, i32) {
+    fn get_chase_target(&self) -> IVec2 {
        let pacman = self.ghost.pacman.borrow();
        let cell = pacman.base().cell_position;
-        (cell.0 as i32, cell.1 as i32)
+        IVec2::new(cell.x as i32, cell.y as i32)
    }

    pub fn set_mode(&mut self, mode: GhostMode) {
        self.ghost.set_mode(mode);
    }

-    pub fn render(&mut self, canvas: &mut Canvas<Window>) {
-        Renderable::render(&mut self.ghost, canvas);
+    pub fn tick(&mut self) {
+        self.ghost.tick();
    }
 }

 impl<'a> Entity for Blinky<'a> {
-    fn base(&self) -> &MovableEntity {
-        self.ghost.base()
+    fn base(&self) -> &StaticEntity {
+        self.ghost.base.base()
    }
+}

-    fn is_colliding(&self, other: &dyn Entity) -> bool {
-        self.ghost.is_colliding(other)
+impl<'a> Renderable for Blinky<'a> {
+    fn render(&self, canvas: &mut Canvas<Window>) {
+        self.ghost.render(canvas);
    }
+}

-    fn tick(&mut self) {
-        self.ghost.tick()
+impl<'a> Moving for Blinky<'a> {
+    fn move_forward(&mut self) {
+        self.ghost.move_forward();
+    }
+    fn update_cell_position(&mut self) {
+        self.ghost.update_cell_position();
+    }
+    fn next_cell(&self, direction: Option<Direction>) -> IVec2 {
+        self.ghost.next_cell(direction)
+    }
+    fn is_wall_ahead(&self, direction: Option<Direction>) -> bool {
+        self.ghost.is_wall_ahead(direction)
+    }
+    fn handle_tunnel(&mut self) -> bool {
+        self.ghost.handle_tunnel()
+    }
+    fn is_grid_aligned(&self) -> bool {
+        self.ghost.is_grid_aligned()
+    }
+    fn set_direction_if_valid(&mut self, new_direction: Direction) -> bool {
+        self.ghost.set_direction_if_valid(new_direction)
    }
 }

--- a/src/helper.rs
+++ b/src/helper.rs
@@ -1,28 +1,23 @@
 //! This module contains helper functions that are used throughout the game.

+use glam::UVec2;
+
 /// Checks if two grid positions are adjacent to each other
 ///
 /// # Arguments
 /// * `a` - First position as (x, y) coordinates
-/// * `b` - Second position as (x, y) coordinates  
+/// * `b` - Second position as (x, y) coordinates
 /// * `diagonal` - Whether to consider diagonal adjacency (true) or only orthogonal (false)
 ///
 /// # Returns
 /// * `true` if positions are adjacent according to the diagonal parameter
 /// * `false` otherwise
-pub fn is_adjacent(a: (u32, u32), b: (u32, u32), diagonal: bool) -> bool {
-    let (ax, ay) = a;
-    let (bx, by) = b;
-
-    // Calculate absolute differences between coordinates
-    let dx = if ax > bx { ax - bx } else { bx - ax };
-    let dy = if ay > by { ay - by } else { by - ay };
-
+pub fn is_adjacent(a: UVec2, b: UVec2, diagonal: bool) -> bool {
+    let dx = a.x.abs_diff(b.x);
+    let dy = a.y.abs_diff(b.y);
    if diagonal {
-        // For diagonal adjacency: both differences must be ≤ 1 and at least one > 0
-        dx <= 1 && dy <= 1 && (dx + dy) > 0
+        dx <= 1 && dy <= 1 && (dx != 0 || dy != 0)
    } else {
-        // For orthogonal adjacency: exactly one difference must be 1, the other 0
        (dx == 1 && dy == 0) || (dx == 0 && dy == 1)
    }
 }
@@ -36,22 +31,22 @@ mod tests {
        // Test orthogonal adjacency (diagonal = false)

        // Same position should not be adjacent
-        assert!(!is_adjacent((0, 0), (0, 0), false));
+        assert!(!is_adjacent(UVec2::new(0, 0), UVec2::new(0, 0), false));

        // Adjacent positions should be true
-        assert!(is_adjacent((0, 0), (1, 0), false)); // Right
-        assert!(is_adjacent((0, 0), (0, 1), false)); // Down
-        assert!(is_adjacent((1, 1), (0, 1), false)); // Left
-        assert!(is_adjacent((1, 1), (1, 0), false)); // Up
+        assert!(is_adjacent(UVec2::new(0, 0), UVec2::new(1, 0), false)); // Right
+        assert!(is_adjacent(UVec2::new(0, 0), UVec2::new(0, 1), false)); // Down
+        assert!(is_adjacent(UVec2::new(1, 1), UVec2::new(0, 1), false)); // Left
+        assert!(is_adjacent(UVec2::new(1, 1), UVec2::new(1, 0), false)); // Up

        // Diagonal positions should be false
-        assert!(!is_adjacent((0, 0), (1, 1), false));
-        assert!(!is_adjacent((0, 1), (1, 0), false));
+        assert!(!is_adjacent(UVec2::new(0, 0), UVec2::new(1, 1), false));
+        assert!(!is_adjacent(UVec2::new(0, 1), UVec2::new(1, 0), false));

        // Positions more than 1 step away should be false
-        assert!(!is_adjacent((0, 0), (2, 0), false));
-        assert!(!is_adjacent((0, 0), (0, 2), false));
-        assert!(!is_adjacent((0, 0), (2, 2), false));
+        assert!(!is_adjacent(UVec2::new(0, 0), UVec2::new(2, 0), false));
+        assert!(!is_adjacent(UVec2::new(0, 0), UVec2::new(0, 2), false));
+        assert!(!is_adjacent(UVec2::new(0, 0), UVec2::new(2, 2), false));
    }

    #[test]
@@ -59,54 +54,54 @@ mod tests {
        // Test diagonal adjacency (diagonal = true)

        // Same position should not be adjacent
-        assert!(!is_adjacent((0, 0), (0, 0), true));
+        assert!(!is_adjacent(UVec2::new(0, 0), UVec2::new(0, 0), true));

        // Orthogonal adjacent positions should be true
-        assert!(is_adjacent((0, 0), (1, 0), true)); // Right
-        assert!(is_adjacent((0, 0), (0, 1), true)); // Down
-        assert!(is_adjacent((1, 1), (0, 1), true)); // Left
-        assert!(is_adjacent((1, 1), (1, 0), true)); // Up
+        assert!(is_adjacent(UVec2::new(0, 0), UVec2::new(1, 0), true)); // Right
+        assert!(is_adjacent(UVec2::new(0, 0), UVec2::new(0, 1), true)); // Down
+        assert!(is_adjacent(UVec2::new(1, 1), UVec2::new(0, 1), true)); // Left
+        assert!(is_adjacent(UVec2::new(1, 1), UVec2::new(1, 0), true)); // Up

        // Diagonal adjacent positions should be true
-        assert!(is_adjacent((0, 0), (1, 1), true)); // Down-right
-        assert!(is_adjacent((1, 0), (0, 1), true)); // Down-left
-        assert!(is_adjacent((0, 1), (1, 0), true)); // Up-right
-        assert!(is_adjacent((1, 1), (0, 0), true)); // Up-left
+        assert!(is_adjacent(UVec2::new(0, 0), UVec2::new(1, 1), true)); // Down-right
+        assert!(is_adjacent(UVec2::new(1, 0), UVec2::new(0, 1), true)); // Down-left
+        assert!(is_adjacent(UVec2::new(0, 1), UVec2::new(1, 0), true)); // Up-right
+        assert!(is_adjacent(UVec2::new(1, 1), UVec2::new(0, 0), true)); // Up-left

        // Positions more than 1 step away should be false
-        assert!(!is_adjacent((0, 0), (2, 0), true));
-        assert!(!is_adjacent((0, 0), (0, 2), true));
-        assert!(!is_adjacent((0, 0), (2, 2), true));
-        assert!(!is_adjacent((0, 0), (1, 2), true));
+        assert!(!is_adjacent(UVec2::new(0, 0), UVec2::new(2, 0), true));
+        assert!(!is_adjacent(UVec2::new(0, 0), UVec2::new(0, 2), true));
+        assert!(!is_adjacent(UVec2::new(0, 0), UVec2::new(2, 2), true));
+        assert!(!is_adjacent(UVec2::new(0, 0), UVec2::new(1, 2), true));
    }

    #[test]
    fn test_edge_cases() {
        // Test with larger coordinates
-        assert!(is_adjacent((100, 100), (101, 100), false));
-        assert!(is_adjacent((100, 100), (100, 101), false));
-        assert!(!is_adjacent((100, 100), (102, 100), false));
+        assert!(is_adjacent(UVec2::new(100, 100), UVec2::new(101, 100), false));
+        assert!(is_adjacent(UVec2::new(100, 100), UVec2::new(100, 101), false));
+        assert!(!is_adjacent(UVec2::new(100, 100), UVec2::new(102, 100), false));

-        assert!(is_adjacent((100, 100), (101, 101), true));
-        assert!(!is_adjacent((100, 100), (102, 102), true));
+        assert!(is_adjacent(UVec2::new(100, 100), UVec2::new(101, 101), true));
+        assert!(!is_adjacent(UVec2::new(100, 100), UVec2::new(102, 102), true));

        // Test with zero coordinates
-        assert!(is_adjacent((0, 0), (1, 0), false));
-        assert!(is_adjacent((0, 0), (0, 1), false));
-        assert!(is_adjacent((0, 0), (1, 1), true));
+        assert!(is_adjacent(UVec2::new(0, 0), UVec2::new(1, 0), false));
+        assert!(is_adjacent(UVec2::new(0, 0), UVec2::new(0, 1), false));
+        assert!(is_adjacent(UVec2::new(0, 0), UVec2::new(1, 1), true));
    }

    #[test]
    fn test_commutative_property() {
        // The function should work the same regardless of parameter order
        assert_eq!(
-            is_adjacent((1, 2), (2, 2), false),
-            is_adjacent((2, 2), (1, 2), false)
+            is_adjacent(UVec2::new(1, 2), UVec2::new(2, 2), false),
+            is_adjacent(UVec2::new(2, 2), UVec2::new(1, 2), false)
        );

        assert_eq!(
-            is_adjacent((1, 2), (2, 3), true),
-            is_adjacent((2, 3), (1, 2), true)
+            is_adjacent(UVec2::new(1, 2), UVec2::new(2, 3), true),
+            is_adjacent(UVec2::new(2, 3), UVec2::new(1, 2), true)
        );
    }
 }
--- a/src/main.rs
+++ b/src/main.rs
@@ -11,7 +11,7 @@ use tracing_subscriber::layer::SubscriberExt;

 #[cfg(windows)]
 use winapi::{
-    shared::{ntdef::NULL, windef::HWND},
+    shared::ntdef::NULL,
    um::{
        fileapi::{CreateFileA, OPEN_EXISTING},
        handleapi::INVALID_HANDLE_VALUE,
@@ -29,13 +29,13 @@ use winapi::{
 /// terminal, this function does nothing.
 #[cfg(windows)]
 unsafe fn attach_console() {
-    if GetConsoleWindow() != std::ptr::null_mut() as HWND {
+    if !std::ptr::eq(GetConsoleWindow(), std::ptr::null_mut()) {
        return;
    }

    if AttachConsole(winapi::um::wincon::ATTACH_PARENT_PROCESS) != 0 {
        let handle = CreateFileA(
-            "CONOUT$\0".as_ptr() as *const i8,
+            c"CONOUT$".as_ptr(),
            GENERIC_READ | GENERIC_WRITE,
            FILE_SHARE_READ | FILE_SHARE_WRITE,
            std::ptr::null_mut(),
@@ -53,9 +53,12 @@ unsafe fn attach_console() {
 }

 mod animation;
+mod asset;
 mod audio;
 mod constants;
+mod debug;
 mod direction;
+mod edible;
 mod entity;
 mod game;
 mod ghost;
@@ -96,26 +99,17 @@ pub fn main() {
        .build()
        .expect("Could not initialize window");

-    let mut canvas = window
-        .into_canvas()
-        .build()
-        .expect("Could not build canvas");
+    let mut canvas = window.into_canvas().build().expect("Could not build canvas");

    canvas
        .set_logical_size(WINDOW_WIDTH, WINDOW_HEIGHT)
        .expect("Could not set logical size");

    let texture_creator = canvas.texture_creator();
-    let mut game = Game::new(
-        &mut canvas,
-        &texture_creator,
-        &ttf_context,
-        &audio_subsystem,
-    );
+    let mut game = Game::new(&mut canvas, &texture_creator, &ttf_context, &audio_subsystem);
+    game.audio.set_mute(cfg!(debug_assertions));

-    let mut event_pump = sdl_context
-        .event_pump()
-        .expect("Could not get SDL EventPump");
+    let mut event_pump = sdl_context.event_pump().expect("Could not get SDL EventPump");

    // Initial draw and tick
    game.draw();
@@ -166,11 +160,7 @@ pub fn main() {
                    ..
                } => {
                    paused = !paused;
-                    event!(
-                        tracing::Level::INFO,
-                        "{}",
-                        if paused { "Paused" } else { "Unpaused" }
-                    );
+                    event!(tracing::Level::INFO, "{}", if paused { "Paused" } else { "Unpaused" });
                }
                Event::KeyDown { keycode, .. } => {
                    game.keyboard_event(keycode.unwrap());
--- a/src/map.rs
+++ b/src/map.rs
@@ -3,42 +3,9 @@ use rand::seq::IteratorRandom;

 use crate::constants::{MapTile, BOARD_OFFSET, CELL_SIZE};
 use crate::constants::{BOARD_HEIGHT, BOARD_WIDTH};
+use glam::{IVec2, UVec2};
+use once_cell::sync::OnceCell;
 use std::collections::{HashSet, VecDeque};
-use std::ops::Add;
-
-#[derive(Clone, Copy, Debug, Eq, Hash, Ord, PartialEq, PartialOrd)]
-pub struct SignedPosition {
-    pub x: i32,
-    pub y: i32,
-}
-
-#[derive(Clone, Copy, Debug, Eq, Hash, Ord, PartialEq, PartialOrd)]
-pub struct Position {
-    pub x: u32,
-    pub y: u32,
-}
-
-impl Add<SignedPosition> for Position {
-    type Output = Position;
-    fn add(self, rhs: SignedPosition) -> Self::Output {
-        Position {
-            x: (self.x as i32 + rhs.x) as u32,
-            y: (self.y as i32 + rhs.y) as u32,
-        }
-    }
-}
-
-impl Position {
-    pub fn as_i32(&self) -> (i32, i32) {
-        (self.x as i32, self.y as i32)
-    }
-    pub fn wrapping_add(&self, dx: i32, dy: i32) -> Position {
-        Position {
-            x: (self.x as i32 + dx) as u32,
-            y: (self.y as i32 + dy) as u32,
-        }
-    }
-}

 /// The game map.
 ///
@@ -60,49 +27,34 @@ impl Map {
    pub fn new(raw_board: [&str; BOARD_HEIGHT as usize]) -> Map {
        let mut map = [[MapTile::Empty; BOARD_HEIGHT as usize]; BOARD_WIDTH as usize];

-        for y in 0..BOARD_HEIGHT as usize {
-            let line = raw_board[y];
-
-            for x in 0..BOARD_WIDTH as usize {
-                if x >= line.len() {
-                    break;
-                }
-
-                let i = (y * (BOARD_WIDTH as usize) + x) as usize;
-                let character = line
-                    .chars()
-                    .nth(x as usize)
-                    .unwrap_or_else(|| panic!("Could not get character at {} = ({}, {})", i, x, y));
-
+        for (y, line) in raw_board.iter().enumerate().take(BOARD_HEIGHT as usize) {
+            for (x, character) in line.chars().enumerate().take(BOARD_WIDTH as usize) {
                let tile = match character {
                    '#' => MapTile::Wall,
                    '.' => MapTile::Pellet,
                    'o' => MapTile::PowerPellet,
                    ' ' => MapTile::Empty,
                    'T' => MapTile::Tunnel,
-                    c @ '0' | c @ '1' | c @ '2' | c @ '3' | c @ '4' => {
-                        MapTile::StartingPosition(c.to_digit(10).unwrap() as u8)
-                    }
+                    c @ '0' | c @ '1' | c @ '2' | c @ '3' | c @ '4' => MapTile::StartingPosition(c.to_digit(10).unwrap() as u8),
                    '=' => MapTile::Empty,
-                    _ => panic!("Unknown character in board: {}", character),
+                    _ => panic!("Unknown character in board: {character}"),
                };
-
-                map[x as usize][y as usize] = tile;
+                map[x][y] = tile;
            }
        }

        Map {
            current: map,
-            default: map.clone(),
+            default: map,
        }
    }

    /// Resets the map to its original state.
    pub fn reset(&mut self) {
        // Restore the map to its original state
-        for x in 0..BOARD_WIDTH as usize {
-            for y in 0..BOARD_HEIGHT as usize {
-                self.current[x][y] = self.default[x][y];
+        for (x, col) in self.current.iter_mut().enumerate().take(BOARD_WIDTH as usize) {
+            for (y, cell) in col.iter_mut().enumerate().take(BOARD_HEIGHT as usize) {
+                *cell = self.default[x][y];
            }
        }
    }
@@ -112,9 +64,9 @@ impl Map {
    /// # Arguments
    ///
    /// * `cell` - The cell coordinates, in grid coordinates.
-    pub fn get_tile(&self, cell: (i32, i32)) -> Option<MapTile> {
-        let x = cell.0 as usize;
-        let y = cell.1 as usize;
+    pub fn get_tile(&self, cell: IVec2) -> Option<MapTile> {
+        let x = cell.x as usize;
+        let y = cell.y as usize;

        if x >= BOARD_WIDTH as usize || y >= BOARD_HEIGHT as usize {
            return None;
@@ -129,9 +81,9 @@ impl Map {
    ///
    /// * `cell` - The cell coordinates, in grid coordinates.
    /// * `tile` - The tile to set.
-    pub fn set_tile(&mut self, cell: (i32, i32), tile: MapTile) -> bool {
-        let x = cell.0 as usize;
-        let y = cell.1 as usize;
+    pub fn set_tile(&mut self, cell: IVec2, tile: MapTile) -> bool {
+        let x = cell.x as usize;
+        let y = cell.y as usize;

        if x >= BOARD_WIDTH as usize || y >= BOARD_HEIGHT as usize {
            return false;
@@ -146,30 +98,24 @@ impl Map {
    /// # Arguments
    ///
    /// * `cell` - The cell coordinates, in grid coordinates.
-    pub fn cell_to_pixel(cell: (u32, u32)) -> (i32, i32) {
-        (
-            (cell.0 * CELL_SIZE) as i32,
-            ((cell.1 + BOARD_OFFSET.1) * CELL_SIZE) as i32,
-        )
+    pub fn cell_to_pixel(cell: UVec2) -> IVec2 {
+        IVec2::new((cell.x * CELL_SIZE) as i32, ((cell.y + BOARD_OFFSET.1) * CELL_SIZE) as i32)
    }

    /// Returns a reference to a cached vector of all valid playable positions in the maze.
    /// This is computed once using a flood fill from a random pellet, and then cached.
-    pub fn get_valid_playable_positions(&mut self) -> &Vec<Position> {
+    pub fn get_valid_playable_positions(&mut self) -> &Vec<UVec2> {
        use MapTile::*;
-        static mut CACHE: Option<Vec<Position>> = None;
-        // SAFETY: This is only mutated once, and only in this function.
-        unsafe {
-            if let Some(ref cached) = CACHE {
-                return cached;
-            }
+        static CACHE: OnceCell<Vec<UVec2>> = OnceCell::new();
+        if let Some(cached) = CACHE.get() {
+            return cached;
        }
        // Find a random starting pellet
        let mut pellet_positions = vec![];
-        for x in 0..BOARD_WIDTH as u32 {
-            for y in 0..BOARD_HEIGHT as u32 {
-                match self.current[x as usize][y as usize] {
-                    Pellet | PowerPellet => pellet_positions.push(Position { x, y }),
+        for (x, col) in self.current.iter().enumerate().take(BOARD_WIDTH as usize) {
+            for (y, &cell) in col.iter().enumerate().take(BOARD_HEIGHT as usize) {
+                match cell {
+                    Pellet | PowerPellet => pellet_positions.push(UVec2::new(x as u32, y as u32)),
                    _ => {}
                }
            }
@@ -185,41 +131,27 @@ impl Map {

        queue.push_back(start);
        while let Some(pos) = queue.pop_front() {
-            // Mark visited, skip if already visited
            if !visited.insert(pos) {
                continue;
            }

-            // Check if the current tile is valid
            match self.current[pos.x as usize][pos.y as usize] {
                Empty | Pellet | PowerPellet => {
-                    // Valid, continue flood
-                    for offset in [
-                        SignedPosition { x: -1, y: 0 },
-                        SignedPosition { x: 1, y: 0 },
-                        SignedPosition { x: 0, y: -1 },
-                        SignedPosition { x: 0, y: 1 },
-                    ] {
-                        let neighbor = pos + offset;
-                        if neighbor.x < BOARD_WIDTH as u32 && neighbor.y < BOARD_HEIGHT as u32 {
-                            let neighbor_tile =
-                                self.current[neighbor.x as usize][neighbor.y as usize];
+                    for offset in [IVec2::new(-1, 0), IVec2::new(1, 0), IVec2::new(0, -1), IVec2::new(0, 1)] {
+                        let neighbor = (pos.as_ivec2() + offset).as_uvec2();
+                        if neighbor.x < BOARD_WIDTH && neighbor.y < BOARD_HEIGHT {
+                            let neighbor_tile = self.current[neighbor.x as usize][neighbor.y as usize];
                            if matches!(neighbor_tile, Empty | Pellet | PowerPellet) {
                                queue.push_back(neighbor);
                            }
                        }
                    }
                }
-                StartingPosition(_) | Wall | Tunnel => {
-                    // Not valid, do not continue
-                }
+                StartingPosition(_) | Wall | Tunnel => {}
            }
        }
-        let mut result: Vec<Position> = visited.into_iter().collect();
-        result.sort_unstable();
-        unsafe {
-            CACHE = Some(result);
-            CACHE.as_ref().unwrap()
-        }
+        let mut result: Vec<UVec2> = visited.into_iter().collect();
+        result.sort_unstable_by_key(|v| (v.x, v.y));
+        CACHE.get_or_init(|| result)
    }
 }
--- a/src/pacman.rs
+++ b/src/pacman.rs
@@ -6,16 +6,17 @@ use sdl2::{
    render::{Canvas, Texture},
    video::Window,
 };
-use tracing::event;

 use crate::{
    animation::{AnimatedAtlasTexture, FrameDrawn},
    direction::Direction,
-    entity::{Entity, MovableEntity, Renderable},
+    entity::{Entity, MovableEntity, Moving, Renderable, StaticEntity},
    map::Map,
    modulation::{SimpleTickModulator, TickModulator},
 };

+use glam::{IVec2, UVec2};
+
 /// The Pac-Man entity.
 pub struct Pacman<'a> {
    /// Shared movement and position fields.
@@ -24,16 +25,42 @@ pub struct Pacman<'a> {
    pub next_direction: Option<Direction>,
    /// Whether Pac-Man is currently stopped.
    pub stopped: bool,
-    sprite: AnimatedAtlasTexture<'a>,
+    pub sprite: AnimatedAtlasTexture<'a>,
+}
+
+impl<'a> Entity for Pacman<'a> {
+    fn base(&self) -> &StaticEntity {
+        &self.base.base
+    }
+}
+
+impl<'a> Moving for Pacman<'a> {
+    fn move_forward(&mut self) {
+        self.base.move_forward();
+    }
+    fn update_cell_position(&mut self) {
+        self.base.update_cell_position();
+    }
+    fn next_cell(&self, direction: Option<Direction>) -> IVec2 {
+        self.base.next_cell(direction)
+    }
+    fn is_wall_ahead(&self, direction: Option<Direction>) -> bool {
+        self.base.is_wall_ahead(direction)
+    }
+    fn handle_tunnel(&mut self) -> bool {
+        self.base.handle_tunnel()
+    }
+    fn is_grid_aligned(&self) -> bool {
+        self.base.is_grid_aligned()
+    }
+    fn set_direction_if_valid(&mut self, new_direction: Direction) -> bool {
+        self.base.set_direction_if_valid(new_direction)
+    }
 }

 impl Pacman<'_> {
    /// Creates a new `Pacman` instance.
-    pub fn new<'a>(
-        starting_position: (u32, u32),
-        atlas: Texture<'a>,
-        map: Rc<RefCell<Map>>,
-    ) -> Pacman<'a> {
+    pub fn new<'a>(starting_position: UVec2, atlas: Texture<'a>, map: Rc<RefCell<Map>>) -> Pacman<'a> {
        let pixel_position = Map::cell_to_pixel(starting_position);
        Pacman {
            base: MovableEntity::new(
@@ -55,7 +82,7 @@ impl Pacman<'_> {
        match self.next_direction {
            None => return false,
            Some(next_direction) => {
-                if self.base.set_direction_if_valid(next_direction) {
+                if <Pacman as Moving>::set_direction_if_valid(self, next_direction) {
                    self.next_direction = None;
                    return true;
                }
@@ -65,57 +92,41 @@ impl Pacman<'_> {
    }

    /// Returns the internal position of Pac-Man, rounded down to the nearest even number.
-    fn internal_position_even(&self) -> (u32, u32) {
-        let (x, y) = self.base.internal_position();
-        ((x / 2u32) * 2u32, (y / 2u32) * 2u32)
-    }
-}
-
-impl Entity for Pacman<'_> {
-    fn base(&self) -> &MovableEntity {
-        &self.base
+    fn internal_position_even(&self) -> UVec2 {
+        let pos = self.base.internal_position();
+        UVec2::new((pos.x / 2) * 2, (pos.y / 2) * 2)
    }

-    fn tick(&mut self) {
-        let can_change = self.internal_position_even() == (0, 0);
-
+    pub fn tick(&mut self) {
+        let can_change = self.internal_position_even() == UVec2::ZERO;
        if can_change {
-            self.base.update_cell_position();
-
-            if !self.base.handle_tunnel() {
-                // Handle direction change as normal if not in tunnel
+            <Pacman as Moving>::update_cell_position(self);
+            if !<Pacman as Moving>::handle_tunnel(self) {
                self.handle_direction_change();
-
-                // Check if the next tile in the current direction is a wall
-                if !self.stopped && self.base.is_wall_ahead(None) {
+                if !self.stopped && <Pacman as Moving>::is_wall_ahead(self, None) {
                    self.stopped = true;
-                } else if self.stopped && !self.base.is_wall_ahead(None) {
+                } else if self.stopped && !<Pacman as Moving>::is_wall_ahead(self, None) {
                    self.stopped = false;
                }
            }
        }
-
        if !self.stopped && self.base.modulation.next() {
-            self.base.move_forward();
-            if self.internal_position_even() == (0, 0) {
-                self.base.update_cell_position();
+            <Pacman as Moving>::move_forward(self);
+            if self.internal_position_even() == UVec2::ZERO {
+                <Pacman as Moving>::update_cell_position(self);
            }
        }
    }
 }

 impl Renderable for Pacman<'_> {
-    fn render(&mut self, canvas: &mut Canvas<Window>) {
+    fn render(&self, canvas: &mut Canvas<Window>) {
+        let pos = self.base.base.pixel_position;
+        let dir = self.base.direction;
        if self.stopped {
-            self.sprite.render(
-                canvas,
-                self.base.pixel_position,
-                self.base.direction,
-                Some(2),
-            );
+            self.sprite.render(canvas, (pos.x, pos.y), dir, Some(2));
        } else {
-            self.sprite
-                .render(canvas, self.base.pixel_position, self.base.direction, None);
+            self.sprite.render(canvas, (pos.x, pos.y), dir, None);
        }
    }
 }
Author	SHA1	Message	Date
Xevion	dc3c4a7580	ci: VCPKG_SYSTEM_LIBRARIES off, cache emsdk, raw jq output	2025-07-23 23:23:41 -05:00
Xevion	434b62b036	ci: use cargo metadata with jq for acquiring workspace package version, drop binstall	2025-07-23 23:12:58 -05:00
Xevion	2bd523e58a	ci: add build-essential dependency, apt-get update before	2025-07-23 23:05:06 -05:00
Xevion	7cd6e8005e	ci: add names to workflow jobs, configure binstall to have lower timeout	2025-07-23 22:58:09 -05:00
Xevion	a8a3745ca1	ci: disable fail-fast, ensure linux vcpkg dependencies are installed	2025-07-23 22:46:57 -05:00
Xevion	cfa26bf146	ci: use build matrix for desktop builds	2025-07-23 22:45:56 -05:00
Xevion	bfbbb71752	ci: verbose vcpkg builds on linux	2025-07-23 22:30:11 -05:00
Xevion	979f736f54	ci: drop rust toolchain to 1.86.0	2025-07-23 22:26:08 -05:00
Xevion	5a7f6a4c10	ci: remove archive assembly steps for statically linked builds	2025-07-23 22:22:55 -05:00
Xevion	b66c9ce135	fix: emscripten assets	2025-07-23 22:18:54 -05:00
Xevion	f5363516c3	chore: remove unused sdl2-image vcpkg features	2025-07-23 21:53:55 -05:00
Xevion	320da36b83	feat: use cargo-vcpkg in build workflow	2025-07-23 21:53:03 -05:00
Xevion	b68813cf5b	ci: explicit toolchain version, fix build script path for wasm	2025-07-23 21:53:03 -05:00
Xevion	0806fc744c	chore: remove unused animation pausing methods	2025-07-23 21:34:27 -05:00
Xevion	eead31d7fc	refactor: add 'glam' for better positioning types, drop position types	2025-07-23 21:24:47 -05:00
Xevion	eaa4ab37f9	feat: add audio muting button, mute by default in debug builds	2025-07-23 21:00:52 -05:00
Xevion	076275158e	chore: lower audio tracing to trace level	2025-07-23 20:36:56 -05:00
Xevion	9f9ace0b16	chore: configure rustfmt, switch to LF line endings	2025-07-23 20:15:54 -05:00
Xevion	2cc47d5904	feat: add pre-comit configuration	2025-07-23 20:12:11 -05:00
Xevion	11e89a63d0	refactor: add thiserror/anyhow for asset error handling	2025-07-23 19:47:44 -05:00
Xevion	50afd8c09f	feat: improved emscripten-compatible asset loading api	2025-07-23 18:02:19 -05:00
Xevion	06841fd0d7	refactor: resolve clippy warnings, resolve shared reference with once_cell	2025-07-23 17:38:27 -05:00
Xevion	4365639a1d	chore: lifetimes	2025-07-23 17:31:16 -05:00
Xevion	7744c06046	chore: cargo fix	2025-07-23 17:27:22 -05:00
Xevion	978752f0f3	chore: add index for FruitType sprite	2025-07-23 17:25:39 -05:00
Xevion	f024ce7a54	refactor: fix unnecessary qualified imports	2025-07-23 17:25:28 -05:00
Xevion	0196282a78	fix: reset code borrows	2025-07-23 17:20:12 -05:00
Xevion	785a760343	feat: new edible type for pellet/powerpellet, fruits, separate static/moving entities	2025-07-23 17:16:15 -05:00
Xevion	de1a89b9b0	refactor: move debug related code into debug.rs	2025-07-23 16:31:09 -05:00