From 7a97abdeb116a7ba5039dab649eb504476cde69e Mon Sep 17 00:00:00 2001
From: Joe Ardent <code@ardent.nebcorp.com>
Date: Sun, 3 Dec 2023 12:49:30 -0800
Subject: [PATCH] update camera to follow center of flock

---
 .rustfmt.toml          |   4 +++
 assets/models/toid.glb | Bin 0 -> 1760 bytes
 src/lib.rs             |  72 +++++++++++++++++++++++++++++++++++------
 src/main.rs            |  46 ++------------------------
 src/systems.rs         |   0
 5 files changed, 70 insertions(+), 52 deletions(-)
 create mode 100644 .rustfmt.toml
 create mode 100644 assets/models/toid.glb
 delete mode 100644 src/systems.rs

diff --git a/.rustfmt.toml b/.rustfmt.toml
new file mode 100644
index 0000000..4c8d0e1
--- /dev/null
+++ b/.rustfmt.toml
@@ -0,0 +1,4 @@
+imports_granularity = "Crate"
+group_imports = "StdExternalCrate"
+wrap_comments = true
+edition = "2021"
diff --git a/assets/models/toid.glb b/assets/models/toid.glb
new file mode 100644
index 0000000000000000000000000000000000000000..e879db6105980c612b4551eef394bbea7be48803
GIT binary patch
literal 1760
zcmb7FPlyv&7=OC{x2-2Hp29<sN*v#NGxKI9YO=dgVcXqINumggl}Yk8JDAKYGm}+`
zQ4dwNhxS$|rIcO@Jt>GSg|^uqy(mbb&_kg;c<IgCp2Y9HB%9H7afOigz3<QO`@Y}z
zy`<Typ4*NP`ga#X-|s-^ql#PVVlR$Gf^%Km6oH7mB#dwlf4mrlK^SM65R#d0iJ&2(
z%*+Wlv#e`|W)hsm%OZ;XFaT$!5!}n-xDEg~M}|_2bMsvscx}+(in3*K5H^G~kW0Nw
z<69TEMZBm&hyKM7prlLNOGM;*tpQpi?9^JK;x|MC=aQ%+0Ar9~Zs?~GLZP^&S~MpT
zuhsJF<*?IS3`7hFU0m~GQ4CvQbk3`*PUne?&~1x3%plBixM5g&R%(gKEn-*{B*Qi-
zV^Yg(YH&k`k8(A#R2Df*H39_+qEXg$oo4n_L(r+BV4WM)E0i4hZ9nmshej_+BEQy2
z<h6@GaVs;`8MmZ3s-C@Ablviq%LM0W7MI-e+|(@2F_?iLH2k^@(Z|$5Oi$76)xi{p
z(SXZZXJJ7^7kqJ5f!4$J5|ADw)$2<zG3b|PaXst=up1P_ws#HYMm5_Zx?@?kMI3`t
zE=d929Fy7(rw##PBzuff-84<k9m_UMgG-Wp*p>O?fM9dVfpe2_hjKG}oM;?a=bT#(
zaX4etkveI$Y|d<lQIps<KqRU(eBo?ShlPV_rdj|Z-qyl6oNWka?-IT-JJ7u`yHXAa
zwAYKT6sKmV%4)aA<)<g2rct||h*=Rd6L=NWf#RgXU06_071k^9qNaScx&efZsn{6H
zAagoafo(bZ^~^eZhuk`BO*%EK)T@Q-@;wYl7!r``+B9s~+RS12!J3{ap$F~ft3SI>
z@{gW=-rr2ti#Ye=GcEsh`(l1G`OCHEg?%^wP&k{(E7Jp<{~jFaZzi9v-2b(A=-BGR
z>KCWCBLDT-TK?vQQ5c<9rf(GF9iiL#@-LsJ&dGwjPm1uAw2#iOexF$P$9E4Z|G_y~
z7~K(?RQfla|B$==14j?{>)*wN``<o1b??eb|NOn>)f3wPCo3;*6-qz+#L_+=PTa|V
zvv#z92>jDNe?R{7x2O4)eg$H;;<J@pY0R{L8h;=90BwW+uJ_Oc+JO$B-DnqjAMHi^
N(RQ>GzIUQM=p`{nOXUCn

literal 0
HcmV?d00001

diff --git a/src/lib.rs b/src/lib.rs
index ce122b1..dd7d699 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -8,15 +8,15 @@ use bevy_spatial::{kdtree::KDTree3, SpatialAccess};
 pub type NNTree = KDTree3<Toid>;
 
 // toid stuff
-const SPEED: f32 = 5.0;
+const SPEED: f32 = 2.0;
 const SPEED_DIFF_RANGE: f32 = 0.1; // +/- 10%
 const MAX_DELTA_V: f32 = std::f32::consts::PI * 2.0; // basically 360 degrees/sec
 
 // how far from origin before really wanting to come back
-const RADIUS: f32 = 50.0;
+const RADIUS: f32 = 40.0;
 
 // how close to try to stay to your buddies
-const BUDDY_RADIUS: f32 = 30.0;
+const BUDDY_RADIUS: f32 = 10.0;
 
 const MIN_ALTITUDE: f32 = 3.5;
 
@@ -43,6 +43,9 @@ pub struct Toid {
     pub buddies: usize,
 }
 
+#[derive(Debug, Default, Clone, Copy, Deref, DerefMut, Resource)]
+pub struct LookAt(Vec3);
+
 pub fn turkey_time(
     commands: &mut Commands,
     scene: &Handle<Scene>,
@@ -67,10 +70,11 @@ pub fn turkey_time(
                 scene: scene.to_owned(),
                 ..Default::default()
             })
-            .insert(Transform::from_rotation(Quat::from_axis_angle(
-                Vec3::Y,
-                -std::f32::consts::FRAC_PI_2,
-            )));
+            .insert(Transform::default());
+            //  .insert(Transform::from_rotation(Quat::from_axis_angle(
+            //     Vec3::Y,
+            //     -std::f32::consts::FRAC_PI_2,
+            // )));
         })
         .id()
 }
@@ -101,7 +105,7 @@ pub fn update_vel(
         }
 
         // avoid flying into neighbors
-        let min_dist = speed / 2.0;
+        let min_dist = speed;
         for neighbor in index
             .within_distance(pos, min_dist)
             .iter()
@@ -151,15 +155,19 @@ pub fn update_vel(
 pub fn update_pos(
     mut toids: Query<(&mut Transform, &Velocity, Entity), With<Toid>>,
     mut positions: ResMut<Positions>,
+    mut lookat: ResMut<LookAt>,
     time: Res<Time>,
 ) {
+    let mut new_look = Vec3::ZERO;
     let dt = time.delta_seconds();
     for (mut xform, vel, entity) in toids.iter_mut() {
         let look_at = xform.translation + vel.0;
         xform.translation += vel.0 * dt;
         xform.look_at(look_at, Vec3::Y);
         *positions.entry(entity).or_insert(Vec3::ZERO) = xform.translation;
+        new_look += xform.translation;
     }
+    **lookat = new_look / positions.len() as f32;
 }
 
 pub fn update_buddies(
@@ -170,7 +178,6 @@ pub fn update_buddies(
     let d2 = (BUDDY_RADIUS * 1.5).powi(2);
     for (xform, entity, toid, mut buddies) in toids.iter_mut() {
         let pos = xform.translation;
-
         for buddy in buddies.clone().iter() {
             let bp = positions.get(buddy).unwrap();
             let bd2 = (*bp - pos).length_squared();
@@ -192,6 +199,53 @@ pub fn update_buddies(
     }
 }
 
+pub fn update_gizmos(toids: Query<&Transform, With<Toid>>, mut gizmos: Gizmos) {
+    for toid in toids.iter() {
+        let pos = toid.translation;
+        let up = toid.up();
+        let forward = toid.forward();
+        let right = toid.right();
+        gizmos.ray(pos, pos + forward, Color::RED);
+        gizmos.ray(pos, pos + up, Color::BLUE);
+        gizmos.ray(pos, pos + right, Color::GREEN);
+    }
+}
+
+pub fn rotate_camera(
+    mut query: Query<&mut Transform, With<Camera>>,
+    keys: Res<Input<KeyCode>>,
+    lookat: Res<LookAt>,
+) {
+    let mut xform = query.single_mut();
+
+    let forward = xform.forward() * 0.7;
+    let right = xform.right();
+
+    if keys.pressed(KeyCode::Right) {
+        xform.translation += right;
+    }
+    if keys.pressed(KeyCode::Left) {
+        xform.translation -= right;
+    }
+
+    if keys.pressed(KeyCode::Up) {
+        if keys.pressed(KeyCode::ShiftLeft) || keys.pressed(KeyCode::ShiftRight) {
+            xform.translation += Vec3::Y;
+        } else {
+            xform.translation += forward;
+        }
+    }
+    if keys.pressed(KeyCode::Down) {
+        if keys.pressed(KeyCode::ShiftLeft) || keys.pressed(KeyCode::ShiftRight) {
+            xform.translation -= Vec3::Y;
+        } else {
+            xform.translation -= forward;
+        }
+    }
+
+    xform.look_at(**lookat, Vec3::Y);
+}
+
 //-************************************************************************
 // util
 //-************************************************************************
diff --git a/src/main.rs b/src/main.rs
index 8c54ff4..4d94a4a 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -25,9 +25,11 @@ fn main() {
             color: Color::WHITE,
             brightness: 1.0,
         })
+        .insert_resource(LookAt::default())
         .add_systems(Startup, setup)
         .add_systems(Update, (update_pos, update_buddies, update_vel).chain())
         .add_systems(Update, (rotate_camera, bevy::window::close_on_esc))
+        //.add_systems(Update, update_gizmos)
         .run();
 }
 
@@ -60,7 +62,7 @@ fn setup(
     // instructions
     commands.spawn(
         TextBundle::from_section(
-            "Up and down for camera forward and back; hold shift to change height.\nLeft and right to rotate camera; hold shift to translate.\nPress 'r' to look back at the origin. Press 'ESC' to quit.",
+            "Up and down for camera forward and back; hold shift to change height.\nLeft or right to move left or right.\nPress 'ESC' to quit.",
             TextStyle {
                 font_size: 20.,
                 ..default()
@@ -74,45 +76,3 @@ fn setup(
         }),
     );
 }
-
-fn rotate_camera(mut query: Query<&mut Transform, With<Camera>>, keys: Res<Input<KeyCode>>) {
-    let mut xform = query.single_mut();
-
-    let forward = xform.forward() * 0.7;
-    let right = xform.right();
-
-    if keys.pressed(KeyCode::Right) {
-        if keys.pressed(KeyCode::ShiftLeft) || keys.pressed(KeyCode::ShiftRight) {
-            xform.translation += right;
-        } else {
-            xform.rotate(Quat::from_rotation_y(-0.08));
-        }
-    }
-    if keys.pressed(KeyCode::Left) {
-        if keys.pressed(KeyCode::ShiftLeft) || keys.pressed(KeyCode::ShiftRight) {
-            xform.translation -= right;
-        } else {
-            xform.rotate(Quat::from_rotation_y(0.08));
-        }
-    }
-
-    if keys.pressed(KeyCode::Up) {
-        if keys.pressed(KeyCode::ShiftLeft) || keys.pressed(KeyCode::ShiftRight) {
-            xform.translation += Vec3::Y;
-        } else {
-            xform.translation += forward;
-        }
-    }
-    if keys.pressed(KeyCode::Down) {
-        if keys.pressed(KeyCode::ShiftLeft) || keys.pressed(KeyCode::ShiftRight) {
-            xform.translation -= Vec3::Y;
-        } else {
-            xform.translation -= forward;
-        }
-    }
-
-    if keys.just_pressed(KeyCode::R) {
-        let height = xform.translation.y;
-        xform.look_at(Vec3::new(0.0, height, 0.0), Vec3::Y);
-    }
-}
diff --git a/src/systems.rs b/src/systems.rs
deleted file mode 100644
index e69de29..0000000