nebkor/audubon
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

add diagnostics, tighten updates

Browse source
This commit is contained in:
Joe Ardent 2023-12-02 15:44:25 -08:00
parent d62f828884
commit 2872643acc
2 changed files with 26 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

37
src/lib.rs
View file

@ -1,5 +1,8 @@
use argh::FromArgs; use argh::FromArgs;
use bevy::{prelude::*, utils::HashMap, utils::HashSet}; use bevy::{
prelude::*,
utils::{HashMap, HashSet},
};
use bevy_spatial::{kdtree::KDTree3, SpatialAccess}; use bevy_spatial::{kdtree::KDTree3, SpatialAccess};
pub type NNTree = KDTree3<Toid>; pub type NNTree = KDTree3<Toid>;
@ -28,7 +31,7 @@ pub struct Config {
#[derive(Clone, Debug, Default, Deref, DerefMut, Resource)] #[derive(Clone, Debug, Default, Deref, DerefMut, Resource)]
pub struct Positions(pub HashMap<Entity, Vec3>); pub struct Positions(pub HashMap<Entity, Vec3>);
#[derive(Component, Debug, Clone, Default)] #[derive(Component, Debug, Deref, DerefMut, Clone, Default)]
pub struct Buddies(HashSet<Entity>); pub struct Buddies(HashSet<Entity>);
#[derive(Component, Debug, Clone, Deref, DerefMut, Default)] #[derive(Component, Debug, Clone, Deref, DerefMut, Default)]
@ -84,11 +87,11 @@ pub fn update_vel(
let speed = toid.speed; let speed = toid.speed;
let mut dir = vel.normalize(); let mut dir = vel.normalize();
let pos = xform.translation; let pos = xform.translation;
let original_dir = dir.clone(); let original_dir = dir;
// find buddies and orient; point more towards further-away buddies // find buddies and orient; point more towards further-away buddies
for buddy in buddies.0.iter() { for buddy in buddies.0.iter() {
let bp = positions.get(buddy).unwrap_or(&pos); let bp = positions.get(buddy).unwrap();
let bdir = *bp - pos; let bdir = *bp - pos;
let dist = bdir.length(); let dist = bdir.length();
let rot = Quat::from_rotation_arc(dir, bdir.normalize()); let rot = Quat::from_rotation_arc(dir, bdir.normalize());
@ -155,7 +158,7 @@ pub fn update_pos(
let look_at = xform.translation + vel.0; let look_at = xform.translation + vel.0;
xform.translation += vel.0 * dt; xform.translation += vel.0 * dt;
xform.look_at(look_at, Vec3::Y); xform.look_at(look_at, Vec3::Y);
let _ = positions.insert(entity, xform.translation); *positions.entry(entity).or_insert(Vec3::ZERO) = xform.translation;
} }
} }
@ -168,26 +171,22 @@ pub fn update_buddies(
for (xform, entity, toid, mut buddies) in toids.iter_mut() { for (xform, entity, toid, mut buddies) in toids.iter_mut() {
let pos = xform.translation; let pos = xform.translation;
for buddy in buddies.0.clone().iter() { for buddy in buddies.clone().iter() {
let bp = positions.get(buddy).unwrap_or(&pos); let bp = positions.get(buddy).unwrap();
let bd2 = (*bp - pos).length_squared(); let bd2 = (*bp - pos).length_squared();
if bd2 > d2 { if bd2 > d2 {
buddies.0.remove(buddy); buddies.remove(buddy);
} }
} }
if buddies.0.len() < toid.buddies { if buddies.len() < toid.buddies {
let mut neighbors = index let diff = toid.buddies - buddies.len();
.within_distance(pos, BUDDY_RADIUS) for (_, neighbor) in index
.k_nearest_neighbour(pos, diff + 1)
.into_iter() .into_iter()
.filter(|n| n.1.is_some() && n.1.unwrap() != entity); .filter(|n| n.1.is_some() && n.1.unwrap() != entity)
let diff = toid.buddies - buddies.0.len(); {
for _ in 0..diff { buddies.insert(neighbor.unwrap());
if let Some(neighbor) = neighbors.next() {
buddies.0.insert(neighbor.1.unwrap());
} else {
break;
}
} }
} }
} }

11
src/main.rs
View file

@ -1,18 +1,23 @@
use std::time::Duration; use std::time::Duration;
use audubon::*; use audubon::*;
use bevy::prelude::*; use bevy::{
diagnostic::{FrameTimeDiagnosticsPlugin, LogDiagnosticsPlugin},
prelude::*,
};
use bevy_spatial::{AutomaticUpdate, TransformMode}; use bevy_spatial::{AutomaticUpdate, TransformMode};
fn main() { fn main() {
let config: audubon::Config = argh::from_env(); let config: audubon::Config = argh::from_env();
App::new() App::new()
.add_plugins(DefaultPlugins) .add_plugins(DefaultPlugins)
.add_plugins( .add_plugins((
AutomaticUpdate::<Toid>::new() AutomaticUpdate::<Toid>::new()
.with_transform(TransformMode::GlobalTransform) .with_transform(TransformMode::GlobalTransform)
.with_frequency(Duration::from_millis(150)), .with_frequency(Duration::from_millis(150)),
) FrameTimeDiagnosticsPlugin,
LogDiagnosticsPlugin::default(),
))
.insert_resource(config) .insert_resource(config)
.insert_resource(Positions::default()) .insert_resource(Positions::default())
.insert_resource(ClearColor(Color::rgb(0.64, 0.745, 0.937))) // a nice light blue .insert_resource(ClearColor(Color::rgb(0.64, 0.745, 0.937))) // a nice light blue