@xeokit/xeokit-sdk 2.6.61 → 2.6.62

package/dist/xeokit-sdk.es.js

@@ -780,12 +780,19 @@ class ContextMenu {
                             subMenuElement.getBoundingClientRect();
 
                             const subMenuWidth = 200; // TODO
-                            const showOnLeft = ((itemRect.right + subMenuWidth) > window.innerWidth);
+                            const showOnRight = (itemRect.right + subMenuWidth) < window.innerWidth;
+                            const showOnLeft = (itemRect.left - subMenuWidth) > 0;
 
-                            if (showOnLeft) {
-                                self._showMenu(subMenu.id, itemRect.left - subMenuWidth, itemRect.top - 1);
-                            } else {
+                            if(showOnRight)
                                 self._showMenu(subMenu.id, itemRect.right - 5, itemRect.top - 1);
+                            else if (showOnLeft)
+                                self._showMenu(subMenu.id, itemRect.left - subMenuWidth, itemRect.top - 1);
+                            else {
+                                const spaceOnLeft = itemRect.left, spaceOnRight = window.innerWidth - itemRect.right;
+                                if(spaceOnRight > spaceOnLeft) 
+                                    self._showMenu(subMenu.id, itemRect.right - 5 - (subMenuWidth - spaceOnRight), itemRect.top - 1);
+                                else 
+                                    self._showMenu(subMenu.id, itemRect.left - spaceOnLeft, itemRect.top - 1);
                             }
 
                             lastSubMenu = subMenu;
@@ -9589,14 +9596,17 @@ function addContextMenuListener(elem, callback) {
 
     const touchStartHandler = (event) => {
         event.preventDefault();
-        const touch = event.touches[0];
-        startX = touch.clientX;
-        startY = touch.clientY;
-
+        
         if (timeout) {
             clearTimeout(timeout);
             timeout = null;
         }
+        // If more than one finger touches the screen, cancel the timeout
+        if (event.touches.length > 1) return;
+
+        const touch = event.touches[0];
+        startX = touch.clientX;
+        startY = touch.clientY;
 
         timeout = setTimeout(() => {
             event.clientX = touch.clientX;
@@ -9607,6 +9617,14 @@ function addContextMenuListener(elem, callback) {
         }, longPressTimer);
     };
 
+    const globalTouchStartHandler = (event) => {
+        // Cancel timeout if multiple touches are detected anywhere on the screen
+        if (event.touches.length > 1 && timeout) {
+            clearTimeout(timeout);
+            timeout = null;
+        }
+    };
+
     const touchMoveHandler = (event) => {
         if (!timeout) return;
         const touch = event.touches[0];
@@ -9637,6 +9655,7 @@ function addContextMenuListener(elem, callback) {
         elem.addEventListener('touchstart', touchStartHandler);
         elem.addEventListener('touchmove', touchMoveHandler);
         elem.addEventListener('touchend', touchEndHandler);
+        window.addEventListener('touchstart', globalTouchStartHandler);
     } else {
         elem.addEventListener('contextmenu', contextMenuHandler);
     }
@@ -9646,6 +9665,7 @@ function addContextMenuListener(elem, callback) {
             elem.removeEventListener('touchstart', touchStartHandler);
             elem.removeEventListener('touchmove', touchMoveHandler);
             elem.removeEventListener('touchend', touchEndHandler);
+            window.removeEventListener('touchstart', globalTouchStartHandler);
         } else {
             elem.removeEventListener('contextmenu', contextMenuHandler);
         }
@@ -14769,10 +14789,10 @@ class Annotation extends Marker {
             this._marker.addEventListener("click", this._onMouseClickedExternalMarker = () => {
                 this.plugin.fire("markerClicked", this);
             });
-            this._onContextMenuExtenalMarker = () => {
+            this._onContextMenuExternalMarker = () => {
                 this.plugin.fire("contextmenu", this);
             };
-            this._onContextMenuExtenalMarkerRemover = addContextMenuListener(this._markerHTML, this._onContextMenuExtenalMarker);
+            this._onContextMenuExternalMarkerRemover = addContextMenuListener(this._marker, this._onContextMenuExternalMarker);
             this._marker.addEventListener("mouseenter", this._onMouseEnterExternalMarker = () => {
                 this.plugin.fire("markerMouseEnter", this);
             });
@@ -15143,7 +15163,7 @@ class Annotation extends Marker {
                 this._marker = null;
             } else {
                 this._marker.removeEventListener("click", this._onMouseClickedExternalMarker);
-                this._onContextMenuExtenalMarkerRemover();
+                this._onContextMenuExternalMarkerRemover();
                 this._marker.removeEventListener("mouseenter", this._onMouseEnterExternalMarker);
                 this._marker.removeEventListener("mouseleave", this._onMouseLeaveExternalMarker);
                 this._marker = null;
@@ -19388,6 +19408,8 @@ function getExtension (gl, name) {
     return extension;
 }
 
+const vec3_0 = math.vec3([0,0,0]);
+
 /**
  * @private
  */
@@ -20066,9 +20088,11 @@ const Renderer$1 = function (scene, options) {
             // Transparent color fill
 
             if (normalFillTransparentBinLen > 0) {
+                const eye = frameCtx.pickOrigin || scene.camera.eye;
+                const byDist = normalFillTransparentBin.map(d => ({ drawable: d, distSq: math.distVec3(d.origin || vec3_0, eye) }));
+                byDist.sort((a, b) => b.distSq - a.distSq);
                 for (i = 0; i < normalFillTransparentBinLen; i++) {
-                    drawable = normalFillTransparentBin[i];
-                    drawable.drawColorTransparent(frameCtx);
+                    byDist[i].drawable.drawColorTransparent(frameCtx);
                 }
             }
 
@@ -73103,6 +73127,10 @@ class DTXTrianglesColorRenderer {
             const sectionPlanes = scene._sectionPlanesState.sectionPlanes;
             const baseIndex = dataTextureLayer.layerIndex * numSectionPlanes;
             const renderFlags = model.renderFlags;
+            if (scene.crossSections) {
+                gl.uniform4fv(this._uSliceColor, scene.crossSections.sliceColor);
+                gl.uniform1f(this._uSliceThickness, scene.crossSections.sliceThickness);
+            }
             for (let sectionPlaneIndex = 0; sectionPlaneIndex < numAllocatedSectionPlanes; sectionPlaneIndex++) {
                 const sectionPlaneUniforms = this._uSectionPlanes[sectionPlaneIndex];
                 if (sectionPlaneUniforms) {
@@ -73240,6 +73268,11 @@ class DTXTrianglesColorRenderer {
         this._uTexturePerPolygonIdPortionIds = "uTexturePerPolygonIdPortionIds";
         this._uTexturePerObjectMatrix= "uTexturePerObjectMatrix";
         this._uCameraEyeRtc = program.getLocation("uCameraEyeRtc");
+
+        if (scene.crossSections) {
+            this._uSliceColor = program.getLocation("sliceColor");
+            this._uSliceThickness = program.getLocation("sliceThickness");
+        }
     }
 
     _bindProgram(frameCtx) {
@@ -73556,11 +73589,14 @@ class DTXTrianglesColorRenderer {
                 src.push("uniform vec3 sectionPlanePos" + i + ";");
                 src.push("uniform vec3 sectionPlaneDir" + i + ";");
             }
+            src.push("uniform float sliceThickness;");
+            src.push("uniform vec4 sliceColor;");
         }
         src.push("in vec4 vColor;");
         src.push("out vec4 outColor;");
         src.push("void main(void) {");
-
+        src.push("  vec4 newColor;");
+        src.push("  newColor = vColor;");
         if (clipping) {
             src.push("  bool clippable = vFlags2 > 0u;");
             src.push("  if (clippable) {");
@@ -73570,9 +73606,12 @@ class DTXTrianglesColorRenderer {
                 src.push("   dist += clamp(dot(-sectionPlaneDir" + i + ".xyz, vWorldPosition.xyz - sectionPlanePos" + i + ".xyz), 0.0, 1000.0);");
                 src.push("}");
             }
-            src.push("  if (dist > 0.0) { ");
+            src.push("  if (dist > sliceThickness) { ");
             src.push("      discard;");
             src.push("  }");
+            src.push("  if (dist > 0.0) { ");
+            src.push("      newColor = sliceColor;");
+            src.push("  }");
             src.push("}");
         }
 
@@ -73590,9 +73629,9 @@ class DTXTrianglesColorRenderer {
             src.push("   float blendFactor       = uSAOParams[3];");
             src.push("   vec2 uv                 = vec2(gl_FragCoord.x / viewportWidth, gl_FragCoord.y / viewportHeight);");
             src.push("   float ambient           = smoothstep(blendCutoff, 1.0, unpackRGBToFloat(texture(uOcclusionTexture, uv))) * blendFactor;");
-            src.push("   outColor            = vec4(vColor.rgb * ambient, 1.0);");
+            src.push("   outColor            = vec4(newColor.rgb * ambient, 1.0);");
         } else {
-            src.push("   outColor            = vColor;");
+            src.push("   outColor            = newColor;");
         }
 
         src.push("}");
@@ -74034,10 +74073,14 @@ class DTXTrianglesSilhouetteRenderer {
                 src.push("uniform vec3 sectionPlanePos" + i + ";");
                 src.push("uniform vec3 sectionPlaneDir" + i + ";");
             }
+            src.push("uniform float sliceThickness;");
+            src.push("uniform vec4 sliceColor;");
         }
         src.push("uniform vec4 color;");
         src.push("out vec4 outColor;");
         src.push("void main(void) {");
+        src.push("  vec4 newColor;");
+        src.push("  newColor = color;");
         if (clipping) {
             src.push("  bool clippable = vFlags2 > 0u;");
             src.push("  if (clippable) {");
@@ -74047,15 +74090,18 @@ class DTXTrianglesSilhouetteRenderer {
                 src.push("   dist += clamp(dot(-sectionPlaneDir" + i + ".xyz, vWorldPosition.xyz - sectionPlanePos" + i + ".xyz), 0.0, 1000.0);");
                 src.push("}");
             }
-            src.push("  if (dist > 0.0) { ");
+            src.push("  if (dist > sliceThickness) { ");
             src.push("      discard;");
             src.push("  }");
+            src.push("  if (dist > 0.0) { ");
+            src.push("      newColor = sliceColor;");
+            src.push("  }");
             src.push("}");
         }
         if (scene.logarithmicDepthBufferEnabled) {
             src.push("    gl_FragDepth = isPerspective == 0.0 ? gl_FragCoord.z : log2( vFragDepth ) * logDepthBufFC * 0.5;");
         }
-        src.push("    outColor = color;");
+        src.push("    outColor = newColor;");
         src.push("}");
         return src;
     }
@@ -74454,10 +74500,14 @@ class DTXTrianglesEdgesRenderer {
                 src.push("uniform vec3 sectionPlanePos" + i + ";");
                 src.push("uniform vec3 sectionPlaneDir" + i + ";");
             }
+            src.push("uniform float sliceThickness;");
+            src.push("uniform vec4 sliceColor;");
         }
         src.push("in vec4 vColor;");
         src.push("out vec4 outColor;");
         src.push("void main(void) {");
+        src.push("  vec4 newColor;");
+        src.push("  newColor = vColor;");
         if (clipping) {
             src.push("  bool clippable = vFlags2 > 0u;");
             src.push("  if (clippable) {");
@@ -74467,13 +74517,18 @@ class DTXTrianglesEdgesRenderer {
                 src.push("   dist += clamp(dot(-sectionPlaneDir" + i + ".xyz, vWorldPosition.xyz - sectionPlanePos" + i + ".xyz), 0.0, 1000.0);");
                 src.push("}");
             }
-            src.push("  if (dist > 0.0) { discard; }");
+            src.push("  if (dist > sliceThickness) { ");
+            src.push("      discard;");
+            src.push("  }");
+            src.push("  if (dist > 0.0) { ");
+            src.push("      newColor = sliceColor;");
+            src.push("  }");
             src.push("}");
         }
         if (scene.logarithmicDepthBufferEnabled) {
             src.push("    gl_FragDepth = isPerspective == 0.0 ? gl_FragCoord.z : log2( vFragDepth ) * logDepthBufFC * 0.5;");
         }
-        src.push("   outColor            = vColor;");
+        src.push("   outColor            = newColor;");
         src.push("}");
         return src;
     }
@@ -74863,10 +74918,14 @@ class DTXTrianglesEdgesColorRenderer {
                 src.push("uniform vec3 sectionPlanePos" + i + ";");
                 src.push("uniform vec3 sectionPlaneDir" + i + ";");
             }
+            src.push("uniform float sliceThickness;");
+            src.push("uniform vec4 sliceColor;");
         }
         src.push("in vec4 vColor;");
         src.push("out vec4 outColor;");
         src.push("void main(void) {");
+        src.push("  vec4 newColor;");
+        src.push("  newColor = vColor;");
         if (clipping) {
             src.push("  bool clippable = vFlags2 > 0u;");
             src.push("  if (clippable) {");
@@ -74876,13 +74935,18 @@ class DTXTrianglesEdgesColorRenderer {
                 src.push("   dist += clamp(dot(-sectionPlaneDir" + i + ".xyz, vWorldPosition.xyz - sectionPlanePos" + i + ".xyz), 0.0, 1000.0);");
                 src.push("}");
             }
-            src.push("  if (dist > 0.0) { discard; }");
+            src.push("  if (dist > sliceThickness) { ");
+            src.push("      discard;");
+            src.push("  }");
+            src.push("  if (dist > 0.0) { ");
+            src.push("      newColor = sliceColor;");
+            src.push("  }");
             src.push("}");
         }
         if (scene.logarithmicDepthBufferEnabled) {
               src.push("    gl_FragDepth = isPerspective == 0.0 ? gl_FragCoord.z : log2( vFragDepth ) * logDepthBufFC * 0.5;");
         }
-        src.push("   outColor            = vColor;");
+        src.push("   outColor            = newColor;");
         src.push("}");
         return src;
     }
@@ -97729,7 +97793,7 @@ class MousePickHandler {
 
                 this._timeout = setTimeout(() => {
 
-                    if (firstClickPickResult && firstClickPickResult.worldPos) {
+                    if (firstClickPickResult) {
 
                         cameraControl.fire("picked", firstClickPickResult, true);
 
@@ -101921,8 +101985,8 @@ class MetaScene {
 
         for (let modelId in this.metaModels) {
             const metaModel = this.metaModels[modelId];
-            for (let i = 0, len = metaModel.metaObjects.length; i < len; i++) {
-                const metaObject = metaModel.metaObjects[i];
+            for (let objectId in metaModel.metaObjects) {
+                const metaObject = metaModel.metaObjects[objectId];
                 metaObject.metaModels.push(metaModel);
             }
         }
@@ -140846,8 +140910,21 @@ class Zone extends Component {
         }
 
 
-        const positions = [].concat(...pos);
+        const min = idx => Math.min(...pos.map(p => p[idx]));
+        const max = idx => Math.max(...pos.map(p => p[idx]));
+
+        const xmin = min(0);
+        const ymin = min(1);
+        const zmin = min(2);
+        const xmax = max(0);
+        const ymax = max(1);
+        const zmax = max(2);
+
+        this._center = math.vec3([ (xmin + xmax) / 2, (ymin + ymax) / 2, (zmin + zmax) / 2 ]);
+
+        const positions = [].concat(...pos.map(p => math.subVec3(p, this._center, p)));
         this._zoneMesh = new Mesh(scene, {
+            origin: this._center,
             edges: this._edges,
             geometry: new ReadableGeometry(
                 scene,
@@ -140888,19 +140965,6 @@ class Zone extends Component {
         }
 
         this._metrics = null;
-
-
-        const min = idx => Math.min(...pos.map(p => p[idx]));
-        const max = idx => Math.max(...pos.map(p => p[idx]));
-
-        const xmin = min(0);
-        const ymin = min(1);
-        const zmin = min(2);
-        const xmax = max(0);
-        const ymax = max(1);
-        const zmax = max(2);
-
-        this._center = math.vec3([ (xmin + xmax) / 2, (ymin + ymax) / 2, (zmin + zmax) / 2 ]);
     }
 
     get baseArea() {