@xeokit/xeokit-sdk 2.4.0-alpha-62 → 2.4.0-alpha-65

package/dist/xeokit-sdk.es.js

@@ -59832,6 +59832,7 @@ class SnapBatchingDepthRenderer {
             src.push("isPerspective = float (isPerspectiveMatrix(projMatrix));");
         }
         src.push("gl_Position = clipPos;");
+        src.push("gl_PointSize = 1.0;"); // Windows needs this?
         src.push("  }");
         src.push("}");
         return src;
@@ -64572,7 +64573,7 @@ class SnapInstancingDepthBufInitRenderer {
         const clipping = sectionPlanesState.sectionPlanes.length > 0;
         const src = [];
         src.push ('#version 300 es');
-        src.push("// Points instancing snap vertex shader");
+        src.push("// SnapInstancingDepthBufInitRenderer vertex shader");
         src.push("#ifdef GL_FRAGMENT_PRECISION_HIGH");
         src.push("precision highp float;");
         src.push("precision highp int;");
@@ -64942,7 +64943,7 @@ class SnapInstancingDepthRenderer {
         const clipping = sectionPlanesState.sectionPlanes.length > 0;
         const src = [];
         src.push ('#version 300 es');
-        src.push("// Points instancing snap vertex shader");
+        src.push("// SnapInstancingDepthRenderer vertex shader");
         src.push("#ifdef GL_FRAGMENT_PRECISION_HIGH");
         src.push("precision highp float;");
         src.push("precision highp int;");
@@ -65019,6 +65020,7 @@ class SnapInstancingDepthRenderer {
             src.push("isPerspective = float (isPerspectiveMatrix(projMatrix));");
         }
         src.push("gl_Position = clipPos;");
+        src.push("gl_PointSize = 1.0;"); // Windows needs this?
         src.push("}");
         src.push("}");
         return src;
@@ -65030,7 +65032,7 @@ class SnapInstancingDepthRenderer {
         const clipping = sectionPlanesState.sectionPlanes.length > 0;
         const src = [];
         src.push ('#version 300 es');
-        src.push("// Points instancing pick depth fragment shader");
+        src.push("// SnapInstancingDepthRenderer fragment shader");
         src.push("#ifdef GL_FRAGMENT_PRECISION_HIGH");
         src.push("precision highp float;");
         src.push("precision highp int;");
@@ -65070,7 +65072,7 @@ class SnapInstancingDepthRenderer {
             src.push("}");
         }
         if (scene.logarithmicDepthBufferEnabled) {
-            src.push("gl_FragDepth = log2( vFragDepth ) * logDepthBufFC * 0.5;");
+            src.push("    gl_FragDepth = isPerspective == 0.0 ? gl_FragCoord.z : log2( vFragDepth ) * logDepthBufFC * 0.5;");
         }
         src.push("outCoords = ivec4(relativeToOriginPosition.xyz*coordinateScaler.xyz, layerNumber);");
         src.push("}");
@@ -76481,6 +76483,7 @@ class TrianglesDataTextureSnapDepthRenderer {
             src.push("isPerspective = float (isPerspectiveMatrix(projMatrix));");
         }
         src.push("gl_Position = clipPos;");
+        src.push("gl_PointSize = 1.0;"); // Windows needs this?
         src.push("  }");
         src.push("}");
         return src;
@@ -118092,6 +118095,8 @@ function inflate$9(deflatedData) {
 
 function load$9(viewer, options, inflatedData, sceneModel, metaModel, manifestCtx) {
 
+    manifestCtx.getNextId();
+
     sceneModel.positionsCompression = "precompressed";
     sceneModel.normalsCompression = "precompressed";
 
@@ -118189,7 +118194,7 @@ const ParserV1 = {
     parse: function (viewer, options, elements, sceneModel, metaModel, manifestCtx) {
         const deflatedData = extract$9(elements);
         const inflatedData = inflate$9(deflatedData);
-        load$9(viewer, options, inflatedData, sceneModel);
+        load$9(viewer, options, inflatedData, sceneModel, metaModel, manifestCtx);
     }
 };
 
@@ -118269,6 +118274,8 @@ const decompressColor$8 = (function () {
 
 function load$8(viewer, options, inflatedData, sceneModel, metaModel, manifestCtx) {
 
+    const modelPartId = manifestCtx.getNextId();
+
     sceneModel.positionsCompression = "precompressed";
     sceneModel.normalsCompression = "precompressed";
 
@@ -118338,7 +118345,7 @@ function load$8(viewer, options, inflatedData, sceneModel, metaModel, manifestCt
             const jj = entityMeshIds [j];
 
             const lastMesh = (jj === (numMeshes - 1));
-            const meshId = manifestCtx.nextMeshId++;
+            const meshId = manifestCtx.getNextId();
 
             const color = decompressColor$8(meshColors.subarray((jj * 4), (jj * 4) + 3));
             const opacity = meshColors[(jj * 4) + 3] / 255.0;
@@ -118350,7 +118357,7 @@ function load$8(viewer, options, inflatedData, sceneModel, metaModel, manifestCt
 
             if (entityUsesInstancing [i] === 1) {
 
-                const geometryId = "geometry." + jj;
+                const geometryId = `${modelPartId}.geometry.${meshId}.${jj}`;
 
                 if (!(geometryId in alreadyCreatedGeometries)) {
 
@@ -118372,7 +118379,7 @@ function load$8(viewer, options, inflatedData, sceneModel, metaModel, manifestCt
                     color: color,
                     opacity: opacity,
                     matrix: entityMatrix,
-                    geometryId: geometryId,
+                    geometryId,
                 }));
 
                 meshIds.push(meshId);
@@ -118483,6 +118490,8 @@ const decompressColor$7 = (function () {
 
 function load$7(viewer, options, inflatedData, sceneModel, metaModel, manifestCtx) {
 
+    const modelPartId = manifestCtx.getNextId();
+
     sceneModel.positionsCompression = "precompressed";
     sceneModel.normalsCompression = "precompressed";
 
@@ -118555,7 +118564,7 @@ function load$7(viewer, options, inflatedData, sceneModel, metaModel, manifestCt
             var jj = entityMeshIds [j];
 
             const lastMesh = (jj === (numMeshes - 1));
-            const meshId = entityId + ".mesh." + jj;
+            const meshId = `${modelPartId}.${entityId}.mesh.${jj}`;
 
             const color = decompressColor$7(meshColors.subarray((jj * 4), (jj * 4) + 3));
             const opacity = meshColors[(jj * 4) + 3] / 255.0;
@@ -118566,7 +118575,8 @@ function load$7(viewer, options, inflatedData, sceneModel, metaModel, manifestCt
             var tmpEdgeIndices = edgeIndices.subarray(meshEdgesIndices [jj], lastMesh ? edgeIndices.length : meshEdgesIndices [jj + 1]);
 
             if (entityUsesInstancing [i] === 1) {
-                var geometryId = "geometry." + jj;
+
+                const geometryId = `${modelPartId}.geometry.${meshId}.${jj}`;
 
                 if (!(geometryId in _alreadyCreatedGeometries)) {
 
@@ -118588,7 +118598,7 @@ function load$7(viewer, options, inflatedData, sceneModel, metaModel, manifestCt
                     color: color,
                     opacity: opacity,
                     matrix: entityMatrix,
-                    geometryId: geometryId,
+                    geometryId,
                 }));
 
                 meshIds.push(meshId);
@@ -118627,7 +118637,7 @@ const ParserV3 = {
     parse: function (viewer, options, elements, sceneModel, metaModel, manifestCtx) {
         const deflatedData = extract$7(elements);
         const inflatedData = inflate$7(deflatedData);
-        load$7(viewer, options, inflatedData, sceneModel);
+        load$7(viewer, options, inflatedData, sceneModel, metaModel, manifestCtx);
     }
 };
 
@@ -118697,6 +118707,8 @@ const decompressColor$6 = (function () {
 
 function load$6(viewer, options, inflatedData, sceneModel, metaModel, manifestCtx) {
 
+    const modelPartId = manifestCtx.getNextId();
+
     sceneModel.positionsCompression = "precompressed";
     sceneModel.normalsCompression = "precompressed";
 
@@ -118802,7 +118814,7 @@ function load$6(viewer, options, inflatedData, sceneModel, metaModel, manifestCt
 
             // Primitive instanced by more than one entity, and has positions in Model-space
 
-            var geometryId = "geometry" + orderedPrimitiveIndex; // These IDs are local to the SceneModel
+           const geometryId = `${modelPartId}-geometry.${orderedPrimitiveIndex}`; // These IDs are local to the SceneModel
 
             sceneModel.createGeometry({
                 id: geometryId,
@@ -118818,7 +118830,7 @@ function load$6(viewer, options, inflatedData, sceneModel, metaModel, manifestCt
 
             // Primitive is used only by one entity, and has positions pre-transformed into World-space
 
-            const meshId = orderedPrimitiveIndex; // These IDs are local to the SceneModel
+            const meshId = `${modelPartId}-${orderedPrimitiveIndex}`;
 
             const entityIndex = batchedPrimitiveEntityIndexes[orderedPrimitiveIndex];
             eachEntityId[entityIndex];
@@ -118861,8 +118873,9 @@ function load$6(viewer, options, inflatedData, sceneModel, metaModel, manifestCt
 
                 const meshDefaults = {}; // TODO: get from lookup from entity IDs
 
-                const meshId = "instance." + countInstances++;
-                const geometryId = "geometry" + primitiveIndex;
+                const meshId = `${modelPartId}-instance.${countInstances++}`;
+                const geometryId = `${modelPartId}-geometry.${primitiveIndex}`; // These IDs are local to the SceneModel
+
                 const matricesIndex = (eachEntityMatricesPortion [entityIndex]) * 16;
                 const matrix = matrices.subarray(matricesIndex, matricesIndex + 16);
 
@@ -118898,7 +118911,7 @@ const ParserV4 = {
     parse: function (viewer, options, elements, sceneModel, metaModel, manifestCtx) {
         const deflatedData = extract$6(elements);
         const inflatedData = inflate$6(deflatedData);
-        load$6(viewer, options, inflatedData, sceneModel);
+        load$6(viewer, options, inflatedData, sceneModel, metaModel, manifestCtx);
     }
 };
 
@@ -118963,6 +118976,8 @@ const decompressColor$5 = (function () {
 
 function load$5(viewer, options, inflatedData, sceneModel, metaModel, manifestCtx) {
 
+    const modelPartId = manifestCtx.getNextId();
+
     sceneModel.positionsCompression = "disabled"; // Positions in XKT V4 are floats, which we never quantize, for precision with big models
     sceneModel.normalsCompression = "precompressed"; // Normals are oct-encoded though
 
@@ -119040,7 +119055,7 @@ function load$5(viewer, options, inflatedData, sceneModel, metaModel, manifestCt
 
             // Primitive instanced by more than one entity, and has positions in Model-space
 
-            var geometryId = "geometry" + primitiveIndex; // These IDs are local to the SceneModel
+            const geometryId = `${modelPartId}-geometry.${primitiveIndex}`; // These IDs are local to the SceneModel
 
             sceneModel.createGeometry({
                 id: geometryId,
@@ -119134,7 +119149,7 @@ const ParserV5 = {
     parse: function (viewer, options, elements, sceneModel, metaModel, manifestCtx) {
         const deflatedData = extract$5(elements);
         const inflatedData = inflate$5(deflatedData);
-        load$5(viewer, options, inflatedData, sceneModel);
+        load$5(viewer, options, inflatedData, sceneModel, metaModel, manifestCtx);
     }
 };
 
@@ -119209,6 +119224,8 @@ const decompressColor$4 = (function () {
 
 function load$4(viewer, options, inflatedData, sceneModel, metaModel, manifestCtx) {
 
+    const modelPartId = manifestCtx.getNextId();
+
     const positions = inflatedData.positions;
     const normals = inflatedData.normals;
     const indices = inflatedData.indices;
@@ -119356,13 +119373,13 @@ function load$4(viewer, options, inflatedData, sceneModel, metaModel, manifestCt
                 const color = decompressColor$4(eachPrimitiveColorAndOpacity.subarray((primitiveIndex * 4), (primitiveIndex * 4) + 3));
                 const opacity = eachPrimitiveColorAndOpacity[(primitiveIndex * 4) + 3] / 255.0;
 
-                const meshId = manifestCtx.nextMeshId++;
+                const meshId = manifestCtx.getNextId();
 
                 if (isReusedPrimitive) {
 
                     // Create mesh for multi-use primitive - create (or reuse) geometry, create mesh using that geometry
 
-                    const geometryId = "geometry." + tileIndex + "." + primitiveIndex; // These IDs are local to the SceneModel
+                    const geometryId = `${modelPartId}-geometry.${tileIndex}.${primitiveIndex}`; // These IDs are local to the SceneModel
 
                     if (!geometryCreated[geometryId]) {
 
@@ -119548,6 +119565,8 @@ function convertColorsRGBToRGBA$1(colorsRGB) {
 
 function load$3(viewer, options, inflatedData, sceneModel, metaModel, manifestCtx) {
 
+    const modelPartId = manifestCtx.getNextId();
+
     const positions = inflatedData.positions;
     const normals = inflatedData.normals;
     const colors = inflatedData.colors;
@@ -119700,7 +119719,7 @@ function load$3(viewer, options, inflatedData, sceneModel, metaModel, manifestCt
                 const meshMetallic = eachMeshMaterial[(meshIndex * 6) + 4] / 255.0;
                 const meshRoughness = eachMeshMaterial[(meshIndex * 6) + 5] / 255.0;
 
-                const meshId = manifestCtx.nextMeshId++;
+                const meshId = manifestCtx.getNextId();
 
                 if (isReusedGeometry) {
 
@@ -119709,7 +119728,7 @@ function load$3(viewer, options, inflatedData, sceneModel, metaModel, manifestCt
                     const meshMatrixIndex = eachMeshMatricesPortion[meshIndex];
                     const meshMatrix = matrices.slice(meshMatrixIndex, meshMatrixIndex + 16);
 
-                    const geometryId = "geometry." + tileIndex + "." + geometryIndex; // These IDs are local to the SceneModel
+                    const geometryId = `${modelPartId}-geometry.${tileIndex}.${geometryIndex}`; // These IDs are local to the SceneModel
 
                     if (!geometryCreated[geometryId]) {
 
@@ -119987,6 +120006,8 @@ function convertColorsRGBToRGBA(colorsRGB) {
 
 function load$2(viewer, options, inflatedData, sceneModel, metaModel, manifestCtx) {
 
+    const modelPartId = manifestCtx.getNextId();
+
     const types = JSON.parse(inflatedData.types);
     const eachMetaObjectId = JSON.parse(inflatedData.eachMetaObjectId);
     const eachMetaObjectType = inflatedData.eachMetaObjectType;
@@ -120174,7 +120195,7 @@ function load$2(viewer, options, inflatedData, sceneModel, metaModel, manifestCt
                 const meshMetallic = eachMeshMaterial[(meshIndex * 6) + 4] / 255.0;
                 const meshRoughness = eachMeshMaterial[(meshIndex * 6) + 5] / 255.0;
 
-                const meshId = manifestCtx.nextMeshId++;
+                const meshId = manifestCtx.getNextId();
 
                 if (isReusedGeometry) {
 
@@ -120183,7 +120204,7 @@ function load$2(viewer, options, inflatedData, sceneModel, metaModel, manifestCt
                     const meshMatrixIndex = eachMeshMatricesPortion[meshIndex];
                     const meshMatrix = matrices.slice(meshMatrixIndex, meshMatrixIndex + 16);
 
-                    const geometryId = "geometry." + tileIndex + "." + geometryIndex; // These IDs are local to the SceneModel
+                     const geometryId = `${modelPartId}-geometry.${tileIndex}.${geometryIndex}`; // These IDs are local to the SceneModel
 
                     let geometryArrays = geometryArraysCache[geometryId];
 
@@ -120518,6 +120539,8 @@ const decompressColor$1 = (function () {
 
 function load$1(viewer, options, inflatedData, sceneModel, metaModel, manifestCtx) {
 
+    const modelPartId = manifestCtx.getNextId();
+
     const metadata = inflatedData.metadata;
 
     const positions = inflatedData.positions;
@@ -120677,7 +120700,7 @@ function load$1(viewer, options, inflatedData, sceneModel, metaModel, manifestCt
                 const meshMetallic = eachMeshMaterial[(meshIndex * 6) + 4] / 255.0;
                 const meshRoughness = eachMeshMaterial[(meshIndex * 6) + 5] / 255.0;
 
-                const meshId = manifestCtx.nextMeshId++;
+                const meshId = manifestCtx.getNextId();
 
                 if (isReusedGeometry) {
 
@@ -120686,7 +120709,7 @@ function load$1(viewer, options, inflatedData, sceneModel, metaModel, manifestCt
                     const meshMatrixIndex = eachMeshMatricesPortion[meshIndex];
                     const meshMatrix = matrices.slice(meshMatrixIndex, meshMatrixIndex + 16);
 
-                    const geometryId = "geometry." + tileIndex + "." + geometryIndex; // These IDs are local to the SceneModel
+                    const geometryId = `${modelPartId}-geometry.${tileIndex}.${geometryIndex}`; // These IDs are local to the SceneModel
 
                     let geometryArrays = geometryArraysCache[geometryId];
 
@@ -121022,6 +121045,8 @@ const decompressColor = (function () {
 
 function load(viewer, options, inflatedData, sceneModel, metaModel, manifestCtx) {
 
+    const modelPartId = manifestCtx.getNextId();
+
     const metadata = inflatedData.metadata;
     const textureData = inflatedData.textureData;
     const eachTextureDataPortion = inflatedData.eachTextureDataPortion;
@@ -121088,7 +121113,7 @@ function load(viewer, options, inflatedData, sceneModel, metaModel, manifestCtx)
 
             const imageDataSubarray = new Uint8Array(textureData.subarray(textureDataPortionStart, textureDataPortionEnd));
             const arrayBuffer = imageDataSubarray.buffer;
-            const textureId = `texture-${textureIndex}`;
+            const textureId = `${modelPartId}-texture-${textureIndex}`;
 
             if (compressed) {
 
@@ -121129,7 +121154,7 @@ function load(viewer, options, inflatedData, sceneModel, metaModel, manifestCtx)
 
     for (let textureSetIndex = 0; textureSetIndex < numTextureSets; textureSetIndex++) {
         const eachTextureSetTexturesIndex = textureSetIndex * 5;
-        const textureSetId = `textureSet-${textureSetIndex}`;
+        const textureSetId = `${modelPartId}-textureSet-${textureSetIndex}`;
         const colorTextureIndex = eachTextureSetTextures[eachTextureSetTexturesIndex + 0];
         const metallicRoughnessTextureIndex = eachTextureSetTextures[eachTextureSetTexturesIndex + 1];
         const normalsTextureIndex = eachTextureSetTextures[eachTextureSetTexturesIndex + 2];
@@ -121137,11 +121162,11 @@ function load(viewer, options, inflatedData, sceneModel, metaModel, manifestCtx)
         const occlusionTextureIndex = eachTextureSetTextures[eachTextureSetTexturesIndex + 4];
         sceneModel.createTextureSet({
             id: textureSetId,
-            colorTextureId: colorTextureIndex >= 0 ? `texture-${colorTextureIndex}` : null,
-            normalsTextureId: normalsTextureIndex >= 0 ? `texture-${normalsTextureIndex}` : null,
-            metallicRoughnessTextureId: metallicRoughnessTextureIndex >= 0 ? `texture-${metallicRoughnessTextureIndex}` : null,
-            emissiveTextureId: emissiveTextureIndex >= 0 ? `texture-${emissiveTextureIndex}` : null,
-            occlusionTextureId: occlusionTextureIndex >= 0 ? `texture-${occlusionTextureIndex}` : null
+            colorTextureId: colorTextureIndex >= 0 ? `${modelPartId}-texture-${colorTextureIndex}` : null,
+            normalsTextureId: normalsTextureIndex >= 0 ? `${modelPartId}-texture-${normalsTextureIndex}` : null,
+            metallicRoughnessTextureId: metallicRoughnessTextureIndex >= 0 ? `${modelPartId}-texture-${metallicRoughnessTextureIndex}` : null,
+            emissiveTextureId: emissiveTextureIndex >= 0 ? `${modelPartId}-texture-${emissiveTextureIndex}` : null,
+            occlusionTextureId: occlusionTextureIndex >= 0 ? `${modelPartId}-texture-${occlusionTextureIndex}` : null
         });
     }
 
@@ -121264,14 +121289,14 @@ function load(viewer, options, inflatedData, sceneModel, metaModel, manifestCtx)
 
                 const textureSetIndex = eachMeshTextureSet[meshIndex];
 
-                const textureSetId = (textureSetIndex >= 0) ? `textureSet-${textureSetIndex}` : null;
+                const textureSetId = (textureSetIndex >= 0) ? `${modelPartId}-textureSet-${textureSetIndex}` : null;
 
                 const meshColor = decompressColor(eachMeshMaterialAttributes.subarray((meshIndex * 6), (meshIndex * 6) + 3));
                 const meshOpacity = eachMeshMaterialAttributes[(meshIndex * 6) + 3] / 255.0;
                 const meshMetallic = eachMeshMaterialAttributes[(meshIndex * 6) + 4] / 255.0;
                 const meshRoughness = eachMeshMaterialAttributes[(meshIndex * 6) + 5] / 255.0;
 
-                const meshId = manifestCtx.nextMeshId++;
+                const meshId = manifestCtx.getNextId();
 
                 if (isReusedGeometry) {
 
@@ -121280,7 +121305,7 @@ function load(viewer, options, inflatedData, sceneModel, metaModel, manifestCtx)
                     const meshMatrixIndex = eachMeshMatricesPortion[meshIndex];
                     const meshMatrix = matrices.slice(meshMatrixIndex, meshMatrixIndex + 16);
 
-                    const geometryId = "geometry." + tileIndex + "." + geometryIndex; // These IDs are local to the SceneModel
+                    const geometryId = `${modelPartId}-geometry.${tileIndex}.${geometryIndex}`; // These IDs are local to the SceneModel
 
                     let geometryArrays = geometryArraysCache[geometryId];
 
@@ -121379,7 +121404,7 @@ function load(viewer, options, inflatedData, sceneModel, metaModel, manifestCtx)
 
                             sceneModel.createMesh(utils.apply(meshDefaults, {
                                 id: meshId,
-                                textureSetId: textureSetId,
+                                textureSetId,
                                 origin: tileCenter,
                                 primitive: geometryArrays.primitiveName,
                                 positionsCompressed: transformedAndRecompressedPositions,
@@ -121418,8 +121443,8 @@ function load(viewer, options, inflatedData, sceneModel, metaModel, manifestCtx)
 
                             sceneModel.createMesh(utils.apply(meshDefaults, {
                                 id: meshId,
-                                geometryId: geometryId,
-                                textureSetId: textureSetId,
+                                geometryId,
+                                textureSetId,
                                 matrix: meshMatrix,
                                 color: meshColor,
                                 metallic: meshMetallic,
@@ -121494,7 +121519,7 @@ function load(viewer, options, inflatedData, sceneModel, metaModel, manifestCtx)
 
                         sceneModel.createMesh(utils.apply(meshDefaults, {
                             id: meshId,
-                            textureSetId: textureSetId,
+                            textureSetId,
                             origin: tileCenter,
                             primitive: primitiveName,
                             positionsCompressed: geometryPositions,
@@ -122436,8 +122461,11 @@ class XKTLoaderPlugin extends Plugin {
             sceneModel.fire("error", errMsg);
         };
 
+        let nextId = 0;
         const manifestCtx = {
-            nextMeshId: 0
+            getNextId: () => {
+                return `${modelId}.${nextId++}`;
+            }
         };
 
         if (params.metaModelSrc || params.metaModelData) {
@@ -122480,7 +122508,6 @@ class XKTLoaderPlugin extends Plugin {
             }
 
 
-
         } else {
 
             if (params.src) {
@@ -122552,9 +122579,9 @@ class XKTLoaderPlugin extends Plugin {
 
     _loadModel(src, params, options, sceneModel, metaModel, manifestCtx, done, error) {
         this._dataSource.getXKT(params.src, (arrayBuffer) => {
-                this._parseModel(arrayBuffer, params, options, sceneModel, metaModel, manifestCtx);
-                done();
-            }, error);
+            this._parseModel(arrayBuffer, params, options, sceneModel, metaModel, manifestCtx);
+            done();
+        }, error);
     }
 
     _parseModel(arrayBuffer, params, options, sceneModel, metaModel, manifestCtx) {