etc.

Author: onlycs

.vscode/settings.json

@@ -1,11 +1,6 @@
 {
-	// "rust-analyzer.cargo.target": "wasm32-unknown-unknown",
-	// "rust-analyzer.cargo.features": [
-	// 	"sync"
-	// ],
-	// "rust-analyzer.check.features": [
-	// 	"sync"
-	// ],
-	"rust-analyzer.cargo.features": [],
-	"rust-analyzer.check.features": [],
+	"rust-analyzer.cargo.target": "wasm32-unknown-unknown",
+	"rust-analyzer.check.targets": [
+		"wasm32-unknown-unknown"
+	],
 }

index.html

@@ -16,18 +16,6 @@
 
 			document.getElementById("help").style.display = "none";
 
-
-			// the canvas will be created by wasm.
-			// when it is created, add a listener
-			setTimeout(() => {
-				document.getElementById("onboard-help").style.display = "block";
-				document.querySelectorAll("canvas")[0].addEventListener("click", (e) => {
-					document.getElementById("onboard-help").style.display = "none";
-					document.querySelector("canvas").style.width = "100vw";
-					document.querySelector("canvas").style.height = "100vh";
-				});
-			}, 250);
-
 			init()
 				.then(() => {
 					console.log("loaded!");

src/renderer/mod.rs

@@ -14,7 +14,7 @@ use winit::{
     event::WindowEvent,
     event_loop::ActiveEventLoop,
     keyboard::KeyCode,
-    window::{Fullscreen, Window, WindowId},
+    window::{Window, WindowId},
 };
 
 mod egui;
@@ -113,13 +113,41 @@ impl WgpuState {
 
         #[cfg(target_arch = "wasm32")]
         {
+            use wasm_bindgen::prelude::Closure;
+            use wasm_bindgen::JsCast;
+            use web_sys::Event;
             use winit::platform::web::WindowExtWebSys;
+
             web_sys::window()
                 .and_then(|win| win.document())
                 .and_then(|doc| {
                     let dest = doc.get_element_by_id("fluidsim")?;
                     let canvas = web_sys::Element::from(window.canvas()?);
                     dest.append_child(&canvas).ok()?;
+                    Some(doc)
+                })
+                .and_then(|doc| {
+                    let canvas = doc.query_selector("canvas").ok()??;
+
+                    canvas
+                        .add_event_listener_with_callback(
+                            "click",
+                            Closure::wrap(Box::new(|_| {
+                                // set w and h of canvas to 100vw and 100vh, after click
+
+                                let window = web_sys::window().unwrap();
+                                let document = window.document().unwrap();
+                                let canvas = document.query_selector("canvas").unwrap().unwrap();
+
+                                canvas
+                                    .set_attribute("style", "width: 100vw; height: 100vh;")
+                                    .unwrap();
+                            }) as Box<dyn FnMut(Event)>)
+                            .as_ref()
+                            .unchecked_ref(),
+                        )
+                        .ok()?;
+
                     Some(())
                 })
                 .unwrap();
@@ -197,7 +225,7 @@ impl SimRenderer {
         #[cfg(not(target_arch = "wasm32"))]
         self.wgpu
             .window
-            .set_fullscreen(Some(Fullscreen::Borderless(None)));
+            .set_fullscreen(Some(winit::window::Fullscreen::Borderless(None)));
 
         #[cfg(target_arch = "wasm32")]
         self.wgpu.window.set_min_inner_size(Some(WASM_WINDOW));

src/renderer/state.rs

@@ -54,8 +54,9 @@ impl Game {
             let el = self.time.last_instant.elapsed().as_secs_f32();
             let speed = self.physics.settings.speed;
             let sspf = self.physics.settings.steps_per_frame;
+            let maxed = (el * speed / sspf as f32).min(1. / 90.);
 
-            self.physics.settings.dtime = el * speed / sspf as f32;
+            self.physics.settings.dtime = maxed;
         }
 
         self.time.last_instant = Instant::now();