Frustum.intersectsWorldAABB(minmax) opensourceBIM#72

changed minmax from [[xmin, ymin, zmin], [xwidth, ywidth, zwidth]] to [[xmin, ymin, zmin], [xmax, ymax, zmax]]
muren400 · Feb 2, 2021 · a7e4c12 · a7e4c12
1 parent 4091d18
commit a7e4c12
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/viewer/frustum.js b/viewer/frustum.js
@@ -39,7 +39,7 @@ export class Frustum {
         this.planes[5].init(m3 + m2, m7 + m6, m11 + m10, m15 + m14);
     }
 
-    // Tests for intersection with World-space AABB, which is assumed to be: [xmin, ymin, zmin, xwidth, ywidth, zwidth]
+    // Tests for intersection with World-space AABB, which is assumed to be: [xmin, ymin, zmin, xmax, ymax, zmax]
     intersectsWorldAABB(minmax) {
         var result = Frustum.INSIDE_FRUSTUM;
         var plane = null;

diff --git a/viewer/octree.js b/viewer/octree.js
@@ -277,7 +277,10 @@ class Box {
 		vec3.add(this.normalizedMinVector, this.normalizedMinVector, this.globalTranslationVector);
 		vec3.add(this.normalizedMaxVector, this.normalizedMaxVector, this.globalTranslationVector);
 
-		this.minmax = [[this.normalizedMinVector[0], this.normalizedMinVector[1], this.normalizedMinVector[2]], [this.normalizedMaxVector[0] - this.normalizedMinVector[0], this.normalizedMaxVector[1] - this.normalizedMinVector[1], this.normalizedMaxVector[2] - this.normalizedMinVector[2]]];
+		this.minmax = [
+			[this.normalizedMinVector[0], this.normalizedMinVector[1], this.normalizedMinVector[2]],
+			[this.normalizedMaxVector[0], this.normalizedMaxVector[1], this.normalizedMaxVector[2]],
+		];
 	}
 
 	set(min, max) {