feat: new assets

docs: expand feature target details, experimental ideas
feat: window events & canvas rendering
2025-12-06 11:15:46 -06:00 · 2025-06-17 11:48:43 -05:00 · 2025-06-17 11:48:34 -05:00 · 2025-06-17 11:48:26 -05:00 · 2025-06-17 11:48:16 -05:00 · 2025-06-17 11:48:09 -05:00
26 changed files with 298 additions and 20 deletions
--- a/.cargo/config.toml
+++ b/.cargo/config.toml
@@ -0,0 +1,4 @@
+[target.wasm32-unknown-emscripten]
+rustflags = [
+    "--use-preload-plugins --preload-file assets -s USE_SDL=2 -s USE_SDL_IMAGE=2 -s ASSERTIONS=1",
+]
--- a/.github/workflows/deploy.yaml
+++ b/.github/workflows/deploy.yaml
@@ -0,0 +1,28 @@
+name: Github Pages
+
+on: [push]
+
+permissions:
+  contents: write
+
+jobs:
+  build-github-pages:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2 # repo checkout
+      - uses: mymindstorm/setup-emsdk@v11 # setup emscripten toolchain
+        # with:
+        #   version: 3.1.35
+      - uses: actions-rs/toolchain@v1 # get rust toolchain for wasm
+        with:
+          toolchain: stable
+          target: wasm32-unknown-emscripten
+          override: true
+      - name: Rust Cache # cache the rust build artefacts
+        uses: Swatinem/rust-cache@v1
+      - name: Build # build
+        run: ./build.sh
+      - name: Deploy
+        uses: JamesIves/github-pages-deploy-action@v4
+        with:
+          folder: dist
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 /target
+.idea
--- a/README.md
+++ b/README.md
@@ -2,11 +2,65 @@

 If the title doesn't clue you in, I'm remaking Pac-Man with SDL and Rust.

-The project is *extremely* early in development, but check back in a week, and maybe I'll have something cool to look
+The project is _extremely_ early in development, but check back in a week, and maybe I'll have something cool to look
 at.

 ## Feature Targets

 - Near-perfect replication of logic, scoring, graphics, sound, and behaviors.
 - Written in Rust, buildable on Windows, Linux, Mac and WebAssembly.
