robert/another-boids-in-rust
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Move separation_force down with cohesive_force

Browse Source
This commit is contained in:
Robert Garrett
2024-07-15 10:14:13 -05:00
parent 283a0bdde3
commit 651ed774c3
1 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/birdoids_plugin.rs
View File

@@ -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( fn alignment(
spatial_tree: Res<KDTree2<TrackedByKdTree>>, spatial_tree: Res<KDTree2<TrackedByKdTree>>,
mut boids: Query<(&Transform, &Velocity, &mut Force), With<Boid>>, mut boids: Query<(&Transform, &Velocity, &mut Force), With<Boid>>,
@@ -311,3 +303,11 @@ fn cohesive_force(boid: Vec2, target: Vec2) -> Force {
let cube = (scaled - half_one).powf(3.0); let cube = (scaled - half_one).powf(3.0);
Force(((cube + 0.125) * 4.0).extend(0.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))
}