@xeokit/xeokit-sdk 2.4.0-alpha-11 → 2.4.0-alpha-12

package/dist/xeokit-sdk.cjs.js

@@ -119071,7 +119071,7 @@ class TreeViewPlugin extends Plugin {
             if (!treeViews[i]) {
                 treeViews[i] = this;
                 this._index = i;
-                this._id = `tree-${i}-`;
+                this._id = `tree-${i}`;
                 break;
             }
         }
@@ -119120,7 +119120,7 @@ class TreeViewPlugin extends Plugin {
             } else {
                 node.numVisibleEntities--;
             }
-            const checkbox = document.getElementById(node.nodeId);
+            const checkbox = document.getElementById(`checkbox-${node.nodeId}`);
             if (checkbox) {
                 checkbox.checked = visible;
             }
@@ -119132,7 +119132,7 @@ class TreeViewPlugin extends Plugin {
                 } else {
                     parent.numVisibleEntities--;
                 }
-                const parentCheckbox = document.getElementById(parent.nodeId);
+                const parentCheckbox = document.getElementById(`checkbox-${parent.nodeId}`);
                 if (parentCheckbox) {
                     const newChecked = (parent.numVisibleEntities > 0);
                     if (newChecked !== parentCheckbox.checked) {
@@ -119193,13 +119193,13 @@ class TreeViewPlugin extends Plugin {
             this._muteSceneEvents = true;
             const checkbox = event.target;
             const visible = checkbox.checked;
-            const nodeId = checkbox.id;
+            const nodeId = checkbox.id.replace('checkbox-', '');
             const checkedNode = this._nodeNodes[nodeId];
             const objects = this._viewer.scene.objects;
             let numUpdated = 0;
             this._withNodeTree(checkedNode, (node) => {
                 const objectId = node.objectId;
-                const checkBoxId = node.nodeId;
+                const checkBoxId = `checkbox-${node.nodeId}`;
                 const entity = objects[objectId];
                 const isLeaf = (node.children.length === 0);
                 node.numVisibleEntities = visible ? node.numEntities : 0;
@@ -119218,7 +119218,7 @@ class TreeViewPlugin extends Plugin {
             let parent = checkedNode.parent;
             while (parent) {
                 parent.checked = visible;
-                const checkbox2 = document.getElementById(parent.nodeId); // Parent checkboxes are always in DOM
+                const checkbox2 = document.getElementById(`checkbox-${parent.nodeId}`); // Parent checkboxes are always in DOM
                 if (visible) {
                     parent.numVisibleEntities += numUpdated;
                 } else {
@@ -120012,7 +120012,7 @@ class TreeViewPlugin extends Plugin {
         if (node.xrayed) {
             nodeElement.classList.add('xrayed-node');
         }
-        nodeElement.id = `${nodeId}`;
+        nodeElement.id = nodeId;
         if (node.children.length > 0) {
             const switchElementId = "switch-" + nodeId;
             const switchElement = document.createElement('a');
@@ -120024,7 +120024,7 @@ class TreeViewPlugin extends Plugin {
             nodeElement.appendChild(switchElement);
         }
         const checkbox = document.createElement('input');
-        checkbox.id = `${nodeId}`;
+        checkbox.id = `checkbox-${nodeId}`;
         checkbox.type = "checkbox";
         checkbox.checked = node.checked;
         checkbox.style["pointer-events"] = "all";

package/dist/xeokit-sdk.es.js

@@ -119067,7 +119067,7 @@ class TreeViewPlugin extends Plugin {
             if (!treeViews[i]) {
                 treeViews[i] = this;
                 this._index = i;
-                this._id = `tree-${i}-`;
+                this._id = `tree-${i}`;
                 break;
             }
         }
@@ -119116,7 +119116,7 @@ class TreeViewPlugin extends Plugin {
             } else {
                 node.numVisibleEntities--;
             }
-            const checkbox = document.getElementById(node.nodeId);
+            const checkbox = document.getElementById(`checkbox-${node.nodeId}`);
             if (checkbox) {
                 checkbox.checked = visible;
             }
@@ -119128,7 +119128,7 @@ class TreeViewPlugin extends Plugin {
                 } else {
                     parent.numVisibleEntities--;
                 }
-                const parentCheckbox = document.getElementById(parent.nodeId);
+                const parentCheckbox = document.getElementById(`checkbox-${parent.nodeId}`);
                 if (parentCheckbox) {
                     const newChecked = (parent.numVisibleEntities > 0);
                     if (newChecked !== parentCheckbox.checked) {
@@ -119189,13 +119189,13 @@ class TreeViewPlugin extends Plugin {
             this._muteSceneEvents = true;
             const checkbox = event.target;
             const visible = checkbox.checked;
-            const nodeId = checkbox.id;
+            const nodeId = checkbox.id.replace('checkbox-', '');
             const checkedNode = this._nodeNodes[nodeId];
             const objects = this._viewer.scene.objects;
             let numUpdated = 0;
             this._withNodeTree(checkedNode, (node) => {
                 const objectId = node.objectId;
-                const checkBoxId = node.nodeId;
+                const checkBoxId = `checkbox-${node.nodeId}`;
                 const entity = objects[objectId];
                 const isLeaf = (node.children.length === 0);
                 node.numVisibleEntities = visible ? node.numEntities : 0;
@@ -119214,7 +119214,7 @@ class TreeViewPlugin extends Plugin {
             let parent = checkedNode.parent;
             while (parent) {
                 parent.checked = visible;
-                const checkbox2 = document.getElementById(parent.nodeId); // Parent checkboxes are always in DOM
+                const checkbox2 = document.getElementById(`checkbox-${parent.nodeId}`); // Parent checkboxes are always in DOM
                 if (visible) {
                     parent.numVisibleEntities += numUpdated;
                 } else {
@@ -120008,7 +120008,7 @@ class TreeViewPlugin extends Plugin {
         if (node.xrayed) {
             nodeElement.classList.add('xrayed-node');
         }
-        nodeElement.id = `${nodeId}`;
+        nodeElement.id = nodeId;
         if (node.children.length > 0) {
             const switchElementId = "switch-" + nodeId;
             const switchElement = document.createElement('a');
@@ -120020,7 +120020,7 @@ class TreeViewPlugin extends Plugin {
             nodeElement.appendChild(switchElement);
         }
         const checkbox = document.createElement('input');
-        checkbox.id = `${nodeId}`;
+        checkbox.id = `checkbox-${nodeId}`;
         checkbox.type = "checkbox";
         checkbox.checked = node.checked;
         checkbox.style["pointer-events"] = "all";

package/dist/xeokit-sdk.es5.js

@@ -26264,11 +26264,11 @@ imagePos[0]=Math.floor(storeyMap.width-(worldPos[0]-xmin)*ratioX);imagePos[1]=Ma
          */_this132.errors=[];/**
          * True if errors were found generating this TreeView.
          * @type {boolean}
-         */_this132.valid=true;if(!cfg.containerElement){_this132.error("Config expected: containerElement");return _possibleConstructorReturn(_this132);}for(var _i575=0;;_i575++){if(!treeViews[_i575]){treeViews[_i575]=_assertThisInitialized(_this132);_this132._index=_i575;_this132._id="tree-".concat(_i575,"-");break;}}_this132._containerElement=cfg.containerElement;_this132._metaModels={};_this132._autoAddModels=cfg.autoAddModels!==false;_this132._autoExpandDepth=cfg.autoExpandDepth||0;_this132._sortNodes=cfg.sortNodes!==false;_this132._pruneEmptyNodes=cfg.pruneEmptyNodes!==false;_this132._viewer=viewer;_this132._rootElement=null;_this132._muteSceneEvents=false;_this132._muteTreeEvents=false;_this132._rootNodes=[];_this132._objectNodes={};// Object ID -> Node
+         */_this132.valid=true;if(!cfg.containerElement){_this132.error("Config expected: containerElement");return _possibleConstructorReturn(_this132);}for(var _i575=0;;_i575++){if(!treeViews[_i575]){treeViews[_i575]=_assertThisInitialized(_this132);_this132._index=_i575;_this132._id="tree-".concat(_i575);break;}}_this132._containerElement=cfg.containerElement;_this132._metaModels={};_this132._autoAddModels=cfg.autoAddModels!==false;_this132._autoExpandDepth=cfg.autoExpandDepth||0;_this132._sortNodes=cfg.sortNodes!==false;_this132._pruneEmptyNodes=cfg.pruneEmptyNodes!==false;_this132._viewer=viewer;_this132._rootElement=null;_this132._muteSceneEvents=false;_this132._muteTreeEvents=false;_this132._rootNodes=[];_this132._objectNodes={};// Object ID -> Node
 _this132._nodeNodes={};// Node ID -> Node
 _this132._rootName=cfg.rootName;_this132._sortNodes=cfg.sortNodes;_this132._pruneEmptyNodes=cfg.pruneEmptyNodes;_this132._showListItemElementId=null;_this132._containerElement.oncontextmenu=function(e){e.preventDefault();};_this132._onObjectVisibility=_this132._viewer.scene.on("objectVisibility",function(entity){if(_this132._muteSceneEvents){return;}var objectId=entity.id;var node=_this132._objectNodes[objectId];if(!node){return;// Not in this tree
-}var visible=entity.visible;var updated=visible!==node.checked;if(!updated){return;}_this132._muteTreeEvents=true;node.checked=visible;if(visible){node.numVisibleEntities++;}else{node.numVisibleEntities--;}var checkbox=document.getElementById(node.nodeId);if(checkbox){checkbox.checked=visible;}var parent=node.parent;while(parent){parent.checked=visible;if(visible){parent.numVisibleEntities++;}else{parent.numVisibleEntities--;}var parentCheckbox=document.getElementById(parent.nodeId);if(parentCheckbox){var newChecked=parent.numVisibleEntities>0;if(newChecked!==parentCheckbox.checked){parentCheckbox.checked=newChecked;}}parent=parent.parent;}_this132._muteTreeEvents=false;});_this132._onObjectXrayed=_this132._viewer.scene.on('objectXRayed',function(entity){if(_this132._muteSceneEvents){return;}var objectId=entity.id;var node=_this132._objectNodes[objectId];if(!node){return;// Not in this tree
-}_this132._muteTreeEvents=true;var xrayed=entity.xrayed;var updated=xrayed!==node.xrayed;if(!updated){return;}node.xrayed=xrayed;var listItemElementId=node.nodeId;var listItemElement=document.getElementById(listItemElementId);if(listItemElement!==null){if(xrayed){listItemElement.classList.add('xrayed-node');}else{listItemElement.classList.remove('xrayed-node');}}_this132._muteTreeEvents=false;});_this132._switchExpandHandler=function(event){event.preventDefault();event.stopPropagation();var switchElement=event.target;_this132._expandSwitchElement(switchElement);};_this132._switchCollapseHandler=function(event){event.preventDefault();event.stopPropagation();var switchElement=event.target;_this132._collapseSwitchElement(switchElement);};_this132._checkboxChangeHandler=function(event){if(_this132._muteTreeEvents){return;}_this132._muteSceneEvents=true;var checkbox=event.target;var visible=checkbox.checked;var nodeId=checkbox.id;var checkedNode=_this132._nodeNodes[nodeId];var objects=_this132._viewer.scene.objects;var numUpdated=0;_this132._withNodeTree(checkedNode,function(node){var objectId=node.objectId;var checkBoxId=node.nodeId;var entity=objects[objectId];var isLeaf=node.children.length===0;node.numVisibleEntities=visible?node.numEntities:0;if(isLeaf&&visible!==node.checked){numUpdated++;}node.checked=visible;var checkbox2=document.getElementById(checkBoxId);if(checkbox2){checkbox2.checked=visible;}if(entity){entity.visible=visible;}});var parent=checkedNode.parent;while(parent){parent.checked=visible;var checkbox2=document.getElementById(parent.nodeId);// Parent checkboxes are always in DOM
+}var visible=entity.visible;var updated=visible!==node.checked;if(!updated){return;}_this132._muteTreeEvents=true;node.checked=visible;if(visible){node.numVisibleEntities++;}else{node.numVisibleEntities--;}var checkbox=document.getElementById("checkbox-".concat(node.nodeId));if(checkbox){checkbox.checked=visible;}var parent=node.parent;while(parent){parent.checked=visible;if(visible){parent.numVisibleEntities++;}else{parent.numVisibleEntities--;}var parentCheckbox=document.getElementById("checkbox-".concat(parent.nodeId));if(parentCheckbox){var newChecked=parent.numVisibleEntities>0;if(newChecked!==parentCheckbox.checked){parentCheckbox.checked=newChecked;}}parent=parent.parent;}_this132._muteTreeEvents=false;});_this132._onObjectXrayed=_this132._viewer.scene.on('objectXRayed',function(entity){if(_this132._muteSceneEvents){return;}var objectId=entity.id;var node=_this132._objectNodes[objectId];if(!node){return;// Not in this tree
+}_this132._muteTreeEvents=true;var xrayed=entity.xrayed;var updated=xrayed!==node.xrayed;if(!updated){return;}node.xrayed=xrayed;var listItemElementId=node.nodeId;var listItemElement=document.getElementById(listItemElementId);if(listItemElement!==null){if(xrayed){listItemElement.classList.add('xrayed-node');}else{listItemElement.classList.remove('xrayed-node');}}_this132._muteTreeEvents=false;});_this132._switchExpandHandler=function(event){event.preventDefault();event.stopPropagation();var switchElement=event.target;_this132._expandSwitchElement(switchElement);};_this132._switchCollapseHandler=function(event){event.preventDefault();event.stopPropagation();var switchElement=event.target;_this132._collapseSwitchElement(switchElement);};_this132._checkboxChangeHandler=function(event){if(_this132._muteTreeEvents){return;}_this132._muteSceneEvents=true;var checkbox=event.target;var visible=checkbox.checked;var nodeId=checkbox.id.replace('checkbox-','');var checkedNode=_this132._nodeNodes[nodeId];var objects=_this132._viewer.scene.objects;var numUpdated=0;_this132._withNodeTree(checkedNode,function(node){var objectId=node.objectId;var checkBoxId="checkbox-".concat(node.nodeId);var entity=objects[objectId];var isLeaf=node.children.length===0;node.numVisibleEntities=visible?node.numEntities:0;if(isLeaf&&visible!==node.checked){numUpdated++;}node.checked=visible;var checkbox2=document.getElementById(checkBoxId);if(checkbox2){checkbox2.checked=visible;}if(entity){entity.visible=visible;}});var parent=checkedNode.parent;while(parent){parent.checked=visible;var checkbox2=document.getElementById("checkbox-".concat(parent.nodeId));// Parent checkboxes are always in DOM
 if(visible){parent.numVisibleEntities+=numUpdated;}else{parent.numVisibleEntities-=numUpdated;}var newChecked=parent.numVisibleEntities>0;if(newChecked!==checkbox2.checked){checkbox2.checked=newChecked;}parent=parent.parent;}_this132._muteSceneEvents=false;};_this132._hierarchy=cfg.hierarchy||"containment";_this132._autoExpandDepth=cfg.autoExpandDepth||0;if(_this132._autoAddModels){var modelIds=Object.keys(_this132.viewer.metaScene.metaModels);for(var _i576=0,len=modelIds.length;_i576<len;_i576++){var modelId=modelIds[_i576];_this132.addModel(modelId);}_this132.viewer.scene.on("modelLoaded",function(modelId){if(_this132.viewer.metaScene.metaModels[modelId]){_this132.addModel(modelId);}});}_this132.hierarchy=cfg.hierarchy;return _this132;}/**
      * Sets how the nodes are organized within this tree view.
      *
@@ -26378,7 +26378,7 @@ var viewer=this.viewer;var scene=viewer.scene;var camera=scene.camera;var metaSc
 if(!node1.aabb){node1.aabb=scene.getAABB(metaScene.getObjectIDsInSubtree(node1.objectId));}if(!node2.aabb){node2.aabb=scene.getAABB(metaScene.getObjectIDsInSubtree(node2.objectId));}}var idx=0;if(camera.xUp){idx=0;}else if(camera.yUp){idx=1;}else{idx=2;}if(node1.aabb[idx]>node2.aabb[idx]){return-1;}if(node1.aabb[idx]<node2.aabb[idx]){return 1;}return 0;});}},{key:"_alphaSortFunc",value:function _alphaSortFunc(node1,node2){var title1=node1.title.toUpperCase();// FIXME: Should be case sensitive?
 var title2=node2.title.toUpperCase();if(title1<title2){return-1;}if(title1>title2){return 1;}return 0;}},{key:"_synchNodesToEntities",value:function _synchNodesToEntities(){var objectIds=Object.keys(this.viewer.metaScene.metaObjects);var metaObjects=this._viewer.metaScene.metaObjects;var objects=this._viewer.scene.objects;for(var _i589=0,len=objectIds.length;_i589<len;_i589++){var objectId=objectIds[_i589];var metaObject=metaObjects[objectId];if(metaObject){var _node19=this._objectNodes[objectId];if(_node19){var entity=objects[objectId];if(entity){var visible=entity.visible;_node19.numEntities=1;_node19.xrayed=entity.xrayed;if(visible){_node19.numVisibleEntities=1;_node19.checked=true;}else{_node19.numVisibleEntities=0;_node19.checked=false;}var parent=_node19.parent;// Synch parents
 while(parent){parent.numEntities++;if(visible){parent.numVisibleEntities++;parent.checked=true;}parent=parent.parent;}}}}}}},{key:"_withNodeTree",value:function _withNodeTree(node,callback){callback(node);var children=node.children;if(!children){return;}for(var _i590=0,len=children.length;_i590<len;_i590++){this._withNodeTree(children[_i590],callback);}}},{key:"_createTrees",value:function _createTrees(){var _this135=this;if(this._rootNodes.length===0){return;}var rootNodeElements=this._rootNodes.map(function(rootNode){return _this135._createNodeElement(rootNode);});var ul=document.createElement('ul');rootNodeElements.forEach(function(nodeElement){ul.appendChild(nodeElement);});this._containerElement.appendChild(ul);this._rootElement=ul;}},{key:"_createNodeElement",value:function _createNodeElement(node){var _this136=this;var nodeElement=document.createElement('li');//const nodeId = this._objectToNodeID(node.objectId);
-var nodeId=node.nodeId;if(node.xrayed){nodeElement.classList.add('xrayed-node');}nodeElement.id="".concat(nodeId);if(node.children.length>0){var switchElementId="switch-"+nodeId;var switchElement=document.createElement('a');switchElement.href='#';switchElement.id=switchElementId;switchElement.textContent='+';switchElement.classList.add('plus');switchElement.addEventListener('click',this._switchExpandHandler);nodeElement.appendChild(switchElement);}var checkbox=document.createElement('input');checkbox.id="".concat(nodeId);checkbox.type="checkbox";checkbox.checked=node.checked;checkbox.style["pointer-events"]="all";checkbox.addEventListener("change",this._checkboxChangeHandler);nodeElement.appendChild(checkbox);var span=document.createElement('span');span.textContent=node.title;nodeElement.appendChild(span);span.oncontextmenu=function(e){_this136.fire("contextmenu",{event:e,viewer:_this136._viewer,treeViewPlugin:_this136,treeViewNode:node});e.preventDefault();};span.onclick=function(e){_this136.fire("nodeTitleClicked",{event:e,viewer:_this136._viewer,treeViewPlugin:_this136,treeViewNode:node});e.preventDefault();};return nodeElement;}},{key:"_expandSwitchElement",value:function _expandSwitchElement(switchElement){var _this137=this;var parentElement=switchElement.parentElement;var expanded=parentElement.getElementsByTagName('li')[0];if(expanded){return;}var nodeId=parentElement.id;var switchNode=this._nodeNodes[nodeId];var childNodes=switchNode.children;var nodeElements=childNodes.map(function(node){return _this137._createNodeElement(node);});var ul=document.createElement('ul');nodeElements.forEach(function(nodeElement){ul.appendChild(nodeElement);});parentElement.appendChild(ul);switchElement.classList.remove('plus');switchElement.classList.add('minus');switchElement.textContent='-';switchElement.removeEventListener('click',this._switchExpandHandler);switchElement.addEventListener('click',this._switchCollapseHandler);}},{key:"_collapseNode",value:function _collapseNode(objectId){var nodeId=objectId;var switchElementId="switch-"+nodeId;var switchElement=document.getElementById(switchElementId);this._collapseSwitchElement(switchElement);}},{key:"_collapseSwitchElement",value:function _collapseSwitchElement(switchElement){if(!switchElement){return;}var parent=switchElement.parentElement;if(!parent){return;}var ul=parent.querySelector('ul');if(!ul){return;}parent.removeChild(ul);switchElement.classList.remove('minus');switchElement.classList.add('plus');switchElement.textContent='+';switchElement.removeEventListener('click',this._switchCollapseHandler);switchElement.addEventListener('click',this._switchExpandHandler);}}]);return TreeViewPlugin;}(Plugin);/**
+var nodeId=node.nodeId;if(node.xrayed){nodeElement.classList.add('xrayed-node');}nodeElement.id=nodeId;if(node.children.length>0){var switchElementId="switch-"+nodeId;var switchElement=document.createElement('a');switchElement.href='#';switchElement.id=switchElementId;switchElement.textContent='+';switchElement.classList.add('plus');switchElement.addEventListener('click',this._switchExpandHandler);nodeElement.appendChild(switchElement);}var checkbox=document.createElement('input');checkbox.id="checkbox-".concat(nodeId);checkbox.type="checkbox";checkbox.checked=node.checked;checkbox.style["pointer-events"]="all";checkbox.addEventListener("change",this._checkboxChangeHandler);nodeElement.appendChild(checkbox);var span=document.createElement('span');span.textContent=node.title;nodeElement.appendChild(span);span.oncontextmenu=function(e){_this136.fire("contextmenu",{event:e,viewer:_this136._viewer,treeViewPlugin:_this136,treeViewNode:node});e.preventDefault();};span.onclick=function(e){_this136.fire("nodeTitleClicked",{event:e,viewer:_this136._viewer,treeViewPlugin:_this136,treeViewNode:node});e.preventDefault();};return nodeElement;}},{key:"_expandSwitchElement",value:function _expandSwitchElement(switchElement){var _this137=this;var parentElement=switchElement.parentElement;var expanded=parentElement.getElementsByTagName('li')[0];if(expanded){return;}var nodeId=parentElement.id;var switchNode=this._nodeNodes[nodeId];var childNodes=switchNode.children;var nodeElements=childNodes.map(function(node){return _this137._createNodeElement(node);});var ul=document.createElement('ul');nodeElements.forEach(function(nodeElement){ul.appendChild(nodeElement);});parentElement.appendChild(ul);switchElement.classList.remove('plus');switchElement.classList.add('minus');switchElement.textContent='-';switchElement.removeEventListener('click',this._switchExpandHandler);switchElement.addEventListener('click',this._switchCollapseHandler);}},{key:"_collapseNode",value:function _collapseNode(objectId){var nodeId=objectId;var switchElementId="switch-"+nodeId;var switchElement=document.getElementById(switchElementId);this._collapseSwitchElement(switchElement);}},{key:"_collapseSwitchElement",value:function _collapseSwitchElement(switchElement){if(!switchElement){return;}var parent=switchElement.parentElement;if(!parent){return;}var ul=parent.querySelector('ul');if(!ul){return;}parent.removeChild(ul);switchElement.classList.remove('minus');switchElement.classList.add('plus');switchElement.textContent='+';switchElement.removeEventListener('click',this._switchCollapseHandler);switchElement.addEventListener('click',this._switchExpandHandler);}}]);return TreeViewPlugin;}(Plugin);/**
  * For each Entity in its Scene, efficiently combines updates from multiple culling systems into a single "culled" state.
  *
  * Two culling systems are supported: