Merge branch 'feature/wgpu' of https://github.com/murl-digital/egui-b…

…aseview into feature/wgpu

Cargo.toml

@@ -15,9 +15,9 @@ readme = "README.md"
 
 [features]
 default = ["wgpu", "default_fonts"]
-opengl = ["egui_glow", "baseview/opengl"]
-wgpu = ["egui-wgpu", "raw-window-handle-06", "pollster"]
 default_fonts = ["egui/default_fonts"]
+opengl = ["egui_glow", "baseview/opengl"]
+wgpu = ["egui-wgpu", "raw-window-handle-06", "pollster", "dep:wgpu"]
 ## Enable parallel tessellation using [`rayon`](https://docs.rs/rayon).
 ##
 ## This can help performance for graphics-intense applications.
@@ -28,11 +28,13 @@ pollster = ["dep:pollster"]
 egui = { version = "0.28", default-features = false, features = ["bytemuck"] }
 egui_glow = { version = "0.28", optional = true }
 egui-wgpu = { version = "0.28", optional = true }
+wgpu = { version = "0.20", optional = true }
 keyboard-types = { version = "0.6", default-features = false }
 baseview = { git = "https://github.com/RustAudio/baseview.git", rev = "45465c5f46abed6c6ce370fffde5edc8e4cd5aa3" }
 raw-window-handle = "0.5"
 raw-window-handle-06 = { package = "raw-window-handle", version = "0.6", optional = true }
 # TODO: Enable wayland feature when baseview gets wayland support.
+
 copypasta = { version = "0.10", default-features = false, features = ["x11"] }
 log = "0.4"
 open = "5.1"

src/renderer/opengl_renderer.rs

@@ -55,6 +55,7 @@ impl Renderer {
             width: canvas_width,
             height: canvas_height,
         } = physical_size;
+
         let shapes = std::mem::take(&mut full_output.shapes);
         let textures_delta = &mut full_output.textures_delta;
 

src/renderer/wgpu_renderer.rs

@@ -77,8 +77,8 @@ impl Renderer {
                         NonZeroU32::new(handle.window).unwrap(),
                     ))
                 }
-                // will this work? i have no idea!
                 raw_window_handle::RawWindowHandle::Win32(handle) => {
+                    // will this work? i have no idea!
                     let mut raw_handle =
                         Win32WindowHandle::new(NonZeroIsize::new(handle.hwnd as isize).unwrap());
 
@@ -188,6 +188,7 @@ impl Renderer {
             width: canvas_width,
             height: canvas_height,
         } = physical_size;
+
         let shapes = std::mem::take(&mut full_output.shapes);
 
         let clipped_primitives = egui_ctx.tessellate(shapes, pixels_per_point);

src/window.rs

@@ -432,9 +432,10 @@ where
                         baseview::ScrollDelta::Lines { x, y } => {
                             (egui::MouseWheelUnit::Line, egui::vec2(*x, *y))
                         }
+
                         baseview::ScrollDelta::Pixels { x, y } => (
                             egui::MouseWheelUnit::Point,
-                            egui::vec2(*x * self.points_per_pixel, *y * self.points_per_pixel),
+                            egui::vec2(*x, *y) * self.points_per_pixel,
                         ),
                     };