1 files changed, 8 insertions, 10 deletions
diff --git a/engine/src/camera/fly.rs b/engine/src/camera/fly.rs
index b6ba7aa..087f727 100644
--- a/engine/src/camera/fly.rs
+++ b/engine/src/camera/fly.rs
@@ -1,13 +1,12 @@
 use ecs::component::local::Local;
+use ecs::phase::UPDATE as UPDATE_PHASE;
 use ecs::sole::Single;
 use ecs::system::{Into, System};
 use ecs::{Component, Query};
-use glfw::window::{Key, KeyState};
 
 use crate::camera::{Active as ActiveCamera, Camera};
 use crate::delta_time::DeltaTime;
-use crate::event::Update as UpdateEvent;
-use crate::input::{Cursor, CursorFlags, Keys};
+use crate::input::{Cursor, CursorFlags, Key, KeyState, Keys};
 use crate::transform::Position;
 use crate::util::builder;
 use crate::vector::{Vec2, Vec3};
@@ -61,7 +60,7 @@ impl ecs::extension::Extension for Extension
     fn collect(self, mut collector: ecs::extension::Collector<'_>)
     {
         collector.add_system(
-            UpdateEvent,
+            *UPDATE_PHASE,
             update
                 .into_system()
                 .initialize((CursorState::default(), self.0)),
@@ -76,7 +75,7 @@ pub struct Options
 }
 
 fn update(
-    camera_query: Query<(Camera, Position, Fly, ActiveCamera)>,
+    camera_query: Query<(&mut Camera, &mut Position, &mut Fly, &ActiveCamera)>,
     keys: Single<Keys>,
     cursor: Single<Cursor>,
     cursor_flags: Single<CursorFlags>,
@@ -87,7 +86,6 @@ fn update(
 {
     for (mut camera, mut camera_pos, mut fly_camera, _) in &camera_query {
         if cursor.has_moved && cursor_flags.is_first_move.flag {
-            #[cfg(feature = "debug")]
             tracing::debug!("First cursor move");
 
             cursor_state.last_pos = cursor.position;
@@ -123,23 +121,23 @@ fn update(
 
         camera.global_up = cam_right.cross(&direction).normalize();
 
-        if matches!(keys.get_key_state(Key::W), KeyState::Pressed) {
+        if keys.get_key_state(Key::W) == KeyState::Pressed {
             camera_pos.position +=
                 direction * fly_camera.speed * delta_time.as_secs_f32();
         }
 
-        if matches!(keys.get_key_state(Key::S), KeyState::Pressed) {
+        if keys.get_key_state(Key::S) == KeyState::Pressed {
             camera_pos.position -=
                 direction * fly_camera.speed * delta_time.as_secs_f32();
         }
 
-        if matches!(keys.get_key_state(Key::A), KeyState::Pressed) {
+        if keys.get_key_state(Key::A) == KeyState::Pressed {
             let cam_left = -direction.cross(&Vec3::UP).normalize();
 
             camera_pos.position += cam_left * fly_camera.speed * delta_time.as_secs_f32();
         }
 
-        if matches!(keys.get_key_state(Key::D), KeyState::Pressed) {
+        if keys.get_key_state(Key::D) == KeyState::Pressed {
             let cam_right = direction.cross(&Vec3::UP).normalize();
 
             camera_pos.position +=