chore: bump to v0.2.0

.cargo/config.toml

@@ -1,12 +1,16 @@
 [target.'cfg(target_os = "emscripten")']
-# TODO: Document what the fuck this is.
 rustflags = [
-    # "-O", "-C", "link-args=-O2 --profiling",
-    #"-C", "link-args=-O3 --closure 1",
-    # "-C", "link-args=-g -gsource-map",
-    "-C", "link-args=-sASYNCIFY -sALLOW_MEMORY_GROWTH=1",
-    # "-C", "link-args=-sALLOW_MEMORY_GROWTH=1",
+    # Stack size is required for this project, it will crash otherwise.
+    "-C", "link-args=-sASYNCIFY=1 -sASYNCIFY_STACK_SIZE=8192 -sALLOW_MEMORY_GROWTH=1",
     "-C", "link-args=-sUSE_SDL=2 -sUSE_SDL_IMAGE=2 -sUSE_SDL_MIXER=2 -sUSE_OGG=1 -sUSE_SDL_GFX=2 -sUSE_SDL_TTF=2 -sSDL2_IMAGE_FORMATS=['png']",
-    # USE_OGG, USE_VORBIS for OGG/VORBIS usage
     "-C", "link-args=--preload-file assets/game/",
 ]
+
+[target.'cfg(target_os = "linux")']
+rustflags = [
+    # Manually link zlib.
+    # The `sdl2` crate's build script uses `libpng`, which requires `zlib`.
+    # By adding `-lz` here, we ensure it's passed to the linker after `libpng`,
+    # which is required for the linker to correctly resolve symbols.
+    "-C", "link-arg=-lz",
+]

.github/workflows/build.yaml

@@ -44,18 +44,16 @@ jobs:
       - name: Cache vcpkg
         uses: actions/cache@v4
         with:
-          save-always: true # deprecated
           path: target/vcpkg
-          key: vcpkg-${{ runner.os }}-${{ matrix.target }}-${{ hashFiles('Cargo.toml', 'Cargo.lock') }}
+          key: A-vcpkg-${{ runner.os }}-${{ matrix.target }}-${{ hashFiles('Cargo.toml', 'Cargo.lock') }}
           restore-keys: |
-            ${{ runner.os }}-vcpkg
-            vcpkg-${{ runner.os }}-${{ matrix.target }}-
+            A-vcpkg-${{ runner.os }}-${{ matrix.target }}-
 
       - name: Vcpkg Linux Dependencies
         if: runner.os == 'Linux'
         run: |
           sudo apt-get update
-          sudo apt-get install -y build-essential gettext libltdl-dev zlib1g-dev
+          sudo apt-get install -y libltdl-dev
 
       - name: Vcpkg
         run: |

Cargo.lock

@@ -174,7 +174,7 @@ checksum = "b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39"
 
 [[package]]
 name = "pacman"
-version = "0.1.0"
+version = "0.2.0"
 dependencies = [
  "anyhow",
  "glam",

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "pacman"
-version = "0.1.0"
+version = "0.2.0"
 edition = "2021"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

src/emscripten.rs

@@ -0,0 +1,31 @@
+#[allow(dead_code)]
+#[cfg(target_os = "emscripten")]
+pub mod emscripten {
+    use std::os::raw::c_uint;
+
+    extern "C" {
+        pub fn emscripten_get_now() -> f64;
+        pub fn emscripten_sleep(ms: c_uint);
+        pub fn emscripten_get_element_css_size(target: *const u8, width: *mut f64, height: *mut f64) -> i32;
+    }
+
+    // milliseconds since start of program
+    pub fn now() -> f64 {
+        unsafe { emscripten_get_now() }
+    }
+
+    pub fn sleep(ms: u32) {
+        unsafe {
+            emscripten_sleep(ms);
+        }
+    }
+
+    pub fn get_canvas_size() -> (u32, u32) {
+        let mut width = 0.0;
+        let mut height = 0.0;
+        unsafe {
+            emscripten_get_element_css_size("canvas\0".as_ptr(), &mut width, &mut height);
+        }
+        (width as u32, height as u32)
+    }
+}

src/main.rs

@@ -59,6 +59,8 @@ mod constants;
 mod debug;
 mod direction;
 mod edible;
+#[cfg(target_os = "emscripten")]
+mod emscripten;
 mod entity;
 mod game;
 mod ghost;
@@ -68,6 +70,26 @@ mod map;
 mod modulation;
 mod pacman;
 
+#[cfg(not(target_os = "emscripten"))]
+fn sleep(value: Duration) {
+    spin_sleep::sleep(value);
+}
+
+#[cfg(target_os = "emscripten")]
+fn sleep(value: Duration) {
+    emscripten::emscripten::sleep(value.as_millis() as u32);
+}
+
+#[cfg(target_os = "emscripten")]
+fn now() -> std::time::Instant {
+    std::time::Instant::now() + std::time::Duration::from_millis(emscripten::emscripten::now() as u64)
+}
+
+#[cfg(not(target_os = "emscripten"))]
+fn now() -> std::time::Instant {
+    std::time::Instant::now()
+}
+
 /// The main entry point of the application.
 ///
 /// This function initializes SDL, the window, the game state, and then enters
@@ -179,14 +201,7 @@ pub fn main() {
         if start.elapsed() < loop_time {
             let time = loop_time.saturating_sub(start.elapsed());
             if time != Duration::ZERO {
-                #[cfg(not(target_os = "emscripten"))]
-                {
-                    spin_sleep::sleep(time);
-                }
-                #[cfg(target_os = "emscripten")]
-                {
-                    std::thread::sleep(time);
-                }
+                sleep(time);
             }
         } else {
             event!(