fix: progress on reproducible Windows builds, disable script tracing

docs: add more TODOs
chore: remove old windows build/serve scripts
2025-12-06 17:15:47 -06:00 · 2025-06-17 11:54:13 -05:00 · 2025-06-17 11:54:13 -05:00 · 2025-06-17 11:54:13 -05:00 · 2025-06-17 11:54:13 -05:00 · 2025-06-17 11:54:13 -05:00
8 changed files with 45 additions and 22 deletions
--- a/.cargo/config.toml
+++ b/.cargo/config.toml
@@ -1,8 +1,9 @@
 [target.wasm32-unknown-emscripten]
+# TODO: Document what the fuck this is.
 rustflags = [
    "-O", "-C", "link-args=-O2 --profiling",
    #"-C", "link-args=-O3 --closure 1",
    "-C", "link-args=-sASYNCIFY -sALLOW_MEMORY_GROWTH=1",
-    "-C", "link-args=-sUSE_SDL=2 -sUSE_SDL_IMAGE=2 -sSDL2_IMAGE_FORMATS=['png']",
+    "-C", "link-args=-sUSE_SDL=2 -sUSE_SDL_IMAGE=2 -sSDL_EMSCRIPTEN_KEYBOARD_ELEMENT -sSDL2_IMAGE_FORMATS=['png']",
    "-C", "link-args=--preload-file assets/ -lidbfs.js",
 ]
--- a/assets/index.html
+++ b/assets/index.html
@@ -3,16 +3,22 @@
 <head>
    <meta name="viewport" content="width=device-width, initial-scale=1.0"/>
 </head>
+<style>
+    body {
+        margin: 0;
+        padding: 0;
+        background: #000;
+    }
+    canvas {
+        display: block;
+        margin: 0 auto;
+        background: #000;
+    }
+</style>
 <body>
    <canvas id="canvas"></canvas>
    <script>
        var Module = {
-            'locateFile': function (path, prefix) {
-                if (path.endsWith(".data")) {
-                    return prefix + "deps/" + path;
-                }
-                return prefix + path;
-            },
            'canvas': document.getElementById('canvas'),
        };
    </script>
--- a/build.ps1
+++ b/build.ps1
@@ -1,7 +0,0 @@
-& 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/scripts/build-wasm.sh
+++ b/scripts/build-wasm.sh
@@ -1,16 +1,14 @@
 #!/bin/sh
-set -eux
-
+set -eu

 echo "Building WASM with Emscripten"
 cargo build --target=wasm32-unknown-emscripten --release

 echo "Copying release files to dist/"
 mkdir -p dist
-mkdir -p dist/deps

 output_folder="target/wasm32-unknown-emscripten/release"
 cp $output_folder/pacman.wasm dist
 cp $output_folder/pacman.js dist
-cp $output_folder/deps/pacman.data dist/deps
+cp $output_folder/deps/pacman.data dist
 cp assets/index.html dist
--- a/scripts/build-windows.sh
+++ b/scripts/build-windows.sh
@@ -0,0 +1,28 @@
+#!/bin/bash
+set -eu
+
+SDL_VERSION="2.28.3"
+SDL_IMAGE_VERSION="2.6.3"
+SDL_MIXER_VERSION="2.6.3"
+SDL_TTF_VERSION="2.20.2"
+
+SDL="https://github.com/libsdl-org/SDL/releases/download/release-${SDL_VERSION}/SDL2-devel-${SDL_VERSION}-mingw.tar.gz"
+SLD_IMAGE="https://github.com/libsdl-org/SDL_image/releases/download/release-${SDL_IMAGE_VERSION}/SDL2_image-devel-${SDL_IMAGE_VERSION}-mingw.tar.gz"
+SDL_MIXER="https://github.com/libsdl-org/SDL_mixer/releases/download/release-${SDL_MIXER_VERSION}/SDL2_mixer-devel-${SDL_MIXER_VERSION}-mingw.tar.gz"
+SDL_TTF="https://github.com/libsdl-org/SDL_ttf/releases/download/release-${SDL_TTF_VERSION}/SDL_ttf-devel-${SDL_TTF_VERSION}-mingw.tar.gz"
+
+# Verify that toolchain is installed
+
+
+# EXTRACT_DIR="~/.rustup/"
+EXTRACT_DIR="~/.rustup/toolchains/stable-x86_64-unknown-linux-gnu/lib/rustlib/x86_64-pc-windows-gnu/lib/"
+# if [ ! -d "~/.rustup/toolchains/stable-x86_64-unknown-linux-gnu/lib/rustlib/x86_64-pc-windows-gnu/lib/" ]; then
+    # ls $EXTRACT_DIR
+    # echo "Toolchain not installed. Run rustup target add x86_64-pc-windows-gnu. This may not work on environments besides Linux GNU."
+    # exit 1
+# fi
+
+echo "Downloading..."
+curl -L -o ./sdl2.tar.gz $SDL
+curl -L -o ./sdl2_image.tar.gz $SLD_IMAGE
+echo "Done."
--- a/serve.ps1
+++ b/serve.ps1
@@ -1,3 +0,0 @@
-& ./build.ps1
-cd ./dist
-python -m http.server
--- a/src/animation.rs
+++ b/src/animation.rs
@@ -92,6 +92,7 @@ impl<'a> AnimatedTexture<'a> {
        direction: Direction,
        frame: u32,
    ) {
+        // TODO: If the frame we're targeting is in the opposite direction (due to self.reverse), we should pre-emptively reverse.
        let current = self.current_frame();
        self.render_static(canvas, position, direction, Some(current));

--- a/src/game.rs
+++ b/src/game.rs
@@ -5,7 +5,6 @@ use sdl2::keyboard::Keycode;
 use sdl2::render::{Texture, TextureCreator};
 use sdl2::video::WindowContext;
 use sdl2::{pixels::Color, render::Canvas, video::Window};
-use tracing::event;

 use crate::constants::{MapTile, BOARD_HEIGHT, BOARD_WIDTH, RAW_BOARD};
 use crate::direction::Direction;
Author	SHA1	Message	Date
Xevion	93ba470ce9	fix: progress on reproducible Windows builds, disable script tracing	2025-06-17 11:54:13 -05:00
Xevion	129aed0ffb	docs: add more TODOs	2025-06-17 11:54:13 -05:00
Xevion	e062ada301	chore: remove old windows build/serve scripts	2025-06-17 11:54:13 -05:00
Xevion	af57199915	fix: center canvas, make background black	2025-06-17 11:54:13 -05:00
Xevion	538cf1efb5	chore: copy .data file directly, remove locateFile step	2025-06-17 11:54:13 -05:00