From 651ed774c3288740f7a7cf2d1de9142261701c66 Mon Sep 17 00:00:00 2001 From: Robert Garrett Date: Mon, 15 Jul 2024 10:14:13 -0500 Subject: [PATCH] Move separation_force down with cohesive_force --- src/birdoids_plugin.rs | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/src/birdoids_plugin.rs b/src/birdoids_plugin.rs index 3043f6cc..52b3c3eb 100644 --- a/src/birdoids_plugin.rs +++ b/src/birdoids_plugin.rs @@ -225,14 +225,6 @@ fn separation( } } -// f(x) = -x^2 + 1 -fn separation_force(us: Vec2, neighbor: Vec2) -> Force { - let distance = neighbor - us; - let scaled = distance / BOID_VIEW_RANGE; - let force_vec = -scaled.powf(2.0) + Vec2::ONE; - Force(force_vec.extend(0.0)) -} - fn alignment( spatial_tree: Res>, mut boids: Query<(&Transform, &Velocity, &mut Force), With>, @@ -311,3 +303,11 @@ fn cohesive_force(boid: Vec2, target: Vec2) -> Force { let cube = (scaled - half_one).powf(3.0); Force(((cube + 0.125) * 4.0).extend(0.0)) } + +// f(x) = -x^2 + 1 +fn separation_force(us: Vec2, neighbor: Vec2) -> Force { + let distance = neighbor - us; + let scaled = distance / BOID_VIEW_RANGE; + let force_vec = -scaled.powf(2.0) + Vec2::ONE; + Force(force_vec.extend(0.0)) +}