From f7062b9a2cae6db9345d9f9d7ceebf5b441ddd3a Mon Sep 17 00:00:00 2001 From: LLLL Colonq Date: Sun, 16 Feb 2025 17:04:13 -0500 Subject: Fix helpers.js handling --- helpers.js | 13 ------------- index.html | 2 -- src/context.rs | 11 ++++++----- src/helpers.js | 13 +++++++++++++ 4 files changed, 19 insertions(+), 20 deletions(-) delete mode 100644 helpers.js create mode 100644 src/helpers.js diff --git a/helpers.js b/helpers.js deleted file mode 100644 index aaaafa1..0000000 --- a/helpers.js +++ /dev/null @@ -1,13 +0,0 @@ -let resized = false; - -export async function js_track_resized_setup() { - window.addEventListener("resize", () => { - resized = true; - }); -} - -export function js_poll_resized() { - let ret = resized; - resized = false; - return ret; -} diff --git a/index.html b/index.html index be4cfac..84b99ea 100644 --- a/index.html +++ b/index.html @@ -4,8 +4,6 @@ - - diff --git a/src/context.rs b/src/context.rs index 05d6990..502bbdb 100644 --- a/src/context.rs +++ b/src/context.rs @@ -1,10 +1,13 @@ use glow::HasContext; +#[cfg(target_arch = "wasm32")] +use wasm_bindgen::prelude::*; + #[cfg(target_arch = "wasm32")] use winit::platform::web::WindowExtWebSys; #[cfg(target_arch = "wasm32")] -#[link(wasm_import_module = "./helpers.js")] +#[wasm_bindgen(module = "/src/helpers.js")] extern { fn js_track_resized_setup(); fn js_poll_resized() -> bool; @@ -69,7 +72,7 @@ impl Context { }; #[cfg(target_arch = "wasm32")] - unsafe { js_track_resized_setup(); } + js_track_resized_setup(); let ret = Self { render_width, render_height, @@ -126,9 +129,7 @@ impl Context { #[cfg(target_arch = "wasm32")] pub fn resize_necessary(&self) -> bool { - unsafe { - js_poll_resized() - } + js_poll_resized() } #[cfg(not(target_arch = "wasm32"))] diff --git a/src/helpers.js b/src/helpers.js new file mode 100644 index 0000000..aaaafa1 --- /dev/null +++ b/src/helpers.js @@ -0,0 +1,13 @@ +let resized = false; + +export async function js_track_resized_setup() { + window.addEventListener("resize", () => { + resized = true; + }); +} + +export function js_poll_resized() { + let ret = resized; + resized = false; + return ret; +} -- cgit v1.2.3