@xeokit/xeokit-sdk 2.4.0-alpha-2 → 2.4.0-alpha-4

package/dist/xeokit-sdk.cjs.js

@@ -66540,6 +66540,116 @@ class SpriteMarker extends Marker {
     }
 }
 
+const tempVec3a$V = math.vec3();
+const tempVec3b$7 = math.vec3();
+const tempMat4a = math.mat4();
+
+/**
+ * @private
+ */
+class FrustumPlane {
+
+    constructor() {
+        this.normal = math.vec3();
+        this.offset = 0;
+        this.testVertex = math.vec3();
+    }
+
+    set(nx, ny, nz, offset) {
+        const s = 1.0 / Math.sqrt(nx * nx + ny * ny + nz * nz);
+        this.normal[0] = nx * s;
+        this.normal[1] = ny * s;
+        this.normal[2] = nz * s;
+        this.offset = offset * s;
+        this.testVertex[0] = (this.normal[0] >= 0.0) ? 1 : 0;
+        this.testVertex[1] = (this.normal[1] >= 0.0) ? 1 : 0;
+        this.testVertex[2] = (this.normal[2] >= 0.0) ? 1 : 0;
+    }
+}
+
+/**
+ * @private
+ */
+class Frustum {
+    constructor() {
+        this.planes = [
+            new FrustumPlane(), new FrustumPlane(), new FrustumPlane(),
+            new FrustumPlane(), new FrustumPlane(), new FrustumPlane()
+        ];
+    }
+}
+
+Frustum.INSIDE = 0;
+Frustum.INTERSECT = 1;
+Frustum.OUTSIDE = 2;
+
+/** @private */
+function setFrustum(frustum, viewMat, projMat) {
+
+    const m = math.mulMat4(projMat, viewMat, tempMat4a);
+
+    const m0 = m[0];
+    const m1 = m[1];
+    const m2 = m[2];
+    const m3 = m[3];
+    const m4 = m[4];
+    const m5 = m[5];
+    const m6 = m[6];
+    const m7 = m[7];
+    const m8 = m[8];
+    const m9 = m[9];
+    const m10 = m[10];
+    const m11 = m[11];
+    const m12 = m[12];
+    const m13 = m[13];
+    const m14 = m[14];
+    const m15 = m[15];
+
+    frustum.planes[0].set(m3 - m0, m7 - m4, m11 - m8, m15 - m12);
+    frustum.planes[1].set(m3 + m0, m7 + m4, m11 + m8, m15 + m12);
+    frustum.planes[2].set(m3 - m1, m7 - m5, m11 - m9, m15 - m13);
+    frustum.planes[3].set(m3 + m1, m7 + m5, m11 + m9, m15 + m13);
+    frustum.planes[4].set(m3 - m2, m7 - m6, m11 - m10, m15 - m14);
+    frustum.planes[5].set(m3 + m2, m7 + m6, m11 + m10, m15 + m14);
+}
+
+/** @private */
+function frustumIntersectsAABB3(frustum, aabb) {
+
+    let ret = Frustum.INSIDE;
+
+    const min = tempVec3a$V;
+    const max = tempVec3b$7;
+
+    min[0] = aabb[0];
+    min[1] = aabb[1];
+    min[2] = aabb[2];
+    max[0] = aabb[3];
+    max[1] = aabb[4];
+    max[2] = aabb[5];
+
+    const bminmax = [min, max];
+
+    for (let i = 0; i < 6; ++i) {
+        const plane = frustum.planes[i];
+        if (((plane.normal[0] * bminmax[plane.testVertex[0]][0]) +
+            (plane.normal[1] * bminmax[plane.testVertex[1]][1]) +
+            (plane.normal[2] * bminmax[plane.testVertex[2]][2]) +
+            (plane.offset)) < 0.0) {
+            return Frustum.OUTSIDE;
+        }
+
+        if (((plane.normal[0] * bminmax[1 - plane.testVertex[0]][0]) +
+            (plane.normal[1] * bminmax[1 - plane.testVertex[1]][1]) +
+            (plane.normal[2] * bminmax[1 - plane.testVertex[2]][2]) +
+            (plane.offset)) < 0.0) {
+            ret = Frustum.INTERSECT;
+        }
+    }
+
+    return ret;
+}
+
 /**
  * @desc Saves and restores the state of a {@link Scene}'s {@link Camera}.
  *
@@ -69090,7 +69200,7 @@ const RENDER_PASSES = {
 };
 
 const tempVec4$7 = math.vec4();
-const tempVec3a$V = math.vec3();
+const tempVec3a$U = math.vec3();
 
 /**
  * @private
@@ -69155,7 +69265,7 @@ class TrianglesBatchingColorRenderer {
                     if (active) {
                         const sectionPlane = sectionPlanes[sectionPlaneIndex];
                         if (origin) {
-                            const rtcSectionPlanePos = getPlaneRTCPos(sectionPlane.dist, sectionPlane.dir, origin, tempVec3a$V);
+                            const rtcSectionPlanePos = getPlaneRTCPos(sectionPlane.dist, sectionPlane.dir, origin, tempVec3a$U);
                             gl.uniform3fv(sectionPlaneUniforms.pos, rtcSectionPlanePos);
                         } else {
                             gl.uniform3fv(sectionPlaneUniforms.pos, sectionPlane.pos);
@@ -69583,7 +69693,7 @@ class TrianglesBatchingColorRenderer {
 }
 
 const tempVec4$6 = math.vec4();
-const tempVec3a$U = math.vec3();
+const tempVec3a$T = math.vec3();
 
 /**
  * @private
@@ -69645,7 +69755,7 @@ class TrianglesBatchingFlatColorRenderer {
                 if (active) {
                     const sectionPlane = sectionPlanes[sectionPlaneIndex];
                     if (origin) {
-                        const rtcSectionPlanePos = getPlaneRTCPos(sectionPlane.dist, sectionPlane.dir, origin, tempVec3a$U);
+                        const rtcSectionPlanePos = getPlaneRTCPos(sectionPlane.dist, sectionPlane.dir, origin, tempVec3a$T);
                         gl.uniform3fv(sectionPlaneUniforms.pos, rtcSectionPlanePos);
                     } else {
                         gl.uniform3fv(sectionPlaneUniforms.pos, sectionPlane.pos);
@@ -70062,7 +70172,7 @@ class TrianglesBatchingFlatColorRenderer {
 }
 
 const defaultColor$4 = new Float32Array([1, 1, 1]);
-const tempVec3a$T = math.vec3();
+const tempVec3a$S = math.vec3();
 
 /**
  * @private
@@ -70110,22 +70220,22 @@ class TrianglesBatchingSilhouetteRenderer {
             const material = scene.xrayMaterial._state;
             const fillColor = material.fillColor;
             const fillAlpha = material.fillAlpha;
-            gl.uniform4f(this._uColor, fillColor[0], fillColor[1], fillColor[2], fillAlpha);
+            gl.uniform4f(this._uSilhouetteColor, fillColor[0], fillColor[1], fillColor[2], fillAlpha);
 
         } else if (renderPass === RENDER_PASSES.SILHOUETTE_HIGHLIGHTED) {
             const material = scene.highlightMaterial._state;
             const fillColor = material.fillColor;
             const fillAlpha = material.fillAlpha;
-            gl.uniform4f(this._uColor, fillColor[0], fillColor[1], fillColor[2], fillAlpha);
+            gl.uniform4f(this._uSilhouetteColor, fillColor[0], fillColor[1], fillColor[2], fillAlpha);
 
         } else if (renderPass === RENDER_PASSES.SILHOUETTE_SELECTED) {
             const material = scene.selectedMaterial._state;
             const fillColor = material.fillColor;
             const fillAlpha = material.fillAlpha;
-            gl.uniform4f(this._uColor, fillColor[0], fillColor[1], fillColor[2], fillAlpha);
+            gl.uniform4f(this._uSilhouetteColor, fillColor[0], fillColor[1], fillColor[2], fillAlpha);
 
         } else {
-            gl.uniform4fv(this._uColor, defaultColor$4);
+            gl.uniform4fv(this._uSilhouetteColor, defaultColor$4);
         }
 
         const viewMat = (origin) ? createRTCViewMat(camera.viewMatrix, origin) : camera.viewMatrix;
@@ -70146,7 +70256,7 @@ class TrianglesBatchingSilhouetteRenderer {
                     if (active) {
                         const sectionPlane = sectionPlanes[sectionPlaneIndex];
                         if (origin) {
-                            const rtcSectionPlanePos = getPlaneRTCPos(sectionPlane.dist, sectionPlane.dir, origin, tempVec3a$T);
+                            const rtcSectionPlanePos = getPlaneRTCPos(sectionPlane.dist, sectionPlane.dir, origin, tempVec3a$S);
                             gl.uniform3fv(sectionPlaneUniforms.pos, rtcSectionPlanePos);
                         } else {
                             gl.uniform3fv(sectionPlaneUniforms.pos, sectionPlane.pos);
@@ -70173,6 +70283,10 @@ class TrianglesBatchingSilhouetteRenderer {
             this._aFlags2.bindArrayBuffer(state.flags2Buf);
         }
 
+        if (this._aColor) {
+            this._aColor.bindArrayBuffer(state.colorsBuf);
+        }
+
         state.indicesBuf.bind();
 
         gl.drawElements(gl.TRIANGLES, state.indicesBuf.numItems, state.indicesBuf.itemType, 0);
@@ -70197,7 +70311,7 @@ class TrianglesBatchingSilhouetteRenderer {
         this._uWorldMatrix = program.getLocation("worldMatrix");
         this._uViewMatrix = program.getLocation("viewMatrix");
         this._uProjMatrix = program.getLocation("projMatrix");
-        this._uColor = program.getLocation("color");
+        this._uSilhouetteColor = program.getLocation("silhouetteColor");
         this._uSectionPlanes = [];
 
         for (let i = 0, len = scene._sectionPlanesState.sectionPlanes.length; i < len; i++) {
@@ -70212,6 +70326,7 @@ class TrianglesBatchingSilhouetteRenderer {
         this._aOffset = program.getAttribute("offset");
         this._aFlags = program.getAttribute("flags");
         this._aFlags2 = program.getAttribute("flags2");
+        this._aColor = program.getAttribute("color");
 
         if (scene.logarithmicDepthBufferEnabled) {
             this._uLogDepthBufFC = program.getLocation("logDepthBufFC");
@@ -70259,11 +70374,12 @@ class TrianglesBatchingSilhouetteRenderer {
         }
         src.push("in vec4 flags;");
         src.push("in vec4 flags2;");
+        src.push("in vec4 color;");
         src.push("uniform mat4 worldMatrix;");
         src.push("uniform mat4 viewMatrix;");
         src.push("uniform mat4 projMatrix;");
         src.push("uniform mat4 positionsDecodeMatrix;");
-        src.push("uniform vec4 color;");
+        src.push("uniform vec4 silhouetteColor;");
 
         if (scene.logarithmicDepthBufferEnabled) {
             src.push("uniform float logDepthBufFC;");
@@ -70279,6 +70395,8 @@ class TrianglesBatchingSilhouetteRenderer {
             src.push("out vec4 vFlags2;");
         }
 
+        src.push("out vec4 vColor;");
+
         src.push("void main(void) {");
 
         // flags.y = NOT_RENDERED | SILHOUETTE_HIGHLIGHTED | SILHOUETTE_SELECTED | SILHOUETTE_XRAYED
@@ -70297,6 +70415,7 @@ class TrianglesBatchingSilhouetteRenderer {
             src.push("vWorldPosition = worldPosition;");
             src.push("vFlags2 = flags2;");
         }
+        src.push("vColor = vec4(silhouetteColor.r, silhouetteColor.g, silhouetteColor.b, min(silhouetteColor.a, float(color.a) / 255.0));");
         src.push("vec4 clipPos = projMatrix * viewPosition;");
         if (scene.logarithmicDepthBufferEnabled) {
            src.push("vFragDepth = 1.0 + clipPos.w;");
@@ -70339,7 +70458,7 @@ class TrianglesBatchingSilhouetteRenderer {
                 src.push("uniform vec3 sectionPlaneDir" + i + ";");
             }
         }
-        src.push("uniform vec4 color;");
+        src.push("in vec4 vColor;");
         src.push("out vec4 outColor;");
         src.push("void main(void) {");
         if (clipping) {
@@ -70357,7 +70476,7 @@ class TrianglesBatchingSilhouetteRenderer {
         if (scene.logarithmicDepthBufferEnabled) {
             src.push("    gl_FragDepth = isPerspective == 0.0 ? gl_FragCoord.z : log2( vFragDepth ) * logDepthBufFC * 0.5;");
         }
-        src.push("outColor = color;");
+        src.push("outColor = vColor;");
         src.push("}");
         return src;
     }
@@ -70374,7 +70493,7 @@ class TrianglesBatchingSilhouetteRenderer {
     }
 }
 
-const tempVec3a$S = math.vec3();
+const tempVec3a$R = math.vec3();
 const defaultColor$3 = new Float32Array([0,0,0,1]);
 
 /**
@@ -70457,7 +70576,7 @@ class TrianglesBatchingEdgesRenderer {
                     if (active) {
                         const sectionPlane = sectionPlanes[sectionPlaneIndex];
                         if (origin) {
-                            const rtcSectionPlanePos = getPlaneRTCPos(sectionPlane.dist, sectionPlane.dir, origin, tempVec3a$S);
+                            const rtcSectionPlanePos = getPlaneRTCPos(sectionPlane.dist, sectionPlane.dir, origin, tempVec3a$R);
                             gl.uniform3fv(sectionPlaneUniforms.pos, rtcSectionPlanePos);
                         } else {
                             gl.uniform3fv(sectionPlaneUniforms.pos, sectionPlane.pos);
@@ -70685,7 +70804,7 @@ class TrianglesBatchingEdgesRenderer {
     }
 }
 
-const tempVec3a$R = math.vec3();
+const tempVec3a$Q = math.vec3();
 
 /**
  * @private
@@ -70745,7 +70864,7 @@ class TrianglesBatchingEdgesColorRenderer {
                     if (active) {
                         const sectionPlane = sectionPlanes[sectionPlaneIndex];
                         if (origin) {
-                            const rtcSectionPlanePos = getPlaneRTCPos(sectionPlane.dist, sectionPlane.dir, origin, tempVec3a$R);
+                            const rtcSectionPlanePos = getPlaneRTCPos(sectionPlane.dist, sectionPlane.dir, origin, tempVec3a$Q);
                             gl.uniform3fv(sectionPlaneUniforms.pos, rtcSectionPlanePos);
                         } else {
                             gl.uniform3fv(sectionPlaneUniforms.pos, sectionPlane.pos);
@@ -70973,7 +71092,7 @@ class TrianglesBatchingEdgesColorRenderer {
     }
 }
 
-const tempVec3a$Q = math.vec3();
+const tempVec3a$P = math.vec3();
 
 /**
  * @private
@@ -71039,7 +71158,7 @@ class TrianglesBatchingPickMeshRenderer {
                     if (active) {
                         const sectionPlane = sectionPlanes[sectionPlaneIndex];
                         if (origin) {
-                            const rtcSectionPlanePos = getPlaneRTCPos(sectionPlane.dist, sectionPlane.dir, origin, tempVec3a$Q);
+                            const rtcSectionPlanePos = getPlaneRTCPos(sectionPlane.dist, sectionPlane.dir, origin, tempVec3a$P);
                             gl.uniform3fv(sectionPlaneUniforms.pos, rtcSectionPlanePos);
                         } else {
                             gl.uniform3fv(sectionPlaneUniforms.pos, sectionPlane.pos);
@@ -71269,7 +71388,7 @@ class TrianglesBatchingPickMeshRenderer {
     }
 }
 
-const tempVec3a$P = math.vec3();
+const tempVec3a$O = math.vec3();
 
 /**
  * @private
@@ -71340,7 +71459,7 @@ class TrianglesBatchingPickDepthRenderer {
                     if (active) {
                         const sectionPlane = sectionPlanes[sectionPlaneIndex];
                         if (origin) {
-                            const rtcSectionPlanePos = getPlaneRTCPos(sectionPlane.dist, sectionPlane.dir, origin, tempVec3a$P);
+                            const rtcSectionPlanePos = getPlaneRTCPos(sectionPlane.dist, sectionPlane.dir, origin, tempVec3a$O);
                             gl.uniform3fv(sectionPlaneUniforms.pos, rtcSectionPlanePos);
                         } else {
                             gl.uniform3fv(sectionPlaneUniforms.pos, sectionPlane.pos);
@@ -71578,7 +71697,7 @@ class TrianglesBatchingPickDepthRenderer {
     }
 }
 
-const tempVec3a$O = math.vec3();
+const tempVec3a$N = math.vec3();
 
 /**
  * @private
@@ -71646,7 +71765,7 @@ class TrianglesBatchingPickNormalsRenderer {
                     if (active) {
                         const sectionPlane = sectionPlanes[sectionPlaneIndex];
                         if (origin) {
-                            const rtcSectionPlanePos = getPlaneRTCPos(sectionPlane.dist, sectionPlane.dir, origin, tempVec3a$O);
+                            const rtcSectionPlanePos = getPlaneRTCPos(sectionPlane.dist, sectionPlane.dir, origin, tempVec3a$N);
                             gl.uniform3fv(sectionPlaneUniforms.pos, rtcSectionPlanePos);
                         } else {
                             gl.uniform3fv(sectionPlaneUniforms.pos, sectionPlane.pos);
@@ -71871,7 +71990,7 @@ class TrianglesBatchingPickNormalsRenderer {
     }
 }
 
-const tempVec3a$N = math.vec3();
+const tempVec3a$M = math.vec3();
 
 /**
  * @private
@@ -71931,7 +72050,7 @@ class TrianglesBatchingOcclusionRenderer {
                     if (active) {
                         const sectionPlane = sectionPlanes[sectionPlaneIndex];
                         if (origin) {
-                            const rtcSectionPlanePos = getPlaneRTCPos(sectionPlane.dist, sectionPlane.dir, origin, tempVec3a$N);
+                            const rtcSectionPlanePos = getPlaneRTCPos(sectionPlane.dist, sectionPlane.dir, origin, tempVec3a$M);
                             gl.uniform3fv(sectionPlaneUniforms.pos, rtcSectionPlanePos);
                         } else {
                             gl.uniform3fv(sectionPlaneUniforms.pos, sectionPlane.pos);
@@ -72154,7 +72273,7 @@ class TrianglesBatchingOcclusionRenderer {
     }
 }
 
-const tempVec3a$M = math.vec3();
+const tempVec3a$L = math.vec3();
 
 /**
  * @private
@@ -72214,7 +72333,7 @@ class TrianglesBatchingDepthRenderer {
                     if (active) {
                         const sectionPlane = sectionPlanes[sectionPlaneIndex];
                         if (origin) {
-                            const rtcSectionPlanePos = getPlaneRTCPos(sectionPlane.dist, sectionPlane.dir, origin, tempVec3a$M);
+                            const rtcSectionPlanePos = getPlaneRTCPos(sectionPlane.dist, sectionPlane.dir, origin, tempVec3a$L);
                             gl.uniform3fv(sectionPlaneUniforms.pos, rtcSectionPlanePos);
                         } else {
                             gl.uniform3fv(sectionPlaneUniforms.pos, sectionPlane.pos);
@@ -72438,7 +72557,7 @@ class TrianglesBatchingDepthRenderer {
     }
 }
 
-const tempVec3a$L = math.vec3();
+const tempVec3a$K = math.vec3();
 
 /**
  * @private
@@ -72501,7 +72620,7 @@ class TrianglesBatchingNormalsRenderer {
                     if (active) {
                         const sectionPlane = sectionPlanes[sectionPlaneIndex];
                         if (origin) {
-                            const rtcSectionPlanePos = getPlaneRTCPos(sectionPlane.dist, sectionPlane.dir, origin, tempVec3a$L);
+                            const rtcSectionPlanePos = getPlaneRTCPos(sectionPlane.dist, sectionPlane.dir, origin, tempVec3a$K);
                             gl.uniform3fv(sectionPlaneUniforms.pos, rtcSectionPlanePos);
                         } else {
                             gl.uniform3fv(sectionPlaneUniforms.pos, sectionPlane.pos);
@@ -72741,7 +72860,7 @@ class TrianglesBatchingNormalsRenderer {
     }
 }
 
-const tempVec3a$K = math.vec3();
+const tempVec3a$J = math.vec3();
 
 /**
  * Renders BatchingLayer fragment depths to a shadow map.
@@ -72810,7 +72929,7 @@ class TrianglesBatchingShadowRenderer {
                     if (active) {
                         const sectionPlane = sectionPlanes[sectionPlaneIndex];
                         if (origin) {
-                            const rtcSectionPlanePos = getPlaneRTCPos(sectionPlane.dist, sectionPlane.dir, origin, tempVec3a$K);
+                            const rtcSectionPlanePos = getPlaneRTCPos(sectionPlane.dist, sectionPlane.dir, origin, tempVec3a$J);
                             gl.uniform3fv(sectionPlaneUniforms.pos, rtcSectionPlanePos);
                         } else {
                             gl.uniform3fv(sectionPlaneUniforms.pos, sectionPlane.pos);
@@ -72982,7 +73101,7 @@ class TrianglesBatchingShadowRenderer {
 }
 
 const tempVec4$5 = math.vec4();
-const tempVec3a$J = math.vec3();
+const tempVec3a$I = math.vec3();
 
 // const TEXTURE_DECODE_FUNCS = {};
 // TEXTURE_DECODE_FUNCS[LinearEncoding] = "linearToLinear";
@@ -73055,7 +73174,7 @@ class TrianglesBatchingPBRRenderer {
                     if (active) {
                         const sectionPlane = sectionPlanes[sectionPlaneIndex];
                         if (origin) {
-                            const rtcSectionPlanePos = getPlaneRTCPos(sectionPlane.dist, sectionPlane.dir, origin, tempVec3a$J);
+                            const rtcSectionPlanePos = getPlaneRTCPos(sectionPlane.dist, sectionPlane.dir, origin, tempVec3a$I);
                             gl.uniform3fv(sectionPlaneUniforms.pos, rtcSectionPlanePos);
                         } else {
                             gl.uniform3fv(sectionPlaneUniforms.pos, sectionPlane.pos);
@@ -73860,7 +73979,7 @@ class TrianglesBatchingPBRRenderer {
     }
 }
 
-const tempVec3a$I = math.vec3();
+const tempVec3a$H = math.vec3();
 
 /**
  * @private
@@ -73927,7 +74046,7 @@ class TrianglesBatchingPickNormalsFlatRenderer {
                 if (active) {
                     const sectionPlane = sectionPlanes[sectionPlaneIndex];
                     if (origin) {
-                        const rtcSectionPlanePos = getPlaneRTCPos(sectionPlane.dist, sectionPlane.dir, origin, tempVec3a$I);
+                        const rtcSectionPlanePos = getPlaneRTCPos(sectionPlane.dist, sectionPlane.dir, origin, tempVec3a$H);
                         gl.uniform3fv(sectionPlaneUniforms.pos, rtcSectionPlanePos);
                     } else {
                         gl.uniform3fv(sectionPlaneUniforms.pos, sectionPlane.pos);
@@ -74137,7 +74256,7 @@ class TrianglesBatchingPickNormalsFlatRenderer {
 }
 
 const tempVec4$4 = math.vec4();
-const tempVec3a$H = math.vec3();
+const tempVec3a$G = math.vec3();
 
 /**
  * @private
@@ -74202,7 +74321,7 @@ class TrianglesBatchingColorTextureRenderer {
                     if (active) {
                         const sectionPlane = sectionPlanes[sectionPlaneIndex];
                         if (origin) {
-                            const rtcSectionPlanePos = getPlaneRTCPos(sectionPlane.dist, sectionPlane.dir, origin, tempVec3a$H);
+                            const rtcSectionPlanePos = getPlaneRTCPos(sectionPlane.dist, sectionPlane.dir, origin, tempVec3a$G);
                             gl.uniform3fv(sectionPlaneUniforms.pos, rtcSectionPlanePos);
                         } else {
                             gl.uniform3fv(sectionPlaneUniforms.pos, sectionPlane.pos);
@@ -75208,8 +75327,8 @@ const tempVec4b$a = math.vec4([0, 0, 0, 1]);
 const tempVec4c$7 = math.vec4([0, 0, 0, 1]);
 const tempOBB3$2 = math.OBB3();
 
-const tempVec3a$G = math.vec3();
-const tempVec3b$7 = math.vec3();
+const tempVec3a$F = math.vec3();
+const tempVec3b$6 = math.vec3();
 const tempVec3c$5 = math.vec3();
 const tempVec3d$2 = math.vec3();
 const tempVec3e$1 = math.vec3();
@@ -76388,8 +76507,8 @@ class TrianglesBatchingLayer {
         const origin = state.origin;
         const offset = portion.offset;
 
-        const rtcRayOrigin = tempVec3a$G;
-        const rtcRayDir = tempVec3b$7;
+        const rtcRayOrigin = tempVec3a$F;
+        const rtcRayDir = tempVec3b$6;
 
         rtcRayOrigin.set(origin ? math.subVec3(worldRayOrigin, origin, tempVec3c$5) : worldRayOrigin);  // World -> RTC
         rtcRayDir.set(worldRayDir);
@@ -76512,7 +76631,7 @@ class TrianglesBatchingLayer {
 }
 
 const tempVec4$3 = math.vec4();
-const tempVec3a$F = math.vec3();
+const tempVec3a$E = math.vec3();
 
 /**
  * @private
@@ -76578,7 +76697,7 @@ class TrianglesInstancingColorRenderer {
                     if (active) {
                         const sectionPlane = sectionPlanes[sectionPlaneIndex];
                         if (origin) {
-                            const rtcSectionPlanePos = getPlaneRTCPos(sectionPlane.dist, sectionPlane.dir, origin, tempVec3a$F);
+                            const rtcSectionPlanePos = getPlaneRTCPos(sectionPlane.dist, sectionPlane.dir, origin, tempVec3a$E);
                             gl.uniform3fv(sectionPlaneUniforms.pos, rtcSectionPlanePos);
                         } else {
                             gl.uniform3fv(sectionPlaneUniforms.pos, sectionPlane.pos);
@@ -77055,7 +77174,7 @@ class TrianglesInstancingColorRenderer {
 }
 
 const tempVec4$2 = math.vec4();
-const tempVec3a$E = math.vec3();
+const tempVec3a$D = math.vec3();
 
 /**
  * @private
@@ -77117,7 +77236,7 @@ class TrianglesInstancingFlatColorRenderer {
                 if (active) {
                     const sectionPlane = sectionPlanes[sectionPlaneIndex];
                     if (origin) {
-                        const rtcSectionPlanePos = getPlaneRTCPos(sectionPlane.dist, sectionPlane.dir, origin, tempVec3a$E);
+                        const rtcSectionPlanePos = getPlaneRTCPos(sectionPlane.dist, sectionPlane.dir, origin, tempVec3a$D);
                         gl.uniform3fv(sectionPlaneUniforms.pos, rtcSectionPlanePos);
                     } else {
                         gl.uniform3fv(sectionPlaneUniforms.pos, sectionPlane.pos);
@@ -77564,7 +77683,7 @@ class TrianglesInstancingFlatColorRenderer {
     }
 }
 
-const tempVec3a$D = math.vec3();
+const tempVec3a$C = math.vec3();
 
 /**
  * @private
@@ -77613,22 +77732,22 @@ class TrianglesInstancingSilhouetteRenderer {
             const material = scene.xrayMaterial._state;
             const fillColor = material.fillColor;
             const fillAlpha = material.fillAlpha;
-            gl.uniform4f(this._uColor, fillColor[0], fillColor[1], fillColor[2], fillAlpha);
+            gl.uniform4f(this._uSilhouetteColor, fillColor[0], fillColor[1], fillColor[2], fillAlpha);
 
         } else if (renderPass === RENDER_PASSES.SILHOUETTE_HIGHLIGHTED) {
             const material = scene.highlightMaterial._state;
             const fillColor = material.fillColor;
             const fillAlpha = material.fillAlpha;
-            gl.uniform4f(this._uColor, fillColor[0], fillColor[1], fillColor[2], fillAlpha);
+            gl.uniform4f(this._uSilhouetteColor, fillColor[0], fillColor[1], fillColor[2], fillAlpha);
 
         } else if (renderPass === RENDER_PASSES.SILHOUETTE_SELECTED) {
             const material = scene.selectedMaterial._state;
             const fillColor = material.fillColor;
             const fillAlpha = material.fillAlpha;
-            gl.uniform4f(this._uColor, fillColor[0], fillColor[1], fillColor[2], fillAlpha);
+            gl.uniform4f(this._uSilhouetteColor, fillColor[0], fillColor[1], fillColor[2], fillAlpha);
 
         } else {
-            gl.uniform4fv(this._uColor, math.vec3([1, 1, 1]));
+            gl.uniform4fv(this._uSilhouetteColor, math.vec3([1, 1, 1]));
         }
 
         gl.uniformMatrix4fv(this._uViewMatrix, false, (origin) ? createRTCViewMat(camera.viewMatrix, origin) : camera.viewMatrix);
@@ -77647,7 +77766,7 @@ class TrianglesInstancingSilhouetteRenderer {
                     if (active) {
                         const sectionPlane = sectionPlanes[sectionPlaneIndex];
                         if (origin) {
-                            const rtcSectionPlanePos = getPlaneRTCPos(sectionPlane.dist, sectionPlane.dir, origin, tempVec3a$D);
+                            const rtcSectionPlanePos = getPlaneRTCPos(sectionPlane.dist, sectionPlane.dir, origin, tempVec3a$C);
                             gl.uniform3fv(sectionPlaneUniforms.pos, rtcSectionPlanePos);
                         } else {
                             gl.uniform3fv(sectionPlaneUniforms.pos, sectionPlane.pos);
@@ -77683,6 +77802,11 @@ class TrianglesInstancingSilhouetteRenderer {
             gl.vertexAttribDivisor(this._aOffset.location, 1);
         }
 
+        if (this._aColor) {
+            this._aColor.bindArrayBuffer(state.colorsBuf);
+            gl.vertexAttribDivisor(this._aColor.location, 1);
+        }
+
         geometry.indicesBuf.bind();
 
         gl.drawElementsInstanced(gl.TRIANGLES, geometry.indicesBuf.numItems, geometry.indicesBuf.itemType, 0, state.numInstances);
@@ -77698,6 +77822,9 @@ class TrianglesInstancingSilhouetteRenderer {
         if (this._aOffset) {
             gl.vertexAttribDivisor(this._aOffset.location, 0);
         }
+        if (this._aColor) {
+            gl.vertexAttribDivisor(this._aColor.location, 0);
+        }
     }
 
     _allocate() {
@@ -77720,7 +77847,7 @@ class TrianglesInstancingSilhouetteRenderer {
         this._uWorldMatrix = program.getLocation("worldMatrix");
         this._uViewMatrix = program.getLocation("viewMatrix");
         this._uProjMatrix = program.getLocation("projMatrix");
-        this._uColor = program.getLocation("color");
+        this._uSilhouetteColor = program.getLocation("silhouetteColor");
         this._uSectionPlanes = [];
 
         const clips = sectionPlanesState.sectionPlanes;
@@ -77736,6 +77863,8 @@ class TrianglesInstancingSilhouetteRenderer {
         this._aOffset = program.getAttribute("offset");
         this._aFlags = program.getAttribute("flags");
         this._aFlags2 = program.getAttribute("flags2");
+        this._aColor = program.getAttribute("color");
+
         this._aModelMatrixCol0 = program.getAttribute("modelMatrixCol0");
         this._aModelMatrixCol1 = program.getAttribute("modelMatrixCol1");
         this._aModelMatrixCol2 = program.getAttribute("modelMatrixCol2");
@@ -77774,7 +77903,7 @@ class TrianglesInstancingSilhouetteRenderer {
         const clipping = sectionPlanesState.sectionPlanes.length > 0;
         const src = [];
         src.push("#version 300 es");
-        src.push("// Instancing fill vertex shader");
+        src.push("// Instancing silhouette vertex shader");
         
         src.push("uniform int renderPass;");
 
@@ -77784,6 +77913,7 @@ class TrianglesInstancingSilhouetteRenderer {
         }
         src.push("in vec4 flags;");
         src.push("in vec4 flags2;");
+        src.push("in vec4 color;");
 
         src.push("in vec4 modelMatrixCol0;"); // Modeling matrix
         src.push("in vec4 modelMatrixCol1;");
@@ -77793,6 +77923,7 @@ class TrianglesInstancingSilhouetteRenderer {
         src.push("uniform mat4 viewMatrix;");
         src.push("uniform mat4 projMatrix;");
         src.push("uniform mat4 positionsDecodeMatrix;");
+        src.push("uniform vec4 silhouetteColor;");
 
         if (scene.logarithmicDepthBufferEnabled) {
             src.push("uniform float logDepthBufFC;");
@@ -77803,13 +77934,13 @@ class TrianglesInstancingSilhouetteRenderer {
             src.push("out float isPerspective;");
         }
 
-        src.push("uniform vec4 color;");
-
         if (clipping) {
             src.push("out vec4 vWorldPosition;");
             src.push("out vec4 vFlags2;");
         }
 
+        src.push("out vec4 vColor;");
+
         src.push("void main(void) {");
 
         // flags.y = NOT_RENDERED | SILHOUETTE_HIGHLIGHTED | SILHOUETTE_SELECTED | | SILHOUETTE_XRAYED
@@ -77831,6 +77962,7 @@ class TrianglesInstancingSilhouetteRenderer {
             src.push("vWorldPosition = worldPosition;");
             src.push("vFlags2 = flags2;");
         }
+        src.push("vColor = vec4(silhouetteColor.r, silhouetteColor.g, silhouetteColor.b, min(silhouetteColor.a, float(color.a) / 255.0));");
         src.push("vec4 clipPos = projMatrix * viewPosition;");
         if (scene.logarithmicDepthBufferEnabled) {
            src.push("vFragDepth = 1.0 + clipPos.w;");
@@ -77871,7 +78003,7 @@ class TrianglesInstancingSilhouetteRenderer {
                 src.push("uniform vec3 sectionPlaneDir" + i + ";");
             }
         }
-        src.push("uniform vec4 color;");
+        src.push("in vec4 vColor;");
         src.push("out vec4 outColor;");
         src.push("void main(void) {");
         if (clipping) {
@@ -77889,7 +78021,7 @@ class TrianglesInstancingSilhouetteRenderer {
         if (scene.logarithmicDepthBufferEnabled) {
             src.push("    gl_FragDepth = isPerspective == 0.0 ? gl_FragCoord.z : log2( vFragDepth ) * logDepthBufFC * 0.5;");
         }
-        src.push("outColor = color;");
+        src.push("outColor = vColor;");
         src.push("}");
         return src;
     }
@@ -77906,7 +78038,7 @@ class TrianglesInstancingSilhouetteRenderer {
     }
 }
 
-const tempVec3a$C = math.vec3();
+const tempVec3a$B = math.vec3();
 const defaultColor$2 = new Float32Array([0,0,0,1]);
 
 /**
@@ -77990,7 +78122,7 @@ class TrianglesInstancingEdgesRenderer {
                     if (active) {
                         const sectionPlane = sectionPlanes[sectionPlaneIndex];
                         if (origin) {
-                            const rtcSectionPlanePos = getPlaneRTCPos(sectionPlane.dist, sectionPlane.dir, origin, tempVec3a$C);
+                            const rtcSectionPlanePos = getPlaneRTCPos(sectionPlane.dist, sectionPlane.dir, origin, tempVec3a$B);
                             gl.uniform3fv(sectionPlaneUniforms.pos, rtcSectionPlanePos);
                         } else {
                             gl.uniform3fv(sectionPlaneUniforms.pos, sectionPlane.pos);
@@ -78251,7 +78383,7 @@ class TrianglesInstancingEdgesRenderer {
     }
 }
 
-const tempVec3a$B = math.vec3();
+const tempVec3a$A = math.vec3();
 
 /**
  * @private
@@ -78312,7 +78444,7 @@ class TrianglesInstancingEdgesColorRenderer {
                     if (active) {
                         const sectionPlane = sectionPlanes[sectionPlaneIndex];
                         if (origin) {
-                            const rtcSectionPlanePos = getPlaneRTCPos(sectionPlane.dist, sectionPlane.dir, origin, tempVec3a$B);
+                            const rtcSectionPlanePos = getPlaneRTCPos(sectionPlane.dist, sectionPlane.dir, origin, tempVec3a$A);
                             gl.uniform3fv(sectionPlaneUniforms.pos, rtcSectionPlanePos);
                         } else {
                             gl.uniform3fv(sectionPlaneUniforms.pos, sectionPlane.pos);
@@ -78578,7 +78710,7 @@ class TrianglesInstancingEdgesColorRenderer {
     }
 }
 
-const tempVec3a$A = math.vec3();
+const tempVec3a$z = math.vec3();
 
 /**
  * @private
@@ -78681,7 +78813,7 @@ class TrianglesInstancingPickMeshRenderer {
                     if (active) {
                         const sectionPlane = sectionPlanes[sectionPlaneIndex];
                         if (origin) {
-                            const rtcSectionPlanePos = getPlaneRTCPos(sectionPlane.dist, sectionPlane.dir, origin, tempVec3a$A);
+                            const rtcSectionPlanePos = getPlaneRTCPos(sectionPlane.dist, sectionPlane.dir, origin, tempVec3a$z);
                             gl.uniform3fv(sectionPlaneUniforms.pos, rtcSectionPlanePos);
                         } else {
                             gl.uniform3fv(sectionPlaneUniforms.pos, sectionPlane.pos);
@@ -78916,7 +79048,7 @@ class TrianglesInstancingPickMeshRenderer {
     }
 }
 
-const tempVec3a$z = math.vec3();
+const tempVec3a$y = math.vec3();
 
 /**
  * @private
@@ -78993,7 +79125,7 @@ class TrianglesInstancingPickDepthRenderer {
                     if (active) {
                         const sectionPlane = sectionPlanes[sectionPlaneIndex];
                         if (origin) {
-                            const rtcSectionPlanePos = getPlaneRTCPos(sectionPlane.dist, sectionPlane.dir, origin, tempVec3a$z);
+                            const rtcSectionPlanePos = getPlaneRTCPos(sectionPlane.dist, sectionPlane.dir, origin, tempVec3a$y);
                             gl.uniform3fv(sectionPlaneUniforms.pos, rtcSectionPlanePos);
                         } else {
                             gl.uniform3fv(sectionPlaneUniforms.pos, sectionPlane.pos);
@@ -79261,7 +79393,7 @@ class TrianglesInstancingPickDepthRenderer {
     }
 }
 
-const tempVec3a$y = math.vec3();
+const tempVec3a$x = math.vec3();
 
 /**
  * @private
@@ -79338,7 +79470,7 @@ class TrianglesInstancingPickNormalsRenderer {
                     if (active) {
                         const sectionPlane = sectionPlanes[sectionPlaneIndex];
                         if (origin) {
-                            const rtcSectionPlanePos = getPlaneRTCPos(sectionPlane.dist, sectionPlane.dir, origin, tempVec3a$y);
+                            const rtcSectionPlanePos = getPlaneRTCPos(sectionPlane.dist, sectionPlane.dir, origin, tempVec3a$x);
                             gl.uniform3fv(sectionPlaneUniforms.pos, rtcSectionPlanePos);
                         } else {
                             gl.uniform3fv(sectionPlaneUniforms.pos, sectionPlane.pos);
@@ -79615,7 +79747,7 @@ class TrianglesInstancingPickNormalsRenderer {
     }
 }
 
-const tempVec3a$x = math.vec3();
+const tempVec3a$w = math.vec3();
 
 /**
  * @private
@@ -79676,7 +79808,7 @@ class TrianglesInstancingOcclusionRenderer {
                     if (active) {
                         const sectionPlane = sectionPlanes[sectionPlaneIndex];
                         if (origin) {
-                            const rtcSectionPlanePos = getPlaneRTCPos(sectionPlane.dist, sectionPlane.dir, origin, tempVec3a$x);
+                            const rtcSectionPlanePos = getPlaneRTCPos(sectionPlane.dist, sectionPlane.dir, origin, tempVec3a$w);
                             gl.uniform3fv(sectionPlaneUniforms.pos, rtcSectionPlanePos);
                         } else {
                             gl.uniform3fv(sectionPlaneUniforms.pos, sectionPlane.pos);
@@ -79934,7 +80066,7 @@ class TrianglesInstancingOcclusionRenderer {
     }
 }
 
-const tempVec3a$w = math.vec3();
+const tempVec3a$v = math.vec3();
 
 /**
  * @private
@@ -79995,7 +80127,7 @@ class TrianglesInstancingDepthRenderer {
                     if (active) {
                         const sectionPlane = sectionPlanes[sectionPlaneIndex];
                         if (origin) {
-                            const rtcSectionPlanePos = getPlaneRTCPos(sectionPlane.dist, sectionPlane.dir, origin, tempVec3a$w);
+                            const rtcSectionPlanePos = getPlaneRTCPos(sectionPlane.dist, sectionPlane.dir, origin, tempVec3a$v);
                             gl.uniform3fv(sectionPlaneUniforms.pos, rtcSectionPlanePos);
                         } else {
                             gl.uniform3fv(sectionPlaneUniforms.pos, sectionPlane.pos);
@@ -80245,7 +80377,7 @@ class TrianglesInstancingDepthRenderer {
     }
 }
 
-const tempVec3a$v = math.vec3();
+const tempVec3a$u = math.vec3();
 
 /**
  * @private
@@ -80309,7 +80441,7 @@ class TrianglesInstancingNormalsRenderer {
                     if (active) {
                         const sectionPlane = sectionPlanes[sectionPlaneIndex];
                         if (origin) {
-                            const rtcSectionPlanePos = getPlaneRTCPos(sectionPlane.dist, sectionPlane.dir, origin, tempVec3a$v);
+                            const rtcSectionPlanePos = getPlaneRTCPos(sectionPlane.dist, sectionPlane.dir, origin, tempVec3a$u);
                             gl.uniform3fv(sectionPlaneUniforms.pos, rtcSectionPlanePos);
                         } else {
                             gl.uniform3fv(sectionPlaneUniforms.pos, sectionPlane.pos);
@@ -80589,7 +80721,7 @@ class TrianglesInstancingNormalsRenderer {
     }
 }
 
-const tempVec3a$u = math.vec3();
+const tempVec3a$t = math.vec3();
 
 /**
  * Renders InstancingLayer fragment depths to a shadow map.
@@ -80676,7 +80808,7 @@ class TrianglesInstancingShadowRenderer {
                     if (active) {
                         const sectionPlane = sectionPlanes[sectionPlaneIndex];
                         if (origin) {
-                            const rtcSectionPlanePos = getPlaneRTCPos(sectionPlane.dist, sectionPlane.dir, origin, tempVec3a$u);
+                            const rtcSectionPlanePos = getPlaneRTCPos(sectionPlane.dist, sectionPlane.dir, origin, tempVec3a$t);
                             gl.uniform3fv(sectionPlaneUniforms.pos, rtcSectionPlanePos);
                         } else {
                             gl.uniform3fv(sectionPlaneUniforms.pos, sectionPlane.pos);
@@ -80869,7 +81001,7 @@ class TrianglesInstancingShadowRenderer {
 }
 
 const tempVec4$1 = math.vec4();
-const tempVec3a$t = math.vec3();
+const tempVec3a$s = math.vec3();
 
 const TEXTURE_DECODE_FUNCS = {};
 TEXTURE_DECODE_FUNCS[LinearEncoding] = "linearToLinear";
@@ -80943,7 +81075,7 @@ class TrianglesInstancingPBRRenderer {
                     if (active) {
                         const sectionPlane = sectionPlanes[sectionPlaneIndex];
                         if (origin) {
-                            const rtcSectionPlanePos = getPlaneRTCPos(sectionPlane.dist, sectionPlane.dir, origin, tempVec3a$t);
+                            const rtcSectionPlanePos = getPlaneRTCPos(sectionPlane.dist, sectionPlane.dir, origin, tempVec3a$s);
                             gl.uniform3fv(sectionPlaneUniforms.pos, rtcSectionPlanePos);
                         } else {
                             gl.uniform3fv(sectionPlaneUniforms.pos, sectionPlane.pos);
@@ -81779,7 +81911,7 @@ class TrianglesInstancingPBRRenderer {
     }
 }
 
-const tempVec3a$s = math.vec3();
+const tempVec3a$r = math.vec3();
 
 /**
  * @private
@@ -81854,7 +81986,7 @@ class TrianglesInstancingPickNormalsFlatRenderer {
                 if (active) {
                     const sectionPlane = sectionPlanes[sectionPlaneIndex];
                     if (origin) {
-                        const rtcSectionPlanePos = getPlaneRTCPos(sectionPlane.dist, sectionPlane.dir, origin, tempVec3a$s);
+                        const rtcSectionPlanePos = getPlaneRTCPos(sectionPlane.dist, sectionPlane.dir, origin, tempVec3a$r);
                         gl.uniform3fv(sectionPlaneUniforms.pos, rtcSectionPlanePos);
                     } else {
                         gl.uniform3fv(sectionPlaneUniforms.pos, sectionPlane.pos);
@@ -82094,7 +82226,7 @@ class TrianglesInstancingPickNormalsFlatRenderer {
 }
 
 const tempVec4 = math.vec4();
-const tempVec3a$r = math.vec3();
+const tempVec3a$q = math.vec3();
 
 /**
  * @private
@@ -82159,7 +82291,7 @@ class TrianglesInstancingColorTextureRenderer {
                     if (active) {
                         const sectionPlane = sectionPlanes[sectionPlaneIndex];
                         if (origin) {
-                            const rtcSectionPlanePos = getPlaneRTCPos(sectionPlane.dist, sectionPlane.dir, origin, tempVec3a$r);
+                            const rtcSectionPlanePos = getPlaneRTCPos(sectionPlane.dist, sectionPlane.dir, origin, tempVec3a$q);
                             gl.uniform3fv(sectionPlaneUniforms.pos, rtcSectionPlanePos);
                         } else {
                             gl.uniform3fv(sectionPlaneUniforms.pos, sectionPlane.pos);
@@ -82970,8 +83102,8 @@ const tempVec4b$9 = math.vec4([0, 0, 0, 1]);
 const tempVec4c$6 = math.vec4([0, 0, 0, 1]);
 const tempVec3fa$2 = new Float32Array(3);
 
-const tempVec3a$q = math.vec3();
-const tempVec3b$6 = math.vec3();
+const tempVec3a$p = math.vec3();
+const tempVec3b$5 = math.vec3();
 const tempVec3c$4 = math.vec3();
 const tempVec3d$1 = math.vec3();
 const tempVec3e = math.vec3();
@@ -83899,8 +84031,8 @@ class TrianglesInstancingLayer {
         const origin = state.origin;
         const offset = portion.offset;
 
-        const rtcRayOrigin = tempVec3a$q;
-        const rtcRayDir = tempVec3b$6;
+        const rtcRayOrigin = tempVec3a$p;
+        const rtcRayDir = tempVec3b$5;
 
         rtcRayOrigin.set(origin ? math.subVec3(worldRayOrigin, origin, tempVec3c$4) : worldRayOrigin);  // World -> RTC
         rtcRayDir.set(worldRayDir);
@@ -84033,7 +84165,7 @@ class TrianglesInstancingLayer {
     }
 }
 
-const tempVec3a$p = math.vec3();
+const tempVec3a$o = math.vec3();
 
 /**
  * @private
@@ -84096,7 +84228,7 @@ class LinesBatchingColorRenderer {
                     if (active) {
                         const sectionPlane = sectionPlanes[sectionPlaneIndex];
                         if (origin) {
-                            const rtcSectionPlanePos = getPlaneRTCPos(sectionPlane.dist, sectionPlane.dir, origin, tempVec3a$p);
+                            const rtcSectionPlanePos = getPlaneRTCPos(sectionPlane.dist, sectionPlane.dir, origin, tempVec3a$o);
                             gl.uniform3fv(sectionPlaneUniforms.pos, rtcSectionPlanePos);
                         } else {
                             gl.uniform3fv(sectionPlaneUniforms.pos, sectionPlane.pos);
@@ -84316,7 +84448,7 @@ class LinesBatchingColorRenderer {
 }
 
 const defaultColor$1 = new Float32Array([1, 1, 1]);
-const tempVec3a$o = math.vec3();
+const tempVec3a$n = math.vec3();
 
 /**
  * @private
@@ -84403,7 +84535,7 @@ class LinesBatchingSilhouetteRenderer {
                     if (active) {
                         const sectionPlane = sectionPlanes[sectionPlaneIndex];
                         if (origin) {
-                            const rtcSectionPlanePos = getPlaneRTCPos(sectionPlane.dist, sectionPlane.dir, origin, tempVec3a$o);
+                            const rtcSectionPlanePos = getPlaneRTCPos(sectionPlane.dist, sectionPlane.dir, origin, tempVec3a$n);
                             gl.uniform3fv(sectionPlaneUniforms.pos, rtcSectionPlanePos);
                         } else {
                             gl.uniform3fv(sectionPlaneUniforms.pos, sectionPlane.pos);
@@ -85500,7 +85632,7 @@ class LinesBatchingLayer {
     }
 }
 
-const tempVec3a$n = math.vec3();
+const tempVec3a$m = math.vec3();
 
 /**
  * @private
@@ -85563,7 +85695,7 @@ class LinesInstancingColorRenderer {
                     if (active) {
                         const sectionPlane = sectionPlanes[sectionPlaneIndex];
                         if (origin) {
-                            const rtcSectionPlanePos = getPlaneRTCPos(sectionPlane.dist, sectionPlane.dir, origin, tempVec3a$n);
+                            const rtcSectionPlanePos = getPlaneRTCPos(sectionPlane.dist, sectionPlane.dir, origin, tempVec3a$m);
                             gl.uniform3fv(sectionPlaneUniforms.pos, rtcSectionPlanePos);
                         } else {
                             gl.uniform3fv(sectionPlaneUniforms.pos, sectionPlane.pos);
@@ -85845,7 +85977,7 @@ class LinesInstancingColorRenderer {
     }
 }
 
-const tempVec3a$m = math.vec3();
+const tempVec3a$l = math.vec3();
 
 /**
  * @private
@@ -85930,7 +86062,7 @@ class LinesInstancingSilhouetteRenderer {
                     if (active) {
                         const sectionPlane = sectionPlanes[sectionPlaneIndex];
                         if (origin) {
-                            const rtcSectionPlanePos = getPlaneRTCPos(sectionPlane.dist, sectionPlane.dir, origin, tempVec3a$m);
+                            const rtcSectionPlanePos = getPlaneRTCPos(sectionPlane.dist, sectionPlane.dir, origin, tempVec3a$l);
                             gl.uniform3fv(sectionPlaneUniforms.pos, rtcSectionPlanePos);
                         } else {
                             gl.uniform3fv(sectionPlaneUniforms.pos, sectionPlane.pos);
@@ -86912,7 +87044,7 @@ class LinesInstancingLayer {
     }
 }
 
-const tempVec3a$l = math.vec3();
+const tempVec3a$k = math.vec3();
 
 /**
  * @private
@@ -86973,7 +87105,7 @@ class PointsBatchingColorRenderer {
                     if (active) {
                         const sectionPlane = sectionPlanes[sectionPlaneIndex];
                         if (origin) {
-                            const rtcSectionPlanePos = getPlaneRTCPos(sectionPlane.dist, sectionPlane.dir, origin, tempVec3a$l);
+                            const rtcSectionPlanePos = getPlaneRTCPos(sectionPlane.dist, sectionPlane.dir, origin, tempVec3a$k);
                             gl.uniform3fv(sectionPlaneUniforms.pos, rtcSectionPlanePos);
                         } else {
                             gl.uniform3fv(sectionPlaneUniforms.pos, sectionPlane.pos);
@@ -87258,7 +87390,7 @@ class PointsBatchingColorRenderer {
 }
 
 const defaultColor = new Float32Array([1, 1, 1]);
-const tempVec3a$k = math.vec3();
+const tempVec3a$j = math.vec3();
 
 /**
  * @private
@@ -87343,7 +87475,7 @@ class PointsBatchingSilhouetteRenderer {
                     if (active) {
                         const sectionPlane = sectionPlanes[sectionPlaneIndex];
                         if (origin) {
-                            const rtcSectionPlanePos = getPlaneRTCPos(sectionPlane.dist, sectionPlane.dir, origin, tempVec3a$k);
+                            const rtcSectionPlanePos = getPlaneRTCPos(sectionPlane.dist, sectionPlane.dir, origin, tempVec3a$j);
                             gl.uniform3fv(sectionPlaneUniforms.pos, rtcSectionPlanePos);
                         } else {
                             gl.uniform3fv(sectionPlaneUniforms.pos, sectionPlane.pos);
@@ -87587,7 +87719,7 @@ class PointsBatchingSilhouetteRenderer {
     }
 }
 
-const tempVec3a$j = math.vec3();
+const tempVec3a$i = math.vec3();
 
 /**
  * @private
@@ -87654,7 +87786,7 @@ class PointsBatchingPickMeshRenderer {
                     if (active) {
                         const sectionPlane = sectionPlanes[sectionPlaneIndex];
                         if (origin) {
-                            const rtcSectionPlanePos = getPlaneRTCPos(sectionPlane.dist, sectionPlane.dir, origin, tempVec3a$j);
+                            const rtcSectionPlanePos = getPlaneRTCPos(sectionPlane.dist, sectionPlane.dir, origin, tempVec3a$i);
                             gl.uniform3fv(sectionPlaneUniforms.pos, rtcSectionPlanePos);
                         } else {
                             gl.uniform3fv(sectionPlaneUniforms.pos, sectionPlane.pos);
@@ -87899,7 +88031,7 @@ class PointsBatchingPickMeshRenderer {
     }
 }
 
-const tempVec3a$i = math.vec3();
+const tempVec3a$h = math.vec3();
 
 /**
  * @private
@@ -87971,7 +88103,7 @@ class PointsBatchingPickDepthRenderer {
                     if (active) {
                         const sectionPlane = sectionPlanes[sectionPlaneIndex];
                         if (origin) {
-                            const rtcSectionPlanePos = getPlaneRTCPos(sectionPlane.dist, sectionPlane.dir, origin, tempVec3a$i);
+                            const rtcSectionPlanePos = getPlaneRTCPos(sectionPlane.dist, sectionPlane.dir, origin, tempVec3a$h);
                             gl.uniform3fv(sectionPlaneUniforms.pos, rtcSectionPlanePos);
                         } else {
                             gl.uniform3fv(sectionPlaneUniforms.pos, sectionPlane.pos);
@@ -88222,7 +88354,7 @@ class PointsBatchingPickDepthRenderer {
     }
 }
 
-const tempVec3a$h = math.vec3();
+const tempVec3a$g = math.vec3();
 
 /**
  * @private
@@ -88283,7 +88415,7 @@ class PointsBatchingOcclusionRenderer {
                     if (active) {
                         const sectionPlane = sectionPlanes[sectionPlaneIndex];
                         if (origin) {
-                            const rtcSectionPlanePos = getPlaneRTCPos(sectionPlane.dist, sectionPlane.dir, origin, tempVec3a$h);
+                            const rtcSectionPlanePos = getPlaneRTCPos(sectionPlane.dist, sectionPlane.dir, origin, tempVec3a$g);
                             gl.uniform3fv(sectionPlaneUniforms.pos, rtcSectionPlanePos);
                         } else {
                             gl.uniform3fv(sectionPlaneUniforms.pos, sectionPlane.pos);
@@ -88649,8 +88781,8 @@ class PointsBatchingBuffer {
     }
 }
 
-const tempVec3a$g = math.vec4();
-const tempVec3b$5 = math.vec4();
+const tempVec3a$f = math.vec4();
+const tempVec3b$4 = math.vec4();
 const tempVec4a$6 = math.vec4([0, 0, 0, 1]);
 const tempVec4b$6 = math.vec4([0, 0, 0, 1]);
 const tempVec4c$3 = math.vec4([0, 0, 0, 1]);
@@ -88802,8 +88934,8 @@ class PointsBatchingLayer {
 
             const bounds = geometryCompressionUtils.getPositionsBounds(positionsCompressed);
 
-            const min = geometryCompressionUtils.decompressPosition(bounds.min, this._state.positionsDecodeMatrix, tempVec3a$g);
-            const max = geometryCompressionUtils.decompressPosition(bounds.max, this._state.positionsDecodeMatrix, tempVec3b$5);
+            const min = geometryCompressionUtils.decompressPosition(bounds.min, this._state.positionsDecodeMatrix, tempVec3a$f);
+            const max = geometryCompressionUtils.decompressPosition(bounds.max, this._state.positionsDecodeMatrix, tempVec3b$4);
 
             worldAABB[0] = min[0];
             worldAABB[1] = min[1];
@@ -89441,7 +89573,7 @@ class PointsBatchingLayer {
     }
 }
 
-const tempVec3a$f = math.vec3();
+const tempVec3a$e = math.vec3();
 
 /**
  * @private
@@ -89510,7 +89642,7 @@ class PointsInstancingColorRenderer {
                     if (active) {
                         const sectionPlane = sectionPlanes[sectionPlaneIndex];
                         if (origin) {
-                            const rtcSectionPlanePos = getPlaneRTCPos(sectionPlane.dist, sectionPlane.dir, origin, tempVec3a$f);
+                            const rtcSectionPlanePos = getPlaneRTCPos(sectionPlane.dist, sectionPlane.dir, origin, tempVec3a$e);
                             gl.uniform3fv(sectionPlaneUniforms.pos, rtcSectionPlanePos);
                         } else {
                             gl.uniform3fv(sectionPlaneUniforms.pos, sectionPlane.pos);
@@ -89820,7 +89952,7 @@ class PointsInstancingColorRenderer {
     }
 }
 
-const tempVec3a$e = math.vec3();
+const tempVec3a$d = math.vec3();
 
 /**
  * @private
@@ -89904,7 +90036,7 @@ class PointsInstancingSilhouetteRenderer {
                     if (active) {
                         const sectionPlane = sectionPlanes[sectionPlaneIndex];
                         if (origin) {
-                            const rtcSectionPlanePos = getPlaneRTCPos(sectionPlane.dist, sectionPlane.dir, origin, tempVec3a$e);
+                            const rtcSectionPlanePos = getPlaneRTCPos(sectionPlane.dist, sectionPlane.dir, origin, tempVec3a$d);
                             gl.uniform3fv(sectionPlaneUniforms.pos, rtcSectionPlanePos);
                         } else {
                             gl.uniform3fv(sectionPlaneUniforms.pos, sectionPlane.pos);
@@ -89979,7 +90111,7 @@ class PointsInstancingSilhouetteRenderer {
         this._uWorldMatrix = program.getLocation("worldMatrix");
         this._uViewMatrix = program.getLocation("viewMatrix");
         this._uProjMatrix = program.getLocation("projMatrix");
-        this._uColor = program.getLocation("color");
+        this._uColor = program.getLocation("silhouetteColor");
         this._uSectionPlanes = [];
 
         const clips = sectionPlanesState.sectionPlanes;
@@ -90048,6 +90180,7 @@ class PointsInstancingSilhouetteRenderer {
         }
         src.push("in vec4 flags;");
         src.push("in vec4 flags2;");
+        src.push("in vec4 color;");
 
         src.push("in vec4 modelMatrixCol0;"); // Modeling matrix
         src.push("in vec4 modelMatrixCol1;");
@@ -90068,12 +90201,13 @@ class PointsInstancingSilhouetteRenderer {
             src.push("out float vFragDepth;");
         }
 
-        src.push("uniform vec4 color;");
+        src.push("uniform vec4 silhouetteColor;");
 
         if (clipping) {
             src.push("out vec4 vWorldPosition;");
             src.push("out vec4 vFlags2;");
         }
+        src.push("out vec4 vColor;");
 
         src.push("void main(void) {");
 
@@ -90100,6 +90234,7 @@ class PointsInstancingSilhouetteRenderer {
         if (scene.logarithmicDepthBufferEnabled) {
            src.push("vFragDepth = 1.0 + clipPos.w;");
         }
+        src.push("vColor = vec4(float(silhouetteColor.r) / 255.0, float(silhouetteColor.g) / 255.0, float(silhouetteColor.b) / 255.0, float(color.a) / 255.0);");
         src.push("gl_Position = clipPos;");
         if (pointsMaterial.perspectivePoints) {
             src.push("gl_PointSize = (nearPlaneHeight * pointSize) / clipPos.w;");
@@ -90140,7 +90275,7 @@ class PointsInstancingSilhouetteRenderer {
                 src.push("uniform vec3 sectionPlaneDir" + i + ";");
             }
         }
-        src.push("uniform vec4 color;");
+        src.push("in vec4 vColor;");
         src.push("out vec4 outColor;");
         src.push("void main(void) {");
         if (scene.pointsMaterial.roundPoints) {
@@ -90165,7 +90300,7 @@ class PointsInstancingSilhouetteRenderer {
         if (scene.logarithmicDepthBufferEnabled) {
             src.push("gl_FragDepth = log2( vFragDepth ) * logDepthBufFC * 0.5;");
         }
-        src.push("outColor = color;");
+        src.push("outColor = vColor;");
         src.push("}");
         return src;
     }
@@ -90182,7 +90317,7 @@ class PointsInstancingSilhouetteRenderer {
     }
 }
 
-const tempVec3a$d = math.vec3();
+const tempVec3a$c = math.vec3();
 
 /**
  * @private
@@ -90288,7 +90423,7 @@ class PointsInstancingPickMeshRenderer {
                     if (active) {
                         const sectionPlane = sectionPlanes[sectionPlaneIndex];
                         if (origin) {
-                            const rtcSectionPlanePos = getPlaneRTCPos(sectionPlane.dist, sectionPlane.dir, origin, tempVec3a$d);
+                            const rtcSectionPlanePos = getPlaneRTCPos(sectionPlane.dist, sectionPlane.dir, origin, tempVec3a$c);
                             gl.uniform3fv(sectionPlaneUniforms.pos, rtcSectionPlanePos);
                         } else {
                             gl.uniform3fv(sectionPlaneUniforms.pos, sectionPlane.pos);
@@ -90539,7 +90674,7 @@ class PointsInstancingPickMeshRenderer {
     }
 }
 
-const tempVec3a$c = math.vec3();
+const tempVec3a$b = math.vec3();
 
 /**
  * @private
@@ -90617,7 +90752,7 @@ class PointsInstancingPickDepthRenderer {
                     if (active) {
                         const sectionPlane = sectionPlanes[sectionPlaneIndex];
                         if (origin) {
-                            const rtcSectionPlanePos = getPlaneRTCPos(sectionPlane.dist, sectionPlane.dir, origin, tempVec3a$c);
+                            const rtcSectionPlanePos = getPlaneRTCPos(sectionPlane.dist, sectionPlane.dir, origin, tempVec3a$b);
                             gl.uniform3fv(sectionPlaneUniforms.pos, rtcSectionPlanePos);
                         } else {
                             gl.uniform3fv(sectionPlaneUniforms.pos, sectionPlane.pos);
@@ -90905,7 +91040,7 @@ class PointsInstancingPickDepthRenderer {
     }
 }
 
-const tempVec3a$b = math.vec3();
+const tempVec3a$a = math.vec3();
 
 /**
  * @private
@@ -90967,7 +91102,7 @@ class PointsInstancingOcclusionRenderer {
                     if (active) {
                         const sectionPlane = sectionPlanes[sectionPlaneIndex];
                         if (origin) {
-                            const rtcSectionPlanePos = getPlaneRTCPos(sectionPlane.dist, sectionPlane.dir, origin, tempVec3a$b);
+                            const rtcSectionPlanePos = getPlaneRTCPos(sectionPlane.dist, sectionPlane.dir, origin, tempVec3a$a);
                             gl.uniform3fv(sectionPlaneUniforms.pos, rtcSectionPlanePos);
                         } else {
                             gl.uniform3fv(sectionPlaneUniforms.pos, sectionPlane.pos);
@@ -91256,7 +91391,7 @@ class PointsInstancingOcclusionRenderer {
     }
 }
 
-const tempVec3a$a = math.vec3();
+const tempVec3a$9 = math.vec3();
 
 /**
  * @private
@@ -91318,7 +91453,7 @@ class PointsInstancingDepthRenderer {
                     if (active) {
                         const sectionPlane = sectionPlanes[sectionPlaneIndex];
                         if (origin) {
-                            const rtcSectionPlanePos = getPlaneRTCPos(sectionPlane.dist, sectionPlane.dir, origin, tempVec3a$a);
+                            const rtcSectionPlanePos = getPlaneRTCPos(sectionPlane.dist, sectionPlane.dir, origin, tempVec3a$9);
                             gl.uniform3fv(sectionPlaneUniforms.pos, rtcSectionPlanePos);
                         } else {
                             gl.uniform3fv(sectionPlaneUniforms.pos, sectionPlane.pos);
@@ -91602,7 +91737,7 @@ class PointsInstancingDepthRenderer {
     }
 }
 
-const tempVec3a$9 = math.vec3();
+const tempVec3a$8 = math.vec3();
 
 /**
  * Renders InstancingLayer fragment depths to a shadow map.
@@ -91689,7 +91824,7 @@ class PointsInstancingShadowRenderer {
                     if (active) {
                         const sectionPlane = sectionPlanes[sectionPlaneIndex];
                         if (origin) {
-                            const rtcSectionPlanePos = getPlaneRTCPos(sectionPlane.dist, sectionPlane.dir, origin, tempVec3a$9);
+                            const rtcSectionPlanePos = getPlaneRTCPos(sectionPlane.dist, sectionPlane.dir, origin, tempVec3a$8);
                             gl.uniform3fv(sectionPlaneUniforms.pos, rtcSectionPlanePos);
                         } else {
                             gl.uniform3fv(sectionPlaneUniforms.pos, sectionPlane.pos);
@@ -94030,7 +94165,7 @@ function getKTX2TextureTranscoder(viewer) {
     return transcoder;
 }
 
-const tempVec3a$8 = math.vec3();
+const tempVec3a$7 = math.vec3();
 const tempMat4$1 = math.mat4();
 
 const defaultScale = math.vec3([1, 1, 1]);
@@ -96411,7 +96546,7 @@ class VBOSceneModel extends Component {
             }
 
             const cfgOrigin = cfg.origin || cfg.rtcCenter;
-            const origin = (cfgOrigin) ? math.addVec3(this._origin, cfgOrigin, tempVec3a$8) : this._origin;
+            const origin = (cfgOrigin) ? math.addVec3(this._origin, cfgOrigin, tempVec3a$7) : this._origin;
 
             const instancingLayer = this._getInstancingLayer(origin, textureSetId, geometryId);
 
@@ -96473,7 +96608,7 @@ class VBOSceneModel extends Component {
 
             let indices = cfg.indices;
             let edgeIndices = cfg.edgeIndices;
-            let origin = (cfg.origin || cfg.rtcCenter) ? math.addVec3(this._origin, cfg.origin || cfg.rtcCenter, tempVec3a$8) : this._origin;
+            let origin = (cfg.origin || cfg.rtcCenter) ? math.addVec3(this._origin, cfg.origin || cfg.rtcCenter, tempVec3a$7) : this._origin;
             let positions = cfg.positions;
 
             if (positions) {
@@ -97487,8 +97622,8 @@ class TextureTranscoder {
 const screenPos = math.vec4();
 const viewPos = math.vec4();
 
-const tempVec3a$7 = math.vec3();
-const tempVec3b$4 = math.vec3();
+const tempVec3a$6 = math.vec3();
+const tempVec3b$3 = math.vec3();
 const tempVec3c$3 = math.vec3();
 
 const tempVec4a$4 = math.vec4();
@@ -97522,7 +97657,7 @@ class PanController {
         const camera = this._scene.camera;
 
         if (optionalTargetWorldPos) {
-            const eyeToWorldPosVec = math.subVec3(optionalTargetWorldPos, camera.eye, tempVec3a$7);
+            const eyeToWorldPosVec = math.subVec3(optionalTargetWorldPos, camera.eye, tempVec3a$6);
             const eyeWorldPosDist = math.lenVec3(eyeToWorldPosVec);
             dolliedThroughSurface = (eyeWorldPosDist < dollyDelta);
         }
@@ -97546,9 +97681,9 @@ class PanController {
                 // suddenly a lot closer than the point we pivoted about on the surface of the last object
                 // that we click-drag-pivoted on.
 
-                const eyeTargetVec = math.subVec3(optionalTargetWorldPos, camera.eye, tempVec3a$7);
+                const eyeTargetVec = math.subVec3(optionalTargetWorldPos, camera.eye, tempVec3a$6);
                 const lenEyeTargetVec = math.lenVec3(eyeTargetVec);
-                const eyeLookVec = math.mulVec3Scalar(math.normalizeVec3(math.subVec3(camera.look, camera.eye, tempVec3b$4)), lenEyeTargetVec);
+                const eyeLookVec = math.mulVec3Scalar(math.normalizeVec3(math.subVec3(camera.look, camera.eye, tempVec3b$3)), lenEyeTargetVec);
                 camera.look = [camera.eye[0] + eyeLookVec[0], camera.eye[1] + eyeLookVec[1], camera.eye[2] + eyeLookVec[2]];
             }
 
@@ -97565,7 +97700,7 @@ class PanController {
 
             const worldPos2 = this._unproject(targetCanvasPos, tempVec4b$4);
             const offset = math.subVec3(worldPos2, worldPos1, tempVec4c$1);
-            const eyeLookMoveVec = math.mulVec3Scalar(math.normalizeVec3(math.subVec3(camera.look, camera.eye, tempVec3a$7)), -dollyDelta, tempVec3b$4);
+            const eyeLookMoveVec = math.mulVec3Scalar(math.normalizeVec3(math.subVec3(camera.look, camera.eye, tempVec3a$6)), -dollyDelta, tempVec3b$3);
             const moveVec = math.addVec3(offset, eyeLookMoveVec, tempVec3c$3);
 
             camera.eye = [camera.eye[0] - moveVec[0], camera.eye[1] - moveVec[1], camera.eye[2] - moveVec[2]];
@@ -97593,8 +97728,8 @@ class PanController {
     }
 }
 
-const tempVec3a$6 = math.vec3();
-const tempVec3b$3 = math.vec3();
+const tempVec3a$5 = math.vec3();
+const tempVec3b$2 = math.vec3();
 const tempVec3c$2 = math.vec3();
 
 const tempVec4a$3 = math.vec4();
@@ -97726,8 +97861,8 @@ class PivotController {
 
     _cameraLookingDownwards() { // Returns true if angle between camera viewing direction and World-space "up" axis is too small
         const camera = this._scene.camera;
-        const forwardAxis = math.normalizeVec3(math.subVec3(camera.look, camera.eye, tempVec3a$6));
-        const rightAxis = math.cross3Vec3(forwardAxis, camera.worldUp, tempVec3b$3);
+        const forwardAxis = math.normalizeVec3(math.subVec3(camera.look, camera.eye, tempVec3a$5));
+        const rightAxis = math.cross3Vec3(forwardAxis, camera.worldUp, tempVec3b$2);
         let rightAxisLen = math.sqLenVec3(rightAxis);
         return (rightAxisLen <= 0.0001);
     }
@@ -97767,8 +97902,8 @@ class PivotController {
         const screenZ = math.dotVec4(D, Pt3) / math.dotVec4(D, Pt4);
         const worldPos = tempVec4a$3;
         camera.project.unproject(canvasPos, screenZ, tempVec4b$3, tempVec4c, worldPos);
-        const eyeWorldPosVec = math.normalizeVec3(math.subVec3(worldPos, camera.eye, tempVec3a$6));
-        const posOnSphere = math.addVec3(camera.eye, math.mulVec3Scalar(eyeWorldPosVec, pivotShereRadius, tempVec3b$3), tempVec3c$2);
+        const eyeWorldPosVec = math.normalizeVec3(math.subVec3(worldPos, camera.eye, tempVec3a$5));
+        const posOnSphere = math.addVec3(camera.eye, math.mulVec3Scalar(eyeWorldPosVec, pivotShereRadius, tempVec3b$2), tempVec3c$2);
         this.setPivotPos(posOnSphere);
     }
 
@@ -98399,8 +98534,8 @@ class MousePanRotateDollyHandler {
 }
 
 const center = math.vec3();
-const tempVec3a$5 = math.vec3();
-const tempVec3b$2 = math.vec3();
+const tempVec3a$4 = math.vec3();
+const tempVec3b$1 = math.vec3();
 const tempVec3c$1 = math.vec3();
 const tempVec3d = math.vec3();
 
@@ -98454,39 +98589,39 @@ class KeyboardAxisViewHandler {
 
             if (axisViewRight) {
 
-                tempCameraTarget.eye.set(math.addVec3(center, math.mulVec3Scalar(camera.worldRight, perspectiveDist, tempVec3a$5), tempVec3d));
+                tempCameraTarget.eye.set(math.addVec3(center, math.mulVec3Scalar(camera.worldRight, perspectiveDist, tempVec3a$4), tempVec3d));
                 tempCameraTarget.look.set(center);
                 tempCameraTarget.up.set(camera.worldUp);
 
             } else if (axisViewBack) {
 
-                tempCameraTarget.eye.set(math.addVec3(center, math.mulVec3Scalar(camera.worldForward, perspectiveDist, tempVec3a$5), tempVec3d));
+                tempCameraTarget.eye.set(math.addVec3(center, math.mulVec3Scalar(camera.worldForward, perspectiveDist, tempVec3a$4), tempVec3d));
                 tempCameraTarget.look.set(center);
                 tempCameraTarget.up.set(camera.worldUp);
 
             } else if (axisViewLeft) {
 
-                tempCameraTarget.eye.set(math.addVec3(center, math.mulVec3Scalar(camera.worldRight, -perspectiveDist, tempVec3a$5), tempVec3d));
+                tempCameraTarget.eye.set(math.addVec3(center, math.mulVec3Scalar(camera.worldRight, -perspectiveDist, tempVec3a$4), tempVec3d));
                 tempCameraTarget.look.set(center);
                 tempCameraTarget.up.set(camera.worldUp);
 
             } else if (axisViewFront) {
 
-                tempCameraTarget.eye.set(math.addVec3(center, math.mulVec3Scalar(camera.worldForward, -perspectiveDist, tempVec3a$5), tempVec3d));
+                tempCameraTarget.eye.set(math.addVec3(center, math.mulVec3Scalar(camera.worldForward, -perspectiveDist, tempVec3a$4), tempVec3d));
                 tempCameraTarget.look.set(center);
                 tempCameraTarget.up.set(camera.worldUp);
 
             } else if (axisViewTop) {
 
-                tempCameraTarget.eye.set(math.addVec3(center, math.mulVec3Scalar(camera.worldUp, perspectiveDist, tempVec3a$5), tempVec3d));
+                tempCameraTarget.eye.set(math.addVec3(center, math.mulVec3Scalar(camera.worldUp, perspectiveDist, tempVec3a$4), tempVec3d));
                 tempCameraTarget.look.set(center);
-                tempCameraTarget.up.set(math.normalizeVec3(math.mulVec3Scalar(camera.worldForward, 1, tempVec3b$2), tempVec3c$1));
+                tempCameraTarget.up.set(math.normalizeVec3(math.mulVec3Scalar(camera.worldForward, 1, tempVec3b$1), tempVec3c$1));
 
             } else if (axisViewBottom) {
 
-                tempCameraTarget.eye.set(math.addVec3(center, math.mulVec3Scalar(camera.worldUp, -perspectiveDist, tempVec3a$5), tempVec3d));
+                tempCameraTarget.eye.set(math.addVec3(center, math.mulVec3Scalar(camera.worldUp, -perspectiveDist, tempVec3a$4), tempVec3d));
                 tempCameraTarget.look.set(center);
-                tempCameraTarget.up.set(math.normalizeVec3(math.mulVec3Scalar(camera.worldForward, -1, tempVec3b$2)));
+                tempCameraTarget.up.set(math.normalizeVec3(math.mulVec3Scalar(camera.worldForward, -1, tempVec3b$1)));
             }
 
             if ((!configs.firstPerson) && configs.followPointer) {
@@ -102923,7 +103058,8 @@ class DistanceMeasurementsControl extends Component {
         this._active = false;
 
         // Mouse input uses a combo of events that requires us to track
-        // the current DistanceMeasurement under construction. This is not used for touch input.
+        // the current DistanceMeasurement under construction. This is not used for touch input, which
+        // just uses touch-move-release to make a measurement.
         this._currentDistanceMeasurementByMouse = null;
 
         this._currentDistanceMeasurementByMouseInittouchState = {
@@ -103111,6 +103247,7 @@ class DistanceMeasurementsControl extends Component {
 
         this._onPickedNothing = cameraControl.on("pickedNothing", event => {
             if (this._currentDistanceMeasurementByMouse) {
+                this.fire("measurementCancel", this._currentDistanceMeasurementByMouse);
                 this._currentDistanceMeasurementByMouse.destroy();
                 this._currentDistanceMeasurementByMouse = null;
             }
@@ -103153,7 +103290,7 @@ class DistanceMeasurementsControl extends Component {
                         case SECOND_TOUCH_EXPECTED:
                             startDot.setVisible(false);
                             this._touchStartMarker.worldPos = pickResult.worldPos;
-                           const measurement = plugin.createMeasurement({
+                            const measurement = plugin.createMeasurement({
                                 id: math.createUUID(),
                                 origin: {
                                     entity: mouseHoverEntity,
@@ -103167,6 +103304,7 @@ class DistanceMeasurementsControl extends Component {
                             });
                             measurement.clickable = true;
                             touchState = FIRST_TOUCH_EXPECTED;
+                            this.fire("measurementEnd", measurement);
                             break;
                     }
                 } else {
@@ -103208,7 +103346,11 @@ class DistanceMeasurementsControl extends Component {
         canvas.removeEventListener("touchstart", this._onCanvasTouchStart);
         canvas.removeEventListener("touchend", this._onCanvasTouchEnd);
 
-        this._currentDistanceMeasurementByMouse = null;
+        if (this._currentDistanceMeasurementByMouse) {
+            this.fire("measurementCancel", this._currentDistanceMeasurementByMouse);
+            this._currentDistanceMeasurementByMouse.destroy();
+            this._currentDistanceMeasurementByMouse = null;
+        }
 
         this._active = false;
     }
@@ -103225,6 +103367,7 @@ class DistanceMeasurementsControl extends Component {
             return;
         }
         if (this._currentDistanceMeasurementByMouse) {
+            this.fire("measurementCancel", this._currentDistanceMeasurementByMouse);
             this._currentDistanceMeasurementByMouse.destroy();
             this._currentDistanceMeasurementByMouse = null;
         }
@@ -113658,7 +113801,7 @@ class NavCubePlugin extends Plugin {
     }
 }
 
-const tempVec3a$4 = math.vec3();
+const tempVec3a$3 = math.vec3();
 
 /**
  * @private
@@ -114356,7 +114499,7 @@ function createMeshes(modelNode, state) {
         }
         geometryCfg.indices = indices;
 
-        const origin = tempVec3a$4;
+        const origin = tempVec3a$3;
 
         worldToRTCPositions(geometry.positions, geometry.positions, origin);
 
@@ -116815,7 +116958,7 @@ class STLDefaultDataSource {
     }
 }
 
-const tempVec3a$3 = math.vec3();
+const tempVec3a$2 = math.vec3();
 
 /**
  * @private
@@ -117067,7 +117210,7 @@ function addMesh(modelNode, positions, normals, colors, material, options) {
         math.faceToVertexNormals(positions, normals, options);
     }
 
-    const origin = tempVec3a$3;
+    const origin = tempVec3a$2;
 
     worldToRTCPositions(positions, positions, origin);
 
@@ -117577,7 +117720,7 @@ class StoreyMap {
     }
 }
 
-const tempVec3a$2 = math.vec3();
+const tempVec3a$1 = math.vec3();
 const tempMat4 = math.mat4();
 
 const EMPTY_IMAGE = "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAYAAAAfFcSJAAAADUlEQVR42mNkYPhfDwAChwGA60e6kgAAAABJRU5ErkJggg==";
@@ -117997,7 +118140,7 @@ class StoreyViewsPlugin extends Plugin {
 
         const orthoScale2 = diag * 1.3;
 
-        const eye2 = tempVec3a$2;
+        const eye2 = tempVec3a$1;
 
         eye2[0] = look2[0] + (camera.worldUp[0] * sca);
         eye2[1] = look2[1] + (camera.worldUp[1] * sca);
@@ -118208,7 +118351,7 @@ class StoreyViewsPlugin extends Plugin {
         const aabb = storey.aabb;
         const look = math.getAABB3Center(aabb);
         const sca = 0.5;
-        const eye = tempVec3a$2;
+        const eye = tempVec3a$1;
         eye[0] = look[0] + (camera.worldUp[0] * sca);
         eye[1] = look[1] + (camera.worldUp[1] * sca);
         eye[2] = look[2] + (camera.worldUp[2] * sca);
@@ -118264,7 +118407,7 @@ class StoreyViewsPlugin extends Plugin {
 
         const origin = math.vec3([xmin + (xWorldSize * normX), ymin + (yWorldSize * 0.5), zmin + (zWorldSize * normZ)]);
         const direction = math.vec3([0, -1, 0]);
-        const look = math.addVec3(origin, direction, tempVec3a$2);
+        const look = math.addVec3(origin, direction, tempVec3a$1);
         const worldForward = this.viewer.camera.worldForward;
         const matrix = math.lookAtMat4v(origin, look, worldForward, tempMat4);
 
@@ -118362,7 +118505,7 @@ class StoreyViewsPlugin extends Plugin {
         const camera = this.viewer.camera;
         const eye = camera.eye;
         const look = camera.look;
-        const eyeLookDir = math.subVec3(look, eye, tempVec3a$2);
+        const eyeLookDir = math.subVec3(look, eye, tempVec3a$1);
         const worldUp = camera.worldUp;
         const xUp = worldUp[0] > worldUp[1] && worldUp[0] > worldUp[2];
         const yUp = !xUp && worldUp[1] > worldUp[0] && worldUp[1] > worldUp[2];
@@ -119790,116 +119933,6 @@ class TreeViewPlugin extends Plugin {
     }
 }
 
-const tempVec3a$1 = math.vec3();
-const tempVec3b$1 = math.vec3();
-const tempMat4a = math.mat4();
-
-/**
- * @private
- */
-class FrustumPlane {
-
-    constructor() {
-        this.normal = math.vec3();
-        this.offset = 0;
-        this.testVertex = math.vec3();
-    }
-
-    set(nx, ny, nz, offset) {
-        const s = 1.0 / Math.sqrt(nx * nx + ny * ny + nz * nz);
-        this.normal[0] = nx * s;
-        this.normal[1] = ny * s;
-        this.normal[2] = nz * s;
-        this.offset = offset * s;
-        this.testVertex[0] = (this.normal[0] >= 0.0) ? 1 : 0;
-        this.testVertex[1] = (this.normal[1] >= 0.0) ? 1 : 0;
-        this.testVertex[2] = (this.normal[2] >= 0.0) ? 1 : 0;
-    }
-}
-
-/**
- * @private
- */
-class Frustum {
-    constructor() {
-        this.planes = [
-            new FrustumPlane(), new FrustumPlane(), new FrustumPlane(),
-            new FrustumPlane(), new FrustumPlane(), new FrustumPlane()
-        ];
-    }
-}
-
-Frustum.INSIDE = 0;
-Frustum.INTERSECT = 1;
-Frustum.OUTSIDE = 2;
-
-/** @private */
-function setFrustum(frustum, viewMat, projMat) {
-
-    const m = math.mulMat4(projMat, viewMat, tempMat4a);
-
-    const m0 = m[0];
-    const m1 = m[1];
-    const m2 = m[2];
-    const m3 = m[3];
-    const m4 = m[4];
-    const m5 = m[5];
-    const m6 = m[6];
-    const m7 = m[7];
-    const m8 = m[8];
-    const m9 = m[9];
-    const m10 = m[10];
-    const m11 = m[11];
-    const m12 = m[12];
-    const m13 = m[13];
-    const m14 = m[14];
-    const m15 = m[15];
-
-    frustum.planes[0].set(m3 - m0, m7 - m4, m11 - m8, m15 - m12);
-    frustum.planes[1].set(m3 + m0, m7 + m4, m11 + m8, m15 + m12);
-    frustum.planes[2].set(m3 - m1, m7 - m5, m11 - m9, m15 - m13);
-    frustum.planes[3].set(m3 + m1, m7 + m5, m11 + m9, m15 + m13);
-    frustum.planes[4].set(m3 - m2, m7 - m6, m11 - m10, m15 - m14);
-    frustum.planes[5].set(m3 + m2, m7 + m6, m11 + m10, m15 + m14);
-}
-
-/** @private */
-function frustumIntersectsAABB3(frustum, aabb) {
-
-    let ret = Frustum.INSIDE;
-
-    const min = tempVec3a$1;
-    const max = tempVec3b$1;
-
-    min[0] = aabb[0];
-    min[1] = aabb[1];
-    min[2] = aabb[2];
-    max[0] = aabb[3];
-    max[1] = aabb[4];
-    max[2] = aabb[5];
-
-    const bminmax = [min, max];
-
-    for (let i = 0; i < 6; ++i) {
-        const plane = frustum.planes[i];
-        if (((plane.normal[0] * bminmax[plane.testVertex[0]][0]) +
-            (plane.normal[1] * bminmax[plane.testVertex[1]][1]) +
-            (plane.normal[2] * bminmax[plane.testVertex[2]][2]) +
-            (plane.offset)) < 0.0) {
-            return Frustum.OUTSIDE;
-        }
-
-        if (((plane.normal[0] * bminmax[1 - plane.testVertex[0]][0]) +
-            (plane.normal[1] * bminmax[1 - plane.testVertex[1]][1]) +
-            (plane.normal[2] * bminmax[1 - plane.testVertex[2]][2]) +
-            (plane.offset)) < 0.0) {
-            ret = Frustum.INTERSECT;
-        }
-    }
-
-    return ret;
-}
-
 /**
  * For each Entity in its Scene, efficiently combines updates from multiple culling systems into a single "culled" state.
  *
@@ -181217,6 +181250,8 @@ exports.EmphasisMaterial = EmphasisMaterial;
 exports.FastNavPlugin = FastNavPlugin;
 exports.FloatType = FloatType;
 exports.Fresnel = Fresnel;
+exports.Frustum = Frustum;
+exports.FrustumPlane = FrustumPlane;
 exports.GIFMediaType = GIFMediaType;
 exports.GLTFDefaultDataSource = GLTFDefaultDataSource;
 exports.GLTFLoaderPlugin = GLTFLoaderPlugin;
@@ -181337,10 +181372,12 @@ exports.buildPlaneGeometry = buildPlaneGeometry;
 exports.buildSphereGeometry = buildSphereGeometry;
 exports.buildTorusGeometry = buildTorusGeometry;
 exports.buildVectorTextGeometry = buildVectorTextGeometry;
+exports.frustumIntersectsAABB3 = frustumIntersectsAABB3;
 exports.getKTX2TextureTranscoder = getKTX2TextureTranscoder;
 exports.load3DSGeometry = load3DSGeometry;
 exports.loadOBJGeometry = loadOBJGeometry;
 exports.math = math;
 exports.sRGBEncoding = sRGBEncoding;
+exports.setFrustum = setFrustum;
 exports.stats = stats;
 exports.utils = utils;