@xeokit/xeokit-sdk 2.0.0-beta.9 → 2.0.0

package/dist/xeokit-sdk.es.js

@@ -74,11 +74,12 @@ class Group {
  * @private
  */
 class Item {
-    constructor(id, getTitle, doAction, getEnabled) {
+    constructor(id, getTitle, doAction, getEnabled, getShown) {
         this.id = id;
         this.getTitle = getTitle;
         this.doAction = doAction;
         this.getEnabled = getEnabled;
+        this.getShown = getShown;
         this.itemElement = null;
         this.subMenu = null;
         this.enabled = true;
@@ -97,6 +98,7 @@ class Item {
  * * A pure JavaScript, lightweight context menu
  * * Dynamically configure menu items
  * * Dynamically enable or disable items
+ * * Dynamically show or hide items
  * * Supports cascading sub-menus
  * * Configure custom style with custom CSS (see examples above)
  *
@@ -110,16 +112,23 @@ class Item {
  * Each item has:
  *
  * * a ````title```` for the item,
- * * a ````doAction()```` callback to fire when the item's title is clicked, and
- * * an optional ````getEnabled()```` callback that indicates if the item should enabled in the menu or not.
+ * * a ````doAction()```` callback to fire when the item's title is clicked,
+ * * an optional ````getShown()```` callback that indicates if the item should shown in the menu or not, and
+ * * an optional ````getEnabled()```` callback that indicates if the item should be shown enabled in the menu or not.
  *
  * <br>
  *
- * The ````getEnabled()```` callbacks are invoked whenever the menu is shown. When an item's ````getEnabled()```` callback
- * returns ````true````, then the item is enabled and clickable. When it returns ````false````, then the item is disabled
- * and cannot be clicked. An item without a ````getEnabled()```` callback is always enabled and clickable.
+ * The ````getShown()```` and ````getEnabled()```` callbacks are invoked whenever the menu is shown.
  *
- * Note how the ````doAction()```` and ````getEnabled()```` callbacks accept a ````context````
+ * When an item's ````getShown()```` callback
+ * returns ````true````, then the item is shown. When it returns ````false````, then the item is hidden. An item without
+ * a ````getShown()```` callback is always shown.
+ *
+ * When an item's ````getEnabled()```` callback returns ````true````, then the item is enabled and clickable (as long as it's also shown). When it
+ * returns ````false````, then the item is disabled and cannot be clicked. An item without a ````getEnabled()````
+ * callback is always enabled and clickable.
+ *
+ * Note how the ````doAction()````,  ````getShown()```` and ````getEnabled()```` callbacks accept a ````context````
  * object. That must be set on the ````ContextMenu```` before we're able to we show it. The context object can be anything. In this example,
  * we'll use the context object to provide the callbacks with the Entity that we right-clicked.
  *
@@ -341,6 +350,11 @@ class ContextMenu {
                     this.hide();
                 }
             });
+            document.addEventListener("touchstart", this._canvasTouchStartHandler = (event) => {
+                if (!event.target.classList.contains("xeokit-context-menu-item")) {
+                    this.hide();
+                }
+            });
         }
 
         if (cfg.items) {
@@ -575,7 +589,11 @@ class ContextMenu {
                         return true;
                     });
 
-                    const item = new Item(itemId, getTitle, doAction, getEnabled);
+                    const getShown = itemCfg.getShown || (() => {
+                        return true;
+                    });
+
+                    const item = new Item(itemId, getTitle, doAction, getEnabled, getShown);
 
                     item.parentMenu = menu;
 
@@ -809,6 +827,10 @@ class ContextMenu {
             if (!itemElement) {
                 continue;
             }
+            const getShown = item.getShown;
+            if (!getShown || !getShown(this._context)) {
+                continue;
+            }
             const title = item.getTitle(this._context);
             if (item.subMenu) {
                 itemElement.innerText = title;
@@ -832,6 +854,22 @@ class ContextMenu {
             if (!getEnabled) {
                 continue;
             }
+            const getShown = item.getShown;
+            if (!getShown) {
+                continue;
+            }
+            const shown = getShown(this._context);
+            item.shown = shown;
+            if (!shown) {
+                itemElement.style.visibility = "hidden";
+                itemElement.style.height = "0";
+                itemElement.style.padding = "0";
+                continue;
+            } else {
+                itemElement.style.visibility = "visible";
+                itemElement.style.height = "auto";
+                itemElement.style.padding = null;
+            }
             const enabled = getEnabled(this._context);
             item.enabled = enabled;
             if (!enabled) {
@@ -8767,7 +8805,6 @@ const createRTCViewMat = (function () {
  *
  * Given a double-precision World-space position, returns a double-precision relative-to-center (RTC) center pos
  * and a single-precision offset fom that center.
- *
  * @private
  * @param {Float64Array} worldPos The World-space position.
  * @param {Float64Array} rtcCenter Double-precision relative-to-center (RTC) center pos.
@@ -9056,12 +9093,12 @@ class Marker extends Component {
         this._entity = entity;
         if (this._entity) {
             if (this._entity instanceof PerformanceNode) {
-                this._onEntityModelDestroyed = this._entity.model.once("destroyed", () => { // PerformanceNode does not fire events, and cannot exist beyond its PerformanceModel
+                this._onEntityModelDestroyed = this._entity.model.on("destroyed", () => { // PerformanceNode does not fire events, and cannot exist beyond its PerformanceModel
                     this._entity = null; // Marker now may become visible, if it was synched to invisible Entity
                     this._onEntityModelDestroyed = null;
                 });
             } else {
-                this._onEntityDestroyed = this._entity.once("destroyed", () => {
+                this._onEntityDestroyed = this._entity.on("destroyed", () => {
                     this._entity = null;
                     this._onEntityDestroyed = null;
                 });
@@ -15849,6 +15886,7 @@ const Renderer = function (scene, options) {
         const tempMat4a = math.mat4();
         const tempMat4b = math.mat4();
 
+        const randomVec3 = math.vec3();
         const up = math.vec3([0, 1, 0]);
         const _pickResult = new PickResult();
 
@@ -15859,6 +15897,7 @@ const Renderer = function (scene, options) {
         const worldRayOrigin = math.vec3();
         const worldRayDir = math.vec3();
         const worldSurfacePos = math.vec3();
+        const worldSurfaceNormal = math.vec3();
 
         return function (params, pickResult = _pickResult) {
 
@@ -15899,7 +15938,7 @@ const Renderer = function (scene, options) {
                 // Picking with arbitrary World-space ray
                 // Align camera along ray and fire ray through center of canvas
 
-                const pickFrustumMatrix = math.frustumMat4(-1, 1, -1, 1, scene.camera.project.near, scene.camera.project.far, tempMat4a);
+                const pickFrustumMatrix = math.frustumMat4(-1, 1, -1, 1, 0.01, scene.camera.project.far, tempMat4a);
 
                 if (params.matrix) {
 
@@ -15913,6 +15952,13 @@ const Renderer = function (scene, options) {
 
                     look = math.addVec3(worldRayOrigin, worldRayDir, tempVec3a);
 
+                    randomVec3[0] = Math.random();
+                    randomVec3[1] = Math.random();
+                    randomVec3[2] = Math.random();
+
+                    math.normalizeVec3(randomVec3);
+                    math.cross3Vec3(worldRayDir, randomVec3, up);
+
                     pickViewMatrix = math.lookAtMat4v(worldRayOrigin, look, up, tempMat4b);
                     pickProjMatrix = pickFrustumMatrix;
 
@@ -15950,14 +15996,18 @@ const Renderer = function (scene, options) {
                         math.canvasPosToWorldRay(scene.canvas.canvas, pickViewMatrix, pickProjMatrix, canvasPos, worldRayOrigin, worldRayDir);
                     }
 
-                    if (pickable.precisionRayPickSurface(worldRayOrigin, worldRayDir, worldSurfacePos)) {
+                    if (pickable.precisionRayPickSurface(worldRayOrigin, worldRayDir, worldSurfacePos, worldSurfaceNormal)) {
 
                         pickResult.worldPos = worldSurfacePos;
 
                         if (params.pickSurfaceNormal !== false) {
-                            gpuPickWorldNormal(pickable, canvasPos, pickViewMatrix, pickProjMatrix, pickResult);
+                            pickResult.worldNormal = worldSurfaceNormal;
                         }
 
+                        // if (params.pickSurfaceNormal !== false) {
+                        //     gpuPickWorldNormal(pickable, canvasPos, pickViewMatrix, pickProjMatrix, pickResult);
+                        // }
+
                         pickResult.pickSurfacePrecision = true;
                     }
 
@@ -16017,8 +16067,6 @@ const Renderer = function (scene, options) {
         gl.disable(gl.BLEND);
         gl.clear(gl.COLOR_BUFFER_BIT | gl.DEPTH_BUFFER_BIT);
 
-        let i;
-        let len;
         const includeEntityIds = params.includeEntityIds;
         const excludeEntityIds = params.excludeEntityIds;
 
@@ -16028,7 +16076,7 @@ const Renderer = function (scene, options) {
                 const drawableInfo = drawableTypeInfo[type];
                 const drawableList = drawableInfo.drawableList;
 
-                for (i = 0, len = drawableList.length; i < len; i++) {
+                for (let i = 0, len = drawableList.length; i < len; i++) {
 
                     const drawable = drawableList[i];
 
@@ -26063,8 +26111,10 @@ class Scene extends Component {
     }
 
     _deregisterModel(entity) {
-        delete this.models[entity.id];
+        const modelId = entity.id;
+        delete this.models[modelId];
         this._modelIds = null; // Lazy regenerate
+        this.fire("modelUnloaded", modelId);
     }
 
     _registerObject(entity) {
@@ -27506,6 +27556,7 @@ class Scene extends Component {
 /**
  * @private
  */
+
 const DrawShaderSource = function (mesh) {
     if (mesh._material._state.type === "LambertMaterial") {
         this.vertex = buildVertexLambert(mesh);
@@ -27594,7 +27645,13 @@ function buildVertexLambert(mesh) {
     }
     if (scene.logarithmicDepthBufferEnabled) {
         src.push("uniform float logDepthBufFC;");
-        src.push("varying float vFragDepth;");
+        if (WEBGL_INFO$1.SUPPORTED_EXTENSIONS["EXT_frag_depth"]) {
+            src.push("varying float vFragDepth;");
+        }
+        src.push("bool isPerspectiveMatrix(mat4 m) {");
+        src.push("    return (m[2][3] == - 1.0);");
+        src.push("}");
+        src.push("varying float isPerspective;");
     }
     if (clipping) {
         src.push("varying vec4 vWorldPosition;");
@@ -27728,7 +27785,6 @@ function buildVertexLambert(mesh) {
             src.push("reflectedColor += lambertian * (lightColor" + i + ".rgb * lightColor" + i + ".a);");
         }
     }
-    //src.push("vColor = vec4((reflectedColor * materialColor) + (lightAmbient.rgb * lightAmbient.a), 1.0) * colorize;");
     src.push("vColor = vec4((lightAmbient.rgb * lightAmbient.a * materialColor.rgb) + materialEmissive.rgb + (reflectedColor * materialColor.rgb), materialColor.a) * colorize;"); // TODO: How to have ambient bright enough for canvas BG but not too bright for scene?
     if (clipping) {
         src.push("vWorldPosition = worldPosition;");
@@ -27738,7 +27794,13 @@ function buildVertexLambert(mesh) {
     }
     src.push("vec4 clipPos = projMatrix * viewPosition;");
     if (scene.logarithmicDepthBufferEnabled) {
-        src.push("vFragDepth = 1.0 + clipPos.w;");
+        if (WEBGL_INFO$1.SUPPORTED_EXTENSIONS["EXT_frag_depth"]) {
+            src.push("vFragDepth = 1.0 + clipPos.w;");
+        } else {
+            src.push("clipPos.z = log2( max( 1e-6, clipPos.w + 1.0 ) ) * logDepthBufFC - 1.0;");
+            src.push("clipPos.z *= clipPos.w;");
+        }
+        src.push("isPerspective = float (isPerspectiveMatrix(projMatrix));");
     }
     src.push("gl_Position = clipPos;");
     src.push("}");
@@ -27764,7 +27826,8 @@ function buildFragmentLambert(mesh) {
     src.push("precision mediump float;");
     src.push("precision mediump int;");
     src.push("#endif");
-    if (scene.logarithmicDepthBufferEnabled) {
+    if (scene.logarithmicDepthBufferEnabled && WEBGL_INFO$1.SUPPORTED_EXTENSIONS["EXT_frag_depth"]) {
+        src.push("varying float isPerspective;");
         src.push("uniform float logDepthBufFC;");
         src.push("varying float vFragDepth;");
     }
@@ -27804,8 +27867,8 @@ function buildFragmentLambert(mesh) {
         src.push("}");
 
     }
-    if (scene.logarithmicDepthBufferEnabled) {
-        src.push("gl_FragDepthEXT = log2( vFragDepth ) * logDepthBufFC * 0.5;");
+    if (scene.logarithmicDepthBufferEnabled && WEBGL_INFO$1.SUPPORTED_EXTENSIONS["EXT_frag_depth"]) {
+        src.push("gl_FragDepthEXT = isPerspective == 0.0 ? gl_FragCoord.z : log2( vFragDepth ) * logDepthBufFC * 0.5;");
     }
     if (gammaOutput) {
         src.push("gl_FragColor = linearToGamma(vColor, gammaFactor);");
@@ -27825,6 +27888,7 @@ function buildVertexDraw(mesh) {
     const lightsState = scene._lightsState;
     let light;
     const billboard = meshState.billboard;
+    const background = meshState.background;
     const stationary = meshState.stationary;
     const texturing = hasTextures(mesh);
     const normals = hasNormals$1(mesh);
@@ -27853,7 +27917,13 @@ function buildVertexDraw(mesh) {
     }
     if (scene.logarithmicDepthBufferEnabled) {
         src.push("uniform float logDepthBufFC;");
-        src.push("varying float vFragDepth;");
+        if (WEBGL_INFO$1.SUPPORTED_EXTENSIONS["EXT_frag_depth"]) {
+            src.push("varying float vFragDepth;");
+        }
+        src.push("bool isPerspectiveMatrix(mat4 m) {");
+        src.push("    return (m[2][3] == - 1.0);");
+        src.push("}");
+        src.push("varying float isPerspective;");
     }
     if (lightsState.lightMaps.length > 0) {
         src.push("varying    vec3 vWorldNormal;");
@@ -27950,6 +28020,8 @@ function buildVertexDraw(mesh) {
     src.push("mat4 modelMatrix2          = modelMatrix;");
     if (stationary) {
         src.push("viewMatrix2[3][0] = viewMatrix2[3][1] = viewMatrix2[3][2] = 0.0;");
+    } else if (background) {
+        src.push("viewMatrix2[3] = vec4(0.0, 0.0, 0.0 ,1.0);");
     }
     if (billboard === "spherical" || billboard === "cylindrical") {
         src.push("mat4 modelViewMatrix = viewMatrix2 * modelMatrix2;");
@@ -28020,7 +28092,16 @@ function buildVertexDraw(mesh) {
     src.push("   vViewPosition = viewPosition.xyz;");
     src.push("vec4 clipPos = projMatrix * viewPosition;");
     if (scene.logarithmicDepthBufferEnabled) {
-        src.push("vFragDepth = 1.0 + clipPos.w;");
+        if (WEBGL_INFO$1.SUPPORTED_EXTENSIONS["EXT_frag_depth"]) {
+            src.push("vFragDepth = 1.0 + clipPos.w;");
+        } else {
+            src.push("clipPos.z = log2( max( 1e-6, clipPos.w + 1.0 ) ) * logDepthBufFC - 1.0;");
+            src.push("clipPos.z *= clipPos.w;");
+        }
+        src.push("isPerspective = float (isPerspectiveMatrix(projMatrix));");
+    }
+    if (background) {
+        src.push("clipPos.z = clipPos.w;");
     }
     src.push("gl_Position = clipPos;");
     if (receivesShadow) {
@@ -28074,7 +28155,8 @@ function buildFragmentDraw(mesh) {
     src.push("precision mediump int;");
     src.push("#endif");
 
-    if (scene.logarithmicDepthBufferEnabled) {
+    if (scene.logarithmicDepthBufferEnabled && WEBGL_INFO$1.SUPPORTED_EXTENSIONS["EXT_frag_depth"]) {
+        src.push("varying float isPerspective;");
         src.push("uniform float logDepthBufFC;");
         src.push("varying float vFragDepth;");
     }
@@ -29034,8 +29116,8 @@ function buildFragmentDraw(mesh) {
         src.push("gl_FragColor = linearToGamma(gl_FragColor, gammaFactor);");
     }
 
-    if (scene.logarithmicDepthBufferEnabled) {
-        src.push("gl_FragDepthEXT = log2( vFragDepth ) * logDepthBufFC * 0.5;");
+    if (scene.logarithmicDepthBufferEnabled && WEBGL_INFO$1.SUPPORTED_EXTENSIONS["EXT_frag_depth"]) {
+        src.push("gl_FragDepthEXT = isPerspective == 0.0 ? gl_FragCoord.z : log2( vFragDepth ) * logDepthBufFC * 0.5;");
     }
 
     src.push("}");
@@ -29121,9 +29203,13 @@ DrawRenderer.prototype.drawMesh = function (frameCtx, mesh) {
     const geometryState = mesh._geometry._state;
     const camera = scene.camera;
     const rtcCenter = mesh.rtcCenter;
+    const background = meshState.background;
 
     if (frameCtx.lastProgramId !== this._program.id) {
         frameCtx.lastProgramId = this._program.id;
+        if (background) {
+            gl.depthFunc(gl.LEQUAL);
+        }
         this._bindProgram(frameCtx);
     }
 
@@ -29640,6 +29726,10 @@ DrawRenderer.prototype.drawMesh = function (frameCtx, mesh) {
         gl.drawArrays(gl.TRIANGLES, 0, geometryState.positions.numItems);
         frameCtx.drawArrays++;
     }
+
+    if (background) {
+        gl.depthFunc(gl.LESS);
+    }
 };
 
 DrawRenderer.prototype._allocate = function (mesh) {
@@ -30051,6 +30141,10 @@ function buildVertex$5(mesh) {
         if (WEBGL_INFO$1.SUPPORTED_EXTENSIONS["EXT_frag_depth"]) {
             src.push("varying float vFragDepth;");
         }
+        src.push("bool isPerspectiveMatrix(mat4 m) {");
+        src.push("    return (m[2][3] == - 1.0);");
+        src.push("}");
+        src.push("varying float isPerspective;");
     }
     if (clipping) {
         src.push("varying vec4 vWorldPosition;");
@@ -30190,6 +30284,7 @@ function buildVertex$5(mesh) {
             src.push("clipPos.z = log2( max( 1e-6, clipPos.w + 1.0 ) ) * logDepthBufFC - 1.0;");
             src.push("clipPos.z *= clipPos.w;");
         }
+        src.push("isPerspective = float (isPerspectiveMatrix(projMatrix));");
     }
     src.push("gl_Position = clipPos;");
     src.push("}");
@@ -30227,6 +30322,7 @@ function buildFragment$5(mesh) {
     src.push("#endif");
 
     if (scene.logarithmicDepthBufferEnabled && WEBGL_INFO$1.SUPPORTED_EXTENSIONS["EXT_frag_depth"]) {
+        src.push("varying float isPerspective;");
         src.push("uniform float logDepthBufFC;");
         src.push("varying float vFragDepth;");
     }
@@ -30267,7 +30363,7 @@ function buildFragment$5(mesh) {
         src.push("}");
     }
     if (scene.logarithmicDepthBufferEnabled && WEBGL_INFO$1.SUPPORTED_EXTENSIONS["EXT_frag_depth"]) {
-        src.push("gl_FragDepthEXT = log2( vFragDepth ) * logDepthBufFC * 0.5;");
+        src.push("gl_FragDepthEXT = isPerspective == 0.0 ? gl_FragCoord.z : log2( vFragDepth ) * logDepthBufFC * 0.5;");
     }
     if (gammaOutput) {
         src.push("gl_FragColor = linearToGamma(vColor, gammaFactor);");
@@ -30578,6 +30674,10 @@ function buildVertex$4(mesh) {
         if (WEBGL_INFO$1.SUPPORTED_EXTENSIONS["EXT_frag_depth"]) {
             src.push("varying float vFragDepth;");
         }
+        src.push("bool isPerspectiveMatrix(mat4 m) {");
+        src.push("    return (m[2][3] == - 1.0);");
+        src.push("}");
+        src.push("varying float isPerspective;");
     }
     if (clipping) {
         src.push("varying vec4 vWorldPosition;");
@@ -30634,6 +30734,7 @@ function buildVertex$4(mesh) {
             src.push("clipPos.z = log2( max( 1e-6, clipPos.w + 1.0 ) ) * logDepthBufFC - 1.0;");
             src.push("clipPos.z *= clipPos.w;");
         }
+        src.push("isPerspective = float (isPerspectiveMatrix(projMatrix));");
     }
     src.push("gl_Position = clipPos;");
     src.push("}");
@@ -30660,6 +30761,7 @@ function buildFragment$4(mesh) {
     src.push("precision mediump int;");
     src.push("#endif");
     if (scene.logarithmicDepthBufferEnabled && WEBGL_INFO$1.SUPPORTED_EXTENSIONS["EXT_frag_depth"]) {
+        src.push("varying float isPerspective;");
         src.push("uniform float logDepthBufFC;");
         src.push("varying float vFragDepth;");
     }
@@ -30692,7 +30794,7 @@ function buildFragment$4(mesh) {
         src.push("}");
     }
     if (scene.logarithmicDepthBufferEnabled && WEBGL_INFO$1.SUPPORTED_EXTENSIONS["EXT_frag_depth"]) {
-        src.push("gl_FragDepthEXT = log2( vFragDepth ) * logDepthBufFC * 0.5;");
+        src.push("gl_FragDepthEXT = isPerspective == 0.0 ? gl_FragCoord.z : log2( vFragDepth ) * logDepthBufFC * 0.5;");
     }
     if (gammaOutput) {
         src.push("gl_FragColor = linearToGamma(vColor, gammaFactor);");
@@ -30986,6 +31088,10 @@ function buildVertex$3(mesh) {
         if (WEBGL_INFO$1.SUPPORTED_EXTENSIONS["EXT_frag_depth"]) {
             src.push("varying float vFragDepth;");
         }
+        src.push("bool isPerspectiveMatrix(mat4 m) {");
+        src.push("    return (m[2][3] == - 1.0);");
+        src.push("}");
+        src.push("varying float isPerspective;");
     }
     if (billboard === "spherical" || billboard === "cylindrical") {
         src.push("void billboard(inout mat4 mat) {");
@@ -31031,6 +31137,7 @@ function buildVertex$3(mesh) {
             src.push("clipPos.z = log2( max( 1e-6, clipPos.w + 1.0 ) ) * logDepthBufFC - 1.0;");
             src.push("clipPos.z *= clipPos.w;");
         }
+        src.push("isPerspective = float (isPerspectiveMatrix(projMatrix));");
     }
     src.push("gl_Position = clipPos;");
     src.push("}");
@@ -31054,6 +31161,7 @@ function buildFragment$3(mesh) {
     src.push("precision mediump int;");
     src.push("#endif");
     if (scene.logarithmicDepthBufferEnabled && WEBGL_INFO$1.SUPPORTED_EXTENSIONS["EXT_frag_depth"]) {
+        src.push("varying float isPerspective;");
         src.push("uniform float logDepthBufFC;");
         src.push("varying float vFragDepth;");
     }
@@ -31080,7 +31188,7 @@ function buildFragment$3(mesh) {
         src.push("}");
     }
     if (scene.logarithmicDepthBufferEnabled && WEBGL_INFO$1.SUPPORTED_EXTENSIONS["EXT_frag_depth"]) {
-        src.push("gl_FragDepthEXT = log2( vFragDepth ) * logDepthBufFC * 0.5;");
+        src.push("gl_FragDepthEXT = isPerspective == 0.0 ? gl_FragCoord.z : log2( vFragDepth ) * logDepthBufFC * 0.5;");
     }
     src.push("   gl_FragColor = pickColor; ");
     src.push("}");
@@ -31327,6 +31435,10 @@ function buildVertex$2(mesh) {
         if (WEBGL_INFO$1.SUPPORTED_EXTENSIONS["EXT_frag_depth"]) {
             src.push("varying float vFragDepth;");
         }
+        src.push("bool isPerspectiveMatrix(mat4 m) {");
+        src.push("    return (m[2][3] == - 1.0);");
+        src.push("}");
+        src.push("varying float isPerspective;");
     }
     src.push("varying vec4 vColor;");
     if (quantizedGeometry) {
@@ -31352,6 +31464,7 @@ function buildVertex$2(mesh) {
             src.push("clipPos.z = log2( max( 1e-6, clipPos.w + 1.0 ) ) * logDepthBufFC - 1.0;");
             src.push("clipPos.z *= clipPos.w;");
         }
+        src.push("isPerspective = float (isPerspectiveMatrix(projMatrix));");
     }
     src.push("gl_Position = clipPos;");
     src.push("}");
@@ -31376,6 +31489,7 @@ function buildFragment$2(mesh) {
     src.push("#endif");
     src.push("varying vec4 vColor;");
     if (scene.logarithmicDepthBufferEnabled && WEBGL_INFO$1.SUPPORTED_EXTENSIONS["EXT_frag_depth"]) {
+        src.push("varying float isPerspective;");
         src.push("uniform float logDepthBufFC;");
         src.push("varying float vFragDepth;");
     }
@@ -31401,7 +31515,7 @@ function buildFragment$2(mesh) {
         src.push("}");
     }
     if (scene.logarithmicDepthBufferEnabled && WEBGL_INFO$1.SUPPORTED_EXTENSIONS["EXT_frag_depth"]) {
-        src.push("gl_FragDepthEXT = log2( vFragDepth ) * logDepthBufFC * 0.5;");
+        src.push("gl_FragDepthEXT = isPerspective == 0.0 ? gl_FragCoord.z : log2( vFragDepth ) * logDepthBufFC * 0.5;");
     }
     src.push("   gl_FragColor = vColor;");
     src.push("}");
@@ -31625,6 +31739,10 @@ function buildVertex$1(mesh) {
         if (WEBGL_INFO$1.SUPPORTED_EXTENSIONS["EXT_frag_depth"]) {
             src.push("varying float vFragDepth;");
         }
+        src.push("bool isPerspectiveMatrix(mat4 m) {");
+        src.push("    return (m[2][3] == - 1.0);");
+        src.push("}");
+        src.push("varying float isPerspective;");
     }
     if (billboard === "spherical" || billboard === "cylindrical") {
         src.push("void billboard(inout mat4 mat) {");
@@ -31670,6 +31788,7 @@ function buildVertex$1(mesh) {
             src.push("clipPos.z = log2( max( 1e-6, clipPos.w + 1.0 ) ) * logDepthBufFC - 1.0;");
             src.push("clipPos.z *= clipPos.w;");
         }
+        src.push("isPerspective = float (isPerspectiveMatrix(projMatrix));");
     }
     src.push("gl_Position = clipPos;");
     src.push("}");
@@ -31698,6 +31817,7 @@ function buildFragment$1(mesh) {
     src.push("#endif");
 
     if (scene.logarithmicDepthBufferEnabled && WEBGL_INFO$1.SUPPORTED_EXTENSIONS["EXT_frag_depth"]) {
+        src.push("varying float isPerspective;");
         src.push("uniform float logDepthBufFC;");
         src.push("varying float vFragDepth;");
     }
@@ -31729,7 +31849,7 @@ function buildFragment$1(mesh) {
     src.push("   gl_FragColor = vec4(0.0, 0.0, 1.0, 1.0); ");
 
     if (scene.logarithmicDepthBufferEnabled && WEBGL_INFO$1.SUPPORTED_EXTENSIONS["EXT_frag_depth"]) {
-        src.push("gl_FragDepthEXT = log2( vFragDepth ) * logDepthBufFC * 0.5;");
+        src.push("gl_FragDepthEXT = isPerspective == 0.0 ? gl_FragCoord.z : log2( vFragDepth ) * logDepthBufFC * 0.5;");
     }
 
     src.push("}");
@@ -32629,6 +32749,7 @@ class Mesh extends Component {
      * @param {Number[]} [cfg.rotation=[0,0,0]] Local rotation, as Euler angles given in degrees, for each of the X, Y and Z axis.
      * @param {Number[]} [cfg.matrix=[1,0,0,0,0,1,0,0,0,0,1,0,0,0,0,1]] Local modelling transform matrix. Overrides the position, scale and rotation parameters.
      * @param {Number[]} [cfg.offset=[0,0,0]] World-space 3D translation offset. Translates the Mesh in World space, after modelling transforms.
+     * @param {Boolean} [cfg.occluder=true] Indicates if the Mesh is able to occlude {@link Marker}s.
      * @param {Boolean} [cfg.visible=true] Indicates if the Mesh is initially visible.
      * @param {Boolean} [cfg.culled=false] Indicates if the Mesh is initially culled from view.
      * @param {Boolean} [cfg.pickable=true] Indicates if the Mesh is initially pickable.
@@ -32640,6 +32761,7 @@ class Mesh extends Component {
      * @param {Boolean} [cfg.highlighted=false] Indicates if the Mesh is initially highlighted.
      * @param {Boolean} [cfg.selected=false] Indicates if the Mesh is initially selected.
      * @param {Boolean} [cfg.edges=false] Indicates if the Mesh's edges are initially emphasized.
+     * @param {Boolean} [cfg.background=false] Indicates if the Mesh should act as background, e.g., it can be used for a skybox.
      * @param {Number[]} [cfg.colorize=[1.0,1.0,1.0]] Mesh's initial RGB colorize color, multiplies by the rendered fragment colors.
      * @param {Number} [cfg.opacity=1.0] Mesh's initial opacity factor, multiplies by the rendered fragment alpha.
      * @param {String} [cfg.billboard="none"] Mesh's billboarding behaviour. Options are "none" for no billboarding, "spherical" to always directly face {@link Camera.eye}, rotating both vertically and horizontally, or "cylindrical" to face the {@link Camera#eye} while rotating only about its vertically axis (use that mode for things like trees on a landscape).
@@ -32671,6 +32793,7 @@ class Mesh extends Component {
             pickable: null,
             clippable: null,
             collidable: null,
+            occluder:  (cfg.occluder !== false),
             castsShadow: null,
             receivesShadow: null,
             xrayed: false,
@@ -32678,6 +32801,7 @@ class Mesh extends Component {
             selected: false,
             edges: false,
             stationary: !!cfg.stationary,
+            background: !!cfg.background,
             billboard: this._checkBillboard(cfg.billboard),
             layer: null,
             colorize: null,
@@ -32841,11 +32965,13 @@ class Mesh extends Component {
             this._putPickRenderers();
             this._pickMeshRenderer = PickMeshRenderer.get(this);
         }
-        const occlusionHash = this._makeOcclusionHash();
-        if (this._state.occlusionHash !== occlusionHash) {
-            this._state.occlusionHash = occlusionHash;
-            this._putOcclusionRenderer();
-            this._occlusionRenderer = OcclusionRenderer.get(this);
+        if (this._state.occluder) {
+            const occlusionHash = this._makeOcclusionHash();
+            if (this._state.occlusionHash !== occlusionHash) {
+                this._state.occlusionHash = occlusionHash;
+                this._putOcclusionRenderer();
+                this._occlusionRenderer = OcclusionRenderer.get(this);
+            }
         }
     }
 
@@ -34252,7 +34378,7 @@ class Mesh extends Component {
 
     /** @private  */
     drawOcclusion(frameCtx) {
-        if (this._occlusionRenderer || (this._occlusionRenderer = OcclusionRenderer.get(this))) {
+        if (this._state.occluder && this._occlusionRenderer || (this._occlusionRenderer = OcclusionRenderer.get(this))) {
             this._occlusionRenderer.drawMesh(frameCtx, this);
         }
     }
@@ -36935,8 +37061,8 @@ class AxisGizmoPlugin extends Plugin {
                 pickable: false,
                 collidable: false,
                 visible: cfg.visible !== false,
-                position: [-5, 0, 0],
-                rotation: [0, 0, 90]
+                position: [5, 0, 0],
+                rotation: [0, 0, -90]
             }),
 
             new Mesh(axisGizmoScene, {  // Shaft
@@ -36945,7 +37071,7 @@ class AxisGizmoPlugin extends Plugin {
                 pickable: false,
                 collidable: false,
                 visible: cfg.visible !== false,
-                position: [-2, 0, 0],
+                position: [2, 0, 0],
                 rotation: [0, 0, 90]
             }),
 
@@ -36955,7 +37081,7 @@ class AxisGizmoPlugin extends Plugin {
                 pickable: false,
                 collidable: false,
                 visible: cfg.visible !== false,
-                position: [-7, 0, 0],
+                position: [7, 0, 0],
                 billboard: "spherical"
             }),
 
@@ -39768,8 +39894,8 @@ class PerformanceMesh {
     }
 
     /** @private */
-    precisionRayPickSurface(worldRayOrigin, worldRayDir, worldSurfacePos) {
-        return this._layer.precisionRayPickSurface ? this._layer.precisionRayPickSurface(this._portionId, worldRayOrigin, worldRayDir, worldSurfacePos) : false;
+    precisionRayPickSurface(worldRayOrigin, worldRayDir, worldSurfacePos, worldSurfaceNormal) {
+        return this._layer.precisionRayPickSurface ? this._layer.precisionRayPickSurface(this._portionId, worldRayOrigin, worldRayDir, worldSurfacePos, worldSurfaceNormal) : false;
     }
 
     /** @private */
@@ -40187,6 +40313,10 @@ class TrianglesBatchingColorRenderer {
             if (WEBGL_INFO$1.SUPPORTED_EXTENSIONS["EXT_frag_depth"]) {
                 src.push("varying float vFragDepth;");
             }
+            src.push("bool isPerspectiveMatrix(mat4 m) {");
+            src.push("    return (m[2][3] == - 1.0);");
+            src.push("}");
+            src.push("varying float isPerspective;");
         }
 
         src.push("uniform vec4 lightAmbient;");
@@ -40288,6 +40418,7 @@ class TrianglesBatchingColorRenderer {
                 src.push("clipPos.z = log2( max( 1e-6, clipPos.w + 1.0 ) ) * logDepthBufFC - 1.0;");
                 src.push("clipPos.z *= clipPos.w;");
             }
+            src.push("isPerspective = float (isPerspectiveMatrix(projMatrix));");
         }
         if (clipping) {
             src.push("vWorldPosition = worldPosition;");
@@ -40318,6 +40449,7 @@ class TrianglesBatchingColorRenderer {
         src.push("#endif");
 
         if (scene.logarithmicDepthBufferEnabled && WEBGL_INFO$1.SUPPORTED_EXTENSIONS["EXT_frag_depth"]) {
+            src.push("varying float isPerspective;");
             src.push("uniform float logDepthBufFC;");
             src.push("varying float vFragDepth;");
         }
@@ -40363,7 +40495,7 @@ class TrianglesBatchingColorRenderer {
         }
 
         if (scene.logarithmicDepthBufferEnabled && WEBGL_INFO$1.SUPPORTED_EXTENSIONS["EXT_frag_depth"]) {
-            src.push("gl_FragDepthEXT = log2( vFragDepth ) * logDepthBufFC * 0.5;");
+            src.push("    gl_FragDepthEXT = isPerspective == 0.0 ? gl_FragCoord.z : log2( vFragDepth ) * logDepthBufFC * 0.5;");
         }
 
         if (this._withSAO) {
@@ -40638,7 +40770,6 @@ class TrianglesBatchingFlatColorRenderer {
     _buildVertexShader() {
         const scene = this._scene;
         const sectionPlanesState = scene._sectionPlanesState;
-        scene._lightsState;
         const clipping = sectionPlanesState.sectionPlanes.length > 0;
         const src = [];
 
@@ -40670,6 +40801,10 @@ class TrianglesBatchingFlatColorRenderer {
             if (WEBGL_INFO$1.SUPPORTED_EXTENSIONS["EXT_frag_depth"]) {
                 src.push("varying float vFragDepth;");
             }
+            src.push("bool isPerspectiveMatrix(mat4 m) {");
+            src.push("    return (m[2][3] == - 1.0);");
+            src.push("}");
+            src.push("varying float isPerspective;");
         }
 
         if (clipping) {
@@ -40705,6 +40840,7 @@ class TrianglesBatchingFlatColorRenderer {
                 src.push("clipPos.z = log2( max( 1e-6, clipPos.w + 1.0 ) ) * logDepthBufFC - 1.0;");
                 src.push("clipPos.z *= clipPos.w;");
             }
+            src.push("isPerspective = float (isPerspectiveMatrix(projMatrix));");
         }
         if (clipping) {
             src.push("vWorldPosition = worldPosition;");
@@ -40737,6 +40873,7 @@ class TrianglesBatchingFlatColorRenderer {
         src.push("#endif");
 
         if (scene.logarithmicDepthBufferEnabled && WEBGL_INFO$1.SUPPORTED_EXTENSIONS["EXT_frag_depth"]) {
+            src.push("varying float isPerspective;");
             src.push("uniform float logDepthBufFC;");
             src.push("varying float vFragDepth;");
         }
@@ -40863,7 +41000,7 @@ class TrianglesBatchingFlatColorRenderer {
         }
 
         if (scene.logarithmicDepthBufferEnabled && WEBGL_INFO$1.SUPPORTED_EXTENSIONS["EXT_frag_depth"]) {
-            src.push("gl_FragDepthEXT = log2( vFragDepth ) * logDepthBufFC * 0.5;");
+            src.push("    gl_FragDepthEXT = isPerspective == 0.0 ? gl_FragCoord.z : log2( vFragDepth ) * logDepthBufFC * 0.5;");
         }
 
         src.push("}");
@@ -41093,6 +41230,10 @@ class TrianglesBatchingSilhouetteRenderer {
             if (WEBGL_INFO$1.SUPPORTED_EXTENSIONS["EXT_frag_depth"]) {
                 src.push("varying float vFragDepth;");
             }
+            src.push("bool isPerspectiveMatrix(mat4 m) {");
+            src.push("    return (m[2][3] == - 1.0);");
+            src.push("}");
+            src.push("varying float isPerspective;");
         }
 
         if (clipping) {
@@ -41126,6 +41267,7 @@ class TrianglesBatchingSilhouetteRenderer {
                 src.push("clipPos.z = log2( max( 1e-6, clipPos.w + 1.0 ) ) * logDepthBufFC - 1.0;");
                 src.push("clipPos.z *= clipPos.w;");
             }
+            src.push("isPerspective = float (isPerspectiveMatrix(projMatrix));");
         }
         src.push("gl_Position = clipPos;");
         src.push("}");
@@ -41152,6 +41294,7 @@ class TrianglesBatchingSilhouetteRenderer {
         src.push("precision mediump int;");
         src.push("#endif");
         if (scene.logarithmicDepthBufferEnabled && WEBGL_INFO$1.SUPPORTED_EXTENSIONS["EXT_frag_depth"]) {
+            src.push("varying float isPerspective;");
             src.push("uniform float logDepthBufFC;");
             src.push("varying float vFragDepth;");
         }
@@ -41179,7 +41322,7 @@ class TrianglesBatchingSilhouetteRenderer {
             src.push("}");
         }
         if (scene.logarithmicDepthBufferEnabled && WEBGL_INFO$1.SUPPORTED_EXTENSIONS["EXT_frag_depth"]) {
-            src.push("gl_FragDepthEXT = log2( vFragDepth ) * logDepthBufFC * 0.5;");
+            src.push("    gl_FragDepthEXT = isPerspective == 0.0 ? gl_FragCoord.z : log2( vFragDepth ) * logDepthBufFC * 0.5;");
         }
         src.push("gl_FragColor = color;");
         src.push("}");
@@ -41405,6 +41548,10 @@ class TrianglesBatchingEdgesRenderer {
             if (WEBGL_INFO$1.SUPPORTED_EXTENSIONS["EXT_frag_depth"]) {
                 src.push("varying float vFragDepth;");
             }
+            src.push("bool isPerspectiveMatrix(mat4 m) {");
+            src.push("    return (m[2][3] == - 1.0);");
+            src.push("}");
+            src.push("varying float isPerspective;");
         }
 
         if (clipping) {
@@ -41442,6 +41589,7 @@ class TrianglesBatchingEdgesRenderer {
                 src.push("clipPos.z = log2( max( 1e-6, clipPos.w + 1.0 ) ) * logDepthBufFC - 1.0;");
                 src.push("clipPos.z *= clipPos.w;");
             }
+            src.push("isPerspective = float (isPerspectiveMatrix(projMatrix));");
         }
         src.push("gl_Position = clipPos;");
         src.push("vColor = vec4(color.r, color.g, color.b, color.a);");
@@ -41467,6 +41615,7 @@ class TrianglesBatchingEdgesRenderer {
         src.push("precision mediump int;");
         src.push("#endif");
         if (scene.logarithmicDepthBufferEnabled && WEBGL_INFO$1.SUPPORTED_EXTENSIONS["EXT_frag_depth"]) {
+            src.push("varying float isPerspective;");
             src.push("uniform float logDepthBufFC;");
             src.push("varying float vFragDepth;");
         }
@@ -41494,7 +41643,7 @@ class TrianglesBatchingEdgesRenderer {
             src.push("}");
         }
         if (scene.logarithmicDepthBufferEnabled && WEBGL_INFO$1.SUPPORTED_EXTENSIONS["EXT_frag_depth"]) {
-            src.push("gl_FragDepthEXT = log2( vFragDepth ) * logDepthBufFC * 0.5;");
+            src.push("    gl_FragDepthEXT = isPerspective == 0.0 ? gl_FragCoord.z : log2( vFragDepth ) * logDepthBufFC * 0.5;");
         }
         src.push("gl_FragColor = vColor;");
         src.push("}");
@@ -41698,6 +41847,10 @@ class TrianglesBatchingEdgesColorRenderer {
             if (WEBGL_INFO$1.SUPPORTED_EXTENSIONS["EXT_frag_depth"]) {
                 src.push("varying float vFragDepth;");
             }
+            src.push("bool isPerspectiveMatrix(mat4 m) {");
+            src.push("    return (m[2][3] == - 1.0);");
+            src.push("}");
+            src.push("varying float isPerspective;");
         }
 
         if (clipping) {
@@ -41735,6 +41888,7 @@ class TrianglesBatchingEdgesColorRenderer {
                 src.push("clipPos.z = log2( max( 1e-6, clipPos.w + 1.0 ) ) * logDepthBufFC - 1.0;");
                 src.push("clipPos.z *= clipPos.w;");
             }
+            src.push("isPerspective = float (isPerspectiveMatrix(projMatrix));");
         }
         src.push("gl_Position = clipPos;");
         //src.push("vColor = vec4(float(color.r-100.0) / 255.0, float(color.g-100.0) / 255.0, float(color.b-100.0) / 255.0, float(color.a) / 255.0);");
@@ -41761,6 +41915,7 @@ class TrianglesBatchingEdgesColorRenderer {
         src.push("precision mediump int;");
         src.push("#endif");
         if (scene.logarithmicDepthBufferEnabled && WEBGL_INFO$1.SUPPORTED_EXTENSIONS["EXT_frag_depth"]) {
+            src.push("varying float isPerspective;");
             src.push("uniform float logDepthBufFC;");
             src.push("varying float vFragDepth;");
         }
@@ -41788,7 +41943,7 @@ class TrianglesBatchingEdgesColorRenderer {
             src.push("}");
         }
         if (scene.logarithmicDepthBufferEnabled && WEBGL_INFO$1.SUPPORTED_EXTENSIONS["EXT_frag_depth"]) {
-            src.push("gl_FragDepthEXT = log2( vFragDepth ) * logDepthBufFC * 0.5;");
+            src.push("    gl_FragDepthEXT = isPerspective == 0.0 ? gl_FragCoord.z : log2( vFragDepth ) * logDepthBufFC * 0.5;");
         }
         src.push("gl_FragColor = vColor;");
         src.push("}");
@@ -42000,6 +42155,10 @@ class TrianglesBatchingPickMeshRenderer {
             if (WEBGL_INFO$1.SUPPORTED_EXTENSIONS["EXT_frag_depth"]) {
                 src.push("varying float vFragDepth;");
             }
+            src.push("bool isPerspectiveMatrix(mat4 m) {");
+            src.push("    return (m[2][3] == - 1.0);");
+            src.push("}");
+            src.push("varying float isPerspective;");
         }
 
         if (clipping) {
@@ -42036,6 +42195,7 @@ class TrianglesBatchingPickMeshRenderer {
                 src.push("clipPos.z = log2( max( 1e-6, clipPos.w + 1.0 ) ) * logDepthBufFC - 1.0;");
                 src.push("clipPos.z *= clipPos.w;");
             }
+            src.push("isPerspective = float (isPerspectiveMatrix(projMatrix));");
         }
         src.push("gl_Position = clipPos;");
         src.push("  }");
@@ -42060,6 +42220,7 @@ class TrianglesBatchingPickMeshRenderer {
         src.push("precision mediump int;");
         src.push("#endif");
         if (scene.logarithmicDepthBufferEnabled && WEBGL_INFO$1.SUPPORTED_EXTENSIONS["EXT_frag_depth"]) {
+            src.push("varying float isPerspective;");
             src.push("uniform float logDepthBufFC;");
             src.push("varying float vFragDepth;");
         }
@@ -42087,7 +42248,7 @@ class TrianglesBatchingPickMeshRenderer {
             src.push("  }");
         }
         if (scene.logarithmicDepthBufferEnabled && WEBGL_INFO$1.SUPPORTED_EXTENSIONS["EXT_frag_depth"]) {
-            src.push("gl_FragDepthEXT = log2( vFragDepth ) * logDepthBufFC * 0.5;");
+            src.push("    gl_FragDepthEXT = isPerspective == 0.0 ? gl_FragCoord.z : log2( vFragDepth ) * logDepthBufFC * 0.5;");
         }
         src.push("   gl_FragColor = vPickColor; ");
         src.push("}");
@@ -42299,6 +42460,10 @@ class TrianglesBatchingPickDepthRenderer {
             if (WEBGL_INFO$1.SUPPORTED_EXTENSIONS["EXT_frag_depth"]) {
                 src.push("varying float vFragDepth;");
             }
+            src.push("bool isPerspectiveMatrix(mat4 m) {");
+            src.push("    return (m[2][3] == - 1.0);");
+            src.push("}");
+            src.push("varying float isPerspective;");
         }
 
         if (clipping) {
@@ -42332,6 +42497,7 @@ class TrianglesBatchingPickDepthRenderer {
                 src.push("clipPos.z = log2( max( 1e-6, clipPos.w + 1.0 ) ) * logDepthBufFC - 1.0;");
                 src.push("clipPos.z *= clipPos.w;");
             }
+            src.push("isPerspective = float (isPerspectiveMatrix(projMatrix));");
         }
         src.push("gl_Position = clipPos;");
         src.push("  }");
@@ -42361,6 +42527,7 @@ class TrianglesBatchingPickDepthRenderer {
         src.push("#endif");
 
         if (scene.logarithmicDepthBufferEnabled && WEBGL_INFO$1.SUPPORTED_EXTENSIONS["EXT_frag_depth"]) {
+            src.push("varying float isPerspective;");
             src.push("uniform float logDepthBufFC;");
             src.push("varying float vFragDepth;");
         }
@@ -42399,7 +42566,7 @@ class TrianglesBatchingPickDepthRenderer {
             src.push("  }");
         }
         if (scene.logarithmicDepthBufferEnabled && WEBGL_INFO$1.SUPPORTED_EXTENSIONS["EXT_frag_depth"]) {
-            src.push("gl_FragDepthEXT = log2( vFragDepth ) * logDepthBufFC * 0.5;");
+            src.push("    gl_FragDepthEXT = isPerspective == 0.0 ? gl_FragCoord.z : log2( vFragDepth ) * logDepthBufFC * 0.5;");
         }
         src.push("    float zNormalizedDepth = abs((pickZNear + vViewPosition.z) / (pickZFar - pickZNear));");
         src.push("    gl_FragColor = packDepth(zNormalizedDepth); ");  // Must be linear depth
@@ -42605,6 +42772,10 @@ class TrianglesBatchingPickNormalsRenderer {
             if (WEBGL_INFO$1.SUPPORTED_EXTENSIONS["EXT_frag_depth"]) {
                 src.push("varying float vFragDepth;");
             }
+            src.push("bool isPerspectiveMatrix(mat4 m) {");
+            src.push("    return (m[2][3] == - 1.0);");
+            src.push("}");
+            src.push("varying float isPerspective;");
         }
         src.push("vec3 octDecode(vec2 oct) {");
         src.push("    vec3 v = vec3(oct.xy, 1.0 - abs(oct.x) - abs(oct.y));");
@@ -42643,6 +42814,7 @@ class TrianglesBatchingPickNormalsRenderer {
                 src.push("clipPos.z = log2( max( 1e-6, clipPos.w + 1.0 ) ) * logDepthBufFC - 1.0;");
                 src.push("clipPos.z *= clipPos.w;");
             }
+            src.push("isPerspective = float (isPerspectiveMatrix(projMatrix));");
         }
         src.push("gl_Position = clipPos;");
         src.push("  }");
@@ -42667,6 +42839,7 @@ class TrianglesBatchingPickNormalsRenderer {
         src.push("precision mediump int;");
         src.push("#endif");
         if (scene.logarithmicDepthBufferEnabled && WEBGL_INFO$1.SUPPORTED_EXTENSIONS["EXT_frag_depth"]) {
+            src.push("varying float isPerspective;");
             src.push("uniform float logDepthBufFC;");
             src.push("varying float vFragDepth;");
         }
@@ -42694,7 +42867,7 @@ class TrianglesBatchingPickNormalsRenderer {
             src.push("  }");
         }
         if (scene.logarithmicDepthBufferEnabled && WEBGL_INFO$1.SUPPORTED_EXTENSIONS["EXT_frag_depth"]) {
-            src.push("gl_FragDepthEXT = log2( vFragDepth ) * logDepthBufFC * 0.5;");
+            src.push("    gl_FragDepthEXT = isPerspective == 0.0 ? gl_FragCoord.z : log2( vFragDepth ) * logDepthBufFC * 0.5;");
         }
         src.push("    gl_FragColor = vec4((vWorldNormal * 0.5) + 0.5, 1.0);");
         src.push("}");
@@ -42896,6 +43069,10 @@ class TrianglesBatchingOcclusionRenderer {
             if (WEBGL_INFO$1.SUPPORTED_EXTENSIONS["EXT_frag_depth"]) {
                 src.push("varying float vFragDepth;");
             }
+            src.push("bool isPerspectiveMatrix(mat4 m) {");
+            src.push("    return (m[2][3] == - 1.0);");
+            src.push("}");
+            src.push("varying float isPerspective;");
         }
         if (clipping) {
             src.push("varying vec4 vWorldPosition;");
@@ -42929,6 +43106,7 @@ class TrianglesBatchingOcclusionRenderer {
                 src.push("clipPos.z = log2( max( 1e-6, clipPos.w + 1.0 ) ) * logDepthBufFC - 1.0;");
                 src.push("clipPos.z *= clipPos.w;");
             }
+            src.push("isPerspective = float (isPerspectiveMatrix(projMatrix));");
         }
         src.push("gl_Position = clipPos;");
         src.push("  }");
@@ -42953,6 +43131,7 @@ class TrianglesBatchingOcclusionRenderer {
         src.push("precision mediump int;");
         src.push("#endif");
         if (scene.logarithmicDepthBufferEnabled && WEBGL_INFO$1.SUPPORTED_EXTENSIONS["EXT_frag_depth"]) {
+            src.push("varying float isPerspective;");
             src.push("uniform float logDepthBufFC;");
             src.push("varying float vFragDepth;");
         }
@@ -42979,7 +43158,7 @@ class TrianglesBatchingOcclusionRenderer {
             src.push("  }");
         }
         if (scene.logarithmicDepthBufferEnabled && WEBGL_INFO$1.SUPPORTED_EXTENSIONS["EXT_frag_depth"]) {
-            src.push("gl_FragDepthEXT = log2( vFragDepth ) * logDepthBufFC * 0.5;");
+            src.push("    gl_FragDepthEXT = isPerspective == 0.0 ? gl_FragCoord.z : log2( vFragDepth ) * logDepthBufFC * 0.5;");
         }
         src.push("   gl_FragColor = vec4(0.0, 0.0, 1.0, 1.0); "); // Occluders are blue
         src.push("}");
@@ -43174,6 +43353,10 @@ class TrianglesBatchingDepthRenderer {
             if (WEBGL_INFO$1.SUPPORTED_EXTENSIONS["EXT_frag_depth"]) {
                 src.push("varying float vFragDepth;");
             }
+            src.push("bool isPerspectiveMatrix(mat4 m) {");
+            src.push("    return (m[2][3] == - 1.0);");
+            src.push("}");
+            src.push("varying float isPerspective;");
         }
         if (clipping) {
             src.push("varying vec4 vWorldPosition;");
@@ -43205,6 +43388,7 @@ class TrianglesBatchingDepthRenderer {
                 src.push("clipPos.z = log2( max( 1e-6, clipPos.w + 1.0 ) ) * logDepthBufFC - 1.0;");
                 src.push("clipPos.z *= clipPos.w;");
             }
+            src.push("isPerspective = float (isPerspectiveMatrix(projMatrix));");
         }
         src.push("gl_Position = clipPos;");
         src.push("vHighPrecisionZW = gl_Position.zw;");
@@ -43225,6 +43409,7 @@ class TrianglesBatchingDepthRenderer {
         src.push("precision highp float;");
         src.push("precision highp int;");
         if (scene.logarithmicDepthBufferEnabled && WEBGL_INFO$1.SUPPORTED_EXTENSIONS["EXT_frag_depth"]) {
+            src.push("varying float isPerspective;");
             src.push("uniform float logDepthBufFC;");
             src.push("varying float vFragDepth;");
         }
@@ -43263,7 +43448,7 @@ class TrianglesBatchingDepthRenderer {
             src.push("  }");
         }
         if (scene.logarithmicDepthBufferEnabled && WEBGL_INFO$1.SUPPORTED_EXTENSIONS["EXT_frag_depth"]) {
-            src.push("gl_FragDepthEXT = log2( vFragDepth ) * logDepthBufFC * 0.5;");
+            src.push("    gl_FragDepthEXT = isPerspective == 0.0 ? gl_FragCoord.z : log2( vFragDepth ) * logDepthBufFC * 0.5;");
         }
         src.push("float fragCoordZ = 0.5 * vHighPrecisionZW[0] / vHighPrecisionZW[1] + 0.5;");
         if (WEBGL_INFO$1.SUPPORTED_EXTENSIONS["WEBGL_depth_texture"]) {
@@ -43474,6 +43659,10 @@ class TrianglesBatchingNormalsRenderer {
             if (WEBGL_INFO$1.SUPPORTED_EXTENSIONS["EXT_frag_depth"]) {
                 src.push("varying float vFragDepth;");
             }
+            src.push("bool isPerspectiveMatrix(mat4 m) {");
+            src.push("    return (m[2][3] == - 1.0);");
+            src.push("}");
+            src.push("varying float isPerspective;");
         }
         src.push("vec3 octDecode(vec2 oct) {");
         src.push("    vec3 v = vec3(oct.xy, 1.0 - abs(oct.x) - abs(oct.y));");
@@ -43516,6 +43705,7 @@ class TrianglesBatchingNormalsRenderer {
                 src.push("clipPos.z = log2( max( 1e-6, clipPos.w + 1.0 ) ) * logDepthBufFC - 1.0;");
                 src.push("clipPos.z *= clipPos.w;");
             }
+            src.push("isPerspective = float (isPerspectiveMatrix(projMatrix));");
         }
         src.push("gl_Position = clipPos;");
         src.push("  }");
@@ -43543,6 +43733,7 @@ class TrianglesBatchingNormalsRenderer {
         src.push("#endif");
 
         if (scene.logarithmicDepthBufferEnabled && WEBGL_INFO$1.SUPPORTED_EXTENSIONS["EXT_frag_depth"]) {
+            src.push("varying float isPerspective;");
             src.push("uniform float logDepthBufFC;");
             src.push("varying float vFragDepth;");
         }
@@ -43574,7 +43765,7 @@ class TrianglesBatchingNormalsRenderer {
             src.push("  }");
         }
         if (scene.logarithmicDepthBufferEnabled && WEBGL_INFO$1.SUPPORTED_EXTENSIONS["EXT_frag_depth"]) {
-            src.push("gl_FragDepthEXT = log2( vFragDepth ) * logDepthBufFC * 0.5;");
+            src.push("    gl_FragDepthEXT = isPerspective == 0.0 ? gl_FragCoord.z : log2( vFragDepth ) * logDepthBufFC * 0.5;");
         }
         src.push("    gl_FragColor = vec4(packNormalToRGB(vViewNormal), 1.0); ");
         src.push("}");
@@ -44163,6 +44354,10 @@ class TrianglesBatchingColorQualityRenderer {
             if (WEBGL_INFO$1.SUPPORTED_EXTENSIONS["EXT_frag_depth"]) {
                 src.push("varying float vFragDepth;");
             }
+            src.push("bool isPerspectiveMatrix(mat4 m) {");
+            src.push("    return (m[2][3] == - 1.0);");
+            src.push("}");
+            src.push("varying float isPerspective;");
         }
 
         src.push("vec3 octDecode(vec2 oct) {");
@@ -44210,6 +44405,7 @@ class TrianglesBatchingColorQualityRenderer {
 
         src.push("vec4 clipPos = projMatrix * viewPosition;");
         if (scene.logarithmicDepthBufferEnabled) {
+            src.push("isPerspective = float (isPerspectiveMatrix(projMatrix));");
             if (WEBGL_INFO$1.SUPPORTED_EXTENSIONS["EXT_frag_depth"]) {
                 src.push("vFragDepth = 1.0 + clipPos.w;");
             } else {
@@ -44267,6 +44463,7 @@ class TrianglesBatchingColorQualityRenderer {
         src.push("#endif");
 
         if (scene.logarithmicDepthBufferEnabled && WEBGL_INFO$1.SUPPORTED_EXTENSIONS["EXT_frag_depth"]) {
+            src.push("varying float isPerspective;");
             src.push("uniform float logDepthBufFC;");
             src.push("varying float vFragDepth;");
         }
@@ -44614,7 +44811,7 @@ class TrianglesBatchingColorQualityRenderer {
         src.push("gl_FragColor = fragColor;");
 
         if (scene.logarithmicDepthBufferEnabled && WEBGL_INFO$1.SUPPORTED_EXTENSIONS["EXT_frag_depth"]) {
-            src.push("gl_FragDepthEXT = log2( vFragDepth ) * logDepthBufFC * 0.5;");
+            src.push("    gl_FragDepthEXT = isPerspective == 0.0 ? gl_FragCoord.z : log2( vFragDepth ) * logDepthBufFC * 0.5;");
         }
 
         src.push("}");
@@ -44811,6 +45008,10 @@ class TrianglesBatchingPickNormalsFlatRenderer {
             if (WEBGL_INFO$1.SUPPORTED_EXTENSIONS["EXT_frag_depth"]) {
                 src.push("varying float vFragDepth;");
             }
+            src.push("bool isPerspectiveMatrix(mat4 m) {");
+            src.push("    return (m[2][3] == - 1.0);");
+            src.push("}");
+            src.push("varying float isPerspective;");
         }
         src.push("varying vec4 vWorldPosition;");
         if (clipping) {
@@ -44839,6 +45040,7 @@ class TrianglesBatchingPickNormalsFlatRenderer {
                 src.push("clipPos.z = log2( max( 1e-6, clipPos.w + 1.0 ) ) * logDepthBufFC - 1.0;");
                 src.push("clipPos.z *= clipPos.w;");
             }
+            src.push("isPerspective = float (isPerspectiveMatrix(projMatrix));");
         }
         src.push("gl_Position = clipPos;");
         src.push("  }");
@@ -44864,6 +45066,7 @@ class TrianglesBatchingPickNormalsFlatRenderer {
         src.push("precision mediump int;");
         src.push("#endif");
         if (scene.logarithmicDepthBufferEnabled && WEBGL_INFO$1.SUPPORTED_EXTENSIONS["EXT_frag_depth"]) {
+            src.push("varying float isPerspective;");
             src.push("uniform float logDepthBufFC;");
             src.push("varying float vFragDepth;");
         }
@@ -44890,7 +45093,7 @@ class TrianglesBatchingPickNormalsFlatRenderer {
             src.push("  }");
         }
         if (scene.logarithmicDepthBufferEnabled && WEBGL_INFO$1.SUPPORTED_EXTENSIONS["EXT_frag_depth"]) {
-            src.push("gl_FragDepthEXT = log2( vFragDepth ) * logDepthBufFC * 0.5;");
+            src.push("    gl_FragDepthEXT = isPerspective == 0.0 ? gl_FragCoord.z : log2( vFragDepth ) * logDepthBufFC * 0.5;");
         }
         src.push("  vec3 xTangent = dFdx( vWorldPosition.xyz );");
         src.push("  vec3 yTangent = dFdy( vWorldPosition.xyz );");
@@ -45425,6 +45628,7 @@ const tempVec3c$4 = math.vec3();
 const tempVec3d$2 = math.vec3();
 const tempVec3e$1 = math.vec3();
 const tempVec3f$1 = math.vec3();
+const tempVec3g$1 = math.vec3();
 
 /**
  * @private
@@ -46449,7 +46653,7 @@ class TrianglesBatchingLayer {
 
     //------------------------------------------------------------------------------------------------
 
-    precisionRayPickSurface(portionId, worldRayOrigin, worldRayDir, worldSurfacePos) {
+    precisionRayPickSurface(portionId, worldRayOrigin, worldRayDir, worldSurfacePos, worldNormal) {
 
         if (!this.model.scene.pickSurfacePrecisionEnabled) {
             return false;
@@ -46484,9 +46688,13 @@ class TrianglesBatchingLayer {
         const b = tempVec3e$1;
         const c = tempVec3f$1;
 
+        let gotIntersect = false;
+        let closestDist = 0;
+        const closestIntersectPos = tempVec3g$1;
+
         for (let i = 0, len = indices.length; i < len; i += 3) {
 
-            const ia = indices[i + 0] * 3;
+            const ia = indices[i] * 3;
             const ib = indices[i + 1] * 3;
             const ic = indices[i + 2] * 3;
 
@@ -46506,23 +46714,37 @@ class TrianglesBatchingLayer {
             math.decompressPosition(b, state.positionsDecodeMatrix);
             math.decompressPosition(c, state.positionsDecodeMatrix);
 
-            if (math.rayTriangleIntersect(rtcRayOrigin, rtcRayDir, a, b, c, worldSurfacePos)) {
+            if (math.rayTriangleIntersect(rtcRayOrigin, rtcRayDir, a, b, c, closestIntersectPos)) {
 
-                math.transformPoint3(this.model.worldMatrix, worldSurfacePos, worldSurfacePos);
+                math.transformPoint3(this.model.worldMatrix, closestIntersectPos, closestIntersectPos);
 
                 if (offset) {
-                    math.addVec3(worldSurfacePos, offset);
+                    math.addVec3(closestIntersectPos, offset);
                 }
 
                 if (rtcCenter) {
-                    math.addVec3(worldSurfacePos, rtcCenter);
+                    math.addVec3(closestIntersectPos, rtcCenter);
                 }
 
-                return true;
+                const dist = Math.abs(math.lenVec3(math.subVec3(closestIntersectPos, worldRayOrigin, [])));
+
+                if (!gotIntersect || dist > closestDist) {
+                    closestDist = dist;
+                    worldSurfacePos.set(closestIntersectPos);
+                    if (worldNormal) { // Not that wasteful to eagerly compute - unlikely to hit >2 surfaces on most geometry
+                        math.triangleNormal(a, b, c, worldNormal);
+                    }
+                    gotIntersect = true;
+                }
             }
         }
 
-        return false;
+        if (gotIntersect && worldNormal) {
+            math.transformVec3(this.model.worldNormalMatrix, worldNormal, worldNormal);
+            math.normalizeVec3(worldNormal);
+        }
+
+        return gotIntersect;
     }
 
     // ---------
@@ -46909,6 +47131,10 @@ class TrianglesInstancingColorRenderer {
             if (WEBGL_INFO$1.SUPPORTED_EXTENSIONS["EXT_frag_depth"]) {
                 src.push("varying float vFragDepth;");
             }
+            src.push("bool isPerspectiveMatrix(mat4 m) {");
+            src.push("    return (m[2][3] == - 1.0);");
+            src.push("}");
+            src.push("varying float isPerspective;");
         }
 
         src.push("uniform vec4 lightAmbient;");
@@ -47012,6 +47238,7 @@ class TrianglesInstancingColorRenderer {
                 src.push("clipPos.z = log2( max( 1e-6, clipPos.w + 1.0 ) ) * logDepthBufFC - 1.0;");
                 src.push("clipPos.z *= clipPos.w;");
             }
+            src.push("isPerspective = float (isPerspectiveMatrix(projMatrix));");
         }
 
         if (clipping) {
@@ -47043,6 +47270,7 @@ class TrianglesInstancingColorRenderer {
         src.push("#endif");
         if (scene.logarithmicDepthBufferEnabled) {
             if (WEBGL_INFO$1.SUPPORTED_EXTENSIONS["EXT_frag_depth"]) {
+                src.push("varying float isPerspective;");
                 src.push("uniform float logDepthBufFC;");
                 src.push("varying float vFragDepth;");
             }
@@ -47089,7 +47317,7 @@ class TrianglesInstancingColorRenderer {
         }
 
         if (scene.logarithmicDepthBufferEnabled && WEBGL_INFO$1.SUPPORTED_EXTENSIONS["EXT_frag_depth"]) {
-            src.push("gl_FragDepthEXT = log2( vFragDepth ) * logDepthBufFC * 0.5;");
+            src.push("    gl_FragDepthEXT = isPerspective == 0.0 ? gl_FragCoord.z : log2( vFragDepth ) * logDepthBufFC * 0.5;");
         }
 
         // Doing SAO blend in the main solid fill draw shader just so that edge lines can be drawn over the top
@@ -47424,6 +47652,10 @@ class TrianglesInstancingFlatColorRenderer {
             if (WEBGL_INFO$1.SUPPORTED_EXTENSIONS["EXT_frag_depth"]) {
                 src.push("varying float vFragDepth;");
             }
+            src.push("bool isPerspectiveMatrix(mat4 m) {");
+            src.push("    return (m[2][3] == - 1.0);");
+            src.push("}");
+            src.push("varying float isPerspective;");
         }
         
         if (clipping) {
@@ -47462,6 +47694,7 @@ class TrianglesInstancingFlatColorRenderer {
                 src.push("clipPos.z = log2( max( 1e-6, clipPos.w + 1.0 ) ) * logDepthBufFC - 1.0;");
                 src.push("clipPos.z *= clipPos.w;");
             }
+            src.push("isPerspective = float (isPerspectiveMatrix(projMatrix));");
         }
 
         if (clipping) {
@@ -47497,6 +47730,7 @@ class TrianglesInstancingFlatColorRenderer {
         src.push("#endif");
         if (scene.logarithmicDepthBufferEnabled) {
             if (WEBGL_INFO$1.SUPPORTED_EXTENSIONS["EXT_frag_depth"]) {
+                src.push("varying float isPerspective;");
                 src.push("uniform float logDepthBufFC;");
                 src.push("varying float vFragDepth;");
             }
@@ -47623,7 +47857,7 @@ class TrianglesInstancingFlatColorRenderer {
         }
 
         if (scene.logarithmicDepthBufferEnabled && WEBGL_INFO$1.SUPPORTED_EXTENSIONS["EXT_frag_depth"]) {
-            src.push("gl_FragDepthEXT = log2( vFragDepth ) * logDepthBufFC * 0.5;");
+            src.push("    gl_FragDepthEXT = isPerspective == 0.0 ? gl_FragCoord.z : log2( vFragDepth ) * logDepthBufFC * 0.5;");
         }
 
         src.push("}");
@@ -47881,6 +48115,10 @@ class TrianglesInstancingSilhouetteRenderer {
             if (WEBGL_INFO$1.SUPPORTED_EXTENSIONS["EXT_frag_depth"]) {
                 src.push("varying float vFragDepth;");
             }
+            src.push("bool isPerspectiveMatrix(mat4 m) {");
+            src.push("    return (m[2][3] == - 1.0);");
+            src.push("}");
+            src.push("varying float isPerspective;");
         }
 
         src.push("uniform vec4 color;");
@@ -47919,6 +48157,7 @@ class TrianglesInstancingSilhouetteRenderer {
                 src.push("clipPos.z = log2( max( 1e-6, clipPos.w + 1.0 ) ) * logDepthBufFC - 1.0;");
                 src.push("clipPos.z *= clipPos.w;");
             }
+            src.push("isPerspective = float (isPerspectiveMatrix(projMatrix));");
         }
         src.push("gl_Position = clipPos;");
         src.push("}");
@@ -47943,6 +48182,7 @@ class TrianglesInstancingSilhouetteRenderer {
         src.push("precision mediump int;");
         src.push("#endif");
         if (scene.logarithmicDepthBufferEnabled && WEBGL_INFO$1.SUPPORTED_EXTENSIONS["EXT_frag_depth"]) {
+            src.push("varying float isPerspective;");
             src.push("uniform float logDepthBufFC;");
             src.push("varying float vFragDepth;");
         }
@@ -47970,7 +48210,7 @@ class TrianglesInstancingSilhouetteRenderer {
             src.push("}");
         }
         if (scene.logarithmicDepthBufferEnabled && WEBGL_INFO$1.SUPPORTED_EXTENSIONS["EXT_frag_depth"]) {
-            src.push("gl_FragDepthEXT = log2( vFragDepth ) * logDepthBufFC * 0.5;");
+            src.push("    gl_FragDepthEXT = isPerspective == 0.0 ? gl_FragCoord.z : log2( vFragDepth ) * logDepthBufFC * 0.5;");
         }
         src.push("gl_FragColor = color;");
         src.push("}");
@@ -48231,6 +48471,10 @@ class TrianglesInstancingEdgesRenderer {
             if (WEBGL_INFO$1.SUPPORTED_EXTENSIONS["EXT_frag_depth"]) {
                 src.push("varying float vFragDepth;");
             }
+            src.push("bool isPerspectiveMatrix(mat4 m) {");
+            src.push("    return (m[2][3] == - 1.0);");
+            src.push("}");
+            src.push("varying float isPerspective;");
         }
 
         if (clipping) {
@@ -48267,6 +48511,7 @@ class TrianglesInstancingEdgesRenderer {
                 src.push("clipPos.z = log2( max( 1e-6, clipPos.w + 1.0 ) ) * logDepthBufFC - 1.0;");
                 src.push("clipPos.z *= clipPos.w;");
             }
+            src.push("isPerspective = float (isPerspectiveMatrix(projMatrix));");
         }
         src.push("gl_Position = clipPos;");
         src.push("vColor = vec4(color.r, color.g, color.b, color.a);");
@@ -48292,6 +48537,7 @@ class TrianglesInstancingEdgesRenderer {
         src.push("precision mediump int;");
         src.push("#endif");
         if (scene.logarithmicDepthBufferEnabled && WEBGL_INFO$1.SUPPORTED_EXTENSIONS["EXT_frag_depth"]) {
+            src.push("varying float isPerspective;");
             src.push("uniform float logDepthBufFC;");
             src.push("varying float vFragDepth;");
         }
@@ -48319,7 +48565,7 @@ class TrianglesInstancingEdgesRenderer {
             src.push("}");
         }
         if (scene.logarithmicDepthBufferEnabled && WEBGL_INFO$1.SUPPORTED_EXTENSIONS["EXT_frag_depth"]) {
-            src.push("gl_FragDepthEXT = log2( vFragDepth ) * logDepthBufFC * 0.5;");
+            src.push("    gl_FragDepthEXT = isPerspective == 0.0 ? gl_FragCoord.z : log2( vFragDepth ) * logDepthBufFC * 0.5;");
         }
         src.push("gl_FragColor = vColor;");
         src.push("}");
@@ -48561,6 +48807,10 @@ class TrianglesInstancingEdgesColorRenderer {
             if (WEBGL_INFO$1.SUPPORTED_EXTENSIONS["EXT_frag_depth"]) {
                 src.push("varying float vFragDepth;");
             }
+            src.push("bool isPerspectiveMatrix(mat4 m) {");
+            src.push("    return (m[2][3] == - 1.0);");
+            src.push("}");
+            src.push("varying float isPerspective;");
         }
 
         if (clipping) {
@@ -48597,6 +48847,7 @@ class TrianglesInstancingEdgesColorRenderer {
                 src.push("clipPos.z = log2( max( 1e-6, clipPos.w + 1.0 ) ) * logDepthBufFC - 1.0;");
                 src.push("clipPos.z *= clipPos.w;");
             }
+            src.push("isPerspective = float (isPerspectiveMatrix(projMatrix));");
         }
         src.push("gl_Position = clipPos;");
      //   src.push("vColor = vec4(float(color.r-100.0) / 255.0, float(color.g-100.0) / 255.0, float(color.b-100.0) / 255.0, float(color.a) / 255.0);");
@@ -48623,6 +48874,7 @@ class TrianglesInstancingEdgesColorRenderer {
         src.push("precision mediump int;");
         src.push("#endif");
         if (scene.logarithmicDepthBufferEnabled && WEBGL_INFO$1.SUPPORTED_EXTENSIONS["EXT_frag_depth"]) {
+            src.push("varying float isPerspective;");
             src.push("uniform float logDepthBufFC;");
             src.push("varying float vFragDepth;");
         }
@@ -48650,7 +48902,7 @@ class TrianglesInstancingEdgesColorRenderer {
             src.push("}");
         }
         if (scene.logarithmicDepthBufferEnabled && WEBGL_INFO$1.SUPPORTED_EXTENSIONS["EXT_frag_depth"]) {
-            src.push("gl_FragDepthEXT = log2( vFragDepth ) * logDepthBufFC * 0.5;");
+            src.push("    gl_FragDepthEXT = isPerspective == 0.0 ? gl_FragCoord.z : log2( vFragDepth ) * logDepthBufFC * 0.5;");
         }
         src.push("gl_FragColor = vColor;");
         src.push("}");
@@ -48903,6 +49155,10 @@ class TrianglesInstancingPickMeshRenderer {
             if (WEBGL_INFO$1.SUPPORTED_EXTENSIONS["EXT_frag_depth"]) {
                 src.push("varying float vFragDepth;");
             }
+            src.push("bool isPerspectiveMatrix(mat4 m) {");
+            src.push("    return (m[2][3] == - 1.0);");
+            src.push("}");
+            src.push("varying float isPerspective;");
         }
 
         if (clipping) {
@@ -48942,6 +49198,7 @@ class TrianglesInstancingPickMeshRenderer {
                 src.push("clipPos.z = log2( max( 1e-6, clipPos.w + 1.0 ) ) * logDepthBufFC - 1.0;");
                 src.push("clipPos.z *= clipPos.w;");
             }
+            src.push("isPerspective = float (isPerspectiveMatrix(projMatrix));");
         }
         src.push("gl_Position = clipPos;");
         src.push("}");
@@ -48966,6 +49223,7 @@ class TrianglesInstancingPickMeshRenderer {
         src.push("precision mediump int;");
         src.push("#endif");
         if (scene.logarithmicDepthBufferEnabled && WEBGL_INFO$1.SUPPORTED_EXTENSIONS["EXT_frag_depth"]) {
+            src.push("varying float isPerspective;");
             src.push("uniform float logDepthBufFC;");
             src.push("varying float vFragDepth;");
         }
@@ -48993,7 +49251,7 @@ class TrianglesInstancingPickMeshRenderer {
             src.push("}");
         }
         if (scene.logarithmicDepthBufferEnabled && WEBGL_INFO$1.SUPPORTED_EXTENSIONS["EXT_frag_depth"]) {
-            src.push("gl_FragDepthEXT = log2( vFragDepth ) * logDepthBufFC * 0.5;");
+            src.push("    gl_FragDepthEXT = isPerspective == 0.0 ? gl_FragCoord.z : log2( vFragDepth ) * logDepthBufFC * 0.5;");
         }
         src.push("gl_FragColor = vPickColor; ");
         src.push("}");
@@ -49242,6 +49500,10 @@ class TrianglesInstancingPickDepthRenderer {
             if (WEBGL_INFO$1.SUPPORTED_EXTENSIONS["EXT_frag_depth"]) {
                 src.push("varying float vFragDepth;");
             }
+            src.push("bool isPerspectiveMatrix(mat4 m) {");
+            src.push("    return (m[2][3] == - 1.0);");
+            src.push("}");
+            src.push("varying float isPerspective;");
         }
 
         if (clipping) {
@@ -49279,6 +49541,7 @@ class TrianglesInstancingPickDepthRenderer {
                 src.push("clipPos.z = log2( max( 1e-6, clipPos.w + 1.0 ) ) * logDepthBufFC - 1.0;");
                 src.push("clipPos.z *= clipPos.w;");
             }
+            src.push("isPerspective = float (isPerspectiveMatrix(projMatrix));");
         }
         src.push("gl_Position = clipPos;");
         src.push("}");
@@ -49306,6 +49569,7 @@ class TrianglesInstancingPickDepthRenderer {
         src.push("#endif");
 
         if (scene.logarithmicDepthBufferEnabled && WEBGL_INFO$1.SUPPORTED_EXTENSIONS["EXT_frag_depth"]) {
+            src.push("varying float isPerspective;");
             src.push("uniform float logDepthBufFC;");
             src.push("varying float vFragDepth;");
         }
@@ -49344,7 +49608,7 @@ class TrianglesInstancingPickDepthRenderer {
             src.push("}");
         }
         if (scene.logarithmicDepthBufferEnabled && WEBGL_INFO$1.SUPPORTED_EXTENSIONS["EXT_frag_depth"]) {
-            src.push("gl_FragDepthEXT = log2( vFragDepth ) * logDepthBufFC * 0.5;");
+            src.push("    gl_FragDepthEXT = isPerspective == 0.0 ? gl_FragCoord.z : log2( vFragDepth ) * logDepthBufFC * 0.5;");
         }
         src.push("    float zNormalizedDepth = abs((pickZNear + vViewPosition.z) / (pickZFar - pickZNear));");
         src.push("    gl_FragColor = packDepth(zNormalizedDepth); "); // Must be linear depth
@@ -49605,6 +49869,10 @@ class TrianglesInstancingPickNormalsRenderer {
             if (WEBGL_INFO$1.SUPPORTED_EXTENSIONS["EXT_frag_depth"]) {
                 src.push("varying float vFragDepth;");
             }
+            src.push("bool isPerspectiveMatrix(mat4 m) {");
+            src.push("    return (m[2][3] == - 1.0);");
+            src.push("}");
+            src.push("varying float isPerspective;");
         }
         src.push("vec3 octDecode(vec2 oct) {");
         src.push("    vec3 v = vec3(oct.xy, 1.0 - abs(oct.x) - abs(oct.y));");
@@ -49647,6 +49915,7 @@ class TrianglesInstancingPickNormalsRenderer {
                 src.push("clipPos.z = log2( max( 1e-6, clipPos.w + 1.0 ) ) * logDepthBufFC - 1.0;");
                 src.push("clipPos.z *= clipPos.w;");
             }
+            src.push("isPerspective = float (isPerspectiveMatrix(projMatrix));");
         }
         src.push("gl_Position = clipPos;");
         src.push("}");
@@ -49674,6 +49943,7 @@ class TrianglesInstancingPickNormalsRenderer {
         src.push("#endif");
 
         if (scene.logarithmicDepthBufferEnabled && WEBGL_INFO$1.SUPPORTED_EXTENSIONS["EXT_frag_depth"]) {
+            src.push("varying float isPerspective;");
             src.push("uniform float logDepthBufFC;");
             src.push("varying float vFragDepth;");
         }
@@ -49702,7 +49972,7 @@ class TrianglesInstancingPickNormalsRenderer {
             src.push("}");
         }
         if (scene.logarithmicDepthBufferEnabled && WEBGL_INFO$1.SUPPORTED_EXTENSIONS["EXT_frag_depth"]) {
-            src.push("gl_FragDepthEXT = log2( vFragDepth ) * logDepthBufFC * 0.5;");
+            src.push("    gl_FragDepthEXT = isPerspective == 0.0 ? gl_FragCoord.z : log2( vFragDepth ) * logDepthBufFC * 0.5;");
         }
         src.push("    gl_FragColor = vec4((vWorldNormal * 0.5) + 0.5, 1.0);");
         src.push("}");
@@ -49944,6 +50214,10 @@ class TrianglesInstancingOcclusionRenderer {
             if (WEBGL_INFO$1.SUPPORTED_EXTENSIONS["EXT_frag_depth"]) {
                 src.push("varying float vFragDepth;");
             }
+            src.push("bool isPerspectiveMatrix(mat4 m) {");
+            src.push("    return (m[2][3] == - 1.0);");
+            src.push("}");
+            src.push("varying float isPerspective;");
         }
         if (clipping) {
             src.push("varying vec4 vWorldPosition;");
@@ -49975,6 +50249,7 @@ class TrianglesInstancingOcclusionRenderer {
                 src.push("clipPos.z = log2( max( 1e-6, clipPos.w + 1.0 ) ) * logDepthBufFC - 1.0;");
                 src.push("clipPos.z *= clipPos.w;");
             }
+            src.push("isPerspective = float (isPerspectiveMatrix(projMatrix));");
         }
         src.push("gl_Position = clipPos;");
         src.push("}");
@@ -49999,6 +50274,7 @@ class TrianglesInstancingOcclusionRenderer {
         src.push("precision mediump int;");
         src.push("#endif");
         if (scene.logarithmicDepthBufferEnabled && WEBGL_INFO$1.SUPPORTED_EXTENSIONS["EXT_frag_depth"]) {
+            src.push("varying float isPerspective;");
             src.push("uniform float logDepthBufFC;");
             src.push("varying float vFragDepth;");
         }
@@ -50026,7 +50302,7 @@ class TrianglesInstancingOcclusionRenderer {
         }
         src.push("   gl_FragColor = vec4(0.0, 0.0, 1.0, 1.0); "); // Occluders are blue
         if (scene.logarithmicDepthBufferEnabled && WEBGL_INFO$1.SUPPORTED_EXTENSIONS["EXT_frag_depth"]) {
-            src.push("gl_FragDepthEXT = log2( vFragDepth ) * logDepthBufFC * 0.5;");
+            src.push("    gl_FragDepthEXT = isPerspective == 0.0 ? gl_FragCoord.z : log2( vFragDepth ) * logDepthBufFC * 0.5;");
         }
         src.push("}");
         return src;
@@ -50256,6 +50532,10 @@ class TrianglesInstancingDepthRenderer {
             if (WEBGL_INFO$1.SUPPORTED_EXTENSIONS["EXT_frag_depth"]) {
                 src.push("varying float vFragDepth;");
             }
+            src.push("bool isPerspectiveMatrix(mat4 m) {");
+            src.push("    return (m[2][3] == - 1.0);");
+            src.push("}");
+            src.push("varying float isPerspective;");
         }
         if (clipping) {
             src.push("varying vec4 vWorldPosition;");
@@ -50290,6 +50570,7 @@ class TrianglesInstancingDepthRenderer {
                 src.push("clipPos.z = log2( max( 1e-6, clipPos.w + 1.0 ) ) * logDepthBufFC - 1.0;");
                 src.push("clipPos.z *= clipPos.w;");
             }
+            src.push("isPerspective = float (isPerspectiveMatrix(projMatrix));");
         }
         src.push("gl_Position = clipPos;");
         src.push("vHighPrecisionZW = gl_Position.zw;");
@@ -50313,6 +50594,7 @@ class TrianglesInstancingDepthRenderer {
         src.push("precision highp int;");
         if (scene.logarithmicDepthBufferEnabled) {
             if (WEBGL_INFO$1.SUPPORTED_EXTENSIONS["EXT_frag_depth"]) {
+                src.push("varying float isPerspective;");
                 src.push("uniform float logDepthBufFC;");
                 src.push("varying float vFragDepth;");
             }
@@ -50355,7 +50637,7 @@ class TrianglesInstancingDepthRenderer {
             src.push("}");
         }
         if (scene.logarithmicDepthBufferEnabled && WEBGL_INFO$1.SUPPORTED_EXTENSIONS["EXT_frag_depth"]) {
-            src.push("gl_FragDepthEXT = log2( vFragDepth ) * logDepthBufFC * 0.5;");
+            src.push("    gl_FragDepthEXT = isPerspective == 0.0 ? gl_FragCoord.z : log2( vFragDepth ) * logDepthBufFC * 0.5;");
         }
         src.push("float fragCoordZ = 0.5 * vHighPrecisionZW[0] / vHighPrecisionZW[1] + 0.5;");
         if (WEBGL_INFO$1.SUPPORTED_EXTENSIONS["WEBGL_depth_texture"]) {
@@ -50611,6 +50893,10 @@ class TrianglesInstancingNormalsRenderer {
             if (WEBGL_INFO$1.SUPPORTED_EXTENSIONS["EXT_frag_depth"]) {
                 src.push("varying float vFragDepth;");
             }
+            src.push("bool isPerspectiveMatrix(mat4 m) {");
+            src.push("    return (m[2][3] == - 1.0);");
+            src.push("}");
+            src.push("varying float isPerspective;");
         }
         src.push("vec3 octDecode(vec2 oct) {");
         src.push("    vec3 v = vec3(oct.xy, 1.0 - abs(oct.x) - abs(oct.y));");
@@ -50654,6 +50940,7 @@ class TrianglesInstancingNormalsRenderer {
                 src.push("clipPos.z = log2( max( 1e-6, clipPos.w + 1.0 ) ) * logDepthBufFC - 1.0;");
                 src.push("clipPos.z *= clipPos.w;");
             }
+            src.push("isPerspective = float (isPerspectiveMatrix(projMatrix));");
         }
         src.push("gl_Position = clipPos;");
         src.push("}");
@@ -50678,6 +50965,7 @@ class TrianglesInstancingNormalsRenderer {
         src.push("precision mediump int;");
         src.push("#endif");
         if (scene.logarithmicDepthBufferEnabled && WEBGL_INFO$1.SUPPORTED_EXTENSIONS["EXT_frag_depth"]) {
+            src.push("varying float isPerspective;");
             src.push("uniform float logDepthBufFC;");
             src.push("varying float vFragDepth;");
         }
@@ -50708,7 +50996,7 @@ class TrianglesInstancingNormalsRenderer {
             src.push("}");
         }
         if (scene.logarithmicDepthBufferEnabled && WEBGL_INFO$1.SUPPORTED_EXTENSIONS["EXT_frag_depth"]) {
-            src.push("gl_FragDepthEXT = log2( vFragDepth ) * logDepthBufFC * 0.5;");
+            src.push("    gl_FragDepthEXT = isPerspective == 0.0 ? gl_FragCoord.z : log2( vFragDepth ) * logDepthBufFC * 0.5;");
         }
         src.push("    gl_FragColor = vec4(packNormalToRGB(vViewNormal), 1.0); ");
         src.push("}");
@@ -51383,6 +51671,10 @@ class TrianglesInstancingColorQualityRenderer {
             if (WEBGL_INFO$1.SUPPORTED_EXTENSIONS["EXT_frag_depth"]) {
                 src.push("varying float vFragDepth;");
             }
+            src.push("bool isPerspectiveMatrix(mat4 m) {");
+            src.push("    return (m[2][3] == - 1.0);");
+            src.push("}");
+            src.push("varying float isPerspective;");
         }
 
         src.push("vec3 octDecode(vec2 oct) {");
@@ -51440,6 +51732,7 @@ class TrianglesInstancingColorQualityRenderer {
                 src.push("clipPos.z = log2( max( 1e-6, clipPos.w + 1.0 ) ) * logDepthBufFC - 1.0;");
                 src.push("clipPos.z *= clipPos.w;");
             }
+            src.push("isPerspective = float (isPerspectiveMatrix(projMatrix));");
         }
 
         if (clipping) {
@@ -51490,6 +51783,7 @@ class TrianglesInstancingColorQualityRenderer {
         src.push("#endif");
 
         if (scene.logarithmicDepthBufferEnabled) {
+            src.push("varying float isPerspective;");
             if (WEBGL_INFO$1.SUPPORTED_EXTENSIONS["EXT_frag_depth"]) {
                 src.push("uniform float logDepthBufFC;");
                 src.push("varying float vFragDepth;");
@@ -51840,7 +52134,7 @@ class TrianglesInstancingColorQualityRenderer {
         src.push("gl_FragColor = fragColor;");
 
         if (scene.logarithmicDepthBufferEnabled && WEBGL_INFO$1.SUPPORTED_EXTENSIONS["EXT_frag_depth"]) {
-            src.push("gl_FragDepthEXT = log2( vFragDepth ) * logDepthBufFC * 0.5;");
+            src.push("    gl_FragDepthEXT = isPerspective == 0.0 ? gl_FragCoord.z : log2( vFragDepth ) * logDepthBufFC * 0.5;");
         }
 
         src.push("}");
@@ -52074,6 +52368,10 @@ class TrianglesInstancingPickNormalsFlatRenderer {
             if (WEBGL_INFO$1.SUPPORTED_EXTENSIONS["EXT_frag_depth"]) {
                 src.push("varying float vFragDepth;");
             }
+            src.push("bool isPerspectiveMatrix(mat4 m) {");
+            src.push("    return (m[2][3] == - 1.0);");
+            src.push("}");
+            src.push("varying float isPerspective;");
         }
         if (clipping) {
             src.push("varying vec4 vFlags2;");
@@ -52102,6 +52400,7 @@ class TrianglesInstancingPickNormalsFlatRenderer {
                 src.push("clipPos.z = log2( max( 1e-6, clipPos.w + 1.0 ) ) * logDepthBufFC - 1.0;");
                 src.push("clipPos.z *= clipPos.w;");
             }
+            src.push("isPerspective = float (isPerspectiveMatrix(projMatrix));");
         }
         src.push("gl_Position = clipPos;");
         src.push("}");
@@ -52128,6 +52427,7 @@ class TrianglesInstancingPickNormalsFlatRenderer {
         src.push("#endif");
 
         if (scene.logarithmicDepthBufferEnabled && WEBGL_INFO$1.SUPPORTED_EXTENSIONS["EXT_frag_depth"]) {
+            src.push("varying float isPerspective;");
             src.push("uniform float logDepthBufFC;");
             src.push("varying float vFragDepth;");
         }
@@ -52155,7 +52455,7 @@ class TrianglesInstancingPickNormalsFlatRenderer {
             src.push("}");
         }
         if (scene.logarithmicDepthBufferEnabled && WEBGL_INFO$1.SUPPORTED_EXTENSIONS["EXT_frag_depth"]) {
-            src.push("gl_FragDepthEXT = log2( vFragDepth ) * logDepthBufFC * 0.5;");
+            src.push("    gl_FragDepthEXT = isPerspective == 0.0 ? gl_FragCoord.z : log2( vFragDepth ) * logDepthBufFC * 0.5;");
         }
         src.push("  vec3 xTangent = dFdx( vWorldPosition.xyz );");
         src.push("  vec3 yTangent = dFdy( vWorldPosition.xyz );");
@@ -52468,6 +52768,7 @@ const tempVec3c$3 = math.vec3();
 const tempVec3d$1 = math.vec3();
 const tempVec3e = math.vec3();
 const tempVec3f = math.vec3();
+const tempVec3g = math.vec3();
 
 /**
  * @private
@@ -52704,18 +53005,18 @@ class TrianglesInstancingLayer {
 
             // Note: order of inverse and transpose doesn't matter
 
-        let transposedMat = math.transposeMat4(meshMatrix, math.mat4()); // TODO: Use cached matrix
-        let normalMatrix = math.inverseMat4(transposedMat);
+            let transposedMat = math.transposeMat4(meshMatrix, math.mat4()); // TODO: Use cached matrix
+            let normalMatrix = math.inverseMat4(transposedMat);
 
-        this._modelNormalMatrixCol0.push(normalMatrix[0]);
-        this._modelNormalMatrixCol0.push(normalMatrix[4]);
-        this._modelNormalMatrixCol0.push(normalMatrix[8]);
-        this._modelNormalMatrixCol0.push(normalMatrix[12]);
+            this._modelNormalMatrixCol0.push(normalMatrix[0]);
+            this._modelNormalMatrixCol0.push(normalMatrix[4]);
+            this._modelNormalMatrixCol0.push(normalMatrix[8]);
+            this._modelNormalMatrixCol0.push(normalMatrix[12]);
 
-        this._modelNormalMatrixCol1.push(normalMatrix[1]);
-        this._modelNormalMatrixCol1.push(normalMatrix[5]);
-        this._modelNormalMatrixCol1.push(normalMatrix[9]);
-        this._modelNormalMatrixCol1.push(normalMatrix[13]);
+            this._modelNormalMatrixCol1.push(normalMatrix[1]);
+            this._modelNormalMatrixCol1.push(normalMatrix[5]);
+            this._modelNormalMatrixCol1.push(normalMatrix[9]);
+            this._modelNormalMatrixCol1.push(normalMatrix[13]);
 
             this._modelNormalMatrixCol2.push(normalMatrix[2]);
             this._modelNormalMatrixCol2.push(normalMatrix[6]);
@@ -52769,6 +53070,7 @@ class TrianglesInstancingLayer {
         if (this.model.scene.pickSurfacePrecisionEnabled) {
             portion.matrix = meshMatrix.slice();
             portion.inverseMatrix = null; // Lazy-computed in precisionRayPickSurface
+            portion.normalMatrix = null; // Lazy-computed in precisionRayPickSurface
         }
 
         this._portions.push(portion);
@@ -53399,7 +53701,7 @@ class TrianglesInstancingLayer {
 
     //-----------------------------------------------------------------------------------------
 
-    precisionRayPickSurface(portionId, worldRayOrigin, worldRayDir, worldSurfacePos) {
+    precisionRayPickSurface(portionId, worldRayOrigin, worldRayDir, worldSurfacePos, worldNormal) {
 
         if (!this.model.scene.pickSurfacePrecisionEnabled) {
             return false;
@@ -53417,6 +53719,10 @@ class TrianglesInstancingLayer {
             portion.inverseMatrix = math.inverseMat4(portion.matrix, math.mat4());
         }
 
+        if (worldNormal && !portion.normalMatrix) {
+            portion.normalMatrix = math.transposeMat4(portion.inverseMatrix, math.mat4());
+        }
+
         const quantizedPositions = state.quantizedPositions;
         const indices = state.indices;
         const rtcCenter = state.rtcCenter;
@@ -53440,6 +53746,10 @@ class TrianglesInstancingLayer {
         const b = tempVec3e;
         const c = tempVec3f;
 
+        let gotIntersect = false;
+        let closestDist = 0;
+        const closestIntersectPos = tempVec3g;
+
         for (let i = 0, len = indices.length; i < len; i += 3) {
 
             const ia = indices[i + 0] * 3;
@@ -53462,25 +53772,40 @@ class TrianglesInstancingLayer {
             math.decompressPosition(b, state.positionsDecodeMatrix);
             math.decompressPosition(c, state.positionsDecodeMatrix);
 
-            if (math.rayTriangleIntersect(rtcRayOrigin, rtcRayDir, a, b, c, worldSurfacePos)) {
+            if (math.rayTriangleIntersect(rtcRayOrigin, rtcRayDir, a, b, c, closestIntersectPos)) {
 
-                math.transformPoint3(portion.matrix, worldSurfacePos, worldSurfacePos);
+                math.transformPoint3(portion.matrix, closestIntersectPos, closestIntersectPos);
 
-                math.transformPoint3(this.model.worldMatrix, worldSurfacePos, worldSurfacePos);
+                math.transformPoint3(this.model.worldMatrix, closestIntersectPos, closestIntersectPos);
 
                 if (offset) {
-                    math.addVec3(worldSurfacePos, offset);
+                    math.addVec3(closestIntersectPos, offset);
                 }
 
                 if (rtcCenter) {
-                    math.addVec3(worldSurfacePos, rtcCenter);
+                    math.addVec3(closestIntersectPos, rtcCenter);
                 }
 
-                return true;
+                const dist = Math.abs(math.lenVec3(math.subVec3(closestIntersectPos, worldRayOrigin, [])));
+
+                if (!gotIntersect || dist > closestDist) {
+                    closestDist = dist;
+                    worldSurfacePos.set(closestIntersectPos);
+                    if (worldNormal) { // Not that wasteful to eagerly compute - unlikely to hit >2 surfaces on most geometry
+                        math.triangleNormal(a, b, c, worldNormal);
+                    }
+                    gotIntersect = true;
+                }
             }
         }
 
-        return false;
+        if (gotIntersect && worldNormal) {
+            math.transformVec3(portion.normalMatrix, worldNormal, worldNormal);
+            math.transformVec3(this.model.worldNormalMatrix, worldNormal, worldNormal);
+            math.normalizeVec3(worldNormal);
+        }
+
+        return gotIntersect;
     }
 
     destroy() {
@@ -69554,14 +69879,16 @@ var parseGLTF$1 = (function () {
             var geometry;
 
             for (var i = 0, len = primitivesInfo.length; i < len; i++) {
-
+                primitiveInfo = primitivesInfo[i];
+                if (primitiveInfo.mode < 4 ) {
+                    continue;
+                }
                 geometryCfg = {
                     primitive: "triangles",
                     compressGeometry: true,
                     edgeThreshold: ctx.edgeThreshold
                 };
 
-                primitiveInfo = primitivesInfo[i];
                 indicesIndex = primitiveInfo.indices;
 
                 if (indicesIndex !== null && indicesIndex !== undefined) {
@@ -70245,11 +70572,14 @@ const parseGLTF = (function () {
                     const meshIds = [];
 
                     for (let i = 0; i < numPrimitives; i++) {
+                        const primitiveInfo = meshInfo.primitives[i];
+                        if (primitiveInfo.mode < 4 ) {
+                            continue;
+                        }
                         const meshCfg = {
                             id: performanceModel.id + "." + ctx.numObjects++,
                             matrix: worldMatrix
                         };
-                        const primitiveInfo = meshInfo.primitives[i];
 
                         const materialIndex = primitiveInfo.material;
                         let materialInfo;
@@ -71424,6 +71754,7 @@ class NavCubePlugin extends Plugin {
             var lastX;
             var lastY;
 
+
             self._navCubeCanvas.addEventListener("mouseenter", self._onMouseEnter = function (e) {
                 over = true;
             });
@@ -71492,27 +71823,16 @@ class NavCubePlugin extends Plugin {
                                             self._repaint();
                                             lastAreaId = -1;
                                         }
-                                        var hit = navCubeScene.pick({
-                                            canvasPos: canvasPos,
-                                            pickSurface: true
-                                        });
-                                        if (hit) {
-                                            if (hit.uv) {
-                                                var areaId = self._cubeTextureCanvas.getArea(hit.uv);
-                                                if (areaId !== undefined) {
-                                                    document.body.style.cursor = "pointer";
-                                                    if (lastAreaId >= 0) {
-                                                        self._cubeTextureCanvas.setAreaHighlighted(lastAreaId, false);
-                                                        self._repaint();
-                                                        lastAreaId = -1;
-                                                    }
-                                                    if (areaId >= 0) {
-                                                        self._cubeTextureCanvas.setAreaHighlighted(areaId, true);
-                                                        lastAreaId = areaId;
-                                                        self._repaint();
-                                                    }
-                                                }
-                                            }
+                                        document.body.style.cursor = "pointer";
+                                        if (lastAreaId >= 0) {
+                                            self._cubeTextureCanvas.setAreaHighlighted(lastAreaId, false);
+                                            self._repaint();
+                                            lastAreaId = -1;
+                                        }
+                                        if (areaId >= 0) {
+                                            self._cubeTextureCanvas.setAreaHighlighted(areaId, false);
+                                            lastAreaId = -1;
+                                            self._repaint();
                                         }
                                     });
                                 }
@@ -75014,6 +75334,7 @@ class Skybox extends Component {
                     12, 13, 14, 12, 14, 15, 16, 17, 18, 16, 18, 19, 20, 21, 22, 20, 22, 23
                 ]
             }),
+            background: true,
             scale: [2000, 2000, 2000], // Overridden when we initialize the 'size' property, below
             rotation: [0, -90, 0],
             material: new PhongMaterial(this, {
@@ -75024,6 +75345,8 @@ class Skybox extends Component {
                 emissiveMap: new Texture(this, {
                     src: cfg.src,
                     flipY: true,
+                    wrapS: "clampToEdge",
+                    wrapT: "clampToEdge",
                     encoding: cfg.encoding || "sRGB"
                 }),
                 backfaces: true // Show interior faces of our skybox geometry
@@ -78690,6 +79013,8 @@ class TreeViewPlugin extends Plugin {
     /**
      * Removes a model from this tree view.
      *
+     * Does nothing if model not currently in tree view.
+     *
      * @param {String} modelId ID of a model {@link Entity} in {@link Scene#models}.
      */
     removeModel(modelId) {
@@ -78698,7 +79023,6 @@ class TreeViewPlugin extends Plugin {
         }
         const modelTreeView = this._modelTreeViews[modelId];
         if (!modelTreeView) {
-            this.warn("Model not added: " + modelId);
             return;
         }
         modelTreeView.destroy();
@@ -98020,6 +98344,355 @@ class Fresnel extends Component {
     }
 }
 
+/**
+ * A {@link Marker} with a billboarded and textured quad attached to it.
+ *
+ * * Extends {@link Marker}
+ * * Keeps the quad oriented towards the viewpoint
+ * * Auto-fits the quad to the texture
+ * * Has a world-space position
+ * * Can be configured to hide the quad whenever the position is occluded by some other object
+ *
+ * ## Usage
+ *
+ * [[Run this example](http://xeokit.github.io/xeokit-sdk/examples/#markers_SpriteMarker)]
+ *
+ * ```` javascript
+ * import {Viewer, SpriteMarker } from "../dist/xeokit-sdk.es.js";
+ *
+ * const viewer = new Viewer({
+ *        canvasId: "myCanvas",
+ *      transparent: true
+ *  });
+ *
+ * viewer.scene.camera.eye = [0, 0, 25];
+ * viewer.scene.camera.look = [0, 0, 0];
+ * viewer.scene.camera.up = [0, 1, 0];
+ *
+ * new SpriteMarker(viewer.scene, {
+ *      worldPos: [-10, 0, 0],
+ *      src: "../assets/textures/diffuse/uvGrid2_512x1024.jpg",
+ *      size: 5,
+ *      occludable: false
+ *  });
+ *
+ * new SpriteMarker(viewer.scene, {
+ *      worldPos: [+10, 0, 0],
+ *      src: "../assets/textures/diffuse/uvGrid2_1024x512.jpg",
+ *      size: 4,
+ *      occludable: false
+ *  });
+ *````
+ */
+class SpriteMarker extends Marker {
+
+    /**
+     * @constructor
+     * @param {Component} owner Owner component. When destroyed, the owner will destroy this SpriteMarker as well.
+     * @param {*} [cfg] Configs
+     * @param {String} [cfg.id] Optional ID for this SpriteMarker, unique among all components in the parent scene, generated automatically when omitted.
+     * @param {Entity} [cfg.entity] Entity to associate this Marker with. When the SpriteMarker has an Entity, then {@link Marker#visible} will always be ````false```` if {@link Entity#visible} is false.
+     * @param {Boolean} [cfg.occludable=false] Indicates whether or not this Marker is hidden (ie. {@link Marker#visible} is ````false```` whenever occluded by {@link Entity}s in the {@link Scene}.
+     * @param {Number[]} [cfg.worldPos=[0,0,0]] World-space 3D Marker position.
+     * @param {String} [cfg.src=null] Path to image file to load into this SpriteMarker. See the {@link SpriteMarker#src} property for more info.
+     * @param {HTMLImageElement} [cfg.image=null] HTML Image object to load into this SpriteMarker. See the {@link SpriteMarker#image} property for more info.
+     * @param {Boolean} [cfg.flipY=false] Flips this SpriteMarker's texture image along its vertical axis when true.
+     * @param  {String} [cfg.encoding="linear"] Texture encoding format.  See the {@link Texture#encoding} property for more info.
+     */
+    constructor(owner, cfg = {}) {
+
+        super(owner, {
+            entity: cfg.entity,
+            occludable: cfg.occludable,
+            worldPos: cfg.worldPos
+        });
+
+        this._occluded = false;
+        this._visible = true;
+        this._src = null;
+        this._image = null;
+        this._pos = math.vec3();
+        this._rtcCenter = math.vec3();
+        this._rtcPos = math.vec3();
+        this._dir = math.vec3();
+        this._size = 1.0;
+        this._imageSize = math.vec2();
+
+        this._texture = new Texture(this, {
+            src: cfg.src
+        });
+
+        this._geometry = new ReadableGeometry(this, {
+            primitive: "triangles",
+            positions: [3, 3, 0, -3, 3, 0, -3, -3, 0, 3, -3, 0],
+            normals: [-1, 0, 0, -1, 0, 0, -1, 0, 0, -1, 0, 0],
+            uv: [1, -1, 0, -1, 0, 0, 1, 0],
+            indices: [0, 1, 2, 0, 2, 3] // Ensure these will be front-faces
+        });
+
+        this._mesh = new Mesh(this, {
+            geometry: this._geometry,
+            material: new PhongMaterial(this, {
+                ambient: [0.9, 0.3, 0.9],
+                shininess: 30,
+                diffuseMap: this._texture,
+                backfaces: true
+            }),
+            scale: [1, 1, 1], // Note: by design, scale does not work with billboard
+            position: cfg.worldPos,
+            rotation: [90, 0, 0],
+            billboard: "spherical",
+            occluder: false // Don't occlude SpriteMarkers or Annotations
+        });
+
+        this.visible = true;
+        this.collidable = cfg.collidable;
+        this.clippable = cfg.clippable;
+        this.pickable = cfg.pickable;
+        this.opacity = cfg.opacity;
+        this.size = cfg.size;
+
+        if (cfg.image) {
+            this.image = cfg.image;
+        } else {
+            this.src = cfg.src;
+        }
+    }
+
+    _setVisible(visible) { // Called by VisibilityTester and this._entity.on("destroyed"..)
+        this._occluded = (!visible);
+        this._mesh.visible = this._visible && (!this._occluded);
+        super._setVisible(visible);
+    }
+
+    /**
+     * Sets if this ````SpriteMarker```` is visible or not.
+     *
+     * Default value is ````true````.
+     *
+     * @param {Boolean} visible Set ````true```` to make this ````SpriteMarker```` visible.
+     */
+    set visible(visible) {
+        this._visible = (visible === null || visible === undefined) ? true : visible;
+        this._mesh.visible = this._visible && (!this._occluded);
+    }
+
+    /**
+     * Gets if this ````SpriteMarker```` is visible or not.
+     *
+     * Default value is ````true````.
+     *
+     * @returns {Boolean} Returns ````true```` if visible.
+     */
+    get visible() {
+        return this._visible;
+    }
+
+    /**
+     * Sets an ````HTMLImageElement```` to source the image from.
+     *
+     * Sets {@link Texture#src} null.
+     *
+     * @type {HTMLImageElement}
+     */
+    set image(image) {
+        this._image = image;
+        if (this._image) {
+            this._imageSize[0] = this._image.width;
+            this._imageSize[1] = this._image.height;
+            this._updatePlaneSizeFromImage();
+            this._src = null;
+            this._texture.image = this._image;
+        }
+    }
+
+    /**
+     * Gets the ````HTMLImageElement```` the ````SpriteMarker````'s image is sourced from, if set.
+     *
+     * Returns null if not set.
+     *
+     * @type {HTMLImageElement}
+     */
+    get image() {
+        return this._image;
+    }
+
+    /**
+     * Sets an image file path that the ````SpriteMarker````'s image is sourced from.
+     *
+     * Accepted file types are PNG and JPEG.
+     *
+     * Sets {@link Texture#image} null.
+     *
+     * @type {String}
+     */
+    set src(src) {
+        this._src = src;
+        if (this._src) {
+            this._image = null;
+            const image = new Image();
+            image.onload = () => {
+                this._texture.image = image;
+                this._imageSize[0] = image.width;
+                this._imageSize[1] = image.height;
+                this._updatePlaneSizeFromImage();
+            };
+            image.src = this._src;
+        }
+    }
+
+    /**
+     * Gets the image file path that the ````SpriteMarker````'s image is sourced from, if set.
+     *
+     * Returns null if not set.
+     *
+     * @type {String}
+     */
+    get src() {
+        return this._src;
+    }
+
+    /**
+     * Sets the World-space size of the longest edge of the ````SpriteMarker````.
+     *
+     * Note that ````SpriteMarker```` sets its aspect ratio to match its image. If we set a value of ````1000````, and
+     * the image has size ````400x300````, then the ````SpriteMarker```` will then have size ````1000 x 750````.
+     *
+     * Default value is ````1.0````.
+     *
+     * @param {Number} size New World-space size of the ````SpriteMarker````.
+     */
+    set size(size) {
+        this._size = (size === undefined || size === null) ? 1.0 : size;
+        if (this._image) {
+            this._updatePlaneSizeFromImage();
+        }
+    }
+
+    /**
+     * Gets the World-space size of the longest edge of the ````SpriteMarker````.
+     *
+     * Returns {Number} World-space size of the ````SpriteMarker````.
+     */
+    get size() {
+        return this._size;
+    }
+
+    /**
+     * Sets if this ````SpriteMarker```` is included in boundary calculations.
+     *
+     * Default is ````true````.
+     *
+     * @type {Boolean}
+     */
+    set collidable(value) {
+        this._mesh.collidable = (value !== false);
+    }
+
+    /**
+     * Gets if this ````SpriteMarker```` is included in boundary calculations.
+     *
+     * Default is ````true````.
+     *
+     * @type {Boolean}
+     */
+    get collidable() {
+        return this._mesh.collidable;
+    }
+
+    /**
+     * Sets if this ````SpriteMarker```` is clippable.
+     *
+     * Clipping is done by the {@link SectionPlane}s in {@link Scene#sectionPlanes}.
+     *
+     * Default is ````true````.
+     *
+     * @type {Boolean}
+     */
+    set clippable(value) {
+        this._mesh.clippable = (value !== false);
+    }
+
+    /**
+     * Gets if this ````SpriteMarker````  is clippable.
+     *
+     * Clipping is done by the {@link SectionPlane}s in {@link Scene#sectionPlanes}.
+     *
+     * Default is ````true````.
+     *
+     * @type {Boolean}
+     */
+    get clippable() {
+        return this._mesh.clippable;
+    }
+
+    /**
+     * Sets if this ````SpriteMarker```` is pickable.
+     *
+     * Default is ````true````.
+     *
+     * @type {Boolean}
+     */
+    set pickable(value) {
+        this._mesh.pickable = (value !== false);
+    }
+
+    /**
+     * Gets if this ````SpriteMarker````  is pickable.
+     *
+     * Default is ````true````.
+     *
+     * @type {Boolean}
+     */
+    get pickable() {
+        return this._mesh.pickable;
+    }
+
+    /**
+     * Sets the opacity factor for this ````SpriteMarker````.
+     *
+     * This is a factor in range ````[0..1]```` which multiplies by the rendered fragment alphas.
+     *
+     * @type {Number}
+     */
+    set opacity(opacity) {
+        this._mesh.opacity = opacity;
+    }
+
+    /**
+     * Gets this ````SpriteMarker````'s opacity factor.
+     *
+     * This is a factor in range ````[0..1]```` which multiplies by the rendered fragment alphas.
+     *
+     * @type {Number}
+     */
+    get opacity() {
+        return this._mesh.opacity;
+    }
+
+    _updatePlaneSizeFromImage() {
+        const halfSize = this._size * 0.5;
+        const width = this._imageSize[0];
+        const height = this._imageSize[1];
+        const aspect = height / width;
+        if (width > height) {
+            this._geometry.positions = [
+                halfSize, halfSize * aspect, 0,
+                -halfSize, halfSize * aspect, 0,
+                -halfSize, -halfSize * aspect, 0,
+                halfSize, -halfSize * aspect, 0
+            ];
+        } else {
+            this._geometry.positions = [
+                halfSize / aspect, halfSize, 0,
+                -halfSize / aspect, halfSize, 0,
+                -halfSize / aspect, -halfSize, 0,
+                halfSize / aspect, -halfSize, 0
+            ];
+        }
+    }
+}
+
 const color = math.vec3();
 
 /**
@@ -99708,6 +100381,7 @@ class MousePanRotateDollyHandler {
                     const y = canvasPos[1];
                     if (Math.abs(x - lastXDown) < 3 && Math.abs(y - lastYDown) < 3) {
                         controllers.cameraControl.fire("rightClick", { // For context menus
+                            pagePos: [Math.round(e.pageX), Math.round(e.pageY)],
                             canvasPos: canvasPos,
                             event: e
                         }, true);
@@ -99793,13 +100467,13 @@ const tempCameraTarget = {
  */
 class KeyboardAxisViewHandler {
 
-    constructor(scene, controllers, configs, states, updates) {
+    constructor(scene, controllers, configs, states) {
 
         this._scene = scene;
         const cameraControl = controllers.cameraControl;
         const camera = scene.camera;
 
-        scene.input.on("keydown", this._documentKeyDownHandler = (e) => {
+        this._onSceneKeyDown = scene.input.on("keydown", () => {
 
             if (!(configs.active && configs.pointerEnabled) || (!scene.input.keyboardEnabled)) {
                 return;
@@ -99891,7 +100565,7 @@ class KeyboardAxisViewHandler {
     }
 
     destroy() {
-        document.removeEventListener("keydown", this._documentKeyDownHandler);
+        this._scene.input.off(this._onSceneKeyDown);
     }
 }
 
@@ -100265,22 +100939,19 @@ class KeyboardPanRotateDollyHandler {
 
         const canvas = scene.canvas.canvas;
 
-        controllers.pickController;
-
         let mouseMovedSinceLastKeyboardDolly = true;
 
-        document.addEventListener("mousemove", this._documentMouseMoveHandler = () => {
+        this._onSceneMouseMove = input.on("mousemove", () => {
             mouseMovedSinceLastKeyboardDolly = true;
         });
 
-        document.addEventListener("keydown", this._documentKeyDownHandler = (e) => {
+        this._onSceneKeyDown = input.on("keydown", (keyCode) => {
             if (!(configs.active && configs.pointerEnabled) || (!scene.input.keyboardEnabled)) {
                 return;
             }
             if (!states.mouseover) {
                 return;
             }
-            const keyCode = e.keyCode;
             keyDownMap[keyCode] = true;
 
             if (keyCode === input.KEY_SHIFT) {
@@ -100288,14 +100959,13 @@ class KeyboardPanRotateDollyHandler {
             }
         });
 
-        document.addEventListener("keyup", this._documentKeyUpHandler = (e) => {
+        this._onSceneKeyUp = input.on("keyup", (keyCode) => {
             if (!(configs.active && configs.pointerEnabled) || (!scene.input.keyboardEnabled)) {
                 return;
             }
             if (!states.mouseover) {
                 return;
             }
-            const keyCode = e.keyCode;
             keyDownMap[keyCode] = false;
 
             if (keyCode === input.KEY_SHIFT) {
@@ -100430,9 +101100,9 @@ class KeyboardPanRotateDollyHandler {
 
         this._scene.off(this._onTick);
 
-        document.removeEventListener("mousemove", this._documentMouseMoveHandler);
-        document.removeEventListener("keydown", this._documentKeyDownHandler);
-        document.removeEventListener("keyup", this._documentKeyUpHandler);
+        this._scene.input.off(this._onSceneMouseMove);
+        this._scene.input.off(this._onSceneKeyDown);
+        this._scene.input.off(this._onSceneKeyUp);
     }
 }
 
@@ -100865,7 +101535,6 @@ class TouchPanRotateAndDollyHandler {
                 return;
             }
 
-            event.stopPropagation();
             event.preventDefault();
 
             const touches = event.touches;
@@ -100965,7 +101634,12 @@ class TouchPanRotateAndDollyHandler {
 
                 const xPanDelta = touch0Vec[0];
                 const yPanDelta = touch0Vec[1];
-                
+
+                if (states.longTouchTimeout !== null && (Math.abs(xPanDelta) > configs.longTapRadius || Math.abs(yPanDelta) > configs.longTapRadius)) {
+                    clearTimeout(states.longTouchTimeout);
+                    states.longTouchTimeout = null;
+                }
+
                 if (configs.planView) { // No rotating in plan-view mode
 
                     const camera = scene.camera;
@@ -101075,7 +101749,6 @@ class TouchPickHandler {
         this._scene = scene;
 
         const pickController = controllers.pickController;
-        controllers.pivotController;
         const cameraControl = controllers.cameraControl;
 
         let touchStartTime;
@@ -101112,6 +101785,11 @@ class TouchPickHandler {
                 return;
             }
 
+            if (states.longTouchTimeout !== null) {
+                clearTimeout(states.longTouchTimeout);
+                states.longTouchTimeout = null;
+            }
+
             const touches = e.touches;
             const changedTouches = e.changedTouches;
 
@@ -101121,6 +101799,23 @@ class TouchPickHandler {
                 tapStartTime = touchStartTime;
                 tapStartPos[0] = touches[0].pageX;
                 tapStartPos[1] = touches[0].pageY;
+
+                const rightClickClientX = touches[0].clientX;
+                const rightClickClientY = touches[0].clientY;
+
+                const rightClickPageX = touches[0].pageX;
+                const rightClickPageY = touches[0].pageY;
+
+                states.longTouchTimeout = setTimeout(() => {
+                    controllers.cameraControl.fire("rightClick", { // For context menus
+                        pagePos: [Math.round(rightClickPageX), Math.round(rightClickPageY)],
+                        canvasPos: [Math.round(rightClickClientX), Math.round(rightClickClientY)],
+                        event: e
+                    }, true);
+
+                    states.longTouchTimeout = null;
+                }, configs.longTapTimeout);
+
             } else {
                 tapStartTime = -1;
             }
@@ -101136,8 +101831,6 @@ class TouchPickHandler {
 
             activeTouches.length = touches.length;
 
-            e.stopPropagation();
-
         }, {passive: true});
 
 
@@ -101151,12 +101844,12 @@ class TouchPickHandler {
             const touches = e.touches;
             const changedTouches = e.changedTouches;
 
-            cameraControl.hasSubs("picked");
-            cameraControl.hasSubs("pickedNothing");
             const pickedSurfaceSubs = cameraControl.hasSubs("pickedSurface");
-            cameraControl.hasSubs("doublePicked");
-            cameraControl.hasSubs("doublePickedSurface");
-            cameraControl.hasSubs("doublePickedNothing");
+
+            if (states.longTouchTimeout !== null) {
+                clearTimeout(states.longTouchTimeout);
+                states.longTouchTimeout = null;
+            }
 
             // process tap
 
@@ -101240,8 +101933,8 @@ class TouchPickHandler {
 
     reset() {
         // TODO
-         // tapStartTime = -1;
-         // lastTapTime = -1;
+        // tapStartTime = -1;
+        // lastTapTime = -1;
 
     }
 
@@ -101859,9 +102552,8 @@ class CameraControl extends Component {
 
             // Private
 
-            tapInterval: 150, // Millisecs
-            doubleTapInterval: 325, // Millisecs
-            tapDistanceThreshold: 4, // Pixels
+            longTapTimeout: 600, // Millisecs
+            longTapRadius: 5, // Pixels
 
             // General
 
@@ -101914,7 +102606,8 @@ class CameraControl extends Component {
             activeTouches: [],
             tapStartPos: math.vec2(),
             tapStartTime: -1,
-            lastTapTime: -1
+            lastTapTime: -1,
+            longTouchTimeout: null
         };
 
         // Updates for CameraUpdater to process on next Scene "tick" event
@@ -103303,7 +103996,7 @@ class PropertySet {
     constructor(id, originalSystemId, name, type, properties) {
 
         /**
-         * Globally-unique ID.
+         * Globally-unique ID for this PropertySet.
          *
          * PropertySet instances are registered by this ID in {@link MetaScene#propertySets} and {@link MetaModel#propertySets}.
          *
@@ -103347,7 +104040,7 @@ class PropertySet {
         if (properties) {
             for (let i = 0, len = properties.length; i < len; i++) {
                 const property = properties[i];
-                this.properties.push(new Property(property.name, property.value, property.type, property.valueType, property.description));
+                this.properties.push(new Property(property.name,  property.value, property.type, property.valueType, property.description));
             }
         }
     }
@@ -104102,4 +104795,4 @@ class Viewer {
     }
 }
 
-export { AmbientLight, AngleMeasurementsPlugin, AnnotationsPlugin, AxisGizmoPlugin, BCFViewpointsPlugin, CameraMemento, CameraPath, CameraPathAnimation, Component, ContextMenu, CubicBezierCurve, Curve, DirLight, DistanceMeasurementsPlugin, EdgeMaterial, EmphasisMaterial, FastNavPlugin, Fresnel, GLTFDefaultDataSource, GLTFLoaderPlugin, ImagePlane, LambertMaterial, LightMap, LocaleService, Map, Marker, Mesh, MetallicMaterial, ModelMemento, NavCubePlugin, Node, OBJLoaderPlugin, ObjectsMemento, Path, PerformanceModel, PhongMaterial, Plugin, PointLight, QuadraticBezierCurve, Queue, ReadableGeometry, ReflectionMap, STLDefaultDataSource, STLLoaderPlugin, SectionPlane, SectionPlanesPlugin, Skybox, SkyboxesPlugin, SpecularMaterial, SplineCurve, StoreyViewsPlugin, Texture, TreeViewPlugin, VBOGeometry, ViewCullPlugin, Viewer, XKTDefaultDataSource, XKTLoaderPlugin, XML3DLoaderPlugin, buildBoxGeometry, buildBoxLinesGeometry, buildCylinderGeometry, buildGridGeometry, buildPlaneGeometry, buildSphereGeometry, buildTorusGeometry, buildVectorTextGeometry, load3DSGeometry, loadOBJGeometry, math, utils };
+export { AmbientLight, AngleMeasurementsPlugin, AnnotationsPlugin, AxisGizmoPlugin, BCFViewpointsPlugin, CameraMemento, CameraPath, CameraPathAnimation, Component, ContextMenu, CubicBezierCurve, Curve, DirLight, DistanceMeasurementsPlugin, EdgeMaterial, EmphasisMaterial, FastNavPlugin, Fresnel, GLTFDefaultDataSource, GLTFLoaderPlugin, ImagePlane, LambertMaterial, LightMap, LocaleService, Map, Marker, Mesh, MetallicMaterial, ModelMemento, NavCubePlugin, Node, OBJLoaderPlugin, ObjectsMemento, Path, PerformanceModel, PhongMaterial, Plugin, PointLight, QuadraticBezierCurve, Queue, ReadableGeometry, ReflectionMap, STLDefaultDataSource, STLLoaderPlugin, SectionPlane, SectionPlanesPlugin, Skybox, SkyboxesPlugin, SpecularMaterial, SplineCurve, SpriteMarker, StoreyViewsPlugin, Texture, TreeViewPlugin, VBOGeometry, ViewCullPlugin, Viewer, XKTDefaultDataSource, XKTLoaderPlugin, XML3DLoaderPlugin, buildBoxGeometry, buildBoxLinesGeometry, buildCylinderGeometry, buildGridGeometry, buildPlaneGeometry, buildSphereGeometry, buildTorusGeometry, buildVectorTextGeometry, load3DSGeometry, loadOBJGeometry, math, utils };