start wasm draw bit

Author: bgkillas

Cargo.lock

@@ -51,6 +51,7 @@ rug=["kalc-lib/rug","kalc-lib"]
 fastnum=["kalc-lib/fastnum","kalc-lib"]
 kalc-lib=["dep:kalc-lib"]
 wasm=["dep:wasm-bindgen", "dep:web-sys"]
+wasm-draw=["rupl/wasm", "wasm", "rupl/winit", "dep:winit"]
 
 [dependencies]
 egui={version="0.31.1",default-features = false,optional=true}
@@ -65,4 +66,4 @@ rupl={version = "0.1.2",path="../rupl",default-features = false}
 kalc-lib={version="1.5.1",default-features=false,features = ["fastrand"],path="../kalc-lib",optional = true}
 wasm-bindgen = {version="0.2.100",optional = true}
 #console_error_panic_hook = { version = "0.1.7", optional = true }
-web-sys = { version = "0.3.77", features = ["CanvasRenderingContext2d"], optional = true }
+web-sys = { version = "0.3.77", features = ["CanvasRenderingContext2d", "HtmlCanvasElement"], optional = true }

Cargo.toml

@@ -123,13 +123,13 @@ impl App {
             #[cfg(any(feature = "skia", feature = "tiny-skia"))]
             #[cfg(not(feature = "skia-vulkan"))]
             surface_state: None,
-            #[cfg(any(feature = "skia", feature = "tiny-skia"))]
+            #[cfg(any(feature = "skia", feature = "tiny-skia", feature = "wasm-draw"))]
             input_state: rupl::types::InputState::default(),
-            #[cfg(any(feature = "skia", feature = "tiny-skia"))]
+            #[cfg(any(feature = "skia", feature = "tiny-skia", feature = "wasm-draw"))]
             name: function,
-            #[cfg(any(feature = "skia", feature = "tiny-skia"))]
+            #[cfg(any(feature = "skia", feature = "tiny-skia", feature = "wasm-draw"))]
             touch_positions: Default::default(),
-            #[cfg(any(feature = "skia", feature = "tiny-skia"))]
+            #[cfg(any(feature = "skia", feature = "tiny-skia", feature = "wasm-draw"))]
             last_touch_positions: Default::default(),
         }
     }
@@ -184,13 +184,13 @@ impl App {
             #[cfg(any(feature = "skia", feature = "tiny-skia"))]
             #[cfg(not(feature = "wasm"))]
             surface_state: None,
-            #[cfg(any(feature = "skia", feature = "tiny-skia"))]
+            #[cfg(any(feature = "skia", feature = "tiny-skia", feature = "wasm-draw"))]
             input_state: rupl::types::InputState::default(),
-            #[cfg(any(feature = "skia", feature = "tiny-skia"))]
+            #[cfg(any(feature = "skia", feature = "tiny-skia", feature = "wasm-draw"))]
             name: _function,
-            #[cfg(any(feature = "skia", feature = "tiny-skia"))]
+            #[cfg(any(feature = "skia", feature = "tiny-skia", feature = "wasm-draw"))]
             touch_positions: Default::default(),
-            #[cfg(any(feature = "skia", feature = "tiny-skia"))]
+            #[cfg(any(feature = "skia", feature = "tiny-skia", feature = "wasm-draw"))]
             last_touch_positions: Default::default(),
         }
     }
@@ -307,8 +307,49 @@ impl App {
             }
         }
     }
+    #[cfg(feature = "wasm")]
+    #[cfg(feature = "wasm-draw")]
+    pub(crate) fn main(&mut self, width: u32, height: u32) {
+        let mut b = false;
+        self.plot.keybinds(&self.input_state);
+        self.plot
+            .set_screen(width as f64, height as f64, true, true);
+        #[cfg(feature = "bincode")]
+        if let Some(tiny) = std::mem::take(&mut self.tiny) {
+            self.plot.apply_tiny(tiny);
+        }
+        if let Some(n) = self.data.update(&mut self.plot) {
+            b = true;
+            self.name = n;
+        };
+        use wasm_bindgen::prelude::*;
+        use winit::platform::web::WindowExtWebSys;
+        let canvas: web_sys::HtmlCanvasElement = self
+            .window
+            .as_ref()
+            .unwrap()
+            .canvas()
+            .expect("Failed to get canvas");
+        let ctx: web_sys::CanvasRenderingContext2d = canvas
+            .get_context("2d")
+            .expect("Failed to get 2d context")
+            .expect("Failed to get 2d context")
+            .dyn_into()
+            .expect("Failed to convert to CanvasRenderingContext2d");
+        self.plot.update(width, height, ctx);
+        if b {
+            let name = self.name.clone();
+            if let Some(w) = self.window() {
+                if name.is_empty() {
+                    w.set_title("kalc-plot");
+                } else {
+                    w.set_title(&name);
+                }
+            }
+        }
+    }
 }
