Add a macro to generate boilerplate methods

examples/demo.rs

@@ -1,4 +1,4 @@
-use {egui_miniquad as egui_mq, miniquad as mq};
+use {egui_miniquad::{self as egui_mq, EguiMqExt}, miniquad as mq};
 
 struct Stage {
     egui_mq: egui_mq::EguiMq,
@@ -111,33 +111,11 @@ impl mq::EventHandler for Stage {
 
         self.mq_ctx.commit_frame();
     }
+}
 
-    fn mouse_motion_event(&mut self, x: f32, y: f32) {
-        self.egui_mq.mouse_motion_event(x, y);
-    }
-
-    fn mouse_wheel_event(&mut self, dx: f32, dy: f32) {
-        self.egui_mq.mouse_wheel_event(dx, dy);
-    }
-
-    fn mouse_button_down_event(&mut self, mb: mq::MouseButton, x: f32, y: f32) {
-        self.egui_mq.mouse_button_down_event(mb, x, y);
-    }
-
-    fn mouse_button_up_event(&mut self, mb: mq::MouseButton, x: f32, y: f32) {
-        self.egui_mq.mouse_button_up_event(mb, x, y);
-    }
-
-    fn char_event(&mut self, character: char, _keymods: mq::KeyMods, _repeat: bool) {
-        self.egui_mq.char_event(character);
-    }
-
-    fn key_down_event(&mut self, keycode: mq::KeyCode, keymods: mq::KeyMods, _repeat: bool) {
-        self.egui_mq.key_down_event(keycode, keymods);
-    }
-
-    fn key_up_event(&mut self, keycode: mq::KeyCode, keymods: mq::KeyMods) {
-        self.egui_mq.key_up_event(keycode, keymods);
+impl EguiMqExt for Stage {
+    fn get_egui_mq(&mut self) -> &mut egui_mq::EguiMq {
+        &mut self.egui_mq
     }
 }
 
@@ -154,5 +132,6 @@ fn main() {
         window_height: 1024,
         ..Default::default()
     };
-    mq::start(conf, || Box::new(Stage::new()));
+
+    mq::start(conf, || Stage::new().wrap());
 }

examples/render_to_egui_image.rs

@@ -1,4 +1,5 @@
 use egui::load::SizedTexture;
+use egui_miniquad::EguiMqExt;
 use glam::{vec3, EulerRot, Mat4};
 use {egui_miniquad as egui_mq, miniquad as mq};
 
@@ -201,33 +202,11 @@ impl mq::EventHandler for Stage {
 
         self.mq_ctx.commit_frame();
     }
+}
 
-    fn mouse_motion_event(&mut self, x: f32, y: f32) {
-        self.egui_mq.mouse_motion_event(x, y);
-    }
-
-    fn mouse_wheel_event(&mut self, dx: f32, dy: f32) {
-        self.egui_mq.mouse_wheel_event(dx, dy);
-    }
-
-    fn mouse_button_down_event(&mut self, mb: mq::MouseButton, x: f32, y: f32) {
-        self.egui_mq.mouse_button_down_event(mb, x, y);
-    }
-
-    fn mouse_button_up_event(&mut self, mb: mq::MouseButton, x: f32, y: f32) {
-        self.egui_mq.mouse_button_up_event(mb, x, y);
-    }
-
-    fn char_event(&mut self, character: char, _keymods: mq::KeyMods, _repeat: bool) {
-        self.egui_mq.char_event(character);
-    }
-
-    fn key_down_event(&mut self, keycode: mq::KeyCode, keymods: mq::KeyMods, _repeat: bool) {
-        self.egui_mq.key_down_event(keycode, keymods);
-    }
-
-    fn key_up_event(&mut self, keycode: mq::KeyCode, keymods: mq::KeyMods) {
-        self.egui_mq.key_up_event(keycode, keymods);
+impl egui_mq::EguiMqExt for Stage {
+    fn get_egui_mq(&mut self) -> &mut egui_mq::EguiMq {
+        &mut self.egui_mq
     }
 }
 
@@ -236,7 +215,7 @@ fn main() {
         high_dpi: true,
         ..Default::default()
     };
-    mq::start(conf, || Box::new(Stage::new()));
+    mq::start(conf, || Stage::new().wrap());
 }
 
 mod offscreen_shader {

src/lib.rs

@@ -451,3 +451,59 @@ fn to_mq_cursor_icon(cursor_icon: egui::CursorIcon) -> Option<mq::CursorIcon> {
         | egui::CursorIcon::ZoomOut => None,
     }
 }
+
+pub trait EguiMqExt: miniquad::EventHandler {
+    fn get_egui_mq(&mut self) -> &mut EguiMq;
+
+    fn wrap(self) -> Box<Stage> where Self: Sized + 'static {
+        Box::new(Stage::new(Box::new(self)))
+    }
+}
+
+pub struct Stage {
+    inner: Box<dyn EguiMqExt>,
+}
+
+impl Stage {
+    pub fn new(inner: Box<dyn EguiMqExt>) -> Self {
+        Self { inner }
+    }
+}
+
+impl miniquad::EventHandler for Stage {
+    fn draw(&mut self) {
+        self.inner.draw();
+    }
+
+    fn update(&mut self) {
+        self.inner.update();
+    }
+
+    fn mouse_motion_event(&mut self, x: f32, y: f32) {
+        self.inner.get_egui_mq().mouse_motion_event(x, y);
+    }
+
+    fn mouse_wheel_event(&mut self, dx: f32, dy: f32) {
+        self.inner.get_egui_mq().mouse_wheel_event(dx, dy);
+    }
+
+    fn mouse_button_down_event(&mut self, mb: mq::MouseButton, x: f32, y: f32) {
+        self.inner.get_egui_mq().mouse_button_down_event(mb, x, y);
+    }
+
+    fn mouse_button_up_event(&mut self, mb: mq::MouseButton, x: f32, y: f32) {
+        self.inner.get_egui_mq().mouse_button_up_event(mb, x, y);
+    }
+
+    fn char_event(&mut self, character: char, _keymods: mq::KeyMods, _repeat: bool) {
+        self.inner.get_egui_mq().char_event(character);
+    }
+
+    fn key_down_event(&mut self, keycode: mq::KeyCode, keymods: mq::KeyMods, _repeat: bool) {
+        self.inner.get_egui_mq().key_down_event(keycode, keymods);
+    }
+
+    fn key_up_event(&mut self, keycode: mq::KeyCode, keymods: mq::KeyMods) {
+        self.inner.get_egui_mq().key_up_event(keycode, keymods);
+    }
+}