refactor: use cursor_visible & cursor_grab_mode window creation attrs

1 files changed, 10 insertions, 21 deletions

diff --git a/src/main.rs b/src/main.rs
index ebb6563..dfcf22c 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -11,11 +11,8 @@ use engine::camera::{Active as ActiveCamera, Camera};
 use engine::color::Color;
 use engine::data_types::dimens::Dimens3;
 use engine::ecs::actions::Actions;
-use engine::ecs::event::component::{Added, EventMatchExt};
-use engine::ecs::pair::Pair;
 use engine::ecs::phase::START as START_PHASE;
 use engine::ecs::sole::Single;
-use engine::ecs::system::observer::Observe;
 use engine::input::Extension as InputExtension;
 use engine::lighting::{AttenuationParams, GlobalLight, PointLight};
 use engine::material::{Flags as MaterialFlags, Material};
@@ -24,13 +21,16 @@ use engine::mesh::cube::{
     CreationSpec as CubeMeshCreationSpec,
 };
 use engine::model::{Materials as ModelMaterials, Model, Spec as ModelSpec};
-use engine::rendering::{Extension as RenderingExtension, GraphicsProperties, TargetWindow as RenderingTargetWindow};
+use engine::rendering::{
+    Extension as RenderingExtension,
+    GraphicsProperties,
+    TargetWindow as RenderingTargetWindow,
+};
 use engine::transform::WorldPosition;
 use engine::vector::Vec3;
 use engine::windowing::window::{
     CreationAttributes as WindowCreationAttributes,
     CursorGrabMode as WindowCursorGrabMode,
-    Window,
 };
 use engine::Engine;
 use tracing::level_filters::LevelFilter;
@@ -76,8 +76,6 @@ fn main() -> Result<(), Box<dyn Error>>
 
     engine.register_system(*START_PHASE, init);
 
-    engine.register_observer(configure_window_on_added);
-
     engine.add_extension(engine::windowing::Extension::default());
 
     engine.add_extension(
@@ -97,8 +95,11 @@ fn main() -> Result<(), Box<dyn Error>>
     engine.add_extension(InputExtension::default());
 
     engine.spawn((
-        WindowCreationAttributes::default().with_title("Game"),
-        RenderingTargetWindow
+        WindowCreationAttributes::default()
+            .with_title("Game")
+            .with_cursor_visible(false)
+            .with_cursor_grab_mode(WindowCursorGrabMode::Locked),
+        RenderingTargetWindow,
     ));
 
     engine.start();
@@ -106,18 +107,6 @@ fn main() -> Result<(), Box<dyn Error>>
     Ok(())
 }
 
-fn configure_window_on_added(observe: Observe<Pair<Added, Window>>)
-{
-    for evt_match in &observe {
-        let mut window = evt_match.get_ent_target_comp_mut();
-
-        window.cursor_visible = false;
-        window.cursor_grab_mode = WindowCursorGrabMode::Locked;
-
-        window.set_changed();
-    }
-}
-
 fn init(mut assets: Single<Assets>, mut actions: Actions)
 {
     actions.spawn((