skyler
/
egui
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Don't install console panic hook and tracing wasm subscriber in egui_web (#1230) 

Do so in egui_demo_app instead
This commit is contained in:
Yusuf Bera Ertan 2022-02-10 17:44:41 +03:00 committed by GitHub
parent 2f042ababd
commit 1ebb5ccabf
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Cargo.lock generated
View File

@ -1039,9 +1039,11 @@ dependencies = [
name = "egui_demo_app" name = "egui_demo_app"
version = "0.16.0" version = "0.16.0"
dependencies = [ dependencies = [
"console_error_panic_hook",
"eframe", "eframe",
"egui_demo_lib", "egui_demo_lib",
"tracing-subscriber", "tracing-subscriber",
"tracing-wasm",
] ]
[[package]] [[package]]
@ -1095,7 +1097,6 @@ name = "egui_web"
version = "0.16.0" version = "0.16.0"
dependencies = [ dependencies = [
"bytemuck", "bytemuck",
"console_error_panic_hook",
"egui", "egui",
"egui_glow", "egui_glow",
"epi", "epi",
@ -1103,7 +1104,6 @@ dependencies = [
"ron", "ron",
"serde", "serde",
"tracing", "tracing",
"tracing-wasm",
"tts", "tts",
"wasm-bindgen", "wasm-bindgen",
"wasm-bindgen-futures", "wasm-bindgen-futures",

4
egui_demo_app/Cargo.toml
View File

@ -30,3 +30,7 @@ eframe = { version = "0.16.0", path = "../eframe" }
egui_demo_lib = { version = "0.16.0", path = "../egui_demo_lib", features = ["extra_debug_asserts"] } egui_demo_lib = { version = "0.16.0", path = "../egui_demo_lib", features = ["extra_debug_asserts"] }
tracing-subscriber = "0.3" tracing-subscriber = "0.3"
[target.'cfg(target_arch = "wasm32")'.dependencies]
console_error_panic_hook = "0.1.6"
tracing-wasm = "0.2"

6
egui_demo_app/src/lib.rs
View File

@ -13,6 +13,12 @@ use eframe::wasm_bindgen::{self, prelude::*};
#[cfg(target_arch = "wasm32")] #[cfg(target_arch = "wasm32")]
#[wasm_bindgen] #[wasm_bindgen]
pub fn start(canvas_id: &str) -> Result<(), wasm_bindgen::JsValue> { pub fn start(canvas_id: &str) -> Result<(), wasm_bindgen::JsValue> {
// Make sure panics are logged using `console.error`.
console_error_panic_hook::set_once();
// Redirect tracing to console.log and friends:
tracing_wasm::set_as_global_default();
let app = egui_demo_lib::WrapApp::default(); let app = egui_demo_lib::WrapApp::default();
eframe::start_web(canvas_id, Box::new(app)) eframe::start_web(canvas_id, Box::new(app))
} }

2
egui_web/Cargo.toml
View File

@ -56,10 +56,8 @@ egui_glow = { version = "0.16.0",path = "../egui_glow", default-features = false
epi = { version = "0.16.0", path = "../epi" } epi = { version = "0.16.0", path = "../epi" }
bytemuck = "1.7" bytemuck = "1.7"
console_error_panic_hook = "0.1.6"
js-sys = "0.3" js-sys = "0.3"
tracing = "0.1" tracing = "0.1"
tracing-wasm = "0.2"
wasm-bindgen = "0.2" wasm-bindgen = "0.2"
wasm-bindgen-futures = "0.4" wasm-bindgen-futures = "0.4"

6
egui_web/src/backend.rs
View File

@ -281,12 +281,6 @@ impl AppRunner {
/// Install event listeners to register different input events /// Install event listeners to register different input events
/// and start running the given app. /// and start running the given app.
pub fn start(canvas_id: &str, app: Box<dyn epi::App>) -> Result<AppRunnerRef, JsValue> { pub fn start(canvas_id: &str, app: Box<dyn epi::App>) -> Result<AppRunnerRef, JsValue> {
// Make sure panics are logged using `console.error`.
console_error_panic_hook::set_once();
// Redirect tracing to console.log and friends:
tracing_wasm::set_as_global_default();
let mut runner = AppRunner::new(canvas_id, app)?; let mut runner = AppRunner::new(canvas_id, app)?;
runner.warm_up()?; runner.warm_up()?;
start_runner(runner) start_runner(runner)