Rewrite

.github/renovate.json

@@ -0,0 +1,8 @@
+{
+	"$schema": "https://docs.renovatebot.com/renovate-schema.json",
+	"extends": [
+		"config:base",
+		":automergeAll",
+		":automergeBranch"
+	]
+}

.github/workflows/release.yml

@@ -0,0 +1,29 @@
+name: Release
+
+permissions:
+  pull-requests: write
+  contents: write
+
+on:
+  push:
+    branches:
+      - master
+
+jobs:
+  release-plz:
+    name: Release PR
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+
+      - name: Install Rust toolchain
+        uses: dtolnay/rust-toolchain@stable
+
+      - name: Run release-plz
+        uses: MarcoIeni/[email protected]
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          CARGO_REGISTRY_TOKEN: ${{ secrets.CARGO_REGISTRY_TOKEN }}

.github/workflows/rust.yml

@@ -4,218 +4,84 @@ on:
     paths-ignore:
       - "docs/**"
       - "**.md"
-  pull_request:
-    paths-ignore:
-      - "docs/**"
-      - "**.md"
 
 jobs:
-  # Run the `rustfmt` code formatter
+  # Check for formatting
   rustfmt:
-    name: Rustfmt [Formatter]
+    name: Formatter check
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v1
+      - uses: actions/checkout@v4
+
       - uses: actions-rs/toolchain@v1
         with:
           profile: minimal
           toolchain: stable
           components: rustfmt
           override: true
+
       - run: rustup component add rustfmt
       - uses: actions-rs/cargo@v1
         with:
           command: fmt
           args: --all -- --check
 
-  # Run the `clippy` linting tool
-  clippy:
-    name: Clippy [Linter]
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v1
-      - name: Install dependencies
-        run: sudo apt-get install -y xorg-dev libasound2-dev
-      - uses: actions-rs/toolchain@v1
-        with:
-          profile: minimal
-          toolchain: stable
-          components: clippy
-          override: true
-      - uses: actions-rs/clippy-check@v1
-        with:
-          token: ${{ secrets.GITHUB_TOKEN }}
-          args: --all-targets --all-features -- -D clippy::all
-
-  # Ensure that the project could be successfully compiled
-  cargo_check:
-    name: Compile
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v1
-      - name: Install dependencies
-        run: sudo apt-get install -y xorg-dev libasound2-dev
-      - uses: actions-rs/toolchain@v1
-        with:
-          profile: minimal
-          toolchain: stable
-          override: true
-      - uses: actions-rs/cargo@v1
-        with:
-          command: check
-          args: --all
-
-  # Run tests on Linux, macOS, and Windows
-  # On both Rust stable and Rust nightly
+  # Run test check on Linux, macOS, and Windows
   test:
-    name: Test Suite
-    needs: [cargo_check]
+    name: Test
     runs-on: ${{ matrix.os }}
     strategy:
-      fail-fast: false
+      fail-fast: true
       matrix:
         os: [ubuntu-latest, macOS-latest, windows-latest]
-        rust: [stable, nightly]
     steps:
       # Checkout the branch being tested
-      - uses: actions/checkout@v1
+      - uses: actions/checkout@v4
 
-      # Install all the required dependencies for testing
-      - uses: actions-rs/toolchain@v1
+      # Install rust stable
+      - uses: dtolnay/rust-toolchain@master
         with:
-          profile: minimal
           toolchain: stable
-          override: true
 
-      # Install Node.js at a fixed version
-      - uses: actions/setup-node@v1
+      # Cache the built dependencies
+      - uses: Swatinem/[email protected]
         with:
-          node-version: "12.0"
+          save-if: ${{ github.event_name == 'push' }}
 
-      # Install Ruby at a fixed version
-      - uses: actions/setup-ruby@v1
-        with:
-          ruby-version: "2.6"
-
-      # Install Python at a fixed version
-      - uses: actions/setup-python@v1
-        with:
-          python-version: "3.7"
+      # Install cargo-hack
+      - uses: taiki-e/install-action@cargo-hack
 
