fix(wasm): remove unnecessary emscripten looping

ci: prepare proper build script, move script into /scripts, move index.html into /assets
fix(wasm): wasm32-unknown-emscripten compiler flags
2025-12-07 16:07:54 -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
7 changed files with 40 additions and 45 deletions
--- a/.cargo/config.toml
+++ b/.cargo/config.toml
@@ -1,4 +1,8 @@
 [target.wasm32-unknown-emscripten]
 rustflags = [
-    "--use-preload-plugins --preload-file assets -s USE_SDL=2 -s USE_SDL_IMAGE=2 -s ASSERTIONS=1",
+    "-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=--preload-file assets/ -lidbfs.js",
 ]
--- a/.github/workflows/deploy.yaml
+++ b/.github/workflows/deploy.yaml
@@ -21,7 +21,7 @@ jobs:
      - name: Rust Cache # cache the rust build artefacts
        uses: Swatinem/rust-cache@v1
      - name: Build # build
-        run: ./build.sh
+        run: ./scripts/build-wasm.sh
      - name: Deploy
        uses: JamesIves/github-pages-deploy-action@v4
        with:
--- a/assets/index.html
+++ b/assets/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>
        var Module = {
            'locateFile': function (path, prefix) {
                if (path.endsWith(".data")) {
                    return prefix + "deps/" + path;
                }
                return prefix + path;
            },
            'canvas': document.getElementById('canvas'),
        };
    </script>
    <script src="pacman.js"></script>
 </body>
 </html>
--- a/build.sh
+++ b/build.sh
@@ -1,10 +0,0 @@
 #!/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
@@ -1,21 +0,0 @@
 <!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/scripts/build-wasm.sh
+++ b/scripts/build-wasm.sh
@@ -0,0 +1,11 @@
 #!/bin/sh
 set -eux
 cargo build --target=wasm32-unknown-emscripten --release
 mkdir -p dist
 cp target/wasm32-unknown-emscripten/release/pacman.wasm dist
 cp target/wasm32-unknown-emscripten/release/pacman.js dist
 cp target/wasm32-unknown-emscripten/release/deps/pacman.data dist/deps
 cp assets/index.html dist
--- a/src/main.rs
+++ b/src/main.rs
@@ -8,9 +8,6 @@ use tracing::event;
 use tracing_error::ErrorLayer;
 use tracing_subscriber::layer::SubscriberExt;
 #[cfg(target_os = "emscripten")]
 pub mod emscripten;
 mod animation;
 mod constants;
 mod direction;
@@ -150,13 +147,6 @@ pub fn main() {
        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	f634beffee	fix(wasm): remove unnecessary emscripten looping	2025-06-17 11:54:13 -05:00
Xevion	d15dbe3982	ci: prepare proper build script, move script into /scripts, move index.html into /assets	2025-06-17 11:54:13 -05:00
Xevion	de5cddd9b6	fix(wasm): wasm32-unknown-emscripten compiler flags	2025-06-17 11:54:13 -05:00