try wasm

jan-tennert · Oct 12, 2023 · 5d5457a · 5d5457a
1 parent 4fa37f9
commit 5d5457a
Show file tree

Hide file tree

Showing 6 changed files with 48 additions and 21 deletions.
diff --git a/.github/workflows/gh-pages.yml b/.github/workflows/gh-pages.yml
@@ -1,6 +1,6 @@
 on:
   push:
-    branches: []
+    branches: [main]
 permissions: 
    contents: read 
    pages: write 
@@ -42,7 +42,7 @@ jobs:
         run: cargo install wasm-bindgen-cli
 
       - name: Run build
-        run: cargo build --release --target wasm32-unknown-unknown
+        run: cargo build --profile wasm-release --target wasm32-unknown-unknown
       - name: WASM
         run: wasm-bindgen --out-dir out/ --target web ./target/wasm32-unknown-unknown/release/Simulation.wasm
     #  - name: Copy Assets

diff --git a/.gitignore b/.gitignore
@@ -1,3 +1,3 @@
 /target
 /.lapce
-/.idea
+/.idea
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -16,7 +16,7 @@ runner = "wasm-server-runner"
 
 [dependencies]
 #bevy = { git = "https://github.com/bevyengine/bevy", branch = "release-0.11.3", features = ["dynamic_linking"] } 
-bevy = { version = "0.11.3", features = ["dynamic_linking"] }
+bevy = { version = "0.11.3" }
 bevy_easings = "0.11.1"
 #bevy_panorbit_camera = { git = "https://github.com/jan-tennert/bevy_panorbit_camera", rev = "7e3c3f8" }
 bevy-inspector-egui = { version = "0.20", default-features = false }
@@ -25,6 +25,22 @@ bevy_egui = "0.22"
 chrono = "0.4.23"
 itertools = "0.11.0"
 
+[profile.wasm-release]
+# Use release profile as default values
+inherits = "release"
+
+# Optimize with size in mind, also try "s", sometimes it is better.
+# This doesn't increase compilation times compared to -O3, great improvements
+opt-level = "z"
+
+# Do a second optimization pass removing duplicate or unused code from dependencies.
+# Slows compile times, marginal improvements
+lto = "fat"
+
+# When building crates, optimize larger chunks at a time
+# Slows compile times, marginal improvements
+codegen-units = 1
+
 [patch.crates-io]
 bevy = { git = "https://github.com/jan-tennert/bevy", branch = "skybox-fix" }
 bevy_ecs = { git = "https://github.com/jan-tennert/bevy", branch = "skybox-fix" }

diff --git a/out/index.html b/out/index.html
@@ -0,0 +1,27 @@
+<html>
+  <head>
+    <meta charset="UTF-8" />
+    <style>
+      body {
+        background: linear-gradient(
+          135deg,
+          white 0%,
+          white 49%,
+          black 49%,
+          black 51%,
+          white 51%,
+          white 100%
+        );
+        background-repeat: repeat;
+        background-size: 20px 20px;
+      }
+      canvas {
+        background-color: white;
+      }
+    </style>
+  </head>
+  <script type="module">
+    import init from './Simulation.js'
+    init()
+  </script>
+</html>
diff --git a/src/main.rs b/src/main.rs
@@ -44,14 +44,7 @@ pub enum SimState {
 fn main() {
     App::new()
      //   .add_plugins(DefaultPlugins)
-        .add_plugins(DefaultPlugins
-            .set(RenderPlugin {
-                wgpu_settings: WgpuSettings {
-                    backends: Some(Backends::VULKAN),
-                    ..default()
-                },
-            })
-        ) 
+        .add_plugins(DefaultPlugins) 
         .add_plugins(WorldInspectorPlugin::new())
   //      .add_plugins(DefaultPickingPlugins)
         .add_plugins(PanOrbitCameraPlugin)