-      # Install dotnet at a fixed version
-      - uses: actions/setup-dotnet@v1
-        with:
-          dotnet-version: "2.2.402"
-
-      - name: Install dependencies
-        if: matrix.os == 'ubuntu-latest'
-        run: sudo apt-get install -y xorg-dev libasound2-dev
-
-      # Run the ignored tests that expect the above setup
-      - name: Run all tests
-        uses: actions-rs/cargo@v1
-        with:
-          command: test
-          args: -- -Z unstable-options --include-ignored
+      # Test all feature combinations on the target platform
+      - name: Test
+        run: cargo hack --feature-powerset test
 
-  # Build sources for every OS
-  github_build:
-    if: startsWith(github.ref, 'refs/tags/v')
-    name: Build release binaries
-    strategy:
-      fail-fast: false
-      matrix:
-        target:
-          - x86_64-unknown-linux-gnu
-          - x86_64-apple-darwin
-          - x86_64-pc-windows-msvc
-        include:
-          - target: x86_64-unknown-linux-gnu
-            os: ubuntu-latest
-            name: castle-game-x86_64-unknown-linux-gnu.tar.gz
-          - target: x86_64-apple-darwin
-            os: macOS-latest
-            name: castle-game-x86_64-apple-darwin.tar.gz
-          - target: x86_64-pc-windows-msvc
-            os: windows-latest
-            name: castle-game-x86_64-pc-windows-msvc.zip
-    runs-on: ${{ matrix.os }}
+  # Build the WASM target & push it to GitHub pages
+  wasm:
+    name: WASM test & build
+    runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v1
+      - uses: actions/checkout@v4
 
-      - name: Install Rust toolchain
-        uses: actions-rs/toolchain@v1
+      # Install rust stable
+      - uses: dtolnay/rust-toolchain@master
         with:
-          profile: minimal
           toolchain: stable
-          override: true
-          target: ${{ matrix.target }}
+          targets: wasm32-unknown-unknown
 
-      - name: Install dependencies
-        if: matrix.os == 'ubuntu-latest'
-        run: sudo apt-get install -y xorg-dev libasound2-dev
-
-      - name: Build target
-        uses: actions-rs/cargo@v1
+      # Cache the built dependencies
+      - uses: Swatinem/[email protected]
         with:
-          command: build
-          args: --release --target ${{ matrix.target }}
-
-      - name: Prepare build artifacts [Windows]
-        if: matrix.os == 'windows-latest'
-        run: |
-          cd target/${{ matrix.target }}/release
-          strip castle-game.exe
-          7z a ../../../${{ matrix.name }} castle-game.exe
-          cd -
+          save-if: ${{ github.event_name == 'push' }}
 
-      - name: Prepare build artifacts [-nix]
-        if: matrix.os != 'windows-latest'
-        run: |
-          cd target/${{ matrix.target }}/release
-          strip castle-game
-          tar czvf ../../../${{ matrix.name }} castle-game
-          cd -
-
-      - name: Upload build artifact
-        uses: actions/upload-artifact@v1
-        with:
-          name: ${{ matrix.name }}
-          path: ${{ matrix.name }}
-
-  # Create GitHub release with Rust build targets and release notes
-  github_release:
-    if: startsWith(github.ref, 'refs/tags/v')
-    name: Create GitHub Release
-    needs: github_build
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v1
+      # Build the WASM 
+      - name: Build
+        run: cargo run --package run-wasm -- --bin castle-game --no-default-features --release --build-only
 
-      # These can be squashed when https://github.com/actions/download-artifact/issues/6 is closed
-      - name: Download releases from github_build
-        uses: actions/download-artifact@v1
-        with:
-          name: castle-game-x86_64-unknown-linux-gnu.tar.gz
-          path: .
-      - name: Download releases from github_build
-        uses: actions/download-artifact@v1
-        with:
-          name: castle-game-x86_64-apple-darwin.tar.gz
-          path: .
-      - name: Download releases from github_build
-        uses: actions/download-artifact@v1
-        with:
-          name: castle-game-x86_64-pc-windows-msvc.zip
-          path: .
-
-      - name: Generate checksums
-        run: for file in castle-game-*; do openssl dgst -sha256 -r "$file" | awk '{print $1}' > "${file}.sha256"; done
-
-      - name: Create GitHub release ${{ matrix.target }}
-        uses: softprops/action-gh-release@v1
-        with:
-          files: |
-            castle-game-*
+      # Deploy to GitHub pages
+      - name: Deploy to GitHub Pages
+        uses: s0/git-publish-subdir-action@master
         env:
