wasm32-unknown-unknown

kvark · Dec 6, 2021 · f4b541c · f4b541c
1 parent bb1cb0b
commit f4b541c
Show file tree

Hide file tree

Showing 13 changed files with 492 additions and 38 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -60,13 +60,17 @@ rust-ini = "0.17"
 serde = "1.0"
 serde_derive = "1.0"
 serde_scan = "0.4"
-wgpu = { git = "https://github.com/gfx-rs/wgpu", rev = "c8d572a", features = [] }
+wgpu = { git = "https://github.com/gfx-rs/wgpu", rev = "c8d572a", features = ["webgl"] }
 # binaries
 env_logger = "0.8"
 getopts = "0.2"
 obj = "0.10"
 png = "0.16"
-winit = "0.26"
+winit = { version = "0.26", features = [] }
+wasm-bindgen = "0.2.78"
+wasm-bindgen-futures = "0.4"
+console_error_panic_hook = { version = "0.1.7" }
+
 
 [dev-dependencies]
 naga = { git = "https://github.com/gfx-rs/naga", rev = "c69f676", features = ["wgsl-in"] }
@@ -82,5 +86,5 @@ default-features = false
 #wgpu-core = { path = "../wgpu/wgpu-core" }
 #wgpu-types = { path = "../wgpu/wgpu-types" }
 
-[patch."https://github.com/gfx-rs/naga"]
-#naga = { path = "../naga" }
+[dependencies.getrandom]
+features = ["js"]
diff --git a/README.md b/README.md
@@ -42,6 +42,34 @@ Controls:
 
 <img alt="game" src="etc/shots/Road11-pause.png" width="25%">
 
