npm - @xeokit/xeokit-sdk - Versions diffs - 2.4.0-alpha-2 → 2.4.0-alpha-3 - Mend

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

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (7) hide show

package/dist/xeokit-sdk.cjs.js +310 -273
package/dist/xeokit-sdk.es.js +307 -274
package/dist/xeokit-sdk.es5.js +294 -293
package/dist/xeokit-sdk.min.cjs.js +2 -2
package/dist/xeokit-sdk.min.es.js +4 -4
package/dist/xeokit-sdk.min.es5.js +2 -2
package/package.json +1 -1

package/dist/xeokit-sdk.es.js CHANGED Viewed

@@ -66536,6 +66536,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}.
  *
@@ -69086,7 +69196,7 @@ const RENDER_PASSES = {
 };
 const tempVec4$7 = math.vec4();
-const tempVec3a$V = math.vec3();
+const tempVec3a$U = math.vec3();
 /**
  * @private
@@ -69151,7 +69261,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);
@@ -69579,7 +69689,7 @@ class TrianglesBatchingColorRenderer {
 }
 const tempVec4$6 = math.vec4();
-const tempVec3a$U = math.vec3();
+const tempVec3a$T = math.vec3();
 /**
  * @private
@@ -69641,7 +69751,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);
@@ -70058,7 +70168,7 @@ class TrianglesBatchingFlatColorRenderer {
 }
 const defaultColor$4 = new Float32Array([1, 1, 1]);
-const tempVec3a$T = math.vec3();
+const tempVec3a$S = math.vec3();
 /**
  * @private
@@ -70106,22 +70216,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;
@@ -70142,7 +70252,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);
@@ -70169,6 +70279,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);
@@ -70193,7 +70307,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++) {
@@ -70208,6 +70322,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");
@@ -70255,11 +70370,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;");
@@ -70275,6 +70391,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
@@ -70293,6 +70411,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;");
@@ -70335,7 +70454,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) {
@@ -70353,7 +70472,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;
     }
@@ -70370,7 +70489,7 @@ class TrianglesBatchingSilhouetteRenderer {
     }
 }
-const tempVec3a$S = math.vec3();
+const tempVec3a$R = math.vec3();
 const defaultColor$3 = new Float32Array([0,0,0,1]);
 /**
@@ -70453,7 +70572,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);
@@ -70681,7 +70800,7 @@ class TrianglesBatchingEdgesRenderer {
     }
 }
-const tempVec3a$R = math.vec3();
+const tempVec3a$Q = math.vec3();
 /**
  * @private
@@ -70741,7 +70860,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);
@@ -70969,7 +71088,7 @@ class TrianglesBatchingEdgesColorRenderer {
     }
 }
-const tempVec3a$Q = math.vec3();
+const tempVec3a$P = math.vec3();
 /**
  * @private
@@ -71035,7 +71154,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);
@@ -71265,7 +71384,7 @@ class TrianglesBatchingPickMeshRenderer {
     }
 }
-const tempVec3a$P = math.vec3();
+const tempVec3a$O = math.vec3();
 /**
  * @private
@@ -71336,7 +71455,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);
@@ -71574,7 +71693,7 @@ class TrianglesBatchingPickDepthRenderer {
     }
 }
-const tempVec3a$O = math.vec3();
+const tempVec3a$N = math.vec3();
 /**
  * @private
@@ -71642,7 +71761,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);
@@ -71867,7 +71986,7 @@ class TrianglesBatchingPickNormalsRenderer {
     }
 }
-const tempVec3a$N = math.vec3();
+const tempVec3a$M = math.vec3();
 /**
  * @private
@@ -71927,7 +72046,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);
@@ -72150,7 +72269,7 @@ class TrianglesBatchingOcclusionRenderer {
     }
 }
-const tempVec3a$M = math.vec3();
+const tempVec3a$L = math.vec3();
 /**
  * @private
@@ -72210,7 +72329,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);
@@ -72434,7 +72553,7 @@ class TrianglesBatchingDepthRenderer {
     }
 }
-const tempVec3a$L = math.vec3();
+const tempVec3a$K = math.vec3();
 /**
  * @private
@@ -72497,7 +72616,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);
@@ -72737,7 +72856,7 @@ class TrianglesBatchingNormalsRenderer {
     }
 }
-const tempVec3a$K = math.vec3();
+const tempVec3a$J = math.vec3();
 /**
  * Renders BatchingLayer fragment depths to a shadow map.
@@ -72806,7 +72925,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);
@@ -72978,7 +73097,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";
@@ -73051,7 +73170,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);
@@ -73856,7 +73975,7 @@ class TrianglesBatchingPBRRenderer {
     }
 }
-const tempVec3a$I = math.vec3();
+const tempVec3a$H = math.vec3();
 /**
  * @private
@@ -73923,7 +74042,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);
@@ -74133,7 +74252,7 @@ class TrianglesBatchingPickNormalsFlatRenderer {
 }
 const tempVec4$4 = math.vec4();
-const tempVec3a$H = math.vec3();
+const tempVec3a$G = math.vec3();
 /**
  * @private
@@ -74198,7 +74317,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);
@@ -75204,8 +75323,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();
@@ -76384,8 +76503,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);
@@ -76508,7 +76627,7 @@ class TrianglesBatchingLayer {
 }
 const tempVec4$3 = math.vec4();
-const tempVec3a$F = math.vec3();
+const tempVec3a$E = math.vec3();
 /**
  * @private
@@ -76574,7 +76693,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);
@@ -77051,7 +77170,7 @@ class TrianglesInstancingColorRenderer {
 }
 const tempVec4$2 = math.vec4();
-const tempVec3a$E = math.vec3();
+const tempVec3a$D = math.vec3();
 /**
  * @private
@@ -77113,7 +77232,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);
@@ -77560,7 +77679,7 @@ class TrianglesInstancingFlatColorRenderer {
     }
 }
-const tempVec3a$D = math.vec3();
+const tempVec3a$C = math.vec3();
 /**
  * @private
@@ -77609,22 +77728,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);
@@ -77643,7 +77762,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);
@@ -77679,6 +77798,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);
@@ -77694,6 +77818,9 @@ class TrianglesInstancingSilhouetteRenderer {
         if (this._aOffset) {
             gl.vertexAttribDivisor(this._aOffset.location, 0);
         }
+        if (this._aColor) {
+            gl.vertexAttribDivisor(this._aColor.location, 0);
+        }
     }
     _allocate() {
@@ -77716,7 +77843,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;
@@ -77732,6 +77859,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");
@@ -77770,7 +77899,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;");
@@ -77780,6 +77909,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;");
@@ -77789,6 +77919,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;");
@@ -77799,13 +77930,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
@@ -77827,6 +77958,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;");
@@ -77867,7 +77999,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) {
@@ -77885,7 +78017,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;
     }
@@ -77902,7 +78034,7 @@ class TrianglesInstancingSilhouetteRenderer {
     }
 }
-const tempVec3a$C = math.vec3();
+const tempVec3a$B = math.vec3();
 const defaultColor$2 = new Float32Array([0,0,0,1]);
 /**
@@ -77986,7 +78118,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);
@@ -78247,7 +78379,7 @@ class TrianglesInstancingEdgesRenderer {
     }
 }
-const tempVec3a$B = math.vec3();
+const tempVec3a$A = math.vec3();
 /**
  * @private
@@ -78308,7 +78440,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);
@@ -78574,7 +78706,7 @@ class TrianglesInstancingEdgesColorRenderer {
     }
 }
-const tempVec3a$A = math.vec3();
+const tempVec3a$z = math.vec3();
 /**
  * @private
@@ -78677,7 +78809,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);
@@ -78912,7 +79044,7 @@ class TrianglesInstancingPickMeshRenderer {
     }
 }
-const tempVec3a$z = math.vec3();
+const tempVec3a$y = math.vec3();
 /**
  * @private
@@ -78989,7 +79121,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);
@@ -79257,7 +79389,7 @@ class TrianglesInstancingPickDepthRenderer {
     }
 }
-const tempVec3a$y = math.vec3();
+const tempVec3a$x = math.vec3();
 /**
  * @private
@@ -79334,7 +79466,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);
@@ -79611,7 +79743,7 @@ class TrianglesInstancingPickNormalsRenderer {
     }
 }
-const tempVec3a$x = math.vec3();
+const tempVec3a$w = math.vec3();
 /**
  * @private
@@ -79672,7 +79804,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);
@@ -79930,7 +80062,7 @@ class TrianglesInstancingOcclusionRenderer {
     }
 }
-const tempVec3a$w = math.vec3();
+const tempVec3a$v = math.vec3();
 /**
  * @private
@@ -79991,7 +80123,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);
@@ -80241,7 +80373,7 @@ class TrianglesInstancingDepthRenderer {
     }
 }
-const tempVec3a$v = math.vec3();
+const tempVec3a$u = math.vec3();
 /**
  * @private
@@ -80305,7 +80437,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);
@@ -80585,7 +80717,7 @@ class TrianglesInstancingNormalsRenderer {
     }
 }
-const tempVec3a$u = math.vec3();
+const tempVec3a$t = math.vec3();
 /**
  * Renders InstancingLayer fragment depths to a shadow map.
@@ -80672,7 +80804,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);
@@ -80865,7 +80997,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";
@@ -80939,7 +81071,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);
@@ -81775,7 +81907,7 @@ class TrianglesInstancingPBRRenderer {
     }
 }
-const tempVec3a$s = math.vec3();
+const tempVec3a$r = math.vec3();
 /**
  * @private
@@ -81850,7 +81982,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);
@@ -82090,7 +82222,7 @@ class TrianglesInstancingPickNormalsFlatRenderer {
 }
 const tempVec4 = math.vec4();
-const tempVec3a$r = math.vec3();
+const tempVec3a$q = math.vec3();
 /**
  * @private
@@ -82155,7 +82287,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);
@@ -82966,8 +83098,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();
@@ -83895,8 +84027,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);
@@ -84029,7 +84161,7 @@ class TrianglesInstancingLayer {
     }
 }
-const tempVec3a$p = math.vec3();
+const tempVec3a$o = math.vec3();
 /**
  * @private
@@ -84092,7 +84224,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);
@@ -84312,7 +84444,7 @@ class LinesBatchingColorRenderer {
 }
 const defaultColor$1 = new Float32Array([1, 1, 1]);
-const tempVec3a$o = math.vec3();
+const tempVec3a$n = math.vec3();
 /**
  * @private
@@ -84399,7 +84531,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);
@@ -85496,7 +85628,7 @@ class LinesBatchingLayer {
     }
 }
-const tempVec3a$n = math.vec3();
+const tempVec3a$m = math.vec3();
 /**
  * @private
@@ -85559,7 +85691,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);
@@ -85841,7 +85973,7 @@ class LinesInstancingColorRenderer {
     }
 }
-const tempVec3a$m = math.vec3();
+const tempVec3a$l = math.vec3();
 /**
  * @private
@@ -85926,7 +86058,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);
@@ -86908,7 +87040,7 @@ class LinesInstancingLayer {
     }
 }
-const tempVec3a$l = math.vec3();
+const tempVec3a$k = math.vec3();
 /**
  * @private
@@ -86969,7 +87101,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);
@@ -87254,7 +87386,7 @@ class PointsBatchingColorRenderer {
 }
 const defaultColor = new Float32Array([1, 1, 1]);
-const tempVec3a$k = math.vec3();
+const tempVec3a$j = math.vec3();
 /**
  * @private
@@ -87339,7 +87471,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);
@@ -87583,7 +87715,7 @@ class PointsBatchingSilhouetteRenderer {
     }
 }
-const tempVec3a$j = math.vec3();
+const tempVec3a$i = math.vec3();
 /**
  * @private
@@ -87650,7 +87782,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);
@@ -87895,7 +88027,7 @@ class PointsBatchingPickMeshRenderer {
     }
 }
-const tempVec3a$i = math.vec3();
+const tempVec3a$h = math.vec3();
 /**
  * @private
@@ -87967,7 +88099,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);
@@ -88218,7 +88350,7 @@ class PointsBatchingPickDepthRenderer {
     }
 }
-const tempVec3a$h = math.vec3();
+const tempVec3a$g = math.vec3();
 /**
  * @private
@@ -88279,7 +88411,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);
@@ -88645,8 +88777,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]);
@@ -88798,8 +88930,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];
@@ -89437,7 +89569,7 @@ class PointsBatchingLayer {
     }
 }
-const tempVec3a$f = math.vec3();
+const tempVec3a$e = math.vec3();
 /**
  * @private
@@ -89506,7 +89638,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);
@@ -89816,7 +89948,7 @@ class PointsInstancingColorRenderer {
     }
 }
-const tempVec3a$e = math.vec3();
+const tempVec3a$d = math.vec3();
 /**
  * @private
@@ -89900,7 +90032,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);
@@ -89975,7 +90107,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;
@@ -90044,6 +90176,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;");
@@ -90064,12 +90197,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) {");
@@ -90096,6 +90230,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;");
@@ -90136,7 +90271,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) {
@@ -90161,7 +90296,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;
     }
@@ -90178,7 +90313,7 @@ class PointsInstancingSilhouetteRenderer {
     }
 }
-const tempVec3a$d = math.vec3();
+const tempVec3a$c = math.vec3();
 /**
  * @private
@@ -90284,7 +90419,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);
@@ -90535,7 +90670,7 @@ class PointsInstancingPickMeshRenderer {
     }
 }
-const tempVec3a$c = math.vec3();
+const tempVec3a$b = math.vec3();
 /**
  * @private
@@ -90613,7 +90748,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);
@@ -90901,7 +91036,7 @@ class PointsInstancingPickDepthRenderer {
     }
 }
-const tempVec3a$b = math.vec3();
+const tempVec3a$a = math.vec3();
 /**
  * @private
@@ -90963,7 +91098,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);
@@ -91252,7 +91387,7 @@ class PointsInstancingOcclusionRenderer {
     }
 }
-const tempVec3a$a = math.vec3();
+const tempVec3a$9 = math.vec3();
 /**
  * @private
@@ -91314,7 +91449,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);
@@ -91598,7 +91733,7 @@ class PointsInstancingDepthRenderer {
     }
 }
-const tempVec3a$9 = math.vec3();
+const tempVec3a$8 = math.vec3();
 /**
  * Renders InstancingLayer fragment depths to a shadow map.
@@ -91685,7 +91820,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);
@@ -94026,7 +94161,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]);
@@ -96407,7 +96542,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);
@@ -96469,7 +96604,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) {
@@ -97483,8 +97618,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();
@@ -97518,7 +97653,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);
         }
@@ -97542,9 +97677,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]];
             }
@@ -97561,7 +97696,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]];
@@ -97589,8 +97724,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();
@@ -97722,8 +97857,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);
     }
@@ -97763,8 +97898,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);
     }
@@ -98395,8 +98530,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();
@@ -98450,39 +98585,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) {
@@ -102919,7 +103054,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 = {
@@ -103107,6 +103243,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;
             }
@@ -103149,7 +103286,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,
@@ -103163,6 +103300,7 @@ class DistanceMeasurementsControl extends Component {
                             });
                             measurement.clickable = true;
                             touchState = FIRST_TOUCH_EXPECTED;
+                            this.fire("measurementEnd", measurement);
                             break;
                     }
                 } else {
@@ -103204,7 +103342,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;
     }
@@ -103221,6 +103363,7 @@ class DistanceMeasurementsControl extends Component {
             return;
         }
         if (this._currentDistanceMeasurementByMouse) {
+            this.fire("measurementCancel", this._currentDistanceMeasurementByMouse);
             this._currentDistanceMeasurementByMouse.destroy();
             this._currentDistanceMeasurementByMouse = null;
         }
@@ -113654,7 +113797,7 @@ class NavCubePlugin extends Plugin {
     }
 }
-const tempVec3a$4 = math.vec3();
+const tempVec3a$3 = math.vec3();
 /**
  * @private
@@ -114352,7 +114495,7 @@ function createMeshes(modelNode, state) {
         }
         geometryCfg.indices = indices;
-        const origin = tempVec3a$4;
+        const origin = tempVec3a$3;
         worldToRTCPositions(geometry.positions, geometry.positions, origin);
@@ -116811,7 +116954,7 @@ class STLDefaultDataSource {
     }
 }
-const tempVec3a$3 = math.vec3();
+const tempVec3a$2 = math.vec3();
 /**
  * @private
@@ -117063,7 +117206,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);
@@ -117573,7 +117716,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==";
@@ -117993,7 +118136,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);
@@ -118204,7 +118347,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);
@@ -118260,7 +118403,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);
@@ -118358,7 +118501,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];
@@ -119786,116 +119929,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.
  *
@@ -181183,4 +181216,4 @@ class CityJSONLoaderPlugin extends Plugin {
     }
 }
-export { AlphaFormat, AmbientLight, AngleMeasurementsPlugin, AnnotationsPlugin, AxisGizmoPlugin, BCFViewpointsPlugin, Bitmap, ByteType, CameraMemento, CameraPath, CameraPathAnimation, CityJSONLoaderPlugin, ClampToEdgeWrapping, Component, CompressedMediaType, Configs, ContextMenu, CubicBezierCurve, Curve, DataTextureSceneModel, DefaultLoadingManager, DepthFormat, DepthStencilFormat, DirLight, DistanceMeasurementsPlugin, EdgeMaterial, EmphasisMaterial, FastNavPlugin, FloatType, Fresnel, GIFMediaType, GLTFDefaultDataSource, GLTFLoaderPlugin, HalfFloatType, ImagePlane, IntType, JPEGMediaType, KTX2TextureTranscoder, LASLoaderPlugin, LambertMaterial, LightMap, LineSet, LinearEncoding, LinearFilter, LinearMipMapLinearFilter, LinearMipMapNearestFilter, LinearMipmapLinearFilter, LinearMipmapNearestFilter, Loader, LoadingManager, LocaleService, LuminanceAlphaFormat, LuminanceFormat, Map$1 as Map, Marker, Mesh, MetallicMaterial, MirroredRepeatWrapping, ModelMemento, NavCubePlugin, NearestFilter, NearestMipMapLinearFilter, NearestMipMapNearestFilter, NearestMipmapLinearFilter, NearestMipmapNearestFilter, Node$1 as Node, OBJLoaderPlugin, ObjectsMemento, PNGMediaType, Path, PerformanceModel, PhongMaterial, Plugin, PointLight, QuadraticBezierCurve, Queue, RGBAFormat, RGBAIntegerFormat, RGBA_ASTC_10x10_Format, RGBA_ASTC_10x5_Format, RGBA_ASTC_10x6_Format, RGBA_ASTC_10x8_Format, RGBA_ASTC_12x10_Format, RGBA_ASTC_12x12_Format, RGBA_ASTC_4x4_Format, RGBA_ASTC_5x4_Format, RGBA_ASTC_5x5_Format, RGBA_ASTC_6x5_Format, RGBA_ASTC_6x6_Format, RGBA_ASTC_8x5_Format, RGBA_ASTC_8x6_Format, RGBA_ASTC_8x8_Format, RGBA_BPTC_Format, RGBA_ETC2_EAC_Format, RGBA_PVRTC_2BPPV1_Format, RGBA_PVRTC_4BPPV1_Format, RGBA_S3TC_DXT1_Format, RGBA_S3TC_DXT3_Format, RGBA_S3TC_DXT5_Format, RGBFormat, RGB_ETC1_Format, RGB_ETC2_Format, RGB_PVRTC_2BPPV1_Format, RGB_PVRTC_4BPPV1_Format, RGB_S3TC_DXT1_Format, RGFormat, RGIntegerFormat, ReadableGeometry, RedFormat, RedIntegerFormat, ReflectionMap, RepeatWrapping, STLDefaultDataSource, STLLoaderPlugin, SceneModel, SectionPlane, SectionPlanesPlugin, ShortType, Skybox, SkyboxesPlugin, SpecularMaterial, SplineCurve, SpriteMarker, StoreyViewsPlugin, Texture, TextureTranscoder, TreeViewPlugin, UnsignedByteType, UnsignedInt248Type, UnsignedIntType, UnsignedShort4444Type, UnsignedShort5551Type, UnsignedShortType, VBOGeometry, VBOSceneModel, ViewCullPlugin, Viewer, WebIFCLoaderPlugin, WorkerPool$1 as WorkerPool, XKTDefaultDataSource, XKTLoaderPlugin, XML3DLoaderPlugin, buildBoxGeometry, buildBoxLinesGeometry, buildCylinderGeometry, buildGridGeometry, buildPlaneGeometry, buildSphereGeometry, buildTorusGeometry, buildVectorTextGeometry, getKTX2TextureTranscoder, load3DSGeometry, loadOBJGeometry, math, sRGBEncoding, stats, utils };
+export { AlphaFormat, AmbientLight, AngleMeasurementsPlugin, AnnotationsPlugin, AxisGizmoPlugin, BCFViewpointsPlugin, Bitmap, ByteType, CameraMemento, CameraPath, CameraPathAnimation, CityJSONLoaderPlugin, ClampToEdgeWrapping, Component, CompressedMediaType, Configs, ContextMenu, CubicBezierCurve, Curve, DataTextureSceneModel, DefaultLoadingManager, DepthFormat, DepthStencilFormat, DirLight, DistanceMeasurementsPlugin, EdgeMaterial, EmphasisMaterial, FastNavPlugin, FloatType, Fresnel, Frustum, FrustumPlane, GIFMediaType, GLTFDefaultDataSource, GLTFLoaderPlugin, HalfFloatType, ImagePlane, IntType, JPEGMediaType, KTX2TextureTranscoder, LASLoaderPlugin, LambertMaterial, LightMap, LineSet, LinearEncoding, LinearFilter, LinearMipMapLinearFilter, LinearMipMapNearestFilter, LinearMipmapLinearFilter, LinearMipmapNearestFilter, Loader, LoadingManager, LocaleService, LuminanceAlphaFormat, LuminanceFormat, Map$1 as Map, Marker, Mesh, MetallicMaterial, MirroredRepeatWrapping, ModelMemento, NavCubePlugin, NearestFilter, NearestMipMapLinearFilter, NearestMipMapNearestFilter, NearestMipmapLinearFilter, NearestMipmapNearestFilter, Node$1 as Node, OBJLoaderPlugin, ObjectsMemento, PNGMediaType, Path, PerformanceModel, PhongMaterial, Plugin, PointLight, QuadraticBezierCurve, Queue, RGBAFormat, RGBAIntegerFormat, RGBA_ASTC_10x10_Format, RGBA_ASTC_10x5_Format, RGBA_ASTC_10x6_Format, RGBA_ASTC_10x8_Format, RGBA_ASTC_12x10_Format, RGBA_ASTC_12x12_Format, RGBA_ASTC_4x4_Format, RGBA_ASTC_5x4_Format, RGBA_ASTC_5x5_Format, RGBA_ASTC_6x5_Format, RGBA_ASTC_6x6_Format, RGBA_ASTC_8x5_Format, RGBA_ASTC_8x6_Format, RGBA_ASTC_8x8_Format, RGBA_BPTC_Format, RGBA_ETC2_EAC_Format, RGBA_PVRTC_2BPPV1_Format, RGBA_PVRTC_4BPPV1_Format, RGBA_S3TC_DXT1_Format, RGBA_S3TC_DXT3_Format, RGBA_S3TC_DXT5_Format, RGBFormat, RGB_ETC1_Format, RGB_ETC2_Format, RGB_PVRTC_2BPPV1_Format, RGB_PVRTC_4BPPV1_Format, RGB_S3TC_DXT1_Format, RGFormat, RGIntegerFormat, ReadableGeometry, RedFormat, RedIntegerFormat, ReflectionMap, RepeatWrapping, STLDefaultDataSource, STLLoaderPlugin, SceneModel, SectionPlane, SectionPlanesPlugin, ShortType, Skybox, SkyboxesPlugin, SpecularMaterial, SplineCurve, SpriteMarker, StoreyViewsPlugin, Texture, TextureTranscoder, TreeViewPlugin, UnsignedByteType, UnsignedInt248Type, UnsignedIntType, UnsignedShort4444Type, UnsignedShort5551Type, UnsignedShortType, VBOGeometry, VBOSceneModel, ViewCullPlugin, Viewer, WebIFCLoaderPlugin, WorkerPool$1 as WorkerPool, XKTDefaultDataSource, XKTLoaderPlugin, XML3DLoaderPlugin, buildBoxGeometry, buildBoxLinesGeometry, buildCylinderGeometry, buildGridGeometry, buildPlaneGeometry, buildSphereGeometry, buildTorusGeometry, buildVectorTextGeometry, frustumIntersectsAABB3, getKTX2TextureTranscoder, load3DSGeometry, loadOBJGeometry, math, sRGBEncoding, setFrustum, stats, utils };