Merge branch 'master' into test-size-to-length

Chris Hallberg · web-flow · commit 589cd83045d5 · 2020-05-22T12:44:31.000-04:00
diff --git a/examples/visualize_qtree/sketch.js b/examples/visualize_qtree/sketch.js
@@ -20,10 +20,10 @@ function setup() {
 
 function draw() {
   background(0);
-  show(qtree);
 
-  // let range = new Rectangle(mouseX, mouseY, 25, 25);
   let range = new Circle(mouseX, mouseY, 64);
+  show(qtree, range);
+  stroke("pink");
   ellipse(range.x, range.y, range.r * 2);
 
   let points = qtree.query(range);
@@ -32,31 +32,37 @@ function draw() {
     strokeWeight(4);
     point(p.x, p.y);
 
-    let neighbors = qtree.closest(new Point(p.x, p.y), 8, 128);
-    stroke(0, 255, 0, 50);
-    strokeWeight(1);
-    for (let n of neighbors) {
-      line(p.x, p.y, n.x, n.y);
+    if (mouseIsPressed) {
+      let neighbors = qtree.closest(new Point(p.x, p.y), 8);
+      stroke(0, 255, 0, 50);
+      strokeWeight(1);
+      for (let n of neighbors) {
+        line(p.x, p.y, n.x, n.y);
+      }
     }
   }
 }
 
-function show(qtree) {
-  stroke(255);
+function show(qtree, range) {
   noFill();
   strokeWeight(1);
   rectMode(CENTER);
+  stroke(255, 41);
+  if (range.intersects(qtree.boundary)) {
+    stroke(255);
+  }
   rect(qtree.boundary.x, qtree.boundary.y, qtree.boundary.w * 2, qtree.boundary.h * 2);
 
+  stroke(255);
+  strokeWeight(2);
   for (let p of qtree.points) {
-    strokeWeight(2);
     point(p.x, p.y);
   }
 
   if (qtree.divided) {
-    show(qtree.northeast);
-    show(qtree.northwest);
-    show(qtree.southeast);
-    show(qtree.southwest);
+    show(qtree.northeast, range);
+    show(qtree.northwest, range);
+    show(qtree.southeast, range);
+    show(qtree.southwest, range);
   }
 }
diff --git a/quadtree.js b/quadtree.js
@@ -297,15 +297,15 @@ class QuadTree {
     }
 
     if (typeof maxDistance === "undefined") {
-      // A circle that contains the entire QuadTree
+      // A circle as big as the QuadTree's boundary
       const outerReach = Math.sqrt(
         Math.pow(this.boundary.w, 2) + Math.pow(this.boundary.h, 2)
       );
       // Distance of query point from center
       const pointDistance = Math.sqrt(
         Math.pow(point.x, 2) + Math.pow(point.y, 2)
       );
-      // One QuadTree size away from the query point
+      // Together, a circle that encompasses the whole QuadTree
       maxDistance = outerReach + pointDistance;
     }
 
@@ -321,8 +321,10 @@ class QuadTree {
       if (points.length === count) {
         return points; // Return when we hit the right size
       } else if (points.length < count) {
+        // Grow
         inner = radius;
       } else {
+        // Shrink
         outer = radius;
         limit --;
       }