+### Web version
+
+Work in progress, stage matrix:
+
+  Stage                 | State              |
+  --------------------  | ------------------ |
+  Support FS            | :white_check_mark: |
+  WebGL Initialization  | :white_check_mark: |
+  Loading worlds        | :white_check_mark: |
+  Loading heights       | :white_check_mark: |
+  Loading data          | :white_check_mark: |
+  Loading flood         | :white_check_mark: |
+  Render                | :construction:     |
+
+
+Build for web (DEBUG):
+
+```sh
+PATH=$PATH:/home/caiiiycuk/rust/rust/build/x86_64-unknown-linux-gnu/stage0/lib/rustlib/x86_64-unknown-linux-gnu/bin/ LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/home/caiiiycuk/rust/rust/build/x86_64-unknown-linux-gnu/stage0/lib/ cargo build  --target wasm32-unknown-unknown --bin road --verbose && wasm-bindgen --out-dir html5/ --target web --keep-debug target/wasm32-unknown-unknown/debug/road.wasm
+```
+
+
+Build for web (RELEASE):
+```sh
+PATH=$PATH:/home/caiiiycuk/rust/rust/build/x86_64-unknown-linux-gnu/stage0/lib/rustlib/x86_64-unknown-linux-gnu/bin/ LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/home/caiiiycuk/rust/rust/build/x86_64-unknown-linux-gnu/stage0/lib/ cargo build  --target wasm32-unknown-unknown --bin road --verbose --release && wasm-bindgen --out-dir html5/ --target web --keep-debug target/wasm32-unknown-unknown/release/road.wasm
+```
+
+
 ### Mechous viewer/debugger
 `car` binary allows to see the mechos with items selected by the configuration. It also shows the debug collision info.
 ```bash

diff --git a/bin/boilerplate.rs b/bin/boilerplate.rs
@@ -4,7 +4,7 @@ use vangers::{
     render::{ScreenTargets, DEPTH_FORMAT},
 };
 
-use futures::executor::{LocalPool, LocalSpawner};
+use futures::executor::{LocalPool, LocalSpawner, block_on};
 use log::info;
 use winit::{
     event,
@@ -54,9 +54,10 @@ pub struct HarnessOptions {
 
 impl Harness {
     pub fn init(options: HarnessOptions) -> (Self, config::Settings) {
-        env_logger::init();
-        let mut task_pool = LocalPool::new();
+        block_on(Harness::init_async(options))
+    }
 
+    pub async fn init_async(options: HarnessOptions) -> (Self, config::Settings) {
         info!("Loading the settings");
         let settings = config::Settings::load("config/settings.ron");
         let extent = wgpu::Extent3d {
@@ -76,19 +77,22 @@ impl Harness {
             .unwrap();
         let surface = unsafe { instance.create_surface(&window) };
 
-        info!("Initializing the device");
-        let adapter = task_pool
-            .run_until(instance.request_adapter(&wgpu::RequestAdapterOptions {
+        info!("Initializing the device:adapter");
+        let adapter = instance.request_adapter(&wgpu::RequestAdapterOptions {
                 power_preference: wgpu::PowerPreference::HighPerformance,
                 compatible_surface: Some(&surface),
                 force_fallback_adapter: false,
-            }))
-            .expect("Unable to initialize GPU via the selected backend.");
+            }).await.expect("Unable to initialize GPU via the selected backend (adapter).");
 
         let downlevel_caps = adapter.get_downlevel_properties();
         let adapter_limits = adapter.limits();
 
+        #[cfg(target_arch = "wasm32")]
         let mut limits = wgpu::Limits::downlevel_webgl2_defaults();
+
+        #[cfg(not(target_arch = "wasm32"))]
+        let mut limits = wgpu::Limits::downlevel_defaults();
+
         if options.uses_level {
             let desired_height = 16 << 10;
             limits.max_texture_dimension_2d =
@@ -102,8 +106,9 @@ impl Harness {
                     desired_height
                 };
         }
-        let (device, queue) = task_pool
-            .run_until(adapter.request_device(
+
+        info!("Initializing the device:request");
+        let (device, queue) = adapter.request_device(
                 &wgpu::DeviceDescriptor {
                     label: None,
                     features: wgpu::Features::empty(),
@@ -114,8 +119,7 @@ impl Harness {
                 } else {
                     Some(std::path::Path::new(&settings.render.wgpu_trace_path))
                 },
-            ))
-            .unwrap();
+            ).await.expect("Unable to initialize GPU via the selected backend (request).");
 
         let config = wgpu::SurfaceConfiguration {
             usage: wgpu::TextureUsages::RENDER_ATTACHMENT,
@@ -141,7 +145,7 @@ impl Harness {
             .create_view(&wgpu::TextureViewDescriptor::default());
 
         let harness = Harness {
-            task_pool,
+            task_pool: LocalPool::new(),
             event_loop,
             window,
             device,
@@ -160,7 +164,9 @@ impl Harness {
     pub fn main_loop<A: 'static + Application>(self, mut app: A) {
         use std::time;
 
+        #[cfg(not(target_arch = "wasm32"))]
         let mut last_time = time::Instant::now();
+
         let mut needs_reload = false;
         let Harness {
             mut task_pool,
@@ -241,9 +247,14 @@ impl Harness {
                 },
                 event::Event::MainEventsCleared => {
                     let spawner = task_pool.spawner();
-                    let duration = time::Instant::now() - last_time;
-                    last_time += duration;
-                    let delta = duration.as_secs() as f32 + duration.subsec_nanos() as f32 * 1.0e-9;
+
+                    let mut delta: f32 = 16.0;
+
+                    #[cfg(not(target_arch = "wasm32"))] {
+                        let duration = time::Instant::now() - last_time;
+                        last_time += duration;
+                        delta = duration.as_secs() as f32 + duration.subsec_nanos() as f32 * 1.0e-9;
+                    }
 
                     let update_command_buffers = app.update(&device, delta, &spawner);
                     if !update_command_buffers.is_empty() {

diff --git a/bin/road/game.rs b/bin/road/game.rs
@@ -811,14 +811,21 @@ impl Application for Game {
         }
 
         {
+            #[cfg(not(target_arch = "wasm32"))]
             use rayon::prelude::*;
 
             let clipper = Clipper::new(&self.cam);
             let max_quant = self.max_quant;
             let common = &self.db.common;
             let level = &self.level;
 
-            self.agents.par_iter_mut().for_each(|a| {
+            #[cfg(not(target_arch = "wasm32"))]
+            let agent_iter = self.agents.par_iter_mut();
+
+            #[cfg(target_arch = "wasm32")]
+            let agent_iter = self.agents.iter_mut();
+
+            agent_iter.for_each(|a| {
                 let mut dt = physics_dt;
                 a.cpu_apply_control(input_factor, common);