- Online demo, playable in a browser.
+- Online demo, playable in a browser.
+- Automatic build system, with releases for Windows, Linux, and Mac & Web-Assembly.
+- Debug tooling
+    - Game state visualization
+    - Game speed controls + pausing
+    - Log tracing
+    - Performance details
+
+## Experimental Ideas
+
+- Perfected Ghost Algorithms
+- More than 4 ghosts
+- Custom Level Generation
+    - Multi-map tunnelling
+
+## Installation
+
+Besides SDL2, the following extensions are required: Image, Mixer, and TTF.
+
+### Ubuntu
+
+On Ubuntu, you can install the required packages with the following command:
+
+```
+sudo apt install libsdl2-dev libsdl2-image-dev libsdl2-mixer-dev libsdl2-ttf-dev
+```
+
+### Windows
+
+On Windows, installation requires either building from source (not covered), or downloading the pre-built binaries.
+
+The latest releases can be found here:
+
+- [SDL2](https://github.com/libsdl-org/SDL/releases/latest/)
+- [SDL2_image](https://github.com/libsdl-org/SDL_image/releases/latest/)
+- [SDL2_mixer](https://github.com/libsdl-org/SDL_mixer/releases/latest/)
+- [SDL2_ttf](https://github.com/libsdl-org/SDL_ttf/releases/latest/)
+
+Download each for your architecture, and locate the appropriately named DLL within. Move said DLL to root of this project.
+
+## Building
+
+To build the project, run the following command:
+
+```
+cargo build
+```
+
+During development, you can easily run the project with:
+
+```
+cargo run
+cargo run -q # Quiet mode, no logging
+cargo run --release # Release mode, optimized
+```
--- a/SDL2.dll
+++ b/SDL2.dll
--- a/SDL2_image.dll
+++ b/SDL2_image.dll
--- a/SDL2_mixer.dll
+++ b/SDL2_mixer.dll
--- a/SDL2_ttf.dll
+++ b/SDL2_ttf.dll
--- a/assets/24/energizer.png
+++ b/assets/24/energizer.png
--- a/assets/24/pellet.png
+++ b/assets/24/pellet.png
--- a/assets/32/fruit.png
+++ b/assets/32/fruit.png
--- a/assets/32/game_over.png
+++ b/assets/32/game_over.png
--- a/assets/32/ghost_body.png
+++ b/assets/32/ghost_body.png
--- a/assets/32/ghost_eyes.png
+++ b/assets/32/ghost_eyes.png
--- a/assets/32/life.png
+++ b/assets/32/life.png
--- a/assets/32/pacman.png
+++ b/assets/32/pacman.png
--- a/assets/door.png
+++ b/assets/door.png
--- a/build.ps1
+++ b/build.ps1
@@ -0,0 +1,7 @@
+& cargo build --target=wasm32-unknown-emscripten --release
+
+mkdir -p dist -Force
+
+cp ./target/wasm32-unknown-emscripten/release/Pac_Man.wasm ./dist
+cp ./target/wasm32-unknown-emscripten/release/Pac-Man.js ./dist
+cp index.html dist
--- a/build.sh
+++ b/build.sh
@@ -0,0 +1,10 @@
+#!/bin/sh
+set -eux
+
+cargo build --target=wasm32-unknown-emscripten --release
+
+mkdir -p dist
+
+cp target/wasm32-unknown-emscripten/release/Pac_Man.wasm dist
+cp target/wasm32-unknown-emscripten/release/Pac-Man.js dist
+cp index.html dist
--- a/index.html
+++ b/index.html
@@ -0,0 +1,21 @@
+<!DOCTYPE html>
+<html>
+<head>
+    <meta name="viewport" content="width=device-width, initial-scale=1.0"/>
+</head>
+<body>
+    <canvas id="canvas"></canvas>
+    <script type="text/javascript">
+        let Module = {
+            canvas: (function () {
+                // this is how we provide a canvas to our sdl2
+                return document.getElementById("canvas");
+            })(),
+            preRun: [function () {
+                ENV.RUST_LOG = "info,wgpu=warn"
+            }]
+        };
+    </script>
+    <script src="Pac-Man.js"></script>
+</body>
+</html>
--- a/serve.ps1
+++ b/serve.ps1
@@ -0,0 +1,3 @@
+& ./build.ps1
+cd ./dist
+python -m http.server
--- a/src/board.rs
+++ b/src/board.rs
--- a/src/constants.rs
+++ b/src/constants.rs
@@ -0,0 +1,44 @@
+pub const BOARD_WIDTH: u32 = 28;
+pub const BOARD_HEIGHT: u32 = 36;
+pub const BLOCK_SIZE_24: u32 = 24;
+pub const BLOCK_SIZE_32: u32 = 32;
+
+pub const WINDOW_WIDTH: u32 = BLOCK_SIZE_24 * BOARD_WIDTH;
+pub const WINDOW_HEIGHT: u32 = BLOCK_SIZE_24 * BOARD_HEIGHT;
+
+pub const RAW_BOARD: &str = r###"
+
+
+############################
+#............##............#
+#.####.#####.##.#####.####.#
+#o####.#####.##.#####.####o#
+#.####.#####.##.#####.####.#
+#..........................#
+#.####.##.########.##.####.#
+#.####.##.########.##.####.#
+#......##....##....##......#
+######.##### ## #####.######
+     #.##### ## #####.#
+     #.##    1     ##.#
+     #.## ###==### ##.#
+######.## #      # ##.######
+      .   #2 3 4 #   .
+######.## #      # ##.######
+     #.## ######## ##.#
+     #.##          ##.#
+     #.## ######## ##.#
+######.## ######## ##.######
+#............##............#
+#.####.#####.##.#####.####.#
+#.####.#####.##.#####.####.#
+#o..##.......0 .......##..o#
+###.##.##.########.##.##.###
+###.##.##.########.##.##.###
+#......##....##....##......#
+#.##########.##.##########.#
+#.##########.##.##########.#
+#..........................#
+############################
+
+                            "###;
--- a/src/emscripten.rs
+++ b/src/emscripten.rs
@@ -0,0 +1,44 @@
+// taken from https://github.com/Gigoteur/PX8/blob/master/src/px8/emscripten.rs
+#[cfg(target_os = "emscripten")]
+pub mod emscripten {
+    use std::cell::RefCell;
+    use std::ptr::null_mut;
+    use std::os::raw::{c_int, c_void, c_char, c_float};
+    use std::ffi::{CStr, CString};
+
+    #[allow(non_camel_case_types)]
+    type em_callback_func = unsafe extern "C" fn();
+
+    extern "C" {
+        // void emscripten_set_main_loop(em_callback_func func, int fps, int simulate_infinite_loop)
+        pub fn emscripten_set_main_loop(func: em_callback_func,
+                                        fps: c_int,
+                                        simulate_infinite_loop: c_int);
+
+        pub fn emscripten_cancel_main_loop();
+        pub fn emscripten_pause_main_loop();
+        pub fn emscripten_get_now() -> c_float;
+    }
+
+    thread_local!(static MAIN_LOOP_CALLBACK: RefCell<*mut c_void> = RefCell::new(null_mut()));
+
+    pub fn set_main_loop_callback<F>(callback: F)
+        where F: FnMut()
+    {
+        MAIN_LOOP_CALLBACK
+            .with(|log| { *log.borrow_mut() = &callback as *const _ as *mut c_void; });
+
+        unsafe {
+            emscripten_set_main_loop(wrapper::<F>, -1, 1);
+        }
+
+        unsafe extern "C" fn wrapper<F>()
+            where F: FnMut()
+        {
+            MAIN_LOOP_CALLBACK.with(|z| {
+                let closure = *z.borrow_mut() as *mut F;
+                (*closure)();
+            });
+        }
+    }
+}
--- a/src/game.rs
+++ b/src/game.rs
@@ -0,0 +1,11 @@
+pub struct Game {}
+
+impl Game {
+    pub fn new() -> Game {
+        Game {}
+    }
+
+    pub fn tick() {}
+
+    pub fn draw() {}
+}
--- a/src/main.rs
+++ b/src/main.rs
@@ -1,45 +1,96 @@
-use sdl2::pixels::Color;
-use sdl2::event::Event;
+use crate::constants::{WINDOW_HEIGHT, WINDOW_WIDTH};
+use sdl2::event::{Event, WindowEvent};
 use sdl2::image::LoadTexture;
-use sdl2::keyboard::{Keycode, Mod};
+use sdl2::keyboard::Keycode;
+use sdl2::pixels::Color;
+use sdl2::render::{Texture, Canvas};
 use std::time::Duration;
-use crate::constants::{WINDOW_WIDTH, WINDOW_HEIGHT};

-mod constants;
+#[cfg(target_os = "emscripten")]
+pub mod emscripten;
+
 mod board;
+mod constants;
 mod game;

+fn redraw(canvas: &mut Canvas<sdl2::video::Window>, tex: &Texture, i: u8) {
+    canvas.set_draw_color(Color::RGB(i, i, i));
+    canvas.clear();
+    canvas
+        .copy(tex, None, None)
+        .expect("Could not render texture on canvas");
+}
+
 pub fn main() {
    let sdl_context = sdl2::init().unwrap();
    let video_subsystem = sdl_context.video().unwrap();

-    let window = video_subsystem.window("Pac-Man", WINDOW_WIDTH, WINDOW_HEIGHT)
+    let window = video_subsystem
+        .window("Pac-Man", WINDOW_WIDTH, WINDOW_HEIGHT)
        .position_centered()
+        .resizable()
        .build()
        .expect("Could not initialize window");

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

-    let map_texture = texture_creator.load_texture("assets/map.png").expect("Could not load pacman texture");
-    canvas.copy(&map_texture, None, None).expect("Could not render texture on canvas");
+    let map_texture = texture_creator
+        .load_texture("assets/map.png")
+        .expect("Could not load pacman texture");

-    let mut event_pump = sdl_context.event_pump().expect("Could not get SDL EventPump");
-    'main: loop {
+    canvas
+        .copy(&map_texture, None, None)
+        .expect("Could not render texture on canvas");
+    
+    let mut i = 0u8;
+
+    let mut event_pump = sdl_context
+        .event_pump()
+        .expect("Could not get SDL EventPump");
+
+    let mut main_loop = || {
        for event in event_pump.poll_iter() {
            match event {
-                Event::Quit { .. } |
-                Event::KeyDown { keycode: Some(Keycode::Q), .. } => {
-                    break 'main;
-                }
-                event @ Event::KeyDown {  .. } => {
+                // Handle quitting keys or window close
+                Event::Quit { .. }
+                | Event::KeyDown {
+                    keycode: Some(Keycode::Escape) | Some(Keycode::Q),
+                    ..
+                } => return false,
+                event @ Event::KeyDown { .. } => {
                    println!("{:?}", event);
                },
+                Event::Window { win_event, .. } => {
+                    if let WindowEvent::Resized(width, height) = win_event {
+                        i = i.wrapping_add(1);
+
+                        canvas.set_logical_size(width as u32, height as u32).unwrap();
+                        redraw(&mut canvas, &map_texture, i);
+                    }
+                },
                _ => {}
            }
        }

        canvas.present();
        ::std::thread::sleep(Duration::from_millis(10));
+        true
+    };
+
+    #[cfg(target_os = "emscripten")]
+    use emscripten::emscripten;
+
+    #[cfg(target_os = "emscripten")]
+    emscripten::set_main_loop_callback(main_loop);
+
+    #[cfg(not(target_os = "emscripten"))]
+    loop {
+        if !main_loop() {
+            break;
+        }
    }
-}
+}
Author	SHA1	Message	Date
Xevion	361ff95f7f	feat: new assets	2025-06-17 11:48:43 -05:00
Xevion	f3fe1b783b	docs: expand feature target details, experimental ideas	2025-06-17 11:48:34 -05:00
Xevion	570cee0f62	feat: window events & canvas rendering	2025-06-17 11:48:26 -05:00
Xevion	5b6fd34a6f	docs: update installation instructions, remove DLLs	2025-06-17 11:48:16 -05:00
Xevion	973fa08ac9	ci: better build scripts	2025-06-17 11:48:09 -05:00
Xevion	4a1f565f72	feat(wasm): add index.html	2025-06-17 11:48:01 -05:00
Xevion	2ddf2611d9	ci: add wasm32 cargo flags	2025-06-17 11:47:52 -05:00
Xevion	b3a3664578	feat: game loop	2025-06-17 11:47:43 -05:00
Xevion	2b667bb6a2	ci: add deploy workflow + build script	2025-06-17 11:47:25 -05:00
Xevion	9a88e71202	chore: .idea folder in .gitignore	2025-06-17 11:47:18 -05:00