@xeokit/xeokit-sdk 2.4.0-alpha-83 → 2.4.0-alpha-85

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@xeokit/xeokit-sdk",
-  "version": "2.4.0-alpha-83",
+  "version": "2.4.0-alpha-85",
   "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/plugins/XKTLoaderPlugin/parsers/ParserV10.js

@@ -154,7 +154,11 @@ function load(viewer, options, inflatedData, sceneModel, metaModel, manifestCtx)
     const numTiles = eachTileEntitiesPortion.length;
 
     if (metaModel) {
-        metaModel.loadData(metadata); // Can be empty
+        metaModel.loadData(metadata, {
+            includeTypes: options.includeTypes,
+            excludeTypes: options.excludeTypes,
+            globalizeObjectIds: options.globalizeObjectIds
+        }); // Can be empty
     }
 
     // Create textures
@@ -425,7 +429,7 @@ function load(viewer, options, inflatedData, sceneModel, metaModel, manifestCtx)
                                         atLastGeometry
                                             ? indices.length
                                             : eachGeometryIndicesPortion [geometryIndex + 1]));
-                                 geometryValid = (geometryArrays.geometryPositions.length > 0 && geometryArrays.geometryIndices.length > 0);
+                                geometryValid = (geometryArrays.geometryPositions.length > 0 && geometryArrays.geometryIndices.length > 0);
                                 break;
                             default:
                                 continue;

package/src/viewer/metadata/MetaModel.js

@@ -378,7 +378,7 @@ class MetaModel {
                 const propertySet = metaModelData.propertySets[i];
                 propertySet.originalSystemId = propertySet.id;
                 if (globalize) {
-                    propertySet.id = math.globalizeObjectId(mothis.id, propertySet.id);
+                    propertySet.id = math.globalizeObjectId(this.id, propertySet.id);
                 }
             }
         }

package/src/viewer/scene/model/SceneModel.js

@@ -2953,7 +2953,7 @@ export class SceneModel extends Component {
                 return dtxLayer;
             }
         }
-        console.log(`[SceneModel ${this.id}]: creating TrianglesDataTextureLayer`);
+        console.info(`[SceneModel ${this.id}]: creating TrianglesDataTextureLayer`);
         dtxLayer = new TrianglesDataTextureLayer(this, {layerIndex: 0, origin}); // layerIndex is set in #finalize()
         this._dtxLayers[layerId] = dtxLayer;
         this.layerList.push(dtxLayer);
