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

Fix: Return Force instead of Vec2

Browse Source
This commit is contained in:
Robert Garrett
2024-07-15 10:04:41 -05:00
parent 930aa2e75d
commit 6c38083e6d
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/birdoids_plugin.rs
View File

@@ -198,7 +198,7 @@ fn cohesion(
let neighbors = spatial_tree.within_distance(transform.translation.xy(), BOID_VIEW_RANGE); let neighbors = spatial_tree.within_distance(transform.translation.xy(), BOID_VIEW_RANGE);
if let Some(center_mass) = center_of_boids(neighbors.iter().map(|boid| boid.0)) { if let Some(center_mass) = center_of_boids(neighbors.iter().map(|boid| boid.0)) {
let force = cohesive_force(center_mass, transform.translation.xy()); let force = cohesive_force(center_mass, transform.translation.xy());
acceleration.0 += force.extend(0.0) * COHESION_FACTOR; acceleration.0 += *force * COHESION_FACTOR;
} }
} }
} }
@@ -298,7 +298,7 @@ fn average_of_vec2s(points: impl Iterator<Item = Vec2>) -> Option<Vec2> {
} }
// f(x) = 4((x-0.5)^3 + 0.125) // f(x) = 4((x-0.5)^3 + 0.125)
fn cohesive_force(boid: Vec2, target: Vec2) -> Vec2 { fn cohesive_force(boid: Vec2, target: Vec2) -> Force {
let deviation = target - boid; let deviation = target - boid;
/* /*
Scale deviation vector by the boid's view range. The curve is made to Scale deviation vector by the boid's view range. The curve is made to
@@ -307,5 +307,5 @@ fn cohesive_force(boid: Vec2, target: Vec2) -> Vec2 {
let scaled = deviation / BOID_VIEW_RANGE; let scaled = deviation / BOID_VIEW_RANGE;
let half_one = Vec2::ONE / 2.0; let half_one = Vec2::ONE / 2.0;
let cube = (scaled - half_one).powf(3.0); let cube = (scaled - half_one).powf(3.0);
return (cube + 0.125) * 4.0; Force(((cube + 0.125) * 4.0).extend(0.0))
} }