@xeokit/xeokit-sdk 2.3.5 → 2.3.7

package/dist/xeokit-sdk.cjs.js

@@ -96438,9 +96438,9 @@ class GLTFVBOSceneModelLoader {
             });
     }
 
-    parse(plugin, gltf, metaModelJSON,  options, sceneModel, ok, error) {
+    parse(plugin, gltf, metaModelJSON, options, sceneModel, ok, error) {
         options = options || {};
-        parseGLTF(plugin, "", gltf, metaModelJSON,  options, sceneModel, function () {
+        parseGLTF(plugin, "", gltf, metaModelJSON, options, sceneModel, function () {
                 sceneModel.scene.fire("modelLoaded", sceneModel.id); // FIXME: Assumes listeners know order of these two events
                 sceneModel.fire("loaded", true, false);
                 if (ok) {
@@ -96484,14 +96484,14 @@ function getMetaModelCorrections(metaModelJSON) {
     };
 }
 
-function loadGLTF(plugin, src, metaModelJSON, options, sceneModel,  ok, error) {
+function loadGLTF(plugin, src, metaModelJSON, options, sceneModel, ok, error) {
     const spinner = plugin.viewer.scene.canvas.spinner;
     spinner.processes++;
     const isGLB = (src.split('.').pop() === "glb");
     if (isGLB) {
         plugin.dataSource.getGLB(src, (arrayBuffer) => { // OK
                 options.basePath = getBasePath(src);
-                parseGLTF(plugin, src, arrayBuffer, metaModelJSON,  options, sceneModel, ok);
+                parseGLTF(plugin, src, arrayBuffer, metaModelJSON, options, sceneModel, ok);
                 spinner.processes--;
             },
             (err) => {
@@ -96501,7 +96501,7 @@ function loadGLTF(plugin, src, metaModelJSON, options, sceneModel,  ok, error) {
     } else {
         plugin.dataSource.getGLTF(src, (gltf) => { // OK
                 options.basePath = getBasePath(src);
-                parseGLTF(plugin, src, gltf, metaModelJSON,  options, sceneModel, ok);
+                parseGLTF(plugin, src, gltf, metaModelJSON, options, sceneModel, ok);
                 spinner.processes--;
             },
             (err) => {
@@ -96516,7 +96516,7 @@ function getBasePath(src) {
     return (i !== 0) ? src.substring(0, i + 1) : "";
 }
 
-function parseGLTF(plugin, src, gltf, metaModelJSON,  options, sceneModel, ok) {
+function parseGLTF(plugin, src, gltf, metaModelJSON, options, sceneModel, ok) {
     const spinner = plugin.viewer.scene.canvas.spinner;
     spinner.processes++;
     parse$3(gltf, GLTFLoader, {
@@ -96535,7 +96535,10 @@ function parseGLTF(plugin, src, gltf, metaModelJSON,  options, sceneModel, ok) {
             //geometryCreated: {},
             numObjects: 0,
             nodes: [],
-            nextId: 0
+            nextId: 0,
+            log: (msg) => {
+                plugin.log(msg);
+            }
         };
         loadTextures(ctx);
         loadMaterials(ctx);

package/dist/xeokit-sdk.es.js

@@ -96434,9 +96434,9 @@ class GLTFVBOSceneModelLoader {
             });
     }
 
-    parse(plugin, gltf, metaModelJSON,  options, sceneModel, ok, error) {
+    parse(plugin, gltf, metaModelJSON, options, sceneModel, ok, error) {
         options = options || {};
-        parseGLTF(plugin, "", gltf, metaModelJSON,  options, sceneModel, function () {
+        parseGLTF(plugin, "", gltf, metaModelJSON, options, sceneModel, function () {
                 sceneModel.scene.fire("modelLoaded", sceneModel.id); // FIXME: Assumes listeners know order of these two events
                 sceneModel.fire("loaded", true, false);
                 if (ok) {
@@ -96480,14 +96480,14 @@ function getMetaModelCorrections(metaModelJSON) {
     };
 }
 
-function loadGLTF(plugin, src, metaModelJSON, options, sceneModel,  ok, error) {
+function loadGLTF(plugin, src, metaModelJSON, options, sceneModel, ok, error) {
     const spinner = plugin.viewer.scene.canvas.spinner;
     spinner.processes++;
     const isGLB = (src.split('.').pop() === "glb");
     if (isGLB) {
         plugin.dataSource.getGLB(src, (arrayBuffer) => { // OK
                 options.basePath = getBasePath(src);
-                parseGLTF(plugin, src, arrayBuffer, metaModelJSON,  options, sceneModel, ok);
+                parseGLTF(plugin, src, arrayBuffer, metaModelJSON, options, sceneModel, ok);
                 spinner.processes--;
             },
             (err) => {
@@ -96497,7 +96497,7 @@ function loadGLTF(plugin, src, metaModelJSON, options, sceneModel,  ok, error) {
     } else {
         plugin.dataSource.getGLTF(src, (gltf) => { // OK
                 options.basePath = getBasePath(src);
-                parseGLTF(plugin, src, gltf, metaModelJSON,  options, sceneModel, ok);
+                parseGLTF(plugin, src, gltf, metaModelJSON, options, sceneModel, ok);
                 spinner.processes--;
             },
             (err) => {
@@ -96512,7 +96512,7 @@ function getBasePath(src) {
     return (i !== 0) ? src.substring(0, i + 1) : "";
 }
 
-function parseGLTF(plugin, src, gltf, metaModelJSON,  options, sceneModel, ok) {
+function parseGLTF(plugin, src, gltf, metaModelJSON, options, sceneModel, ok) {
     const spinner = plugin.viewer.scene.canvas.spinner;
     spinner.processes++;
     parse$3(gltf, GLTFLoader, {
@@ -96531,7 +96531,10 @@ function parseGLTF(plugin, src, gltf, metaModelJSON,  options, sceneModel, ok) {
             //geometryCreated: {},
             numObjects: 0,
             nodes: [],
-            nextId: 0
+            nextId: 0,
+            log: (msg) => {
+                plugin.log(msg);
+            }
         };
         loadTextures(ctx);
         loadMaterials(ctx);

package/dist/xeokit-sdk.es5.js

@@ -21829,7 +21829,7 @@ sceneModel.fire("loaded",true,false);});if(ok){ok();}},function(msg){plugin.erro
 sceneModel.fire("loaded",true,false);if(ok){ok();}});}}]);return GLTFVBOSceneModelLoader;}();function getMetaModelCorrections(metaModelJSON){var eachRootStats={};var eachChildRoot={};var metaObjects=metaModelJSON.metaObjects||[];var metaObjectsMap={};for(var _i425=0,len=metaObjects.length;_i425<len;_i425++){var metaObject=metaObjects[_i425];metaObjectsMap[metaObject.id]=metaObject;}for(var _i426=0,_len96=metaObjects.length;_i426<_len96;_i426++){var _metaObject4=metaObjects[_i426];if(_metaObject4.parent!==undefined&&_metaObject4.parent!==null){var metaObjectParent=metaObjectsMap[_metaObject4.parent];if(_metaObject4.type===metaObjectParent.type){var rootMetaObject=metaObjectParent;while(rootMetaObject.parent&&metaObjectsMap[rootMetaObject.parent].type===rootMetaObject.type){rootMetaObject=metaObjectsMap[rootMetaObject.parent];}var rootStats=eachRootStats[rootMetaObject.id]||(eachRootStats[rootMetaObject.id]={numChildren:0,countChildren:0});rootStats.numChildren++;eachChildRoot[_metaObject4.id]=rootMetaObject;}}}return{metaObjectsMap:metaObjectsMap,eachRootStats:eachRootStats,eachChildRoot:eachChildRoot};}function loadGLTF(plugin,src,metaModelJSON,options,sceneModel,ok,error){var spinner=plugin.viewer.scene.canvas.spinner;spinner.processes++;var isGLB=src.split('.').pop()==="glb";if(isGLB){plugin.dataSource.getGLB(src,function(arrayBuffer){// OK
 options.basePath=getBasePath(src);parseGLTF(plugin,src,arrayBuffer,metaModelJSON,options,sceneModel,ok);spinner.processes--;},function(err){spinner.processes--;error(err);});}else{plugin.dataSource.getGLTF(src,function(gltf){// OK
 options.basePath=getBasePath(src);parseGLTF(plugin,src,gltf,metaModelJSON,options,sceneModel,ok);spinner.processes--;},function(err){spinner.processes--;error(err);});}}function getBasePath(src){var i=src.lastIndexOf("/");return i!==0?src.substring(0,i+1):"";}function parseGLTF(plugin,src,gltf,metaModelJSON,options,sceneModel,ok){var spinner=plugin.viewer.scene.canvas.spinner;spinner.processes++;parse$3(gltf,GLTFLoader,{baseUri:options.basePath}).then(function(gltfData){var ctx={src:src,metaModelCorrections:metaModelJSON?getMetaModelCorrections(metaModelJSON):null,loadBuffer:options.loadBuffer,basePath:options.basePath,handlenode:options.handlenode,gltfData:gltfData,scene:sceneModel.scene,plugin:plugin,sceneModel:sceneModel,//geometryCreated: {},
-numObjects:0,nodes:[],nextId:0};loadTextures(ctx);loadMaterials(ctx);loadDefaultScene(ctx);sceneModel.finalize();spinner.processes--;ok();});}function loadTextures(ctx){var gltfData=ctx.gltfData;var textures=gltfData.textures;if(textures){for(var _i427=0,len=textures.length;_i427<len;_i427++){loadTexture(ctx,textures[_i427]);}}}function loadTexture(ctx,texture){if(!texture.source||!texture.source.image){return;}var textureId="texture-".concat(ctx.nextId++);var minFilter=NearestMipMapLinearFilter;switch(texture.sampler.minFilter){case 9728:minFilter=NearestFilter;break;case 9729:minFilter=LinearFilter;break;case 9984:minFilter=NearestMipMapNearestFilter;break;case 9985:minFilter=LinearMipMapNearestFilter;break;case 9986:minFilter=NearestMipMapLinearFilter;break;case 9987:minFilter=LinearMipMapLinearFilter;break;}var magFilter=LinearFilter;switch(texture.sampler.magFilter){case 9728:magFilter=NearestFilter;break;case 9729:magFilter=LinearFilter;break;}var wrapS=RepeatWrapping;switch(texture.sampler.wrapS){case 33071:wrapS=ClampToEdgeWrapping;break;case 33648:wrapS=MirroredRepeatWrapping;break;case 10497:wrapS=RepeatWrapping;break;}var wrapT=RepeatWrapping;switch(texture.sampler.wrapT){case 33071:wrapT=ClampToEdgeWrapping;break;case 33648:wrapT=MirroredRepeatWrapping;break;case 10497:wrapT=RepeatWrapping;break;}var wrapR=RepeatWrapping;switch(texture.sampler.wrapR){case 33071:wrapR=ClampToEdgeWrapping;break;case 33648:wrapR=MirroredRepeatWrapping;break;case 10497:wrapR=RepeatWrapping;break;}ctx.sceneModel.createTexture({id:textureId,image:texture.source.image,flipY:!!texture.flipY,minFilter:minFilter,magFilter:magFilter,wrapS:wrapS,wrapT:wrapT,wrapR:wrapR,encoding:sRGBEncoding});texture._textureId=textureId;}function loadMaterials(ctx){var gltfData=ctx.gltfData;var materials=gltfData.materials;if(materials){for(var _i428=0,len=materials.length;_i428<len;_i428++){var material=materials[_i428];material._textureSetId=loadTextureSet(ctx,material);material._attributes=loadMaterialAttributes(ctx,material);}}}function loadTextureSet(ctx,material){var textureSetCfg={};if(material.normalTexture){textureSetCfg.normalTextureId=material.normalTexture.texture._textureId;}if(material.occlusionTexture){textureSetCfg.occlusionTextureId=material.occlusionTexture.texture._textureId;}if(material.emissiveTexture){textureSetCfg.emissiveTextureId=material.emissiveTexture.texture._textureId;}// const alphaMode = material.alphaMode;
+numObjects:0,nodes:[],nextId:0,log:function log(msg){plugin.log(msg);}};loadTextures(ctx);loadMaterials(ctx);loadDefaultScene(ctx);sceneModel.finalize();spinner.processes--;ok();});}function loadTextures(ctx){var gltfData=ctx.gltfData;var textures=gltfData.textures;if(textures){for(var _i427=0,len=textures.length;_i427<len;_i427++){loadTexture(ctx,textures[_i427]);}}}function loadTexture(ctx,texture){if(!texture.source||!texture.source.image){return;}var textureId="texture-".concat(ctx.nextId++);var minFilter=NearestMipMapLinearFilter;switch(texture.sampler.minFilter){case 9728:minFilter=NearestFilter;break;case 9729:minFilter=LinearFilter;break;case 9984:minFilter=NearestMipMapNearestFilter;break;case 9985:minFilter=LinearMipMapNearestFilter;break;case 9986:minFilter=NearestMipMapLinearFilter;break;case 9987:minFilter=LinearMipMapLinearFilter;break;}var magFilter=LinearFilter;switch(texture.sampler.magFilter){case 9728:magFilter=NearestFilter;break;case 9729:magFilter=LinearFilter;break;}var wrapS=RepeatWrapping;switch(texture.sampler.wrapS){case 33071:wrapS=ClampToEdgeWrapping;break;case 33648:wrapS=MirroredRepeatWrapping;break;case 10497:wrapS=RepeatWrapping;break;}var wrapT=RepeatWrapping;switch(texture.sampler.wrapT){case 33071:wrapT=ClampToEdgeWrapping;break;case 33648:wrapT=MirroredRepeatWrapping;break;case 10497:wrapT=RepeatWrapping;break;}var wrapR=RepeatWrapping;switch(texture.sampler.wrapR){case 33071:wrapR=ClampToEdgeWrapping;break;case 33648:wrapR=MirroredRepeatWrapping;break;case 10497:wrapR=RepeatWrapping;break;}ctx.sceneModel.createTexture({id:textureId,image:texture.source.image,flipY:!!texture.flipY,minFilter:minFilter,magFilter:magFilter,wrapS:wrapS,wrapT:wrapT,wrapR:wrapR,encoding:sRGBEncoding});texture._textureId=textureId;}function loadMaterials(ctx){var gltfData=ctx.gltfData;var materials=gltfData.materials;if(materials){for(var _i428=0,len=materials.length;_i428<len;_i428++){var material=materials[_i428];material._textureSetId=loadTextureSet(ctx,material);material._attributes=loadMaterialAttributes(ctx,material);}}}function loadTextureSet(ctx,material){var textureSetCfg={};if(material.normalTexture){textureSetCfg.normalTextureId=material.normalTexture.texture._textureId;}if(material.occlusionTexture){textureSetCfg.occlusionTextureId=material.occlusionTexture.texture._textureId;}if(material.emissiveTexture){textureSetCfg.emissiveTextureId=material.emissiveTexture.texture._textureId;}// const alphaMode = material.alphaMode;
 // switch (alphaMode) {
 //     case "NORMAL_OPAQUE":
 //         materialCfg.alphaMode = "opaque";