glow painter every where

Cargo.toml

@@ -1,17 +1,7 @@
 [workspace]
-resolver = "2"
-members = [
-    "egui_demo_app",
-    "egui_demo_lib",
-    "egui_glium",
-    "egui_glow",
-    "egui_web",
-    "egui-winit",
-    "egui",
-    "emath",
-    "epaint",
-    "epi",
+members = ["egui_demo_app", "egui_demo_lib", "egui_glium", "egui_glow", "egui_glow_painter", "egui_web", "egui-winit", "egui", "emath", "epaint", "epi",
 ]
+resolver = "2"
 
 [profile.dev]
 split-debuginfo = "unpacked" # faster debug builds on mac

eframe/Cargo.toml

@@ -35,7 +35,7 @@ egui_glow = { version = "0.15.0", path = "../egui_glow", default-features = fals
 # web:
 [target.'cfg(target_arch = "wasm32")'.dependencies]
 egui_web = { version = "0.15.0", path = "../egui_web", default-features = false }
-
+console_error_panic_hook = "0.1.7"
 [dev-dependencies]
 image = { version = "0.23", default-features = false, features = ["png"] }
 rfd = "0.5.0"

eframe/src/lib.rs

@@ -62,7 +62,8 @@ pub use {egui, epi};
 
 #[cfg(not(target_arch = "wasm32"))]
 pub use epi::NativeOptions;
-
+#[cfg(target_arch = "wasm32")]
+use std::panic;
 // ----------------------------------------------------------------------------
 // When compiling for web
 
@@ -103,6 +104,7 @@ pub use egui_web::wasm_bindgen;
 /// ```
 #[cfg(target_arch = "wasm32")]
 pub fn start_web(canvas_id: &str, app: Box<dyn epi::App>) -> Result<(), wasm_bindgen::JsValue> {
+    panic::set_hook(Box::new(console_error_panic_hook::hook));
     egui_web::start(canvas_id, app)?;
     Ok(())
 }

egui-winit/src/epi.rs

@@ -1,3 +1,5 @@
+#[cfg(target_os = "windows")]
+use winit::platform::windows::WindowBuilderExtWindows;
 pub fn window_builder(
     native_options: &epi::NativeOptions,
     window_settings: &Option<crate::WindowSettings>,

egui_glow/CHANGELOG.md

@@ -3,7 +3,7 @@ All notable changes to the `egui_glow` integration will be noted in this file.
 
 
 ## Unreleased
-
+* painter separated to new crate egui_glow_painter that support web and native.
 
 ## 0.15.0 - 2021-10-24
 `egui_glow` has been newly created, with feature parity to `egui_glium`.

egui_glow/Cargo.toml

@@ -25,7 +25,7 @@ all-features = true
 egui = { version = "0.15.0", path = "../egui", default-features = false, features = ["single_threaded"] }
 egui-winit = { version = "0.15.0", path = "../egui-winit", default-features = false, features = ["epi"] }
 epi = { version = "0.15.0", path = "../epi", optional = true }
-
+egui_glow_painter={version ="0.15.0",path="../egui_glow_painter"}
 glow = "0.11"
 glutin = "0.27"
 memoffset = "0.6"

egui_glow/src/epi_backend.rs

@@ -1,25 +1,8 @@
 use crate::*;
-use egui::Color32;
 #[cfg(target_os = "windows")]
 use glutin::platform::windows::WindowBuilderExtWindows;
 use std::time::Instant;
 
-impl epi::TextureAllocator for Painter {
-    fn alloc_srgba_premultiplied(
-        &mut self,
-        size: (usize, usize),
-        srgba_pixels: &[Color32],
-    ) -> egui::TextureId {
-        let id = self.alloc_user_texture();
-        self.set_user_texture(id, size, srgba_pixels);
-        id
-    }
-
-    fn free(&mut self, id: egui::TextureId) {
-        self.free_user_texture(id);
-    }
-}
-
 struct RequestRepaintEvent;
 
 struct GlowRepaintSignal(std::sync::Mutex<glutin::event_loop::EventLoopProxy<RequestRepaintEvent>>);