-#[cfg(feature = "wasm")]
+#[cfg(all(feature = "wasm", feature = "tiny-skia"))]
 fn draw_buffer_web(win: &winit::window::Window, width: u32, clamped: wasm_bindgen::Clamped<&[u8]>) {
     use wasm_bindgen::prelude::*;
     let canvas = get_a_canvas(win);

src/app.rs

@@ -1,7 +1,7 @@
 #![windows_subsystem = "windows"]
 mod app;
 mod data;
-#[cfg(any(feature = "skia", feature = "tiny-skia"))]
+#[cfg(any(feature = "skia", feature = "tiny-skia", feature = "wasm-draw"))]
 mod window;
 use crate::data::Data;
 #[cfg(feature = "kalc-lib")]
@@ -97,7 +97,7 @@ pub fn main() {
         )
         .unwrap();
     }
-    #[cfg(any(feature = "skia", feature = "tiny-skia"))]
+    #[cfg(any(feature = "skia", feature = "tiny-skia", feature = "wasm-draw"))]
     {
         #[cfg(feature = "kalc-lib")]
         let f = data.colors.graphtofile.clone();
@@ -169,14 +169,14 @@ struct App {
     #[cfg_attr(feature = "bincode", serde(skip))]
     #[cfg(feature = "wasm")]
     window: Option<winit::window::Window>,
-    #[cfg(any(feature = "skia", feature = "tiny-skia"))]
+    #[cfg(any(feature = "skia", feature = "tiny-skia", feature = "wasm-draw"))]
     #[cfg_attr(feature = "bincode", serde(skip))]
     input_state: rupl::types::InputState,
-    #[cfg(any(feature = "skia", feature = "tiny-skia"))]
+    #[cfg(any(feature = "skia", feature = "tiny-skia", feature = "wasm-draw"))]
     name: String,
-    #[cfg(any(feature = "skia", feature = "tiny-skia"))]
+    #[cfg(any(feature = "skia", feature = "tiny-skia", feature = "wasm-draw"))]
     touch_positions: std::collections::HashMap<u64, rupl::types::Vec2>,
-    #[cfg(any(feature = "skia", feature = "tiny-skia"))]
+    #[cfg(any(feature = "skia", feature = "tiny-skia", feature = "wasm-draw"))]
     last_touch_positions: std::collections::HashMap<u64, rupl::types::Vec2>,
 }
 

src/lib.rs

@@ -1,6 +1,6 @@
-#[cfg(any(feature = "skia", feature = "tiny-skia"))]
+#[cfg(any(feature = "skia", feature = "tiny-skia", feature = "wasm-draw"))]
 use crate::App;
-#[cfg(any(feature = "skia", feature = "tiny-skia"))]
+#[cfg(any(feature = "skia", feature = "tiny-skia", feature = "wasm-draw"))]
 impl App {
     #[cfg(not(target_arch = "wasm32"))]
     pub(crate) fn set_title(&self, window: &std::sync::Arc<winit::window::Window>) {
@@ -19,6 +19,7 @@ impl App {
         }
     }
     #[cfg(not(feature = "skia-vulkan"))]
+    #[cfg(not(feature = "wasm-draw"))]
     #[cfg(not(target_arch = "wasm32"))]
     pub(crate) fn surface_state(
         &mut self,
@@ -51,7 +52,7 @@ use wasm_bindgen::JsCast;
 use web_sys::HtmlCanvasElement;
 #[cfg(feature = "wasm")]
 use winit::platform::web::WindowAttributesExtWebSys;
-#[cfg(any(feature = "skia", feature = "tiny-skia"))]
+#[cfg(any(feature = "skia", feature = "tiny-skia", feature = "wasm-draw"))]
 impl winit::application::ApplicationHandler for App {
     fn resumed(&mut self, event_loop: &winit::event_loop::ActiveEventLoop) {
         let window = {
@@ -76,6 +77,7 @@ impl winit::application::ApplicationHandler for App {
             let window = std::sync::Arc::new(window);
             self.set_title(&window);
             #[cfg(not(feature = "skia-vulkan"))]
+            #[cfg(not(feature = "wasm-draw"))]
             {
                 let context = softbuffer::Context::new(window.clone()).unwrap();
                 self.surface_state =
@@ -320,6 +322,7 @@ impl winit::application::ApplicationHandler for App {
     }
     fn suspended(&mut self, _: &winit::event_loop::ActiveEventLoop) {
         #[cfg(not(feature = "skia-vulkan"))]
+        #[cfg(not(feature = "wasm-draw"))]
         #[cfg(not(target_arch = "wasm32"))]
         {
             self.surface_state = None