Update

src/core/window/mod.rs

@@ -1,24 +1,27 @@
-pub mod window_handler;
-
-use super::app::{App, plugin::Plugin};
-use window_handler::WindowHandler;
+use config::WindowConfig;
+use state::WindowState;
 use winit::event_loop::EventLoop;
-use winit::window::WindowAttributes;
 
-pub struct WindowPlugin {
-    window_attributes: WindowAttributes,
-    event_loop: EventLoop<()>,
+use super::app::{App, AppExit};
+
+pub mod config;
+pub mod state;
+
+pub fn init(app: &mut App, window_config: WindowConfig) {
+    let world = app.world_mut();
+    world.insert_resource(window_config);
+
+    let mut event_loop_builder = EventLoop::with_user_event();
+    let event_loop = event_loop_builder.build().unwrap();
+
+    app.set_runner(Box::new(move |app| runner(app, event_loop)));
 }
 
-impl Plugin for WindowPlugin {
-    fn build(&self, app: &mut App) {
-        let world = app.world_mut();
-        world.insert_resource(WindowHandler::new(self.window_attributes.clone()));
+fn runner(app: App, event_loop: EventLoop<()>) -> AppExit {
+    let mut window_state = WindowState::new(app);
 
-        let window_handler = world.get_resource_mut::<WindowHandler>().unwrap();
-
-        // app.set_runner(Box::new(move || {
-        //     self.event_loop.run_app(&mut window_handler);
-        // }));
+    match event_loop.run_app(&mut window_state) {
+        Ok(_) => AppExit::Success,
+        Err(e) => AppExit::Error(Box::new(e)),
     }
 }