+          REPO: self
+          BRANCH: gh-pages
+          FOLDER: target/wasm-examples/castle-game
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.gitignore

@@ -8,6 +8,3 @@ Cargo.lock
 
 # These are backup files generated by rustfmt
 **/*.rs.bk
-
-resources/
-assets/

CODE_OF_CONDUCT.md

@@ -34,7 +34,7 @@ This Code of Conduct applies both within project spaces and in public spaces whe
 
 ## Enforcement
 
-Instances of abusive, harassing, or otherwise unacceptable behavior may be reported by contacting the project team at [email protected]. The project team will review and investigate all complaints, and will respond in a way that it deems appropriate to the circumstances. The project team is obligated to maintain confidentiality with regard to the reporter of an incident. Further details of specific enforcement policies may be posted separately.
+Instances of abusive, harassing, or otherwise unacceptable behavior may be reported by contacting the project team at [email protected]. The project team will review and investigate all complaints, and will respond in a way that it deems appropriate to the circumstances. The project team is obligated to maintain confidentiality with regard to the reporter of an incident. Further details of specific enforcement policies may be posted separately.
 
 Project maintainers who do not follow or enforce the Code of Conduct in good faith may face temporary or permanent repercussions as determined by other members of the project's leadership.
 

Cargo.toml

@@ -1,8 +1,8 @@
 [package]
 name = "castle-game"
-version = "0.1.37-alpha.0"
-edition = "2018"
-authors = ["Thomas Versteeg <[email protected]>"]
+version = "0.2.0"
+edition = "2021"
+authors = ["Thomas Versteeg <[email protected]>"]
 license = "GPL-3.0"
 homepage = "https://github.com/tversteeg/castle-game"
 
@@ -13,37 +13,37 @@ repository = "https://github.com/tversteeg/castle-game.git"
 keywords = ["game", "2d", "destructible"]
 categories = ["games"]
 
-build = "build.rs"
-
-[badges]
-travis-ci = {repository = "tversteeg/castle-game"}
-is-it-maintained-issue-resolution = { repository = "tversteeg/castle-game" }
+[features]
+default = ["debug"]
+debug = ["drawille"]
 
 [dependencies]
-cgmath = "0.17.0"
-collision = "0.20.1"
-const-tweaker = "0.3.1"
-cpal = "0.11.0"
-direct-gui = "0.1.25"
-line_drawing = "0.8.0"
-minifb = "0.19.0"
-rand = "0.8.0"
-sfxr = "0.1.4"
-specs = { version = "0.16.1", features = ["shred-derive"] }
-specs-derive = "0.4.1"
-
-[dependencies.rust-embed]
-version = "5.5.1"
-features = ["interpolate-folder-path"]
-
-[dependencies.blit]
-version = "0.5.12"
-default-features = false
-features = ["aseprite"]
-
-[build-dependencies]
-git2 = "0.13.6"
-blit = "0.5.12"
-image = "0.23.6"
-aseprite = "0.1.3"
-serde_json = "1.0.56"
+blit = "0.8"
+miette = { version = "7", features = ["fancy"] }
+image = { version = "0.24", default-features = false, features = ["png"] }
+rotsprite = "0.1"
+vek = "0.16"
+serde = "1"
+itertools = "0.12"
+parry2d-f64 = { version = "0.13", features = ["simd-stable"] }
+hecs = { version = "0.10", features = ["macros"] }
+bvh-arena = "1"
+raqote = { version = "0.8", default-features = false }
+bitvec = "1"
+line_drawing = "1"
+drawille = { version = "0.3", optional = true }
+spiral = "0.2"
+pixel-game-lib = "0.8"
+assets_manager = "0.11"
+
+[target.'cfg(not(target_arch = "wasm32"))'.dependencies]
+fastrand = "2"
+puffin = "0.19"
+puffin_http = "0.16"
+
+[target.'cfg(target_arch = "wasm32")'.dependencies]
+fastrand = { version = "2", default-features = false, features = ["js"] }
+puffin = "0.19"
+
+[workspace]
+members = ["run-wasm"]