@@ -2976,7 +2976,7 @@ export class SceneModel extends Component {
         while (!vboBatchingLayer) {
             switch (cfg.primitive) {
                 case "triangles":
-                    console.log(`[SceneModel ${this.id}]: creating TrianglesBatchingLayer`);
+                    console.info(`[SceneModel ${this.id}]: creating TrianglesBatchingLayer`);
                     vboBatchingLayer = new TrianglesBatchingLayer({
                         model,
                         textureSet,
@@ -2991,7 +2991,7 @@ export class SceneModel extends Component {
                     });
                     break;
                 case "solid":
-                    console.log(`[SceneModel ${this.id}]: creating TrianglesBatchingLayer`);
+                    console.info(`[SceneModel ${this.id}]: creating TrianglesBatchingLayer`);
                     vboBatchingLayer = new TrianglesBatchingLayer({
                         model,
                         textureSet,
@@ -3006,7 +3006,7 @@ export class SceneModel extends Component {
                     });
                     break;
                 case "surface":
-                    console.log(`[SceneModel ${this.id}]: creating TrianglesBatchingLayer`);
+                    console.info(`[SceneModel ${this.id}]: creating TrianglesBatchingLayer`);
                     vboBatchingLayer = new TrianglesBatchingLayer({
                         model,
                         textureSet,
@@ -3021,7 +3021,7 @@ export class SceneModel extends Component {
                     });
                     break;
                 case "lines":
-                    console.log(`[SceneModel ${this.id}]: creating LinesBatchingLayer`);
+                    console.info(`[SceneModel ${this.id}]: creating LinesBatchingLayer`);
                     vboBatchingLayer = new LinesBatchingLayer({
                         model,
                         layerIndex: 0, // This is set in #finalize()
@@ -3033,7 +3033,7 @@ export class SceneModel extends Component {
                     });
                     break;
                 case "points":
-                    console.log(`[SceneModel ${this.id}]: creating PointsBatchingLayer`);
+                    console.info(`[SceneModel ${this.id}]: creating PointsBatchingLayer`);
                     vboBatchingLayer = new PointsBatchingLayer({
                         model,
                         layerIndex: 0, // This is set in #finalize()
@@ -3087,7 +3087,7 @@ export class SceneModel extends Component {
         while (!vboInstancingLayer) {
             switch (geometry.primitive) {
                 case "triangles":
-                    console.log(`[SceneModel ${this.id}]: creating TrianglesInstancingLayer`);
+                    console.info(`[SceneModel ${this.id}]: creating TrianglesInstancingLayer`);
                     vboInstancingLayer = new TrianglesInstancingLayer({
                         model,
                         textureSet,
@@ -3098,7 +3098,7 @@ export class SceneModel extends Component {
                     });
                     break;
                 case "solid":
-                    console.log(`[SceneModel ${this.id}]: creating TrianglesInstancingLayer`);
+                    console.info(`[SceneModel ${this.id}]: creating TrianglesInstancingLayer`);
                     vboInstancingLayer = new TrianglesInstancingLayer({
                         model,
                         textureSet,
@@ -3109,7 +3109,7 @@ export class SceneModel extends Component {
                     });
                     break;
                 case "surface":
-                    console.log(`[SceneModel ${this.id}]: creating TrianglesInstancingLayer`);
+                    console.info(`[SceneModel ${this.id}]: creating TrianglesInstancingLayer`);
                     vboInstancingLayer = new TrianglesInstancingLayer({
                         model,
                         textureSet,
@@ -3120,7 +3120,7 @@ export class SceneModel extends Component {
                     });
                     break;
                 case "lines":
-                    console.log(`[SceneModel ${this.id}]: creating LinesInstancingLayer`);
+                    console.info(`[SceneModel ${this.id}]: creating LinesInstancingLayer`);
                     vboInstancingLayer = new LinesInstancingLayer({
                         model,
                         textureSet,
@@ -3130,7 +3130,7 @@ export class SceneModel extends Component {
                     });
                     break;
                 case "points":
-                    console.log(`[SceneModel ${this.id}]: creating PointsInstancingLayer`);
+                    console.info(`[SceneModel ${this.id}]: creating PointsInstancingLayer`);
                     vboInstancingLayer = new PointsInstancingLayer({
                         model,
                         textureSet,
@@ -3814,4 +3814,4 @@ function createGeometryOBB(geometry) {
         math.expandAABB3Points3(localAABB, geometry.positions);
         math.AABB3ToOBB3(localAABB, geometry.obb);
     }
-}
+}

package/src/viewer/scene/model/dtx/triangles/TrianglesDataTextureLayer.js

@@ -760,7 +760,7 @@ export class TrianglesDataTextureLayer {
      * flags/flags2 set since the previous invocation of `_beginDeferredFlags`.
      */
     _uploadDeferredFlags() {
-        //  console.log("_uploadDeferredFlags")
+        console.info("_uploadDeferredFlags")
         this._deferredSetFlagsActive = false;
         if (!this._deferredSetFlagsDirty) {
             return;
@@ -849,14 +849,14 @@ export class TrianglesDataTextureLayer {
         // object colors
         textureState.texturePerObjectIdColorsAndFlags._textureData.set(tempUint8Array4, subPortionId * 32);
         if (this._deferredSetFlagsActive) {
-            // console.log("_subPortionSetColor defer");
+            console.info("_subPortionSetColor defer");
             this._deferredSetFlagsDirty = true;
             return;
         }
         if (++this._numUpdatesInFrame >= MAX_OBJECT_UPDATES_IN_FRAME_WITHOUT_BATCHED_UPDATE) {
             this._beginDeferredFlags(); // Subsequent flags updates now deferred
         }
-        // console.log("_subPortionSetColor write through");
+        console.info("_subPortionSetColor write through");
         gl.bindTexture(gl.TEXTURE_2D, textureState.texturePerObjectIdColorsAndFlags._texture);
         gl.texSubImage2D(
             gl.TEXTURE_2D,
@@ -964,14 +964,14 @@ export class TrianglesDataTextureLayer {
         // object flags
         textureState.texturePerObjectIdColorsAndFlags._textureData.set(tempUint8Array4, subPortionId * 32 + 8);
         if (this._deferredSetFlagsActive || deferred) {
-            // console.log("_subPortionSetFlags set flags defer");
+            console.info("_subPortionSetFlags set flags defer");
             this._deferredSetFlagsDirty = true;
             return;
         }
         if (++this._numUpdatesInFrame >= MAX_OBJECT_UPDATES_IN_FRAME_WITHOUT_BATCHED_UPDATE) {
             this._beginDeferredFlags(); // Subsequent flags updates now deferred
         }
-        // console.log("_subPortionSetFlags set flags write through");
+        console.info("_subPortionSetFlags set flags write through");
         gl.bindTexture(gl.TEXTURE_2D, textureState.texturePerObjectIdColorsAndFlags._texture);
         gl.texSubImage2D(
             gl.TEXTURE_2D,
@@ -1018,7 +1018,7 @@ export class TrianglesDataTextureLayer {
         if (++this._numUpdatesInFrame >= MAX_OBJECT_UPDATES_IN_FRAME_WITHOUT_BATCHED_UPDATE) {
             this._beginDeferredFlags(); // Subsequent flags updates now deferred
         }
-        // console.log("_subPortionSetFlags2 set flags write through");
+        console.info("_subPortionSetFlags2 set flags write through");
         gl.bindTexture(gl.TEXTURE_2D, textureState.texturePerObjectIdColorsAndFlags._texture);
         gl.texSubImage2D(
             gl.TEXTURE_2D,

package/src/viewer/scene/model/vbo/trianglesBatching/TrianglesBatchingLayer.js

@@ -45,7 +45,7 @@ class TrianglesBatchingLayer {
      */
     constructor(cfg) {
 
-        console.log("Creating TrianglesBatchingLayer");
+        console.info("Creating TrianglesBatchingLayer");
 
         /**
          * Owner model
@@ -1319,4 +1319,4 @@ class TrianglesBatchingLayer {
     }
 }
 
-export {TrianglesBatchingLayer};
+export {TrianglesBatchingLayer};

package/src/viewer/scene/model/vbo/trianglesInstancing/TrianglesInstancingLayer.js

@@ -37,7 +37,7 @@ class TrianglesInstancingLayer {
      */
     constructor(cfg) {
 
-        console.log("Creating TrianglesInstancingLayer");
+        console.info("Creating TrianglesInstancingLayer");
 
         /**
          * Owner model

package/src/viewer/scene/utils.js

@@ -103,7 +103,6 @@ function httpRequest(args) {
         var xhr = new XMLHttpRequest();
         xhr.open(args.method || "GET", args.url, true);
         xhr.onload = function (e) {
-            console.log(args.url, xhr.readyState, xhr.status);
             if (xhr.readyState === 4) {
                 if (xhr.status === 200) {
                     resolve(xhr.responseXML);