summaryrefslogtreecommitdiff
path: root/resources/js/boid.js
diff options
context:
space:
mode:
authorFbenas <philbeansburton@gmail.com>2020-10-13 22:18:17 +0100
committerFbenas <philbeansburton@gmail.com>2020-10-13 22:18:17 +0100
commit2df948ca0509b8bf58d1b7bc3a5ce0840132edd1 (patch)
tree232f2b84e5ede61c89afca8085c5eab9b65940f1 /resources/js/boid.js
parenta44e609b27642afc77495293d975f2ea0bbf6f3e (diff)
Fully sort detection of boids colliding
Diffstat (limited to 'resources/js/boid.js')
-rw-r--r--resources/js/boid.js9
1 files changed, 6 insertions, 3 deletions
diff --git a/resources/js/boid.js b/resources/js/boid.js
index 85793ff..a15022a 100644
--- a/resources/js/boid.js
+++ b/resources/js/boid.js
@@ -70,7 +70,7 @@ class Boid {
let rayAngle = tweakAngle + this.direction + rays[i];
// Check against all other boids
- if (i == 0 && this.detectBoids(rayAngle, boids)) {
+ if (this.detectBoids(rayAngle, boids)) {
continue;
}
@@ -81,8 +81,9 @@ class Boid {
return rayAngle;
}
- console.log(this.x, this.y);
+
console.log('cannot find suitable ray');
+ return false;
}
detectBoids(direction, boids) {
@@ -112,10 +113,12 @@ class Boid {
if (intersect) {
console.log('boids intersect detected');
}
+
+ return intersect;
}
boidsIntersect(boid) {
- this.twoCirclesIntersect(this.radius, boid.radius, this.x, boid.x, this.y, boid.y);
+ return this.twoCirclesIntersect(this.radius, boid.radius, this.x, boid.x, this.y, boid.y);
}
twoCirclesIntersect(r1, r2, x1, x2, y1, y2) {