@xeokit/xeokit-sdk 2.6.37 → 2.6.40

package/dist/xeokit-sdk.es.js

@@ -678,21 +678,27 @@ class ContextMenu {
                         if (itemSubMenu) {
 
                             html.push(
-                                '<li id="' + item.id + '" class="xeokit-context-menu-item" style="' +
-                                ((groupIdx === groupLen - 1) || ((j < lenj - 1)) ? 'border-bottom: 0' : 'border-bottom: 1px solid black') +
-                                '">' +
+                                '<li id="' + item.id + '" class="xeokit-context-menu-item">' +
                                 actionTitle +
                                 ' [MORE]' +
                                 '</li>');
+                            if (!((groupIdx === groupLen - 1) || (j < lenj - 1))) {
+                                html.push(
+                                    '<li id="' + item.id + '" class="xeokit-context-menu-item-separator"></li>'
+                                );
+                            }
 
                         } else {
 
                             html.push(
-                                '<li id="' + item.id + '" class="xeokit-context-menu-item" style="' +
-                                ((groupIdx === groupLen - 1) || ((j < lenj - 1)) ? 'border-bottom: 0' : 'border-bottom: 1px solid black') +
-                                '">' +
+                                '<li id="' + item.id + '" class="xeokit-context-menu-item">' +
                                 actionTitle +
                                 '</li>');
+                            if (!((groupIdx === groupLen - 1) || (j < lenj - 1))) {
+                                html.push(
+                                    '<li id="' + item.id + '" class="xeokit-context-menu-item-separator"></li>'
+                                );
+                            }
                         }
                     }
                 }
