From 5158fba63bccf050103362f029e22d75988d0208 Mon Sep 17 00:00:00 2001
From: Joe Ardent <code@ardent.nebcorp.com>
Date: Wed, 27 Nov 2024 13:40:01 -0800
Subject: [PATCH] use parallel iter to update velocities

---
 assets/models/toid3.glb | Bin 0 -> 2156 bytes
 src/lib.rs              | 151 ++++++++++++++++++++++------------------
 src/main.rs             |   4 +-
 3 files changed, 86 insertions(+), 69 deletions(-)
 create mode 100644 assets/models/toid3.glb

diff --git a/assets/models/toid3.glb b/assets/models/toid3.glb
new file mode 100644
index 0000000000000000000000000000000000000000..95b872d8c86632f5f35010d345ca23a7a8278614
GIT binary patch
literal 2156
zcmb7GZEO=|9Dig?Cn!kdC4SN63Fwqk@2%In+xlF$I%IQeNn6=i1?k#bchKIE>uoq@
zWg$q6M$q{30ZsgX8iOww0a;eKQxf?gXe0p?!v~FMmY@VQ!>RM-f7iXqTpUT$=l6eq
z{=fhKX`0E#SI$BRWh)T!lq1v_i-db|GM`sWEcN1yqA5nw)D0}*hdK>i)AN-X2&t^g
zDq31GDjV*PRCcpo&g-MF2X`w*Uez^lX1o+GcyK-i39v+sqCA!oy;w`;K!;<l&4V>P
ztvCj1U18mX)QfXUzS9jI^*41jjUAU<(o_sJnJr~Y>s{?xC8nm8G?q-GOMx7v0?ng-
zUW%gOa+}+YX2ncqvuY};cV#*?B@Y>TaeFeag!HU#tW2idP7{<9!3usxWH^fPi#*5q
zS&yToe7v9H{4^j=@X-w8Xc>X#c#egS>&kg(=aQqP#*zXB##q&Ho!3`z8-h+<3dXq!
z=|CG?*-&$;sdkSVlcs5??OmoL_Ttr%SVO!a5_UO?*SCfuk>~@DQdpurI2?&K*EV5^
z@!)uE_`&*c97`<BL)Fr1$_eKtXoUEJOMNm0ro3*Hcx~_M=unI`s<Oo`kkWIT;Zm9z
z@7WB~gWh=$PU&45><JApmwXInNP7j5Vnx4S@KYj3)4W3vEr=X2$FL$riGt7X=r~Sb
z{63cP^8&+(K9?~S7ALU+QV2ZF!vK5?FVeivvx4%%97MnZ4OG)23)284&vT-mqkSyJ
z(E=;-z`E&P4zH;Xv9NwH+eu9TE&tcVL^v}g9H^Xm_|)p`^@MX%s>8gdR(ErjCLoOW
z9t+hr)kfWiGSU6yk-Fn-?=h7oMa!7*#Ap$Ea}<$|4)@)|u9`_B<NO4$oX9g1Oiqnu
zpz`EcH`$D%udU27*HN4C!QM@-4NE!mo3qyh!zTVan020JiNaC(CUGWE96XxJ%B5up
z)is3C2e~VDRZk6R-SIt{4znRF?L6LXz4-zn)8SpiS7iR@S~4*FC7BLCRfna0&;K1b
zO`6DbI1t-ktiQZHU{~K~&jg>{F-)E)<K(e(Q{CgTBO}yDqW$Y9ok7`=gNk0`*vHP7
zj+Tx4<DH9K|I!(h$7F<puKvHyg=?=`L!Z%>_qT*R*nHKZ`)MolXF~okcGVI-r>(bt
zPsn{=3`xt@Z?j)Lu{(e|f0d$u&m0E4<rj$peB}7<z?}C-NNbp~`beAHRvaNurzopR
zYLmY?JVIIkFRyNsgO~P5<eVn&3-*(~Rj;{tFW?Q!_Dbiz(&V@5K)>l?@%2v|$*Lc>
z+QC^Di}+Y0=?DDL$-!dP$BpD9;GxW5@e}Zg1J<5vu?yw^*;+hd0cY~*P{Lk(a1VJ=
zKI_WQ)~vG)Wd~XH$9YG#dsa8u-`;yqVCjWB98ToW#;`5dP)E0yFR>lD<*#k_g7*##
zbRW1-?fA1h*V?<Tykgz?$a&(}7k~Y*ed(Q|b?oRVS8mywurI&yq&2(hJ4d!(KAyFs
z^XFQ_rw*0;@6zn*4Hab5iv5-ozZ&un9XL4fjPZk;|4^b}XSjJ}WbbVO$KK#6*n{PZ
zt)G@3KH|t5L2kJFcCsY2(6zq{{)-kau=F$gUHi@G7IXvrkC=zb&}?)ox(VHg=A$`i
OE}DhP;kz7Fpnm`erQz%V

literal 0
HcmV?d00001

diff --git a/src/lib.rs b/src/lib.rs
index 14053eb..7e901c4 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -1,6 +1,7 @@
 use argh::FromArgs;
 use bevy::{
     prelude::*,
+    tasks::ParallelIterator,
     utils::{HashMap, HashSet},
 };
 use bevy_spatial::{kdtree::KDTree3, SpatialAccess};
@@ -8,7 +9,7 @@ use bevy_spatial::{kdtree::KDTree3, SpatialAccess};
 pub type NNTree = KDTree3<Toid>;
 
 // toid stuff
-const SPEED: f32 = 10.0;
+const SPEED: f32 = 15.0;
 const SPEED_DIFF_RANGE: f32 = 0.1; // +/- 10%
 const MAX_DELTA_V: f32 = std::f32::consts::PI * 2.0; // basically 360 degrees/sec
 
@@ -16,9 +17,9 @@ const MAX_DELTA_V: f32 = std::f32::consts::PI * 2.0; // basically 360 degrees/se
 const RADIUS: f32 = 50.0;
 
 // how close to try to stay to your buddies
-const BUDDY_RADIUS: f32 = 10.0;
+const BUDDY_RADIUS: f32 = SPEED;
 
-const MIN_ALTITUDE: f32 = 3.5;
+const MIN_ALTITUDE: f32 = 13.5;
 
 #[derive(Debug, FromArgs, Resource)]
 /// Toid Watching
@@ -43,6 +44,9 @@ pub struct Toid {
     pub buddies: usize,
 }
 
+#[derive(Resource, Debug, Deref, DerefMut, Clone, Default)]
+pub struct Paused(bool);
+
 #[derive(Debug, Default, Clone, Copy, Deref, DerefMut, Resource)]
 pub struct LookAt(Vec3);
 
@@ -60,7 +64,6 @@ pub fn turkey_time(
     let y = r.gen_range(0.1..=5.5);
     let pos = Vec3::new(x, MIN_ALTITUDE + y, z);
     let xform = Transform::from_translation(pos);
-    //dbg!(xform);
     let spatial_bundle = (xform, Visibility::Visible);
     commands
         .spawn(spatial_bundle)
@@ -68,10 +71,6 @@ pub fn turkey_time(
         .with_children(|t| {
             t.spawn(SceneRoot(scene.to_owned()))
                 .insert(Transform::default());
-            // .insert(Transform::from_rotation(Quat::from_axis_angle(
-            //     Vec3::Y,
-            //     -std::f32::consts::FRAC_PI_2,
-            // )));
         })
         .id()
 }
@@ -81,72 +80,79 @@ pub fn update_vel(
     time: Res<Time>,
     positions: Res<Positions>,
     index: Res<NNTree>,
+    paused: Res<Paused>,
 ) {
+    if **paused {
+        return;
+    }
+
     let dt = time.delta_secs();
     let max_delta = MAX_DELTA_V * dt;
-    for (xform, mut vel, toid, buddies, entity) in toids.iter_mut() {
-        let speed = toid.speed;
-        let mut dir = vel.normalize();
-        let pos = xform.translation;
-        let original_dir = dir;
+    toids
+        .par_iter_mut()
+        .for_each(|(xform, mut vel, toid, buddies, entity)| {
+            let speed = toid.speed;
+            let mut dir = vel.normalize();
+            let pos = xform.translation;
+            let original_dir = dir;
 
-        // find buddies and orient; point more towards further-away buddies
-        for buddy in buddies.iter() {
-            let bp = positions.get(buddy).unwrap();
-            let bdir = *bp - pos;
-            let dist = bdir.length();
-            let rot = Quat::from_rotation_arc(dir, bdir.normalize());
-            let s = (dist / (BUDDY_RADIUS * 1.2)).min(1.0);
-            let rot = Quat::IDENTITY.slerp(rot, s);
-            dir = rot.mul_vec3(dir).normalize();
-        }
+            // find buddies and orient; point more towards further-away buddies
+            for buddy in buddies.iter() {
+                let bp = positions.get(buddy).unwrap();
+                let bdir = *bp - pos;
+                let dist = bdir.length();
+                let rot = Quat::from_rotation_arc(dir, bdir.normalize());
+                let s = (dist / (BUDDY_RADIUS * 1.2)).min(1.0);
+                let rot = Quat::IDENTITY.slerp(rot, s);
+                dir = rot.mul_vec3(dir).normalize();
+            }
 
-        // avoid flying into neighbors
-        let min_dist = speed * 10.0;
-        for neighbor in index
-            .within_distance(pos, min_dist)
-            .iter()
-            .filter(|n| n.1.is_some() && n.1.unwrap() != entity)
-        {
-            let bp = neighbor.0;
-            let bdir = pos - bp;
-            let dist = bdir.length();
-            let s = 1.0 - (dist / min_dist).min(1.0);
-            let rot = Quat::from_rotation_arc(dir, bdir.normalize());
-            let rot = Quat::IDENTITY.slerp(rot, s);
-            dir = rot.mul_vec3(dir).normalize();
-        }
+            // avoid flying into neighbors
+            let min_dist = speed * 20.0;
+            for neighbor in index
+                .within_distance(pos, min_dist)
+                .iter()
+                .filter(|n| n.1.is_some() && n.1.unwrap() != entity)
+            {
+                let bp = neighbor.0;
+                let bdir = pos - bp;
+                let dist = bdir.length();
+                let s = 1.0 - (dist / min_dist).min(1.0);
+                let rot = Quat::from_rotation_arc(dir, bdir.normalize());
+                let rot = Quat::IDENTITY.slerp(rot, s);
+                dir = rot.mul_vec3(dir).normalize();
+            }
 
-        // nudge toward origin if too far
-        {
-            let dist = pos.length();
-            let toward_origin = -pos.normalize();
-            let s = (dist / RADIUS).min(1.0);
-            let rot = Quat::from_rotation_arc(dir, toward_origin);
-            let rot = Quat::IDENTITY.slerp(rot, s);
-            dir = rot.mul_vec3(dir).normalize();
-        }
+            // nudge toward origin if too far
+            {
+                let dist = pos.length();
+                let toward_origin = -pos.normalize();
+                let s = (dist / RADIUS).min(1.0);
+                let rot = Quat::from_rotation_arc(dir, toward_origin);
+                let rot = Quat::IDENTITY.slerp(rot, s);
+                dir = rot.mul_vec3(dir).normalize();
+            }
 
-        // nudge up if too low
-        if pos.y < MIN_ALTITUDE {
-            let dh = MIN_ALTITUDE - pos.y;
-            let s = (dh / MIN_ALTITUDE).min(1.0);
-            let rot = Quat::from_rotation_arc(dir, Vec3::Y);
-            let rot = Quat::IDENTITY.slerp(rot, s);
-            dir = rot.mul_vec3(dir).normalize();
-        }
+            // nudge up if too low
+            if pos.y < MIN_ALTITUDE {
+                let dh = MIN_ALTITUDE - pos.y;
+                let s = (dh / MIN_ALTITUDE).min(1.0);
+                let rot = Quat::from_rotation_arc(dir, Vec3::Y);
+                let rot = Quat::IDENTITY.slerp(rot, s);
+                dir = rot.mul_vec3(dir).normalize();
+            }
 
-        // make sure velocity doesn't change too suddenly
-        let delta = dir.dot(original_dir).acos();
-        if delta > max_delta {
-            let s = max_delta / delta;
-            let rot = Quat::from_rotation_arc(original_dir, dir);
-            let rot = Quat::IDENTITY.slerp(rot, s);
-            dir = rot.mul_vec3(original_dir).normalize();
-        }
+            // make sure velocity doesn't change too suddenly
+            let delta = dir.dot(original_dir).acos();
+            if delta > max_delta {
+                let s = max_delta / delta;
+                let rot = Quat::from_rotation_arc(original_dir, dir);
+                let rot = Quat::IDENTITY.slerp(rot, s);
+                dir = rot.mul_vec3(original_dir).normalize();
+            }
 
-        **vel = dir * speed;
-    }
+            **vel = dir * speed;
+        });
 }
 
 pub fn update_pos(
@@ -154,7 +160,12 @@ pub fn update_pos(
     mut positions: ResMut<Positions>,
     mut lookat: ResMut<LookAt>,
     time: Res<Time>,
+    paused: Res<Paused>,
 ) {
+    if **paused {
+        return;
+    }
+
     let mut new_look = Vec3::ZERO;
     let dt = time.delta_secs();
     for (mut xform, vel, entity) in toids.iter_mut() {
@@ -204,13 +215,14 @@ pub fn update_gizmos(toids: Query<&Transform, With<Toid>>, mut gizmos: Gizmos) {
         let forward = toid.forward().as_vec3();
         let right = toid.right().as_vec3();
         gizmos.ray(pos, pos + forward, Color::srgb_u8(255, 0, 0));
-        //gizmos.ray(pos, pos + up, Color::srgb_u8(0, 0, 255));
-        //gizmos.ray(pos, pos + right, Color::srgb_u8(0, 255, 0));
+        gizmos.ray(pos, pos + up, Color::srgb_u8(0, 0, 255));
+        gizmos.ray(pos, pos + right, Color::srgb_u8(0, 255, 0));
     }
 }
 
 pub fn rotate_camera(
     mut query: Query<&mut Transform, With<Camera>>,
+    mut paused: ResMut<Paused>,
     keys: Res<ButtonInput<KeyCode>>,
     lookat: Res<LookAt>,
 ) {
@@ -219,6 +231,11 @@ pub fn rotate_camera(
     let forward = xform.forward() * 0.7;
     let right = xform.right().as_vec3();
 
+    if keys.just_pressed(KeyCode::Space) {
+        let pause = **paused;
+        **paused = !pause;
+    }
+
     if keys.pressed(KeyCode::ArrowRight) {
         xform.translation += right;
     }
diff --git a/src/main.rs b/src/main.rs
index 68ca184..0e53427 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -2,7 +2,6 @@ use std::time::Duration;
 
 use audubon::*;
 use bevy::{
-    color::palettes::css::BLACK,
     diagnostic::{FrameTimeDiagnosticsPlugin, LogDiagnosticsPlugin},
     prelude::*,
 };
@@ -27,9 +26,10 @@ fn main() {
             brightness: 1.0,
         })
         .insert_resource(LookAt::default())
+        .insert_resource(Paused::default())
         .add_systems(Startup, (setup, setup_ambient_light))
         //.add_systems(Update, update_gizmos)
-        .add_systems(Update, (update_pos, update_buddies, update_vel).chain())
+        .add_systems(Update, (update_pos, update_buddies, update_vel))
         .add_systems(Update, (rotate_camera, close_on_esc))
         .run();
 }