1
0
mirror of https://github.com/emilk/egui.git synced 2026-09-02 06:40:06 -04:00

Wasm graceful exit

This commit is contained in:
Stanislav
2022-07-27 13:31:09 +03:00
parent 235d77713d
commit 85568ca61c
8 changed files with 202 additions and 38 deletions

View File

@@ -5,6 +5,15 @@ mod backend_panel;
pub(crate) mod frame_history;
mod wrap_app;
#[cfg(target_arch = "wasm32")]
use std::sync::Arc;
#[cfg(target_arch = "wasm32")]
use eframe::web::AppRunner;
#[cfg(target_arch = "wasm32")]
use egui::mutex::Mutex;
pub use wrap_app::WrapApp;
/// Time of day as seconds since midnight. Used for clock in demo app.
@@ -19,13 +28,35 @@ pub(crate) fn seconds_since_midnight() -> f64 {
#[cfg(target_arch = "wasm32")]
use eframe::wasm_bindgen::{self, prelude::*};
#[cfg(target_arch = "wasm32")]
#[wasm_bindgen]
pub struct WebHandle {
handle: Arc<Mutex<AppRunner>>,
}
#[cfg(target_arch = "wasm32")]
#[wasm_bindgen]
impl WebHandle {
#[wasm_bindgen]
#[cfg(target_arch = "wasm32")]
pub fn stop_web(&self) -> Result<(), wasm_bindgen::JsValue> {
let res = self.handle.lock().destroy();
// let numw = Arc::weak_count(&uu);
// let nums = Arc::strong_count(&uu);
// tracing::debug!("runner ref {:?}, {:?}", numw, nums);
res
}
}
/// This is the entry-point for all the web-assembly.
/// This is called once from the HTML.
/// It loads the app, installs some callbacks, then returns.
/// You can add more callbacks like this if you want to call in to your code.
#[cfg(target_arch = "wasm32")]
#[wasm_bindgen]
pub fn start(canvas_id: &str) -> Result<(), wasm_bindgen::JsValue> {
pub fn start(canvas_id: &str) -> Result<WebHandle, wasm_bindgen::JsValue> {
// Make sure panics are logged using `console.error`.
console_error_panic_hook::set_once();
@@ -33,9 +64,12 @@ pub fn start(canvas_id: &str) -> Result<(), wasm_bindgen::JsValue> {
tracing_wasm::set_as_global_default();
let web_options = eframe::WebOptions::default();
eframe::start_web(
let handle = eframe::start_web(
canvas_id,
web_options,
Box::new(|cc| Box::new(WrapApp::new(cc))),
)
.map(|handle| WebHandle { handle });
handle
}