@@ -890,14 +896,11 @@ class ContextMenu {
             const shown = getShown(this._context);
             item.shown = shown;
             if (!shown) {
-                itemElement.style.visibility = "hidden";
-                itemElement.style.height = "0";
-                itemElement.style.padding = "0";
+                itemElement.style.display = "none";
                 continue;
             } else {
-                itemElement.style.visibility = "visible";
-                itemElement.style.height = "auto";
-                itemElement.style.padding = null;
+                itemElement.style.display = "";
+
             }
             const enabled = getEnabled(this._context);
             item.enabled = enabled;
@@ -88163,6 +88166,16 @@ class DistanceMeasurement extends Component {
         const scene = this.plugin.viewer.scene;
 
         if (this._wpDirty) {
+            const delta = math.subVec3(
+                this._targetWorld,
+                this._originWorld,
+                tmpVec3
+            );
+
+            /**
+             * The length detected for each measurement axis.
+             */
+            this._factors = math.transformVec3(this._axesBasis, delta);
 
             this._measurementOrientation = determineMeasurementOrientation(this._originWorld, this._targetWorld, 0);
             if(this._measurementOrientation === 'Vertical' && this.useRotationAdjustment){
@@ -88187,16 +88200,6 @@ class DistanceMeasurement extends Component {
                 this._wp[15] = 1.0;
             }
             else {
-                const delta = math.subVec3(
-                    this._targetWorld,
-                    this._originWorld,
-                    tmpVec3
-                );
-
-                /**
-                 * The length detected for each measurement axis.
-                 */
-                this._factors = math.transformVec3(this._axesBasis, delta);
 
                 this._wp[0] = this._originWorld[0];
                 this._wp[1] = this._originWorld[1];
@@ -118136,172 +118139,74 @@ function loadDefaultScene(ctx) {
         error(ctx, "glTF has no default scene");
         return;
     }
-    loadScene(ctx, scene);
-}
 
-function loadScene(ctx, scene) {
     const nodes = scene.nodes;
     if (!nodes) {
         return;
     }
-    for (let i = 0, len = nodes.length; i < len; i++) {
-        const node = nodes[i];
-        countMeshUsage(ctx, node);
-    }
-    for (let i = 0, len = nodes.length; i < len && !ctx.nodesHaveNames; i++) {
-        const node = nodes[i];
-        if (testIfNodesHaveNames(node)) {
-            ctx.nodesHaveNames = true;
-        }
-    }
-    if (!ctx.nodesHaveNames) {
-        for (let i = 0, len = nodes.length; i < len; i++) {
-            const node = nodes[i];
-            parseNodesWithoutNames(ctx, node, 0, null);
-        }
-    } else {
-        for (let i = 0, len = nodes.length; i < len; i++) {
-            const node = nodes[i];
-            parseNodesWithNames(ctx, node, 0, null);
-        }
-    }
-}
 
-function countMeshUsage(ctx, node) {
-    const mesh = node.mesh;
-    if (mesh) {
-        mesh.instances = mesh.instances ? mesh.instances + 1 : 1;
-    }
-    if (node.children) {
-        const children = node.children;
-        for (let i = 0, len = children.length; i < len; i++) {
-            const childNode = children[i];
-            if (!childNode) {
-                error(ctx, "Node not found: " + i);
-                continue;
+    (function accumulateMeshInstantes(nodes) {
+        nodes.forEach(node => {
+            const mesh = node.mesh;
+            if (mesh) {
+                mesh.instances ||= 0;
+                mesh.instances += 1;
             }
-            countMeshUsage(ctx, childNode);
-        }
-    }
-}
-
-function testIfNodesHaveNames(node) {
-    if (node.name) {
-        return true;
-    }
-    if (node.children) {
-        const children = node.children;
-        for (let i = 0, len = children.length; i < len; i++) {
-            const childNode = children[i];
-            if (testIfNodesHaveNames(childNode)) {
-                return true;
+            if (node.children) {
+                accumulateMeshInstantes(node.children);
             }
-        }
-    }
-    return false;
-}
+        });
+    })(nodes);
 
-/**
- * Parses a glTF node hierarchy that is known to NOT contain "name" attributes on the nodes.
- * Create a SceneMesh for each mesh primitive, and a single SceneObject.
- */
-const parseNodesWithoutNames = (function () {
-    const meshIds = [];
-    return function (ctx, node, depth, matrix, parentNode) {
-        matrix = parseNodeMatrix(node, matrix);
-        if (node.mesh) {
-            parseNodeMesh(node, ctx, matrix, meshIds);
-        }
-        if (node.children) {
-            const children = node.children;
-            for (let i = 0, len = children.length; i < len; i++) {
-                const childNode = children[i];
-                parseNodesWithoutNames(ctx, childNode, depth + 1, matrix, node);
-            }
-        }
-        if (depth === 0) {
-            let entityId = "entity-" + ctx.nextId++;
-            if (meshIds && meshIds.length > 0) {
-                ctx.sceneModel.createEntity({
-                    id: entityId,
-                    meshIds,
-                    isObject: true
-                });
-                if (ctx.autoMetaModel) {
-                    ctx.metaObjects.push({
-                        id: entityId,
-                        type: "Default",
-                        name: entityId,
-                        parent: ctx.sceneModel.id
-                    });
+    // Create a SceneMesh for each mesh primitive, and a SceneModelEntity for the root node and each named node.
+    const meshIdsStack = [];
+    let meshIds = null;
+    (function createSceneMeshesAndEntities(nodes, depth, parentMatrix) {
+        nodes.forEach(node => {
+            const nodeName = node.name;
+            let entityId = (((nodeName !== undefined) && (nodeName !== null) && nodeName)
+                            ||
+                            ((depth === 0) && ("entity-" + ctx.nextId++)));
+
+            if (entityId) {
+                while (ctx.sceneModel.objects[entityId]) {
+                    entityId = "entity-" + ctx.nextId++;
                 }
-                meshIds.length = 0;
+                meshIdsStack.push(meshIds);
+                meshIds = [];
             }
-        }
-    }
-})();
 
-const parseNodesWithNames = (function () {
+            const matrix = parseNodeMatrix(node, parentMatrix);
 
-    const objectIdStack = [];
-    const meshIdsStack = [];
-    let meshIds = [];
-
-    return function (ctx, node, depth, matrix) {
-        matrix = parseNodeMatrix(node, matrix);
-        if (meshIds && node.mesh) {
-            parseNodeMesh(node, ctx, matrix, meshIds);
-        }
-
-        if (node.name) {
-            meshIds = [];
-            let entityId = node.name;
-            if (!!entityId && ctx.sceneModel.objects[entityId]) ;
-            while (!entityId || ctx.sceneModel.objects[entityId]) {
-                entityId = "entity-" + ctx.nextId++;
+            if (node.mesh) {
+                parseNodeMesh(node, ctx, matrix, meshIds);
             }
-            objectIdStack.push(entityId);
-            meshIdsStack.push(meshIds);
-        }
 
-        if (node.children) {
-            const children = node.children;
-            for (let i = 0, len = children.length; i < len; i++) {
-                const childNode = children[i];
-                parseNodesWithNames(ctx, childNode, depth + 1, matrix);
+            if (node.children) {
+                createSceneMeshesAndEntities(node.children, depth + 1, matrix);
             }
-        }
-
-        // Post-order visit scene node
 
-        const nodeName = node.name;
-        if ((nodeName !== undefined && nodeName !== null) || depth === 0) {
-            let entityId = objectIdStack.pop();
-            if (!entityId) { // For when there are no nodes with names
-                entityId = "entity-" + ctx.nextId++;
-            }
-            let entityMeshIds = meshIdsStack.pop();
-            if (meshIds && meshIds.length > 0) {
-                ctx.sceneModel.createEntity({
-                    id: entityId,
-                    meshIds: entityMeshIds,
-                    isObject: true
-                });
-                if (ctx.autoMetaModel) {
-                    ctx.metaObjects.push({
+            if (entityId) {
+                if (meshIds.length > 0) {
+                    ctx.sceneModel.createEntity({
                         id: entityId,
-                        type: "Default",
-                        name: entityId,
-                        parent: ctx.sceneModel.id
+                        meshIds: meshIds,
+                        isObject: true
                     });
+                    if (ctx.autoMetaModel) {
+                        ctx.metaObjects.push({
+                            id: entityId,
+                            type: "Default",
+                            name: entityId,
+                            parent: ctx.sceneModel.id
+                        });
+                    }
                 }
+                meshIds = meshIdsStack.pop();
             }
-            meshIds = meshIdsStack.length > 0 ? meshIdsStack[meshIdsStack.length - 1] : null;
-        }
-    };
-})();
-
-
+        });
+    })(nodes, 0, null);
+}
 /**
  * Parses transform at the given glTF node.
  *
@@ -126128,12 +126033,15 @@ class RenderService {
     return element.checked;
   }
 
-  setCheckbox(nodeId, checked) {
+  setCheckbox(nodeId, checked, indeterminate = false) {
     const checkbox = document.getElementById(`checkbox-${nodeId}`);
     if (checkbox) {
       if (checked !== checkbox.checked) {
         checkbox.checked = checked;
       }
+      if (indeterminate !== checkbox.indeterminate) {
+        checkbox.indeterminate = indeterminate;
+      }
     }
   }
 
@@ -126521,6 +126429,7 @@ class TreeViewPlugin extends Plugin {
      * vertical World axis. For all hierarchy types, other node types will be ordered in the ascending alphanumeric order of their titles.
      * @param {Boolean} [cfg.pruneEmptyNodes=true] When true, will not contain nodes that don't have content in the {@link Scene}. These are nodes whose {@link MetaObject}s don't have {@link Entity}s.
      * @param {RenderService} [cfg.renderService] Optional {@link RenderService} to use. Defaults to the {@link TreeViewPlugin}'s default {@link RenderService}.
+     * @param {Boolean} [cfg.showIndeterminate=false] When true, will show indeterminate state for checkboxes when some but not all child nodes are checked
      */
     constructor(viewer, cfg = {}) {
 
@@ -126572,6 +126481,7 @@ class TreeViewPlugin extends Plugin {
         this._pruneEmptyNodes = cfg.pruneEmptyNodes;
         this._showListItemElementId = null;
         this._renderService = cfg.renderService || new RenderService();
+        this._showIndeterminate = cfg.showIndeterminate ?? false;
 
         if (!this._renderService) {
             throw new Error('TreeViewPlugin: no render service set');
@@ -126613,8 +126523,10 @@ class TreeViewPlugin extends Plugin {
                 } else {
                     parent.numVisibleEntities--;
                 }
-
-                this._renderService.setCheckbox(parent.nodeId, (parent.numVisibleEntities > 0));
+                const indeterminate = this._showIndeterminate 
+                  && parent.numVisibleEntities > 0 
+                  && parent.numVisibleEntities < parent.numEntities;
+                this._renderService.setCheckbox(parent.nodeId, (parent.numVisibleEntities > 0), indeterminate);
 
                 parent = parent.parent;
             }
@@ -126696,8 +126608,10 @@ class TreeViewPlugin extends Plugin {
                 } else {
                     parent.numVisibleEntities -= numUpdated;
                 }
-
-                this._renderService.setCheckbox(parent.nodeId, (parent.numVisibleEntities > 0));
+                const indeterminate = this._showIndeterminate 
+                  && parent.numVisibleEntities > 0 
+                  && parent.numVisibleEntities < parent.numEntities;
+                this._renderService.setCheckbox(parent.nodeId, (parent.numVisibleEntities > 0), indeterminate);
                 
                 parent = parent.parent;
             }
@@ -126937,8 +126851,8 @@ class TreeViewPlugin extends Plugin {
     collapse() {
         for (let i = 0, len = this._rootNodes.length; i < len; i++) {
             const rootNode = this._rootNodes[i];
-            const objectId = rootNode.objectId;
-            this._collapseNode(objectId);
+            const nodeId = rootNode.nodeId;
+            this._collapseNode(nodeId);
         }
     }
 
@@ -139584,8 +139498,8 @@ class DotBIMDefaultDataSource {
  * set ````true```` and will be registered by {@link Entity#id} in {@link Scene#objects}.
  * * When loading, can set the World-space position, scale and rotation of each model within World space,
  * along with initial properties for all the model's {@link Entity}s.
- * * Allows to mask which IFC types we want to load.
- * * Allows to configure initial viewer state for specified IFC types (color, visibility, selection, highlighted, X-rayed, pickable, etc).
+ * * Allows to mask which types we want to load.
+ * * Allows to configure initial viewer state for specified types (color, visibility, selection, highlighted, X-rayed, pickable, etc).
  *
  * ## Usage
  *
@@ -139655,9 +139569,9 @@ class DotBIMDefaultDataSource {
  * });
  * ````
  *
- * ## Including and excluding IFC types
+ * ## Including and excluding types
  *
- * We can also load only those objects that have the specified IFC types. In the example below, we'll load only the
+ * We can also load only those objects that have the specified types. In the example below, we'll load only the
  * objects that represent walls.
  *
  * ````javascript
@@ -139668,7 +139582,7 @@ class DotBIMDefaultDataSource {
  * });
  * ````
  *
- * We can also load only those objects that **don't** have the specified IFC types. In the example below, we'll load only the
+ * We can also load only those objects that **don't** have the specified types. In the example below, we'll load only the
  * objects that do not represent empty space.
  *
  * ````javascript
@@ -139679,13 +139593,13 @@ class DotBIMDefaultDataSource {
  * });
  * ````
  *
- * # Configuring initial IFC object appearances
+ * # Configuring initial object appearances
  *
- * We can specify the custom initial appearance of loaded objects according to their IFC types.
+ * We can specify the custom initial appearance of loaded objects according to their types.
  *
  * This is useful for things like:
  *
- * * setting the colors to our objects according to their IFC types,
+ * * setting the colors to our objects according to their types,
  * * automatically hiding ````IfcSpace```` objects, and
  * * ensuring that ````IfcWindow```` objects are always transparent.
  * <br>
@@ -139717,7 +139631,7 @@ class DotBIMDefaultDataSource {
  * });
  * ````
  *
- * When we don't customize the appearance of IFC types, as just above, then IfcSpace elements tend to obscure other
+ * When we don't customize the appearance of types, as just above, then IfcSpace elements tend to obscure other
  * elements, which can be confusing.
  *
  * It's often helpful to make IfcSpaces transparent and unpickable, like this:
@@ -139917,36 +139831,36 @@ class DotBIMLoaderPlugin extends Plugin {
 
             const dbMeshLoaded = {};
 
-            const ifcProjectId = math.createUUID();
-            const ifcSiteId = math.createUUID();
-            const ifcBuildingId = math.createUUID();
-            const ifcBuildingStoryId = math.createUUID();
+            const projectId = math.createUUID();
+            const siteId = math.createUUID();
+            const buildingId = math.createUUID();
+            const buildingStoryId = math.createUUID();
 
             const metaModelData = {
                 metaObjects: [
                     {
-                        id: ifcProjectId,
-                        name: "IfcProject",
-                        type: "IfcProject",
+                        id: projectId,
+                        name: "Project",
+                        type: "Project",
                         parent: null
                     },
                     {
-                        id: ifcSiteId,
-                        name: "IfcSite",
-                        type: "IfcSite",
-                        parent: ifcProjectId
+                        id: siteId,
+                        name: "Site",
+                        type: "Site",
+                        parent: projectId
                     },
                     {
-                        id: ifcBuildingId,
-                        name: "IfcBuilding",
-                        type: "IfcBuilding",
-                        parent: ifcSiteId
+                        id: buildingId,
+                        name: "Building",
+                        type: "Building",
+                        parent: siteId
                     },
                     {
-                        id: ifcBuildingStoryId,
-                        name: "IfcBuildingStorey",
-                        type: "IfcBuildingStorey",
-                        parent: ifcBuildingId
+                        id: buildingStoryId,
+                        name: "BuildingStorey",
+                        type: "BuildingStorey",
+                        parent: buildingId
                     }
                 ],
                 propertySets: []
@@ -140071,7 +139985,7 @@ class DotBIMLoaderPlugin extends Plugin {
                             id: `${dbMeshId}-${faceColor}`,
                             primitive: "triangles",
                             positions: trianglesCoordinates,
-                            indices: [...Array(trianglesCoordinates.length).keys()]
+                            indices: [...Array(trianglesCoordinates.length / 3).keys()]
                         });
                         const meshId = `${objectId}-mesh-${faceColor}`;
                         const faceColorArray = faceColor.split(',').map(Number);
@@ -140113,30 +140027,23 @@ class DotBIMLoaderPlugin extends Plugin {
                     });
                 }
 
+                let properties = [];
                 for (let infoKey in info) {
-                    let properties;
-                    if (infoKey.startsWith("IFC_Pset_")) {
-                        if (!properties) {
-                            properties = [];
-                        }
-                        properties.push({
-                            name: infoKey,
-                            value: info[infoKey]
-                        });
-                    }
-                    if (properties) {
-                        metaModelData.propertySets.push({
-                            id: objectId,
-                            properties
-                        });
-                    }
+                    properties.push({
+                        name: infoKey,
+                        value: info[infoKey]
+                    });
                 }
+                metaModelData.propertySets.push({
+                    id: objectId,
+                    properties
+                });
 
                 metaModelData.metaObjects.push({
                     id: objectId,
                     name: info && info.Name && info.Name !== "None" ? info.Name : `${element.type} ${objectId}`,
                     type: element.type,
-                    parent: ifcBuildingStoryId,
+                    parent: buildingStoryId,
                     propertySetIds: [objectId]
                 });
             }