Refactor example util folder

Author: madsmtm

README.md

@@ -74,14 +74,14 @@ use winit::event::{Event, WindowEvent};
 use winit::event_loop::{ControlFlow, EventLoop};
 use winit::window::Window;
 
-#[path = "../examples/utils/winit_app.rs"]
-mod winit_app;
+#[path = "../examples/util/mod.rs"]
+mod util;
 
 fn main() {
     let event_loop = EventLoop::new().unwrap();
     let context = softbuffer::Context::new(event_loop.owned_display_handle()).unwrap();
 
-    let mut app = winit_app::WinitAppBuilder::with_init(
+    let mut app = util::WinitAppBuilder::with_init(
         |elwt| {
             let window = elwt.create_window(Window::default_attributes());
             Rc::new(window.unwrap())

examples/animation.rs

@@ -7,18 +7,17 @@ use winit::event::{KeyEvent, WindowEvent};
 use winit::event_loop::{ControlFlow, EventLoop};
 use winit::keyboard::{Key, NamedKey};
 
-#[path = "utils/winit_app.rs"]
-mod winit_app;
+mod util;
 
 fn main() {
     let event_loop = EventLoop::new().unwrap();
     let start = Instant::now();
 
     let context = softbuffer::Context::new(event_loop.owned_display_handle()).unwrap();
 
-    let app = winit_app::WinitAppBuilder::with_init(
+    let app = util::WinitAppBuilder::with_init(
         |event_loop| {
-            let window = winit_app::make_window(event_loop, |w| w);
+            let window = util::make_window(event_loop, |w| w);
 
             let old_size = (0, 0);
             let frames = pre_render_frames(0, 0);
@@ -91,7 +90,7 @@ fn main() {
         window.request_redraw();
     });
 
-    winit_app::run_app(event_loop, app);
+    util::run_app(event_loop, app);
 }
 
 fn pre_render_frames(width: u32, height: u32) -> Vec<Vec<u32>> {

examples/fruit.rs

@@ -4,8 +4,7 @@ use winit::event::{KeyEvent, WindowEvent};
 use winit::event_loop::{ControlFlow, EventLoop};
 use winit::keyboard::{Key, NamedKey};
 
-#[path = "utils/winit_app.rs"]
-mod winit_app;
+mod util;
 
 fn main() {
     //see fruit.jpg.license for the license of fruit.jpg
@@ -15,9 +14,9 @@ fn main() {
     let event_loop = EventLoop::new().unwrap();
     let context = softbuffer::Context::new(event_loop.owned_display_handle()).unwrap();
 
-    let app = winit_app::WinitAppBuilder::with_init(
+    let app = util::WinitAppBuilder::with_init(
         move |elwt| {
-            winit_app::make_window(elwt, |w| {
+            util::make_window(elwt, |w| {
                 w.with_inner_size(winit::dpi::PhysicalSize::new(width, height))
             })
         },
@@ -77,5 +76,5 @@ fn main() {
         }
     });
 
-    winit_app::run_app(event_loop, app);
+    util::run_app(event_loop, app);
 }

examples/rectangle.rs

@@ -5,8 +5,7 @@ use winit::event::{ElementState, KeyEvent, WindowEvent};
 use winit::event_loop::{ControlFlow, EventLoop};
 use winit::keyboard::{Key, NamedKey};
 
-#[path = "utils/winit_app.rs"]
-mod winit_app;
+mod util;
 
 fn redraw(buffer: &mut Buffer<'_, impl HasDisplayHandle, impl HasWindowHandle>, flag: bool) {
     let width = buffer.width().get();
@@ -30,9 +29,9 @@ fn main() {
     let event_loop = EventLoop::new().unwrap();
     let context = softbuffer::Context::new(event_loop.owned_display_handle()).unwrap();
 
-    let app = winit_app::WinitAppBuilder::with_init(
+    let app = util::WinitAppBuilder::with_init(
         |elwt| {
-            let window = winit_app::make_window(elwt, |w| {
+            let window = util::make_window(elwt, |w| {
                 w.with_title("Press space to show/hide a rectangle")
             });
 
@@ -106,5 +105,5 @@ fn main() {
         }
     });
 
-    winit_app::run_app(event_loop, app);
+    util::run_app(event_loop, app);
 }

examples/util/mod.rs

@@ -0,0 +1,4 @@
+mod winit_app;
+
+#[allow(unused_imports)]
+pub use self::winit_app::*;

examples/utils/winit_app.rs examples/util/winit_app.rsexamples/utils/winit_app.rs renamed to examples/util/winit_app.rs

@@ -3,8 +3,7 @@ use winit::event::{KeyEvent, WindowEvent};
 use winit::event_loop::{ControlFlow, EventLoop};
 use winit::keyboard::{Key, NamedKey};
 
-#[path = "utils/winit_app.rs"]
-mod winit_app;
+mod util;
 
 #[cfg(not(target_os = "android"))]
 fn main() {
@@ -14,8 +13,8 @@ fn main() {
 pub(crate) fn entry(event_loop: EventLoop<()>) {
     let context = softbuffer::Context::new(event_loop.owned_display_handle()).unwrap();
 
-    let app = winit_app::WinitAppBuilder::with_init(
-        |elwt| winit_app::make_window(elwt, |w| w),
+    let app = util::WinitAppBuilder::with_init(
+        |elwt| util::make_window(elwt, |w| w),
         move |_elwt, window| softbuffer::Surface::new(&context, window.clone()).unwrap(),
     )
     .with_event_handler(|window, surface, window_id, event, elwt| {
@@ -72,5 +71,5 @@ pub(crate) fn entry(event_loop: EventLoop<()>) {
         }
     });
 
-    winit_app::run_app(event_loop, app);
+    util::run_app(event_loop, app);
 }

examples/winit.rs

@@ -1,8 +1,7 @@
 //! `Surface` implements `Send`. This makes sure that multithreading can work here.
 
 #[cfg(not(target_family = "wasm"))]
-#[path = "utils/winit_app.rs"]
-mod winit_app;
+mod util;
 
 #[cfg(not(target_family = "wasm"))]
 pub mod ex {
@@ -13,7 +12,7 @@ pub mod ex {
     use winit::keyboard::{Key, NamedKey};
     use winit::window::Window;
 
-    use super::winit_app;
+    use super::util;
 
     type Surface = softbuffer::Surface<OwnedDisplayHandle, Arc<Window>>;
 
@@ -55,7 +54,7 @@ pub mod ex {
     pub fn entry(event_loop: EventLoop<()>) {
         let context = softbuffer::Context::new(event_loop.owned_display_handle()).unwrap();
 
-        let app = winit_app::WinitAppBuilder::with_init(
+        let app = util::WinitAppBuilder::with_init(
             |elwt| {
                 let attributes = Window::default_attributes();
                 #[cfg(target_family = "wasm")]
@@ -121,7 +120,7 @@ pub mod ex {
             }
         });
 
-        winit_app::run_app(event_loop, app);
+        util::run_app(event_loop, app);
     }
 }
 

examples/winit_multithread.rs

@@ -3,15 +3,14 @@ use winit::event::{KeyEvent, WindowEvent};
 use winit::event_loop::{ControlFlow, EventLoop};
 use winit::keyboard::{Key, NamedKey};
 
-#[path = "utils/winit_app.rs"]
-mod winit_app;
+mod util;
 
 fn main() {
     let event_loop = EventLoop::new().unwrap();
     let context = softbuffer::Context::new(event_loop.owned_display_handle()).unwrap();
 
-    let app = winit_app::WinitAppBuilder::with_init(
-        |elwt| winit_app::make_window(elwt, |w| w),
+    let app = util::WinitAppBuilder::with_init(
+        |elwt| util::make_window(elwt, |w| w),
         move |_elwt, window| {
             let mut surface = softbuffer::Surface::new(&context, window.clone()).unwrap();
             // Intentionally set the size of the surface to something different than the size of the window.
@@ -64,5 +63,5 @@ fn main() {
         }
     });
 
-    winit_app::run_app(event_loop, app);
+    util::run_app(event_loop, app);
 }