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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@xeokit/xeokit-sdk",
-  "version": "2.4.2-beta-4",
+  "version": "2.4.2-beta-7",
   "description": "Web Programming Toolkit for 3D/2D BIM and AEC Graphics",
   "module": "./dist/xeokit-sdk.es.js",
   "main": "./dist/xeokit-sdk.cjs.js",

package/src/viewer/metadata/IFCObjectDefaultColors.js

@@ -36,6 +36,7 @@ const IFCObjectDefaultColors = {
 
     // Priority 2
 
+
     IfcStair: {
         colorize: [0.637255, 0.603922, 0.670588]
     },

package/src/viewer/metadata/MetaModel.js

@@ -114,15 +114,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.
          *
@@ -154,6 +145,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
@@ -205,7 +210,8 @@ class MetaModel {
                         type,
                         name: metaObjectData.name,
                         attributes: metaObjectData.attributes,
-                        propertySetIds
+                        propertySetIds,
+                        external: metaObjectData.external,
                     });
                     this.metaScene.metaObjects[id] = metaObject;
                 }

package/src/viewer/metadata/MetaObject.js

@@ -21,15 +21,6 @@ class MetaObject {
      */
     constructor(params) {
 
-        /**
-         * Model metadata.
-         *
-         * @property metaModel
-         * @type {MetaModel}
-         * @deprecated
-         */
-        this.metaModel = null;
-
         /**
          * The MetaModels that share this MetaObject.
          * @type {MetaModel[]}
@@ -102,18 +93,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;
     }
 
     /**

package/src/viewer/scene/model/vbo/pointsBatching/renderers/PointsBatchingColorRenderer.js

@@ -88,6 +88,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;");

package/src/viewer/scene/scene/Scene.js

@@ -30,7 +30,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;