@xeokit/xeokit-sdk 2.4.2-beta-4 → 2.4.2-beta-7

package/dist/xeokit-sdk.cjs.js

@@ -26579,7 +26579,7 @@ function getEntityIDMap(scene, entityIds) {
     let entity;
     for (let i = 0, len = entityIds.length; i < len; i++) {
         entityId = entityIds[i];
-        entity = scene.component[entityId];
+        entity = scene.components[entityId];
         if (!entity) {
             scene.warn("pick(): Component not found: " + entityId);
             continue;
@@ -68255,6 +68255,7 @@ class PointsBatchingColorRenderer extends VBOSceneModelPointBatchingRenderer {
         if (scene.logarithmicDepthBufferEnabled) {
             src.push("vFragDepth = 1.0 + clipPos.w;");
         }
+
         src.push("gl_Position = clipPos;");
         if (pointsMaterial.perspectivePoints) {
             src.push("gl_PointSize = (nearPlaneHeight * pointSize) / clipPos.w;");
@@ -89399,15 +89400,6 @@ class MetaObject {
      */
     constructor(params) {
 
-        /**
-         * Model metadata.
-         *
-         * @property metaModel
-         * @type {MetaModel}
-         * @deprecated
-         */
-        this.metaModel = null;
-
         /**
          * The MetaModels that share this MetaObject.
          * @type {MetaModel[]}
@@ -89480,18 +89472,32 @@ class MetaObject {
          */
         this.attributes = params.attributes || {};
 
-        // if (external !== undefined && external !== null) {
-        //
-        //     /**
-        //      * External application-specific metadata
-        //      *
-        //      * Undefined when there are is no external application-specific metadata.
-        //      *
-        //      * @property external
-        //      * @type {*}
-        //      */
-        //     this.external = external;
-        // }
+        if (params.external !== undefined && params.external !== null) {
+        
+            /**
+             * External application-specific metadata
+             *
+             * Undefined when there are is no external application-specific metadata.
+             *
+             * @property external
+             * @type {*}
+             */
+            this.external = params.external;
+        }
+    }
+
+    /**
+     * Backwards compatibility with the object belonging to a single MetaModel.
+     * 
+     * @property metaModel
+     * @type {MetaModel|null}
+     **/
+    get metaModel() {
+        if (this.metaModels.length == 1) {
+            return this.metaModels[0];
+        }
+
+        return null;
     }
 
     /**
@@ -89705,15 +89711,6 @@ class MetaModel {
          */
         this.propertySets = [];
 
-        /**
-         * The root {@link MetaObject} in this MetaModel's composition structure hierarchy.
-         *
-         * @property rootMetaObject
-         * @type {MetaObject}
-         * @deprecated
-         */
-        this.rootMetaObject = null;
-
         /**
          * The root {@link MetaObject}s in this MetaModel's composition structure hierarchy.
          *
@@ -89745,6 +89742,20 @@ class MetaModel {
         this.finalized = false;
     }
 
+    /**
+     * Backwards compatibility with the model having a single root MetaObject.
+     *
+     * @property rootMetaObject
+     * @type {MetaObject|null}
+     */
+    get rootMetaObject()
+    {
+        if (this.rootMetaObjects.length == 1) {
+            return this.rootMetaObjects[0];
+        }
+        return null;
+    }
+
     /**
      * Load metamodel data into this MetaModel.
      * @param metaModelData
@@ -89796,7 +89807,8 @@ class MetaModel {
                         type,
                         name: metaObjectData.name,
                         attributes: metaObjectData.attributes,
-                        propertySetIds
+                        propertySetIds,
+                        external: metaObjectData.external,
                     });
                     this.metaScene.metaObjects[id] = metaObject;
                 }

package/dist/xeokit-sdk.es.js

@@ -26575,7 +26575,7 @@ function getEntityIDMap(scene, entityIds) {
     let entity;
     for (let i = 0, len = entityIds.length; i < len; i++) {
         entityId = entityIds[i];
-        entity = scene.component[entityId];
+        entity = scene.components[entityId];
         if (!entity) {
             scene.warn("pick(): Component not found: " + entityId);
             continue;
@@ -68251,6 +68251,7 @@ class PointsBatchingColorRenderer extends VBOSceneModelPointBatchingRenderer {
         if (scene.logarithmicDepthBufferEnabled) {
             src.push("vFragDepth = 1.0 + clipPos.w;");
         }
+
         src.push("gl_Position = clipPos;");
         if (pointsMaterial.perspectivePoints) {
             src.push("gl_PointSize = (nearPlaneHeight * pointSize) / clipPos.w;");
@@ -89395,15 +89396,6 @@ class MetaObject {
      */
     constructor(params) {
 
-        /**
-         * Model metadata.
-         *
-         * @property metaModel
-         * @type {MetaModel}
-         * @deprecated
-         */
-        this.metaModel = null;
-
         /**
          * The MetaModels that share this MetaObject.
          * @type {MetaModel[]}
@@ -89476,18 +89468,32 @@ class MetaObject {
          */
         this.attributes = params.attributes || {};
 
-        // if (external !== undefined && external !== null) {
-        //
-        //     /**
-        //      * External application-specific metadata
-        //      *
-        //      * Undefined when there are is no external application-specific metadata.
-        //      *
-        //      * @property external
-        //      * @type {*}
-        //      */
-        //     this.external = external;
-        // }
+        if (params.external !== undefined && params.external !== null) {
+        
+            /**
+             * External application-specific metadata
+             *
+             * Undefined when there are is no external application-specific metadata.
+             *
+             * @property external
+             * @type {*}
+             */
+            this.external = params.external;
+        }
+    }
+
+    /**
+     * Backwards compatibility with the object belonging to a single MetaModel.
+     * 
+     * @property metaModel
+     * @type {MetaModel|null}
+     **/
+    get metaModel() {
+        if (this.metaModels.length == 1) {
+            return this.metaModels[0];
+        }
+
+        return null;
     }
 
     /**
@@ -89701,15 +89707,6 @@ class MetaModel {
          */
         this.propertySets = [];
 
-        /**
-         * The root {@link MetaObject} in this MetaModel's composition structure hierarchy.
-         *
-         * @property rootMetaObject
-         * @type {MetaObject}
-         * @deprecated
-         */
-        this.rootMetaObject = null;
-
         /**
          * The root {@link MetaObject}s in this MetaModel's composition structure hierarchy.
          *
@@ -89741,6 +89738,20 @@ class MetaModel {
         this.finalized = false;
     }
 
+    /**
+     * Backwards compatibility with the model having a single root MetaObject.
+     *
+     * @property rootMetaObject
+     * @type {MetaObject|null}
+     */
+    get rootMetaObject()
+    {
+        if (this.rootMetaObjects.length == 1) {
+            return this.rootMetaObjects[0];
+        }
+        return null;
+    }
+
     /**
      * Load metamodel data into this MetaModel.
      * @param metaModelData
@@ -89792,7 +89803,8 @@ class MetaModel {
                         type,
                         name: metaObjectData.name,
                         attributes: metaObjectData.attributes,
-                        propertySetIds
+                        propertySetIds,
+                        external: metaObjectData.external,
                     });
                     this.metaScene.metaObjects[id] = metaObject;
                 }

package/dist/xeokit-sdk.es5.js

@@ -8105,7 +8105,7 @@ _this47.preset=cfg.preset;if(cfg.lineWidth!==undefined){_this47.lineWidth=cfg.li
      */,set:function set(value){value=value||"default";if(this._preset===value){return;}var preset=PRESETS[value];if(!preset){this.error("unsupported preset: '"+value+"' - supported values are "+Object.keys(PRESETS).join(", "));return;}this.lineWidth=preset.lineWidth;this._preset=value;}},{key:"hash",get:function get(){return[""+this.lineWidth].join(";");}/**
      * Destroys this LinesMaterial.
      */},{key:"destroy",value:function destroy(){_get(_getPrototypeOf(LinesMaterial.prototype),"destroy",this).call(this);this._state.destroy();}}]);return LinesMaterial;}(Material);// Cached vars to avoid garbage collection
-function getEntityIDMap(scene,entityIds){var map={};var entityId;var entity;for(var _i76=0,len=entityIds.length;_i76<len;_i76++){entityId=entityIds[_i76];entity=scene.component[entityId];if(!entity){scene.warn("pick(): Component not found: "+entityId);continue;}if(!entity.isEntity){scene.warn("pick(): Component is not an Entity: "+entityId);continue;}map[entityId]=true;}return map;}/**
+function getEntityIDMap(scene,entityIds){var map={};var entityId;var entity;for(var _i76=0,len=entityIds.length;_i76<len;_i76++){entityId=entityIds[_i76];entity=scene.components[entityId];if(!entity){scene.warn("pick(): Component not found: "+entityId);continue;}if(!entity.isEntity){scene.warn("pick(): Component is not an Entity: "+entityId);continue;}map[entityId]=true;}return map;}/**
  * Fired whenever a debug message is logged on a component within this Scene.
  * @event log
  * @param {String} value The debug message
@@ -21742,12 +21742,6 @@ value=value||"qwerty";if(value!=="qwerty"&&value!=="azerty"){this.error("Unsuppo
  */var MetaObject=/*#__PURE__*/function(){/**
      * @private
      */function MetaObject(params){_classCallCheck(this,MetaObject);/**
-         * Model metadata.
-         *
-         * @property metaModel
-         * @type {MetaModel}
-         * @deprecated
-         */this.metaModel=null;/**
          * The MetaModels that share this MetaObject.
          * @type {MetaModel[]}
          */this.metaModels=[];/**
@@ -21789,23 +21783,23 @@ value=value||"qwerty";if(value!=="qwerty"&&value!=="azerty"){this.error("Unsuppo
          */this.propertySets=[];/**
          * The attributes of this MetaObject.
          * @type {{}}
-         */this.attributes=params.attributes||{};// if (external !== undefined && external !== null) {
-//
-//     /**
-//      * External application-specific metadata
-//      *
-//      * Undefined when there are is no external application-specific metadata.
-//      *
-//      * @property external
-//      * @type {*}
-//      */
-//     this.external = external;
-// }
-}/**
+         */this.attributes=params.attributes||{};if(params.external!==undefined&&params.external!==null){/**
+             * External application-specific metadata
+             *
+             * Undefined when there are is no external application-specific metadata.
+             *
+             * @property external
+             * @type {*}
+             */this.external=params.external;}}/**
+     * Backwards compatibility with the object belonging to a single MetaModel.
+     * 
+     * @property metaModel
+     * @type {MetaModel|null}
+     **/_createClass(MetaObject,[{key:"metaModel",get:function get(){if(this.metaModels.length==1){return this.metaModels[0];}return null;}/**
      * Gets the {@link MetaObject#id}s of the {@link MetaObject}s within the subtree.
      *
      * @returns {String[]} Array of {@link MetaObject#id}s.
-     */_createClass(MetaObject,[{key:"getObjectIDsInSubtree",value:function getObjectIDsInSubtree(){var objectIds=[];function visit(metaObject){if(!metaObject){return;}objectIds.push(metaObject.id);var children=metaObject.children;if(children){for(var i=0,len=children.length;i<len;i++){visit(children[i]);}}}visit(this);return objectIds;}/**
+     */},{key:"getObjectIDsInSubtree",value:function getObjectIDsInSubtree(){var objectIds=[];function visit(metaObject){if(!metaObject){return;}objectIds.push(metaObject.id);var children=metaObject.children;if(children){for(var i=0,len=children.length;i<len;i++){visit(children[i]);}}}visit(this);return objectIds;}/**
      * Iterates over the {@link MetaObject}s within the subtree.
      *
      * @param {Function} callback Callback fired at each {@link MetaObject}.
@@ -21898,12 +21892,6 @@ value=value||"qwerty";if(value!=="qwerty"&&value!=="azerty"){this.error("Unsuppo
          * @property propertySets
          * @type  {PropertySet[]}
          */this.propertySets=[];/**
-         * The root {@link MetaObject} in this MetaModel's composition structure hierarchy.
-         *
-         * @property rootMetaObject
-         * @type {MetaObject}
-         * @deprecated
-         */this.rootMetaObject=null;/**
          * The root {@link MetaObject}s in this MetaModel's composition structure hierarchy.
          *
          * @property rootMetaObject
@@ -21920,10 +21908,15 @@ value=value||"qwerty";if(value!=="qwerty"&&value!=="azerty"){this.error("Unsuppo
          * True when this MetaModel has been finalized.
          * @type {boolean}
          */this.finalized=false;}/**
+     * Backwards compatibility with the model having a single root MetaObject.
+     *
+     * @property rootMetaObject
+     * @type {MetaObject|null}
+     */_createClass(MetaModel,[{key:"rootMetaObject",get:function get(){if(this.rootMetaObjects.length==1){return this.rootMetaObjects[0];}return null;}/**
      * Load metamodel data into this MetaModel.
      * @param metaModelData
-     */_createClass(MetaModel,[{key:"loadData",value:function loadData(metaModelData){var options=arguments.length>1&&arguments[1]!==undefined?arguments[1]:{};if(this.finalized){throw"MetaScene already finalized - can't add more data";}this._globalizeIDs(metaModelData,options);var metaScene=this.metaScene;// Create global Property Sets
-if(metaModelData.propertySets){for(var _i437=0,len=metaModelData.propertySets.length;_i437<len;_i437++){var propertySetData=metaModelData.propertySets[_i437];var propertySet=metaScene.propertySets[propertySetData.id];if(!propertySet){propertySet=new PropertySet({id:propertySetData.id,originalSystemId:propertySetData.originalSystemId||propertySetData.id,type:propertySetData.type,name:propertySetData.name,properties:propertySetData.properties});metaScene.propertySets[propertySet.id]=propertySet;}propertySet.metaModels.push(this);this.propertySets.push(propertySet);}}if(metaModelData.metaObjects){for(var _i438=0,_len96=metaModelData.metaObjects.length;_i438<_len96;_i438++){var metaObjectData=metaModelData.metaObjects[_i438];var id=metaObjectData.id;var metaObject=metaScene.metaObjects[id];if(!metaObject){var type=metaObjectData.type;var originalSystemId=metaObjectData.originalSystemId;var propertySetIds=metaObjectData.propertySets||metaObjectData.propertySetIds;metaObject=new MetaObject({id:id,originalSystemId:originalSystemId,parentId:metaObjectData.parent,type:type,name:metaObjectData.name,attributes:metaObjectData.attributes,propertySetIds:propertySetIds});this.metaScene.metaObjects[id]=metaObject;}metaObject.metaModels.push(this);if(!metaObjectData.parent){this.rootMetaObjects.push(metaObject);metaScene.rootMetaObjects[id]=metaObject;}this.metaObjects.push(metaObject);}}}},{key:"finalize",value:function finalize(){if(this.finalized){throw"MetaScene already finalized - can't re-finalize";}// Re-link MetaScene's entire MetaObject parent/child hierarchy
+     */},{key:"loadData",value:function loadData(metaModelData){var options=arguments.length>1&&arguments[1]!==undefined?arguments[1]:{};if(this.finalized){throw"MetaScene already finalized - can't add more data";}this._globalizeIDs(metaModelData,options);var metaScene=this.metaScene;// Create global Property Sets
+if(metaModelData.propertySets){for(var _i437=0,len=metaModelData.propertySets.length;_i437<len;_i437++){var propertySetData=metaModelData.propertySets[_i437];var propertySet=metaScene.propertySets[propertySetData.id];if(!propertySet){propertySet=new PropertySet({id:propertySetData.id,originalSystemId:propertySetData.originalSystemId||propertySetData.id,type:propertySetData.type,name:propertySetData.name,properties:propertySetData.properties});metaScene.propertySets[propertySet.id]=propertySet;}propertySet.metaModels.push(this);this.propertySets.push(propertySet);}}if(metaModelData.metaObjects){for(var _i438=0,_len96=metaModelData.metaObjects.length;_i438<_len96;_i438++){var metaObjectData=metaModelData.metaObjects[_i438];var id=metaObjectData.id;var metaObject=metaScene.metaObjects[id];if(!metaObject){var type=metaObjectData.type;var originalSystemId=metaObjectData.originalSystemId;var propertySetIds=metaObjectData.propertySets||metaObjectData.propertySetIds;metaObject=new MetaObject({id:id,originalSystemId:originalSystemId,parentId:metaObjectData.parent,type:type,name:metaObjectData.name,attributes:metaObjectData.attributes,propertySetIds:propertySetIds,external:metaObjectData.external});this.metaScene.metaObjects[id]=metaObject;}metaObject.metaModels.push(this);if(!metaObjectData.parent){this.rootMetaObjects.push(metaObject);metaScene.rootMetaObjects[id]=metaObject;}this.metaObjects.push(metaObject);}}}},{key:"finalize",value:function finalize(){if(this.finalized){throw"MetaScene already finalized - can't re-finalize";}// Re-link MetaScene's entire MetaObject parent/child hierarchy
 var metaScene=this.metaScene;for(var objectId in metaScene.metaObjects){var metaObject=metaScene.metaObjects[objectId];if(metaObject.children){metaObject.children=[];}// Re-link each MetaObject's property sets
 if(metaObject.propertySets){metaObject.propertySets=[];}if(metaObject.propertySetIds){for(var _i439=0,len=metaObject.propertySetIds.length;_i439<len;_i439++){var propertySetId=metaObject.propertySetIds[_i439];var propertySet=metaScene.propertySets[propertySetId];metaObject.propertySets.push(propertySet);}}}for(var _objectId in metaScene.metaObjects){var _metaObject3=metaScene.metaObjects[_objectId];if(_metaObject3.parentId){var parentMetaObject=metaScene.metaObjects[_metaObject3.parentId];if(parentMetaObject){_metaObject3.parent=parentMetaObject;(parentMetaObject.children||(parentMetaObject.children=[])).push(_metaObject3);}}}// Rebuild MetaScene's MetaObjects-by-type lookup
 metaScene.metaObjectsByType={};for(var _objectId2 in metaScene.metaObjects){var _metaObject4=metaScene.metaObjects[_objectId2];var type=_metaObject4.type;(metaScene.metaObjectsByType[type]||(metaScene.metaObjectsByType[type]={}))[_objectId2]=_metaObject4;}this.finalized=true;this.metaScene.fire("metaModelCreated",this.id);}/**