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

Tests were missing the BOID_VIEW_RANGE

Browse Source 
I love it when I need to test my tests. It's just so easy to do.
This commit is contained in:
Robert Garrett
2024-07-15 14:40:18 -05:00
parent 82dabcfabe
commit 60a0357b0d
1 changed files with 20 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
src/birdoids_plugin.rs
View File

@@ -310,12 +310,14 @@ fn cohesive_force(boid: Vec2, target: Vec2) -> Force {
Force(force_vec.extend(0.0)) Force(force_vec.extend(0.0))
} }
// f(x) = -x^2 + 1 // f(x) = x^2 - 1
fn separation_force(us: Vec2, neighbor: Vec2) -> Force { fn separation_force(us: Vec2, neighbor: Vec2) -> Force {
let distance = neighbor - us; // Scale from BOID_VIEW_RANGE to unit space
let scaled = distance / BOID_VIEW_RANGE; let distance_unit = (neighbor - us) / BOID_VIEW_RANGE;
let force_vec = -scaled.powf(2.0) + Vec2::ONE; let mag = distance_unit.length();
Force(force_vec.extend(0.0)) let force_mag = mag.powf(2.0) - 1.0;
let force = force_mag * distance_unit.normalize();
Force(force.extend(0.0))
} }
#[cfg(test)] #[cfg(test)]
@@ -449,10 +451,10 @@ mod tests{
#[test] #[test]
fn check_separation_midpoint_x_positive(){ fn check_separation_midpoint_x_positive(){
assert_eq!( assert_eq!(
Force(Vec3::new(0.75, 0.0, 0.0)), // expected force Force(Vec3::new(0.75, 0.0, 0.0)), // expected force
separation_force( separation_force(
Vec2::new(0.5, 0.0), // boid position Vec2::new(0.5 * BOID_VIEW_RANGE, 0.0), // boid position
Vec2::ZERO, // obstacle position Vec2::ZERO, // obstacle position
) )
); );
} }
@@ -460,10 +462,10 @@ mod tests{
#[test] #[test]
fn check_separation_midpoint_x_negative(){ fn check_separation_midpoint_x_negative(){
assert_eq!( assert_eq!(
Force(Vec3::new(-0.75, 0.0, 0.0)), // expected force Force(Vec3::new(-0.75, 0.0, 0.0)), // expected force
separation_force( separation_force(
Vec2::new(-0.5, 0.0), // boid position Vec2::new(-0.5 * BOID_VIEW_RANGE, 0.0), // boid position
Vec2::ZERO, // obstacle position Vec2::ZERO, // obstacle position
) )
); );
} }
@@ -473,7 +475,7 @@ mod tests{
assert_eq!( assert_eq!(
Force(Vec3::ZERO), Force(Vec3::ZERO),
separation_force( separation_force(
Vec2::new(1.0, 0.0), Vec2::new(1.0 * BOID_VIEW_RANGE, 0.0),
Vec2::ZERO, Vec2::ZERO,
), ),
); );
@@ -484,7 +486,7 @@ mod tests{
assert_eq!( assert_eq!(
Force(Vec3::ZERO), Force(Vec3::ZERO),
separation_force( separation_force(
Vec2::new(-1.0, 0.0), Vec2::new(-1.0 * BOID_VIEW_RANGE, 0.0),
Vec2::ZERO, Vec2::ZERO,
), ),
); );
@@ -498,7 +500,7 @@ mod tests{
assert_eq!( assert_eq!(
Force(Vec3::new(0.0, 0.75, 0.0)), Force(Vec3::new(0.0, 0.75, 0.0)),
separation_force( separation_force(
Vec2::new(0.0, 0.5), Vec2::new(0.0, 0.5 * BOID_VIEW_RANGE),
Vec2::ZERO, Vec2::ZERO,
) )
); );
@@ -509,7 +511,7 @@ mod tests{
assert_eq!( assert_eq!(
Force(Vec3::new(0.0, -0.75, 0.0)), Force(Vec3::new(0.0, -0.75, 0.0)),
separation_force( separation_force(
Vec2::new(0.0, -0.5), Vec2::new(0.0, -0.5 * BOID_VIEW_RANGE),
Vec2::ZERO, Vec2::ZERO,
) )
); );
@@ -520,7 +522,7 @@ mod tests{
assert_eq!( assert_eq!(
Force(Vec3::ZERO), Force(Vec3::ZERO),
separation_force( separation_force(
Vec2::new(0.0, 1.0), Vec2::new(0.0, 1.0 * BOID_VIEW_RANGE),
Vec2::ZERO, Vec2::ZERO,
) )
) )
@@ -531,10 +533,9 @@ mod tests{
assert_eq!( assert_eq!(
Force(Vec3::ZERO), Force(Vec3::ZERO),
separation_force( separation_force(
Vec2::new(0.0, -1.0), Vec2::new(0.0, -1.0 * BOID_VIEW_RANGE),
Vec2::ZERO, Vec2::ZERO,
) )
) )
} }
}
}