tela.js 1.2.15 → 1.2.16

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "tela.js",
-  "version": "1.2.15",
+  "version": "1.2.16",
   "author": "Pedroth",
   "repository": {
     "type": "git",

package/src/Camera2D/Camera2D.js

@@ -49,7 +49,7 @@ export default class Camera2D {
     }
     return {
       to: tela => {
-        const elements = scene.getElements();
+        const elements = scene.getElementsInBox(this.box);
         for (let i = 0; i < elements.length; i++) {
           const element = elements[i];
           const rasterizer = type2render[element.constructor.name];

package/src/Scene/BScene.js

@@ -31,7 +31,7 @@ export default class BScene extends NaiveScene {
   }
 
   distanceToPoint(p) {
-    return this.getElementNear(p).distanceToPoint(p);
+    return this.getElementsNear(p).distanceToPoint(p);
   }
 
   interceptWithRay(ray, level) {
@@ -43,9 +43,9 @@ export default class BScene extends NaiveScene {
     return this.boundingBoxScene.distanceOnRay(ray, combineLeafs);
   }
 
-  getElementNear(p) {
+  getElementsNear(p) {
     if (this.boundingBoxScene.numberOfLeafs < 2) {
-      return this.boundingBoxScene.getElementNear(p);
+      return this.boundingBoxScene.getElementsNear(p);
     }
     const initial = [this.boundingBoxScene.left, this.boundingBoxScene.right]
       .map(x => ({ node: x, distance: x.box.distanceToPoint(p) }));
@@ -60,7 +60,7 @@ export default class BScene extends NaiveScene {
     }
   }
 
-  getElementInBox(box) {
+  getElementsInBox(box) {
     return this.boundingBoxScene.getElemInBox(box);
   }
 
@@ -178,7 +178,7 @@ class Node {
     return secondHit <= firstHit ? secondHit : firstHit;
   }
 
-  getElementNear(p) {
+  getElementsNear(p) {
     const children = [this.left, this.right].filter(x => x);
     const index = argmin(children, n => n.box.center.sub(p).length());
     return children[index].getElemNear(p);

package/src/Scene/KScene.js

@@ -36,7 +36,7 @@ export default class KScene extends NaiveScene {
         if (this.boundingBoxScene.leafs.length > 0) {
             return distanceFromLeafs(this.boundingBoxScene.leafs, p, combineLeafs);
         }
-        return this.getElementNear(p).distanceToPoint(p);
+        return this.getElementsNear(p).distanceToPoint(p);
     }
 
     normalToPoint(p) {
@@ -44,7 +44,7 @@ export default class KScene extends NaiveScene {
         let weight = 0;
         const ones = Vec3(1, 1, 1).scale(1 / (2 * this.k));
         const box = new Box(p.sub(ones), p.add(ones));
-        const elements = this.getElementInBox(box);
+        const elements = this.getElementsInBox(box);
         const size = elements.length;
         for (let i = 0; i < size; i++) {
             const n = elements[i].normalToPoint(p);
@@ -63,9 +63,9 @@ export default class KScene extends NaiveScene {
         return this.boundingBoxScene.distanceOnRay(ray, combineLeafs);
     }
 
-    getElementNear(p) {
+    getElementsNear(p) {
         if (this.boundingBoxScene.leafs.length > 0) {
-            return this.boundingBoxScene.getElementNear(p);
+            return this.boundingBoxScene.getElementsNear(p);
         }
         const initial = [this.boundingBoxScene.left, this.boundingBoxScene.right]
             .map(x => ({ node: x, distance: x.box.distanceToPoint(p) }));
@@ -86,7 +86,7 @@ export default class KScene extends NaiveScene {
         }
     }
 
-    getElementInBox(box) {
+    getElementsInBox(box) {
         return this.boundingBoxScene.getElemInBox(box);
     }
 
@@ -221,7 +221,7 @@ class Node {
 
     distanceToPoint(p) {
         if (!this.left && !this.right) return Number.MAX_VALUE;
-        return this.getElementNear(p).distanceToPoint(p);
+        return this.getElementsNear(p).distanceToPoint(p);
     }
 
     distanceOnRay(ray, combineLeafs) {
@@ -241,14 +241,14 @@ class Node {
         return secondHit <= firstHit ? secondHit : firstHit;
     }
 
-    getElementNear(p) {
+    getElementsNear(p) {
         if (this.leafs.length > 0) {
             const minIndex = argmin(this.leafs, x => x.distanceToPoint(p));
             return this.leafs[minIndex].element;
         }
         const children = [this.left, this.right];
         const index = argmin(children, n => n.box.center.sub(p).length());
-        return children[index].getElementNear(p);
+        return children[index].getElementsNear(p);
     }
 
     getNodeNear(p) {

package/src/Scene/NaiveScene.js

@@ -85,12 +85,19 @@ export default class NaiveScene {
     return this.distanceToPoint(ray.init);
   }
 
-  getElementNear(p) {
+  getElementsNear(p) {
     return this.sceneElements[argmin(this.sceneElements, x => x.distanceToPoint(p))];
   }
 
-  getElementInBox(box) {
-    return this.sceneElements.reduce((e, x) => e.add(x.getBoundingBox().collidesWith(box)), Box.EMPTY);
+  getElementsInBox(box) {
+    let filteredElements = [];
+    for (let i = 0; i < this.sceneElements.length; i++) {
+      const elem = this.sceneElements[i];
+      if (elem.getBoundingBox().collidesWith(box)) {
+        filteredElements.push(elem);
+      }
+    }
+    return filteredElements;
   }
 
   rebuild() {

package/src/Scene/RandomScene.js

@@ -80,11 +80,11 @@ export default class RandomScene {
         return this.sceneElements;
     }
 
-    getElementInBox(box) {
+    getElementsInBox(box) {
         return this.boundingBoxScene.getElemIn(box);
     }
 
-    getElementNear(p) {
+    getElementsNear(p) {
         return this.boundingBoxScene.getElemNear(p);
     }
 
@@ -105,7 +105,7 @@ export default class RandomScene {
             }
             return distance;
         }
-        return this.getElementNear(p).distanceToPoint(p);
+        return this.getElementsNear(p).distanceToPoint(p);
     }
 
     normalToPoint(p) {

package/src/Scene/VoxelScene.js

@@ -116,11 +116,11 @@ export default class VoxelScene extends NaiveScene {
         return Number.MAX_VALUE;
     }
 
-    getElementNear(p) {
+    getElementsNear(p) {
         throw Error("Not implemented");
     }
 
-    getElementInBox(box) {
+    getElementsInBox(box) {
         const size = box.diagonal.fold((e, x) => e * x, 1);
         const samples = Math.floor(size / this.gridSpace);
         let elements = [];