diff options
Diffstat (limited to 'engine/src/camera/fly.rs')
| -rw-r--r-- | engine/src/camera/fly.rs | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/engine/src/camera/fly.rs b/engine/src/camera/fly.rs index 80355fa..0651e58 100644 --- a/engine/src/camera/fly.rs +++ b/engine/src/camera/fly.rs @@ -13,7 +13,7 @@ use crate::ecs::{Component, Query}; use crate::input::keyboard::{Key, Keyboard}; use crate::input::mouse::Mouse; use crate::reflection::Reflection; -use crate::transform::WorldPosition; +use crate::transform::Transform; use crate::vector::{Vec2, Vec3}; builder! { @@ -77,7 +77,7 @@ pub struct Options fn update( camera_query: Query<( &mut Camera, - &mut WorldPosition, + &mut Transform, &mut Fly, Option<&ControllableCamera>, With<ActiveCamera>, @@ -94,7 +94,7 @@ fn update( for ( camera_ent_id, - (mut camera, mut camera_world_pos, mut fly_camera, controllable_camera), + (mut camera, mut camera_transform, mut fly_camera, controllable_camera), ) in camera_query.iter_with_euids() { if let Some(controllable_camera) = controllable_camera { @@ -134,30 +134,30 @@ fn update( camera.global_up = cam_right.cross(&direction).normalize(); if keyboard.pressed(Key::W) { - camera_world_pos.position += + camera_transform.position += direction * fly_camera.speed * time.delta_time.as_secs_f32(); } if keyboard.pressed(Key::S) { - camera_world_pos.position -= + camera_transform.position -= direction * fly_camera.speed * time.delta_time.as_secs_f32(); } if keyboard.pressed(Key::A) { let cam_left = -direction.cross(&Vec3::UP).normalize(); - camera_world_pos.position += + camera_transform.position += cam_left * fly_camera.speed * time.delta_time.as_secs_f32(); } if keyboard.pressed(Key::D) { let cam_right = direction.cross(&Vec3::UP).normalize(); - camera_world_pos.position += + camera_transform.position += cam_right * fly_camera.speed * time.delta_time.as_secs_f32(); } - camera.target = camera_world_pos.position + direction; + camera.target = camera_transform.position + direction; } Ok(()) |