@loaders.gl/tile-converter 4.0.0-alpha.6 → 4.0.0-alpha.8
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/bin/converter.js +1 -1
- package/dist/3d-tiles-attributes-worker.js +2 -2
- package/dist/3d-tiles-attributes-worker.js.map +3 -3
- package/dist/3d-tiles-converter/3d-tiles-converter.d.ts.map +1 -1
- package/dist/3d-tiles-converter/3d-tiles-converter.js +4 -3
- package/dist/3d-tiles-converter/helpers/b3dm-converter.d.ts +0 -8
- package/dist/3d-tiles-converter/helpers/b3dm-converter.d.ts.map +1 -1
- package/dist/3d-tiles-converter/helpers/b3dm-converter.js +2 -15
- package/dist/converter.min.js +75 -76
- package/dist/deps-installer/deps-installer.js +4 -4
- package/dist/dist.min.js +2529 -1884
- package/dist/es5/3d-tiles-attributes-worker.js +1 -1
- package/dist/es5/3d-tiles-converter/3d-tiles-converter.js +0 -3
- package/dist/es5/3d-tiles-converter/3d-tiles-converter.js.map +1 -1
- package/dist/es5/3d-tiles-converter/helpers/b3dm-converter.js +2 -10
- package/dist/es5/3d-tiles-converter/helpers/b3dm-converter.js.map +1 -1
- package/dist/es5/deps-installer/deps-installer.js +5 -5
- package/dist/es5/deps-installer/deps-installer.js.map +1 -1
- package/dist/es5/i3s-attributes-worker.js +1 -1
- package/dist/es5/i3s-attributes-worker.js.map +1 -1
- package/dist/es5/i3s-converter/helpers/batch-ids-extensions.js +4 -4
- package/dist/es5/i3s-converter/helpers/batch-ids-extensions.js.map +1 -1
- package/dist/es5/i3s-converter/helpers/coordinate-converter.js +6 -7
- package/dist/es5/i3s-converter/helpers/coordinate-converter.js.map +1 -1
- package/dist/es5/i3s-converter/helpers/geometry-converter.js +49 -30
- package/dist/es5/i3s-converter/helpers/geometry-converter.js.map +1 -1
- package/dist/es5/i3s-converter/helpers/gltf-attributes.js +46 -16
- package/dist/es5/i3s-converter/helpers/gltf-attributes.js.map +1 -1
- package/dist/es5/i3s-converter/helpers/load-3d-tiles.js +82 -0
- package/dist/es5/i3s-converter/helpers/load-3d-tiles.js.map +1 -0
- package/dist/es5/i3s-converter/helpers/node-index-document.js +74 -45
- package/dist/es5/i3s-converter/helpers/node-index-document.js.map +1 -1
- package/dist/es5/i3s-converter/helpers/preprocess-3d-tiles.js +111 -0
- package/dist/es5/i3s-converter/helpers/preprocess-3d-tiles.js.map +1 -0
- package/dist/es5/i3s-converter/helpers/tileset-traversal.js +82 -0
- package/dist/es5/i3s-converter/helpers/tileset-traversal.js.map +1 -0
- package/dist/es5/i3s-converter/i3s-converter.js +545 -523
- package/dist/es5/i3s-converter/i3s-converter.js.map +1 -1
- package/dist/es5/i3s-converter/types.js +16 -0
- package/dist/es5/i3s-converter/types.js.map +1 -1
- package/dist/es5/i3s-server/README.md +19 -0
- package/dist/es5/i3s-server/app.js +10 -1
- package/dist/es5/i3s-server/app.js.map +1 -1
- package/dist/es5/i3s-server/controllers/slpk-controller.js +84 -0
- package/dist/es5/i3s-server/controllers/slpk-controller.js.map +1 -0
- package/dist/es5/i3s-server/routes/slpk-router.js +71 -0
- package/dist/es5/i3s-server/routes/slpk-router.js.map +1 -0
- package/dist/es5/i3s-server/utils/create-scene-server.js +17 -0
- package/dist/es5/i3s-server/utils/create-scene-server.js.map +1 -0
- package/dist/es5/lib/utils/file-utils.js +1 -1
- package/dist/es5/lib/utils/file-utils.js.map +1 -1
- package/dist/es5/lib/utils/geometry-utils.js +15 -0
- package/dist/es5/lib/utils/geometry-utils.js.map +1 -0
- package/dist/es5/lib/utils/lod-conversion-utils.js.map +1 -1
- package/dist/es5/pgm-loader.js +1 -1
- package/dist/esm/3d-tiles-attributes-worker.js +1 -1
- package/dist/esm/3d-tiles-converter/3d-tiles-converter.js +0 -3
- package/dist/esm/3d-tiles-converter/3d-tiles-converter.js.map +1 -1
- package/dist/esm/3d-tiles-converter/helpers/b3dm-converter.js +2 -8
- package/dist/esm/3d-tiles-converter/helpers/b3dm-converter.js.map +1 -1
- package/dist/esm/deps-installer/deps-installer.js +5 -5
- package/dist/esm/deps-installer/deps-installer.js.map +1 -1
- package/dist/esm/i3s-attributes-worker.js +1 -1
- package/dist/esm/i3s-attributes-worker.js.map +1 -1
- package/dist/esm/i3s-converter/helpers/batch-ids-extensions.js +4 -4
- package/dist/esm/i3s-converter/helpers/batch-ids-extensions.js.map +1 -1
- package/dist/esm/i3s-converter/helpers/coordinate-converter.js +6 -7
- package/dist/esm/i3s-converter/helpers/coordinate-converter.js.map +1 -1
- package/dist/esm/i3s-converter/helpers/geometry-converter.js +37 -18
- package/dist/esm/i3s-converter/helpers/geometry-converter.js.map +1 -1
- package/dist/esm/i3s-converter/helpers/gltf-attributes.js +50 -16
- package/dist/esm/i3s-converter/helpers/gltf-attributes.js.map +1 -1
- package/dist/esm/i3s-converter/helpers/load-3d-tiles.js +35 -0
- package/dist/esm/i3s-converter/helpers/load-3d-tiles.js.map +1 -0
- package/dist/esm/i3s-converter/helpers/node-index-document.js +14 -1
- package/dist/esm/i3s-converter/helpers/node-index-document.js.map +1 -1
- package/dist/esm/i3s-converter/helpers/preprocess-3d-tiles.js +48 -0
- package/dist/esm/i3s-converter/helpers/preprocess-3d-tiles.js.map +1 -0
- package/dist/esm/i3s-converter/helpers/tileset-traversal.js +14 -0
- package/dist/esm/i3s-converter/helpers/tileset-traversal.js.map +1 -0
- package/dist/esm/i3s-converter/i3s-converter.js +134 -127
- package/dist/esm/i3s-converter/i3s-converter.js.map +1 -1
- package/dist/esm/i3s-converter/types.js +10 -1
- package/dist/esm/i3s-converter/types.js.map +1 -1
- package/dist/esm/i3s-server/README.md +19 -0
- package/dist/esm/i3s-server/app.js +11 -1
- package/dist/esm/i3s-server/app.js.map +1 -1
- package/dist/esm/i3s-server/controllers/slpk-controller.js +36 -0
- package/dist/esm/i3s-server/controllers/slpk-controller.js.map +1 -0
- package/dist/esm/i3s-server/routes/slpk-router.js +33 -0
- package/dist/esm/i3s-server/routes/slpk-router.js.map +1 -0
- package/dist/esm/i3s-server/utils/create-scene-server.js +16 -0
- package/dist/esm/i3s-server/utils/create-scene-server.js.map +1 -0
- package/dist/esm/lib/utils/file-utils.js +1 -1
- package/dist/esm/lib/utils/file-utils.js.map +1 -1
- package/dist/esm/lib/utils/geometry-utils.js +8 -0
- package/dist/esm/lib/utils/geometry-utils.js.map +1 -0
- package/dist/esm/lib/utils/lod-conversion-utils.js.map +1 -1
- package/dist/esm/pgm-loader.js +1 -1
- package/dist/i3s-attributes-worker.d.ts +10 -2
- package/dist/i3s-attributes-worker.d.ts.map +1 -1
- package/dist/i3s-attributes-worker.js +2 -2
- package/dist/i3s-attributes-worker.js.map +3 -3
- package/dist/i3s-converter/helpers/batch-ids-extensions.d.ts +4 -2
- package/dist/i3s-converter/helpers/batch-ids-extensions.d.ts.map +1 -1
- package/dist/i3s-converter/helpers/batch-ids-extensions.js +4 -7
- package/dist/i3s-converter/helpers/coordinate-converter.d.ts +3 -4
- package/dist/i3s-converter/helpers/coordinate-converter.d.ts.map +1 -1
- package/dist/i3s-converter/helpers/coordinate-converter.js +8 -9
- package/dist/i3s-converter/helpers/geometry-converter.d.ts +9 -4
- package/dist/i3s-converter/helpers/geometry-converter.d.ts.map +1 -1
- package/dist/i3s-converter/helpers/geometry-converter.js +84 -54
- package/dist/i3s-converter/helpers/gltf-attributes.d.ts +22 -3
- package/dist/i3s-converter/helpers/gltf-attributes.d.ts.map +1 -1
- package/dist/i3s-converter/helpers/gltf-attributes.js +62 -22
- package/dist/i3s-converter/helpers/load-3d-tiles.d.ts +18 -0
- package/dist/i3s-converter/helpers/load-3d-tiles.d.ts.map +1 -0
- package/dist/i3s-converter/helpers/load-3d-tiles.js +53 -0
- package/dist/i3s-converter/helpers/node-index-document.d.ts +8 -0
- package/dist/i3s-converter/helpers/node-index-document.d.ts.map +1 -1
- package/dist/i3s-converter/helpers/node-index-document.js +20 -2
- package/dist/i3s-converter/helpers/node-pages.js +1 -1
- package/dist/i3s-converter/helpers/preprocess-3d-tiles.d.ts +23 -0
- package/dist/i3s-converter/helpers/preprocess-3d-tiles.d.ts.map +1 -0
- package/dist/i3s-converter/helpers/preprocess-3d-tiles.js +76 -0
- package/dist/i3s-converter/helpers/tileset-traversal.d.ts +25 -0
- package/dist/i3s-converter/helpers/tileset-traversal.d.ts.map +1 -0
- package/dist/i3s-converter/helpers/tileset-traversal.js +29 -0
- package/dist/i3s-converter/i3s-converter.d.ts +40 -40
- package/dist/i3s-converter/i3s-converter.d.ts.map +1 -1
- package/dist/i3s-converter/i3s-converter.js +150 -125
- package/dist/i3s-converter/types.d.ts +18 -0
- package/dist/i3s-converter/types.d.ts.map +1 -1
- package/dist/i3s-converter/types.js +15 -0
- package/dist/i3s-server/app.d.ts.map +1 -1
- package/dist/i3s-server/app.js +9 -1
- package/dist/i3s-server/controllers/slpk-controller.d.ts +3 -0
- package/dist/i3s-server/controllers/slpk-controller.d.ts.map +1 -0
- package/dist/i3s-server/controllers/slpk-controller.js +32 -0
- package/dist/i3s-server/routes/slpk-router.d.ts +3 -0
- package/dist/i3s-server/routes/slpk-router.d.ts.map +1 -0
- package/dist/i3s-server/routes/slpk-router.js +33 -0
- package/dist/i3s-server/utils/create-scene-server.d.ts +11 -0
- package/dist/i3s-server/utils/create-scene-server.d.ts.map +1 -0
- package/dist/i3s-server/utils/create-scene-server.js +14 -0
- package/dist/lib/utils/file-utils.d.ts.map +1 -1
- package/dist/lib/utils/file-utils.js +2 -1
- package/dist/lib/utils/geometry-utils.d.ts +9 -0
- package/dist/lib/utils/geometry-utils.d.ts.map +1 -0
- package/dist/lib/utils/geometry-utils.js +18 -0
- package/dist/lib/utils/lod-conversion-utils.d.ts +3 -2
- package/dist/lib/utils/lod-conversion-utils.d.ts.map +1 -1
- package/dist/lib/utils/lod-conversion-utils.js +1 -1
- package/package.json +15 -16
- package/src/3d-tiles-converter/3d-tiles-converter.ts +9 -8
- package/src/3d-tiles-converter/helpers/b3dm-converter.ts +2 -16
- package/src/deps-installer/deps-installer.ts +4 -4
- package/src/i3s-attributes-worker.ts +11 -2
- package/src/i3s-converter/helpers/batch-ids-extensions.ts +15 -19
- package/src/i3s-converter/helpers/coordinate-converter.ts +11 -10
- package/src/i3s-converter/helpers/geometry-converter.ts +154 -95
- package/src/i3s-converter/helpers/gltf-attributes.ts +85 -25
- package/src/i3s-converter/helpers/load-3d-tiles.ts +68 -0
- package/src/i3s-converter/helpers/node-index-document.ts +22 -2
- package/src/i3s-converter/helpers/preprocess-3d-tiles.ts +81 -0
- package/src/i3s-converter/helpers/tileset-traversal.ts +51 -0
- package/src/i3s-converter/i3s-converter.ts +229 -178
- package/src/i3s-converter/types.ts +20 -0
- package/src/i3s-server/README.md +19 -0
- package/src/i3s-server/app.js +8 -1
- package/src/i3s-server/controllers/slpk-controller.js +38 -0
- package/src/i3s-server/routes/slpk-router.js +33 -0
- package/src/i3s-server/utils/create-scene-server.js +15 -0
- package/src/lib/utils/file-utils.ts +2 -1
- package/src/lib/utils/geometry-utils.ts +14 -0
- package/src/lib/utils/lod-conversion-utils.ts +6 -2
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"b3dm-converter.js","names":["encodeSync","GLTFScenegraph","GLTFWriter","Tile3DWriter","Matrix4","Vector3","Ellipsoid","convertTextureAtlas","Z_UP_TO_Y_UP_MATRIX","scratchVector","B3dmConverter","constructor","_defineProperty","convert","i3sAttributesData","featureAttributes","arguments","length","undefined","gltf","buildGltf","b3dm","gltfEncoded","Uint8Array","type","featuresLength","_getFeaturesLength","batchTable","tileContent","textureFormat","material","attributes","indices","originalIndices","cartesianOrigin","cartographicOrigin","modelMatrix","gltfBuilder","textureIndex","_addI3sTextureToGltf","pbrMaterialInfo","_convertI3sMaterialToGltfMaterial","materialIndex","addMaterial","positions","positionsValue","value","uvRegions","texCoords","_normalizePositions","_createBatchIds","normals","_checkNormals","_generateSynteticIndices","size","meshIndex","addMesh","mode","transformMatrix","_generateTransformMatrix","nodeIndex","addNode","matrix","sceneIndex","addScene","nodeIndices","setDefaultScene","createBinaryChunk","gltfBuffer","texture","selectedTexture","pbrMetallicRoughness","baseColorTexture","source","image","mimeType","_deduceMimeTypeFromFormat","imageIndex","addImage","addTexture","colors","newPositionsValue","Float32Array","index","vertex","subarray","cartesianOriginVector","vertexVector","Array","from","transform","add","WGS84","cartographicToCartesian","subtract","set","translateOriginMatrix","translate","result","multiplyLeft","i3sContent","featureIds","OBJECTID","objectIds","i","featureId","batchId","indexOf","_BATCHID","byteOffset","vertexCount","Uint32Array","format","console","warn","concat","isTextureIndexExists","alphaMode","doubleSided","metallicFactor","roughnessFactor","texCoord","baseColorFactor","_setGltfTexture","materialDefinition","emissiveTexture","metallicRoughnessTexture","normalTexture","occlusionTexture","firstKey","Object","keys","find"],"sources":["../../../../src/3d-tiles-converter/helpers/b3dm-converter.ts"],"sourcesContent":["import type {I3SAttributesData} from '../../3d-tiles-attributes-worker';\n\nimport {encodeSync} from '@loaders.gl/core';\nimport {GLTFScenegraph, GLTFWriter} from '@loaders.gl/gltf';\nimport {Tile3DWriter} from '@loaders.gl/3d-tiles';\nimport {Matrix4, Vector3} from '@math.gl/core';\nimport {Ellipsoid} from '@math.gl/geospatial';\nimport {convertTextureAtlas} from './texture-atlas';\n\nconst Z_UP_TO_Y_UP_MATRIX = new Matrix4([1, 0, 0, 0, 0, 0, -1, 0, 0, 1, 0, 0, 0, 0, 0, 1]);\nconst scratchVector = new Vector3();\n\n/**\n * Converts content of an I3S node to *.b3dm's file content\n */\nexport default class B3dmConverter {\n // @ts-expect-error\n rtcCenter: Float32Array;\n i3sTile: any;\n\n /**\n * The starter of content conversion\n * @param i3sTile - Tile3D instance for I3S node\n * @returns - encoded content\n */\n async convert(\n i3sAttributesData: I3SAttributesData,\n featureAttributes: any = null\n ): Promise<ArrayBuffer> {\n const gltf = await this.buildGltf(i3sAttributesData, featureAttributes);\n const b3dm = encodeSync(\n {\n gltfEncoded: new Uint8Array(gltf),\n type: 'b3dm',\n featuresLength: this._getFeaturesLength(featureAttributes),\n batchTable: featureAttributes\n },\n Tile3DWriter\n );\n return b3dm;\n }\n\n /**\n * Build and encode gltf\n * @param i3sTile - Tile3D instance for I3S node\n * @returns - encoded glb content\n */\n async buildGltf(\n i3sAttributesData: I3SAttributesData,\n featureAttributes: any\n ): Promise<ArrayBuffer> {\n const {tileContent, textureFormat} = i3sAttributesData;\n const {\n material,\n attributes,\n indices: originalIndices,\n cartesianOrigin,\n cartographicOrigin,\n modelMatrix\n } = tileContent;\n const gltfBuilder = new GLTFScenegraph();\n\n const textureIndex = await this._addI3sTextureToGltf(tileContent, textureFormat, gltfBuilder);\n const pbrMaterialInfo = this._convertI3sMaterialToGltfMaterial(material, textureIndex);\n const materialIndex = gltfBuilder.addMaterial(pbrMaterialInfo);\n\n const positions = attributes.positions;\n const positionsValue = positions.value;\n\n if (attributes.uvRegions && attributes.texCoords) {\n attributes.texCoords.value = convertTextureAtlas(\n attributes.texCoords.value,\n attributes.uvRegions.value\n );\n }\n\n attributes.positions.value = this._normalizePositions(\n positionsValue,\n cartesianOrigin,\n cartographicOrigin,\n modelMatrix\n );\n this._createBatchIds(tileContent, featureAttributes);\n if (attributes.normals && !this._checkNormals(attributes.normals.value)) {\n delete attributes.normals;\n }\n const indices =\n originalIndices || this._generateSynteticIndices(positionsValue.length / positions.size);\n const meshIndex = gltfBuilder.addMesh({\n attributes,\n indices,\n material: materialIndex,\n mode: 4\n });\n const transformMatrix = this._generateTransformMatrix(cartesianOrigin);\n const nodeIndex = gltfBuilder.addNode({meshIndex, matrix: transformMatrix});\n const sceneIndex = gltfBuilder.addScene({nodeIndices: [nodeIndex]});\n gltfBuilder.setDefaultScene(sceneIndex);\n\n gltfBuilder.createBinaryChunk();\n\n const gltfBuffer = encodeSync(gltfBuilder.gltf, GLTFWriter);\n\n return gltfBuffer;\n }\n\n /**\n * Update gltfBuilder with texture from I3S tile\n * @param {object} i3sTile - Tile3D object\n * @param {GLTFScenegraph} gltfBuilder - gltfScenegraph instance to construct GLTF\n * @returns {Promise<number | null>} - GLTF texture index\n */\n async _addI3sTextureToGltf(tileContent, textureFormat, gltfBuilder) {\n const {texture, material, attributes} = tileContent;\n let textureIndex = null;\n let selectedTexture = texture;\n if (!texture && material) {\n selectedTexture =\n material.pbrMetallicRoughness &&\n material.pbrMetallicRoughness.baseColorTexture &&\n material.pbrMetallicRoughness.baseColorTexture.texture.source.image;\n }\n if (selectedTexture) {\n const mimeType = this._deduceMimeTypeFromFormat(textureFormat);\n const imageIndex = gltfBuilder.addImage(selectedTexture, mimeType);\n textureIndex = gltfBuilder.addTexture({imageIndex});\n delete attributes.colors;\n }\n return textureIndex;\n }\n\n /**\n * Generate a positions array which is correct for 3DTiles/GLTF format\n * @param {Float64Array} positionsValue - the input geometry positions array\n * @param {number[]} cartesianOrigin - the tile center in the cartesian coordinate system\n * @param {number[]} cartographicOrigin - the tile center in the cartographic coordinate system\n * @param {number[]} modelMatrix - the model matrix of geometry\n * @returns {Float32Array} - the output geometry positions array\n */\n _normalizePositions(positionsValue, cartesianOrigin, cartographicOrigin, modelMatrix) {\n const newPositionsValue = new Float32Array(positionsValue.length);\n for (let index = 0; index < positionsValue.length; index += 3) {\n const vertex = positionsValue.subarray(index, index + 3);\n const cartesianOriginVector = new Vector3(cartesianOrigin);\n let vertexVector = new Vector3(Array.from(vertex))\n .transform(modelMatrix)\n .add(cartographicOrigin);\n Ellipsoid.WGS84.cartographicToCartesian(vertexVector, scratchVector);\n vertexVector = scratchVector.subtract(cartesianOriginVector);\n newPositionsValue.set(vertexVector, index);\n }\n return newPositionsValue;\n }\n\n /**\n * Generate the transformation matrix for GLTF node:\n * https://github.com/KhronosGroup/glTF/tree/master/specification/2.0#reference-node\n * 1. Create the translate transformation from cartesianOrigin (the positions array stores offsets from this cartesianOrigin)\n * 2. Create the rotation transformation to rotate model from z-up coordinates (I3S specific) to y-up coordinates (GLTF specific)\n * @param {number[]} cartesianOrigin - the tile center in the cartesian coordinate system\n * @returns {Matrix4} - an array of 16 numbers (4x4 matrix)\n */\n _generateTransformMatrix(cartesianOrigin) {\n const translateOriginMatrix = new Matrix4().translate(cartesianOrigin);\n const result = translateOriginMatrix.multiplyLeft(Z_UP_TO_Y_UP_MATRIX);\n return result;\n }\n\n /**\n * Create _BATCHID attribute\n * @param {Object} i3sContent - the source object\n * @returns {void}\n */\n _createBatchIds(i3sContent, featureAttributes) {\n const {featureIds} = i3sContent;\n const {OBJECTID: objectIds} = featureAttributes || {};\n if (!featureIds || !objectIds) {\n return;\n }\n\n for (let i = 0; i < featureIds.length; i++) {\n const featureId = featureIds[i];\n const batchId = objectIds.indexOf(featureId);\n featureIds[i] = batchId;\n }\n\n i3sContent.attributes._BATCHID = {\n size: 1,\n byteOffset: 0,\n value: featureIds\n };\n }\n\n /**\n * luma.gl can not work without indices now:\n * https://github.com/visgl/luma.gl/blob/d8cad75b9f8ca3e578cf078ed9d19e619c2ddbc9/modules/experimental/src/gltf/gltf-instantiator.js#L115\n * This method generates syntetic indices array: [0, 1, 2, 3, .... , vertexCount-1]\n * @param {number} vertexCount - vertex count in the geometry\n * @returns {Uint32Array} indices array.\n */\n _generateSynteticIndices(vertexCount) {\n const result = new Uint32Array(vertexCount);\n for (let index = 0; index < vertexCount; index++) {\n result.set([index], index);\n }\n return result;\n }\n\n /**\n * Deduce mime type by format from `textureSetDefinition.formats[0].format`\n * https://github.com/Esri/i3s-spec/blob/master/docs/1.7/textureSetDefinitionFormat.cmn.md\n * @param {string} format - format name\n * @returns {string} mime type.\n */\n _deduceMimeTypeFromFormat(format) {\n switch (format) {\n case 'jpg':\n return 'image/jpeg';\n case 'png':\n return 'image/png';\n case 'ktx2':\n return 'image/ktx2';\n default:\n console.warn(`Unexpected texture format in I3S: ${format}`); // eslint-disable-line no-console, no-undef\n return 'image/jpeg';\n }\n }\n\n /**\n * Convert i3s material to GLTF compatible material\n * @param {object} material - i3s material definition\n * @param {number | null} textureIndex - texture index in GLTF\n * @returns {object} GLTF material\n */\n _convertI3sMaterialToGltfMaterial(material, textureIndex) {\n const isTextureIndexExists = textureIndex !== null;\n\n if (!material) {\n material = {\n alphaMode: 'OPAQUE',\n doubleSided: false,\n pbrMetallicRoughness: {\n metallicFactor: 0,\n roughnessFactor: 1\n }\n };\n\n if (isTextureIndexExists) {\n material.pbrMetallicRoughness.baseColorTexture = {\n index: textureIndex,\n texCoord: 0\n };\n } else {\n material.pbrMetallicRoughness.baseColorFactor = [1, 1, 1, 1];\n }\n\n return material;\n }\n\n if (textureIndex !== null) {\n material = this._setGltfTexture(material, textureIndex);\n }\n\n return material;\n }\n\n /**\n * Set texture properties in material with GLTF textureIndex\n * @param {object} materialDefinition - i3s material definition\n * @param {number} textureIndex - texture index in GLTF\n * @returns {void}\n */\n _setGltfTexture(materialDefinition, textureIndex) {\n const material = {\n ...materialDefinition,\n pbrMetallicRoughness: {...materialDefinition.pbrMetallicRoughness}\n };\n // I3SLoader now support loading only one texture. This elseif sequence will assign this texture to one of\n // properties defined in materialDefinition\n if (\n materialDefinition.pbrMetallicRoughness &&\n materialDefinition.pbrMetallicRoughness.baseColorTexture\n ) {\n material.pbrMetallicRoughness.baseColorTexture = {\n index: textureIndex,\n texCoord: 0\n };\n } else if (materialDefinition.emissiveTexture) {\n material.emissiveTexture = {\n index: textureIndex,\n texCoord: 0\n };\n } else if (\n materialDefinition.pbrMetallicRoughness &&\n materialDefinition.pbrMetallicRoughness.metallicRoughnessTexture\n ) {\n material.pbrMetallicRoughness.metallicRoughnessTexture = {\n index: textureIndex,\n texCoord: 0\n };\n } else if (materialDefinition.normalTexture) {\n material.normalTexture = {\n index: textureIndex,\n texCoord: 0\n };\n } else if (materialDefinition.occlusionTexture) {\n material.occlusionTexture = {\n index: textureIndex,\n texCoord: 0\n };\n }\n return material;\n }\n\n /*\n * Returns Features length based on attribute array in attribute object.\n * @param {Object} attributes\n * @returns {Number} Features length .\n */\n _getFeaturesLength(attributes) {\n if (!attributes) {\n return 0;\n }\n const firstKey = Object.keys(attributes)[0];\n return firstKey ? attributes[firstKey].length : 0;\n }\n\n /* Checks that normals buffer is correct\n * @param {TypedArray} normals\n * @returns {boolean} true - normals are correct; false - normals are incorrect\n */\n _checkNormals(normals) {\n // If all normals === 0, the resulting tileset is all in black colors on Cesium\n return normals.find((value) => value);\n }\n}\n"],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"b3dm-converter.js","names":["encodeSync","GLTFScenegraph","GLTFWriter","Tile3DWriter","Matrix4","Vector3","Ellipsoid","convertTextureAtlas","generateSyntheticIndices","Z_UP_TO_Y_UP_MATRIX","scratchVector","B3dmConverter","constructor","_defineProperty","convert","i3sAttributesData","featureAttributes","arguments","length","undefined","gltf","buildGltf","b3dm","gltfEncoded","Uint8Array","type","featuresLength","_getFeaturesLength","batchTable","tileContent","textureFormat","material","attributes","indices","originalIndices","cartesianOrigin","cartographicOrigin","modelMatrix","gltfBuilder","textureIndex","_addI3sTextureToGltf","pbrMaterialInfo","_convertI3sMaterialToGltfMaterial","materialIndex","addMaterial","positions","positionsValue","value","uvRegions","texCoords","_normalizePositions","_createBatchIds","normals","_checkNormals","size","meshIndex","addMesh","mode","transformMatrix","_generateTransformMatrix","nodeIndex","addNode","matrix","sceneIndex","addScene","nodeIndices","setDefaultScene","createBinaryChunk","gltfBuffer","texture","selectedTexture","pbrMetallicRoughness","baseColorTexture","source","image","mimeType","_deduceMimeTypeFromFormat","imageIndex","addImage","addTexture","colors","newPositionsValue","Float32Array","index","vertex","subarray","cartesianOriginVector","vertexVector","Array","from","transform","add","WGS84","cartographicToCartesian","subtract","set","translateOriginMatrix","translate","result","multiplyLeft","i3sContent","featureIds","OBJECTID","objectIds","i","featureId","batchId","indexOf","_BATCHID","byteOffset","format","console","warn","concat","isTextureIndexExists","alphaMode","doubleSided","metallicFactor","roughnessFactor","texCoord","baseColorFactor","_setGltfTexture","materialDefinition","emissiveTexture","metallicRoughnessTexture","normalTexture","occlusionTexture","firstKey","Object","keys","find"],"sources":["../../../../src/3d-tiles-converter/helpers/b3dm-converter.ts"],"sourcesContent":["import type {I3SAttributesData} from '../../3d-tiles-attributes-worker';\n\nimport {encodeSync} from '@loaders.gl/core';\nimport {GLTFScenegraph, GLTFWriter} from '@loaders.gl/gltf';\nimport {Tile3DWriter} from '@loaders.gl/3d-tiles';\nimport {Matrix4, Vector3} from '@math.gl/core';\nimport {Ellipsoid} from '@math.gl/geospatial';\nimport {convertTextureAtlas} from './texture-atlas';\nimport {generateSyntheticIndices} from '../../lib/utils/geometry-utils';\n\nconst Z_UP_TO_Y_UP_MATRIX = new Matrix4([1, 0, 0, 0, 0, 0, -1, 0, 0, 1, 0, 0, 0, 0, 0, 1]);\nconst scratchVector = new Vector3();\n\n/**\n * Converts content of an I3S node to *.b3dm's file content\n */\nexport default class B3dmConverter {\n // @ts-expect-error\n rtcCenter: Float32Array;\n i3sTile: any;\n\n /**\n * The starter of content conversion\n * @param i3sTile - Tile3D instance for I3S node\n * @returns - encoded content\n */\n async convert(\n i3sAttributesData: I3SAttributesData,\n featureAttributes: any = null\n ): Promise<ArrayBuffer> {\n const gltf = await this.buildGltf(i3sAttributesData, featureAttributes);\n const b3dm = encodeSync(\n {\n gltfEncoded: new Uint8Array(gltf),\n type: 'b3dm',\n featuresLength: this._getFeaturesLength(featureAttributes),\n batchTable: featureAttributes\n },\n Tile3DWriter\n );\n return b3dm;\n }\n\n /**\n * Build and encode gltf\n * @param i3sTile - Tile3D instance for I3S node\n * @returns - encoded glb content\n */\n async buildGltf(\n i3sAttributesData: I3SAttributesData,\n featureAttributes: any\n ): Promise<ArrayBuffer> {\n const {tileContent, textureFormat} = i3sAttributesData;\n const {\n material,\n attributes,\n indices: originalIndices,\n cartesianOrigin,\n cartographicOrigin,\n modelMatrix\n } = tileContent;\n const gltfBuilder = new GLTFScenegraph();\n\n const textureIndex = await this._addI3sTextureToGltf(tileContent, textureFormat, gltfBuilder);\n const pbrMaterialInfo = this._convertI3sMaterialToGltfMaterial(material, textureIndex);\n const materialIndex = gltfBuilder.addMaterial(pbrMaterialInfo);\n\n const positions = attributes.positions;\n const positionsValue = positions.value;\n\n if (attributes.uvRegions && attributes.texCoords) {\n attributes.texCoords.value = convertTextureAtlas(\n attributes.texCoords.value,\n attributes.uvRegions.value\n );\n }\n\n attributes.positions.value = this._normalizePositions(\n positionsValue,\n cartesianOrigin,\n cartographicOrigin,\n modelMatrix\n );\n this._createBatchIds(tileContent, featureAttributes);\n if (attributes.normals && !this._checkNormals(attributes.normals.value)) {\n delete attributes.normals;\n }\n const indices =\n originalIndices || generateSyntheticIndices(positionsValue.length / positions.size);\n const meshIndex = gltfBuilder.addMesh({\n attributes,\n indices,\n material: materialIndex,\n mode: 4\n });\n const transformMatrix = this._generateTransformMatrix(cartesianOrigin);\n const nodeIndex = gltfBuilder.addNode({meshIndex, matrix: transformMatrix});\n const sceneIndex = gltfBuilder.addScene({nodeIndices: [nodeIndex]});\n gltfBuilder.setDefaultScene(sceneIndex);\n\n gltfBuilder.createBinaryChunk();\n\n const gltfBuffer = encodeSync(gltfBuilder.gltf, GLTFWriter);\n\n return gltfBuffer;\n }\n\n /**\n * Update gltfBuilder with texture from I3S tile\n * @param {object} i3sTile - Tile3D object\n * @param {GLTFScenegraph} gltfBuilder - gltfScenegraph instance to construct GLTF\n * @returns {Promise<number | null>} - GLTF texture index\n */\n async _addI3sTextureToGltf(tileContent, textureFormat, gltfBuilder) {\n const {texture, material, attributes} = tileContent;\n let textureIndex = null;\n let selectedTexture = texture;\n if (!texture && material) {\n selectedTexture =\n material.pbrMetallicRoughness &&\n material.pbrMetallicRoughness.baseColorTexture &&\n material.pbrMetallicRoughness.baseColorTexture.texture.source.image;\n }\n if (selectedTexture) {\n const mimeType = this._deduceMimeTypeFromFormat(textureFormat);\n const imageIndex = gltfBuilder.addImage(selectedTexture, mimeType);\n textureIndex = gltfBuilder.addTexture({imageIndex});\n delete attributes.colors;\n }\n return textureIndex;\n }\n\n /**\n * Generate a positions array which is correct for 3DTiles/GLTF format\n * @param {Float64Array} positionsValue - the input geometry positions array\n * @param {number[]} cartesianOrigin - the tile center in the cartesian coordinate system\n * @param {number[]} cartographicOrigin - the tile center in the cartographic coordinate system\n * @param {number[]} modelMatrix - the model matrix of geometry\n * @returns {Float32Array} - the output geometry positions array\n */\n _normalizePositions(positionsValue, cartesianOrigin, cartographicOrigin, modelMatrix) {\n const newPositionsValue = new Float32Array(positionsValue.length);\n for (let index = 0; index < positionsValue.length; index += 3) {\n const vertex = positionsValue.subarray(index, index + 3);\n const cartesianOriginVector = new Vector3(cartesianOrigin);\n let vertexVector = new Vector3(Array.from(vertex))\n .transform(modelMatrix)\n .add(cartographicOrigin);\n Ellipsoid.WGS84.cartographicToCartesian(vertexVector, scratchVector);\n vertexVector = scratchVector.subtract(cartesianOriginVector);\n newPositionsValue.set(vertexVector, index);\n }\n return newPositionsValue;\n }\n\n /**\n * Generate the transformation matrix for GLTF node:\n * https://github.com/KhronosGroup/glTF/tree/master/specification/2.0#reference-node\n * 1. Create the translate transformation from cartesianOrigin (the positions array stores offsets from this cartesianOrigin)\n * 2. Create the rotation transformation to rotate model from z-up coordinates (I3S specific) to y-up coordinates (GLTF specific)\n * @param {number[]} cartesianOrigin - the tile center in the cartesian coordinate system\n * @returns {Matrix4} - an array of 16 numbers (4x4 matrix)\n */\n _generateTransformMatrix(cartesianOrigin) {\n const translateOriginMatrix = new Matrix4().translate(cartesianOrigin);\n const result = translateOriginMatrix.multiplyLeft(Z_UP_TO_Y_UP_MATRIX);\n return result;\n }\n\n /**\n * Create _BATCHID attribute\n * @param {Object} i3sContent - the source object\n * @returns {void}\n */\n _createBatchIds(i3sContent, featureAttributes) {\n const {featureIds} = i3sContent;\n const {OBJECTID: objectIds} = featureAttributes || {};\n if (!featureIds || !objectIds) {\n return;\n }\n\n for (let i = 0; i < featureIds.length; i++) {\n const featureId = featureIds[i];\n const batchId = objectIds.indexOf(featureId);\n featureIds[i] = batchId;\n }\n\n i3sContent.attributes._BATCHID = {\n size: 1,\n byteOffset: 0,\n value: featureIds\n };\n }\n\n /**\n * Deduce mime type by format from `textureSetDefinition.formats[0].format`\n * https://github.com/Esri/i3s-spec/blob/master/docs/1.7/textureSetDefinitionFormat.cmn.md\n * @param {string} format - format name\n * @returns {string} mime type.\n */\n _deduceMimeTypeFromFormat(format) {\n switch (format) {\n case 'jpg':\n return 'image/jpeg';\n case 'png':\n return 'image/png';\n case 'ktx2':\n return 'image/ktx2';\n default:\n console.warn(`Unexpected texture format in I3S: ${format}`); // eslint-disable-line no-console, no-undef\n return 'image/jpeg';\n }\n }\n\n /**\n * Convert i3s material to GLTF compatible material\n * @param {object} material - i3s material definition\n * @param {number | null} textureIndex - texture index in GLTF\n * @returns {object} GLTF material\n */\n _convertI3sMaterialToGltfMaterial(material, textureIndex) {\n const isTextureIndexExists = textureIndex !== null;\n\n if (!material) {\n material = {\n alphaMode: 'OPAQUE',\n doubleSided: false,\n pbrMetallicRoughness: {\n metallicFactor: 0,\n roughnessFactor: 1\n }\n };\n\n if (isTextureIndexExists) {\n material.pbrMetallicRoughness.baseColorTexture = {\n index: textureIndex,\n texCoord: 0\n };\n } else {\n material.pbrMetallicRoughness.baseColorFactor = [1, 1, 1, 1];\n }\n\n return material;\n }\n\n if (textureIndex !== null) {\n material = this._setGltfTexture(material, textureIndex);\n }\n\n return material;\n }\n\n /**\n * Set texture properties in material with GLTF textureIndex\n * @param {object} materialDefinition - i3s material definition\n * @param {number} textureIndex - texture index in GLTF\n * @returns {void}\n */\n _setGltfTexture(materialDefinition, textureIndex) {\n const material = {\n ...materialDefinition,\n pbrMetallicRoughness: {...materialDefinition.pbrMetallicRoughness}\n };\n // I3SLoader now support loading only one texture. This elseif sequence will assign this texture to one of\n // properties defined in materialDefinition\n if (\n materialDefinition.pbrMetallicRoughness &&\n materialDefinition.pbrMetallicRoughness.baseColorTexture\n ) {\n material.pbrMetallicRoughness.baseColorTexture = {\n index: textureIndex,\n texCoord: 0\n };\n } else if (materialDefinition.emissiveTexture) {\n material.emissiveTexture = {\n index: textureIndex,\n texCoord: 0\n };\n } else if (\n materialDefinition.pbrMetallicRoughness &&\n materialDefinition.pbrMetallicRoughness.metallicRoughnessTexture\n ) {\n material.pbrMetallicRoughness.metallicRoughnessTexture = {\n index: textureIndex,\n texCoord: 0\n };\n } else if (materialDefinition.normalTexture) {\n material.normalTexture = {\n index: textureIndex,\n texCoord: 0\n };\n } else if (materialDefinition.occlusionTexture) {\n material.occlusionTexture = {\n index: textureIndex,\n texCoord: 0\n };\n }\n return material;\n }\n\n /*\n * Returns Features length based on attribute array in attribute object.\n * @param {Object} attributes\n * @returns {Number} Features length .\n */\n _getFeaturesLength(attributes) {\n if (!attributes) {\n return 0;\n }\n const firstKey = Object.keys(attributes)[0];\n return firstKey ? attributes[firstKey].length : 0;\n }\n\n /* Checks that normals buffer is correct\n * @param {TypedArray} normals\n * @returns {boolean} true - normals are correct; false - normals are incorrect\n */\n _checkNormals(normals) {\n // If all normals === 0, the resulting tileset is all in black colors on Cesium\n return normals.find((value) => value);\n }\n}\n"],"mappings":"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"}
|
|
@@ -3,7 +3,7 @@ import { ZipLoader } from '@loaders.gl/zip';
|
|
|
3
3
|
import { writeFile } from '../lib/utils/file-utils';
|
|
4
4
|
import { join } from 'path';
|
|
5
5
|
import { ChildProcessProxy } from '@loaders.gl/worker-utils';
|
|
6
|
-
const VERSION = typeof "4.0.0-alpha.
|
|
6
|
+
const VERSION = typeof "4.0.0-alpha.8" !== 'undefined' ? "4.0.0-alpha.8" : 'beta';
|
|
7
7
|
const PGM_LINK = 'https://raw.githubusercontent.com/visgl/deck.gl-data/master/egm/egm2008-5.zip';
|
|
8
8
|
export class DepsInstaller {
|
|
9
9
|
async install() {
|
|
@@ -17,16 +17,16 @@ export class DepsInstaller {
|
|
|
17
17
|
}
|
|
18
18
|
await writeFile(depsPath, new Uint8Array(fileMap['geoids/egm2008-5.pgm']), 'egm2008-5.pgm');
|
|
19
19
|
console.log('Installing "I3S Content Loader worker"');
|
|
20
|
-
await this.installWorker('i3s', 'i3s-content-
|
|
20
|
+
await this.installWorker('i3s', 'i3s-content-worker-node.js', workersPath);
|
|
21
21
|
console.log('Installing "Draco Loader worker"');
|
|
22
|
-
await this.installWorker('draco', 'draco-
|
|
22
|
+
await this.installWorker('draco', 'draco-worker-node.js', workersPath);
|
|
23
23
|
console.log('Installing "Basis Loader worker"');
|
|
24
|
-
await this.installWorker('textures', 'basis-
|
|
24
|
+
await this.installWorker('textures', 'basis-worker-node.js', workersPath);
|
|
25
25
|
console.log('Installing "join-images" npm package');
|
|
26
26
|
const childProcess = new ChildProcessProxy();
|
|
27
27
|
await childProcess.start({
|
|
28
28
|
command: 'npm',
|
|
29
|
-
arguments: ['install', 'sharp
|
|
29
|
+
arguments: ['install', 'sharp@0.30.4', 'join-images@1.1.3'],
|
|
30
30
|
wait: 0
|
|
31
31
|
});
|
|
32
32
|
console.log('All dependencies were installed succesfully.');
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"deps-installer.js","names":["load","fetchFile","ZipLoader","writeFile","join","ChildProcessProxy","VERSION","PGM_LINK","DepsInstaller","install","path","arguments","length","undefined","workersPath","console","log","fileMap","depsPath","process","cwd","Uint8Array","installWorker","childProcess","start","command","wait","module","name","extraPath","fileResponse","concat","fileData","arrayBuffer"],"sources":["../../../src/deps-installer/deps-installer.ts"],"sourcesContent":["import {load, fetchFile} from '@loaders.gl/core';\nimport {ZipLoader} from '@loaders.gl/zip';\nimport {writeFile} from '../lib/utils/file-utils';\nimport {join} from 'path';\nimport {ChildProcessProxy} from '@loaders.gl/worker-utils';\n\n// @ts-ignore TS2304: Cannot find name '__VERSION__'.\nconst VERSION = typeof __VERSION__ !== 'undefined' ? __VERSION__ : 'beta';\n\nconst PGM_LINK = 'https://raw.githubusercontent.com/visgl/deck.gl-data/master/egm/egm2008-5.zip';\n\n/**\n * Install external dependencies for converter:\n * * PGM file (implemented);\n * * Draco library (not implemented);\n * * 7z archiver (not implemented);\n */\nexport class DepsInstaller {\n /**\n * Run instalation\n * @param path destination folder\n * @param workersPath destination folder for workers.\n * This path is '' by default and is not used by tile-converter.\n * It is used in tests to prevent rewriting actual workers during tests running\n */\n async install(path: string = '', workersPath: string = ''): Promise<void> {\n console.log('Installing \"EGM2008-5\" model...'); // eslint-disable-line no-console\n const fileMap = await load(PGM_LINK, ZipLoader, {});\n\n let depsPath = process.cwd();\n if (path) {\n depsPath = join(depsPath, path);\n }\n\n await writeFile(depsPath, new Uint8Array(fileMap['geoids/egm2008-5.pgm']), 'egm2008-5.pgm');\n\n console.log('Installing \"I3S Content Loader worker\"'); // eslint-disable-line no-console\n await this.installWorker('i3s', 'i3s-content-
|
|
1
|
+
{"version":3,"file":"deps-installer.js","names":["load","fetchFile","ZipLoader","writeFile","join","ChildProcessProxy","VERSION","PGM_LINK","DepsInstaller","install","path","arguments","length","undefined","workersPath","console","log","fileMap","depsPath","process","cwd","Uint8Array","installWorker","childProcess","start","command","wait","module","name","extraPath","fileResponse","concat","fileData","arrayBuffer"],"sources":["../../../src/deps-installer/deps-installer.ts"],"sourcesContent":["import {load, fetchFile} from '@loaders.gl/core';\nimport {ZipLoader} from '@loaders.gl/zip';\nimport {writeFile} from '../lib/utils/file-utils';\nimport {join} from 'path';\nimport {ChildProcessProxy} from '@loaders.gl/worker-utils';\n\n// @ts-ignore TS2304: Cannot find name '__VERSION__'.\nconst VERSION = typeof __VERSION__ !== 'undefined' ? __VERSION__ : 'beta';\n\nconst PGM_LINK = 'https://raw.githubusercontent.com/visgl/deck.gl-data/master/egm/egm2008-5.zip';\n\n/**\n * Install external dependencies for converter:\n * * PGM file (implemented);\n * * Draco library (not implemented);\n * * 7z archiver (not implemented);\n */\nexport class DepsInstaller {\n /**\n * Run instalation\n * @param path destination folder\n * @param workersPath destination folder for workers.\n * This path is '' by default and is not used by tile-converter.\n * It is used in tests to prevent rewriting actual workers during tests running\n */\n async install(path: string = '', workersPath: string = ''): Promise<void> {\n console.log('Installing \"EGM2008-5\" model...'); // eslint-disable-line no-console\n const fileMap = await load(PGM_LINK, ZipLoader, {});\n\n let depsPath = process.cwd();\n if (path) {\n depsPath = join(depsPath, path);\n }\n\n await writeFile(depsPath, new Uint8Array(fileMap['geoids/egm2008-5.pgm']), 'egm2008-5.pgm');\n\n console.log('Installing \"I3S Content Loader worker\"'); // eslint-disable-line no-console\n await this.installWorker('i3s', 'i3s-content-worker-node.js', workersPath);\n\n console.log('Installing \"Draco Loader worker\"'); // eslint-disable-line no-console\n await this.installWorker('draco', 'draco-worker-node.js', workersPath);\n\n console.log('Installing \"Basis Loader worker\"'); // eslint-disable-line no-console\n await this.installWorker('textures', 'basis-worker-node.js', workersPath);\n\n console.log('Installing \"join-images\" npm package');\n const childProcess = new ChildProcessProxy();\n await childProcess.start({\n command: 'npm',\n // `npm install sharp join-images` works unstable. It fails because installed `sharp` version\n // may be different from the version required by `join-images`. Pointing to specific versions\n // resolve this issue\n arguments: ['install', 'sharp@0.30.4', 'join-images@1.1.3'],\n wait: 0\n });\n\n console.log('All dependencies were installed succesfully.'); // eslint-disable-line no-console\n }\n\n private async installWorker(module: string, name: string, extraPath: string) {\n const fileResponse = await fetchFile(\n `https://unpkg.com/@loaders.gl/${module}@${VERSION}/dist/${name}`\n );\n const fileData = await fileResponse.arrayBuffer();\n if (!fileData) {\n return;\n }\n const path = join(process.cwd(), extraPath, 'modules', module, 'dist');\n await writeFile(path, fileData, name);\n }\n}\n"],"mappings":"AAAA,SAAQA,IAAI,EAAEC,SAAS,QAAO,kBAAkB;AAChD,SAAQC,SAAS,QAAO,iBAAiB;AACzC,SAAQC,SAAS,QAAO,yBAAyB;AACjD,SAAQC,IAAI,QAAO,MAAM;AACzB,SAAQC,iBAAiB,QAAO,0BAA0B;AAG1D,MAAMC,OAAO,GAAG,sBAAkB,KAAK,WAAW,qBAAiB,MAAM;AAEzE,MAAMC,QAAQ,GAAG,+EAA+E;AAQhG,OAAO,MAAMC,aAAa,CAAC;EAQzB,MAAMC,OAAOA,CAAA,EAA6D;IAAA,IAA5DC,IAAY,GAAAC,SAAA,CAAAC,MAAA,QAAAD,SAAA,QAAAE,SAAA,GAAAF,SAAA,MAAG,EAAE;IAAA,IAAEG,WAAmB,GAAAH,SAAA,CAAAC,MAAA,QAAAD,SAAA,QAAAE,SAAA,GAAAF,SAAA,MAAG,EAAE;IACvDI,OAAO,CAACC,GAAG,CAAC,iCAAiC,CAAC;IAC9C,MAAMC,OAAO,GAAG,MAAMjB,IAAI,CAACO,QAAQ,EAAEL,SAAS,EAAE,CAAC,CAAC,CAAC;IAEnD,IAAIgB,QAAQ,GAAGC,OAAO,CAACC,GAAG,CAAC,CAAC;IAC5B,IAAIV,IAAI,EAAE;MACRQ,QAAQ,GAAGd,IAAI,CAACc,QAAQ,EAAER,IAAI,CAAC;IACjC;IAEA,MAAMP,SAAS,CAACe,QAAQ,EAAE,IAAIG,UAAU,CAACJ,OAAO,CAAC,sBAAsB,CAAC,CAAC,EAAE,eAAe,CAAC;IAE3FF,OAAO,CAACC,GAAG,CAAC,wCAAwC,CAAC;IACrD,MAAM,IAAI,CAACM,aAAa,CAAC,KAAK,EAAE,4BAA4B,EAAER,WAAW,CAAC;IAE1EC,OAAO,CAACC,GAAG,CAAC,kCAAkC,CAAC;IAC/C,MAAM,IAAI,CAACM,aAAa,CAAC,OAAO,EAAE,sBAAsB,EAAER,WAAW,CAAC;IAEtEC,OAAO,CAACC,GAAG,CAAC,kCAAkC,CAAC;IAC/C,MAAM,IAAI,CAACM,aAAa,CAAC,UAAU,EAAE,sBAAsB,EAAER,WAAW,CAAC;IAEzEC,OAAO,CAACC,GAAG,CAAC,sCAAsC,CAAC;IACnD,MAAMO,YAAY,GAAG,IAAIlB,iBAAiB,CAAC,CAAC;IAC5C,MAAMkB,YAAY,CAACC,KAAK,CAAC;MACvBC,OAAO,EAAE,KAAK;MAIdd,SAAS,EAAE,CAAC,SAAS,EAAE,cAAc,EAAE,mBAAmB,CAAC;MAC3De,IAAI,EAAE;IACR,CAAC,CAAC;IAEFX,OAAO,CAACC,GAAG,CAAC,8CAA8C,CAAC;EAC7D;EAEA,MAAcM,aAAaA,CAACK,MAAc,EAAEC,IAAY,EAAEC,SAAiB,EAAE;IAC3E,MAAMC,YAAY,GAAG,MAAM7B,SAAS,kCAAA8B,MAAA,CACDJ,MAAM,OAAAI,MAAA,CAAIzB,OAAO,YAAAyB,MAAA,CAASH,IAAI,CACjE,CAAC;IACD,MAAMI,QAAQ,GAAG,MAAMF,YAAY,CAACG,WAAW,CAAC,CAAC;IACjD,IAAI,CAACD,QAAQ,EAAE;MACb;IACF;IACA,MAAMtB,IAAI,GAAGN,IAAI,CAACe,OAAO,CAACC,GAAG,CAAC,CAAC,EAAES,SAAS,EAAE,SAAS,EAAEF,MAAM,EAAE,MAAM,CAAC;IACtE,MAAMxB,SAAS,CAACO,IAAI,EAAEsB,QAAQ,EAAEJ,IAAI,CAAC;EACvC;AACF"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { processOnWorker } from '@loaders.gl/worker-utils';
|
|
2
|
-
const VERSION = typeof "4.0.0-alpha.
|
|
2
|
+
const VERSION = typeof "4.0.0-alpha.8" !== 'undefined' ? "4.0.0-alpha.8" : 'latest';
|
|
3
3
|
export const I3SAttributesWorker = {
|
|
4
4
|
id: 'i3s-attributes',
|
|
5
5
|
name: 'I3S Attributes Worker',
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"i3s-attributes-worker.js","names":["processOnWorker","VERSION","I3SAttributesWorker","id","name","module","version","options","useCartesianPositions","transformI3SAttributesOnWorker","attributesData","_typecheckI3SAttributesWorker"],"sources":["../../src/i3s-attributes-worker.ts"],"sourcesContent":["import type {WorkerObject} from '@loaders.gl/worker-utils';\nimport type {ConvertedAttributes} from './i3s-converter/types';\nimport type {Matrix4, Vector3} from '@math.gl/core';\nimport type {
|
|
1
|
+
{"version":3,"file":"i3s-attributes-worker.js","names":["processOnWorker","VERSION","I3SAttributesWorker","id","name","module","version","options","useCartesianPositions","transformI3SAttributesOnWorker","attributesData","_typecheckI3SAttributesWorker"],"sources":["../../src/i3s-attributes-worker.ts"],"sourcesContent":["import type {WorkerObject} from '@loaders.gl/worker-utils';\nimport type {ConvertedAttributes} from './i3s-converter/types';\nimport type {Matrix4, Vector3} from '@math.gl/core';\nimport type {GLTFNodePostprocessed} from '@loaders.gl/gltf';\n\nimport {processOnWorker} from '@loaders.gl/worker-utils';\n\n// __VERSION__ is injected by babel-plugin-version-inline\n// @ts-ignore TS2304: Cannot find name '__VERSION__'.\nconst VERSION = typeof __VERSION__ !== 'undefined' ? __VERSION__ : 'latest';\n\nexport type I3SAttributesWorkerOptions = {\n _nodeWorkers: boolean;\n reuseWorkers: boolean;\n useCartesianPositions: boolean;\n source: string;\n};\n\nexport type TextureImageProperties = {\n data: Uint8Array;\n compressed?: boolean;\n height?: number;\n width?: number;\n components?: number;\n mimeType?: string;\n};\n\nexport type B3DMAttributesData = {\n gltfMaterials?: {id: string}[];\n nodes: GLTFNodePostprocessed[];\n images: (null | TextureImageProperties)[];\n cartographicOrigin: Vector3;\n cartesianModelMatrix: Matrix4;\n};\n\n/**\n * I3S Attributes Worker to handle B3DM object\n */\nexport const I3SAttributesWorker = {\n id: 'i3s-attributes',\n name: 'I3S Attributes Worker',\n module: 'tile-converter',\n version: VERSION,\n options: {\n useCartesianPositions: false\n }\n};\n\n/**\n * Performs I3S attributes transformation\n */\nexport function transformI3SAttributesOnWorker(\n attributesData: B3DMAttributesData,\n options: I3SAttributesWorkerOptions\n): Promise<Map<string, ConvertedAttributes>> {\n return processOnWorker(I3SAttributesWorker, attributesData, options);\n}\n\nexport const _typecheckI3SAttributesWorker: WorkerObject = I3SAttributesWorker;\n"],"mappings":"AAKA,SAAQA,eAAe,QAAO,0BAA0B;AAIxD,MAAMC,OAAO,GAAG,sBAAkB,KAAK,WAAW,qBAAiB,QAAQ;AA6B3E,OAAO,MAAMC,mBAAmB,GAAG;EACjCC,EAAE,EAAE,gBAAgB;EACpBC,IAAI,EAAE,uBAAuB;EAC7BC,MAAM,EAAE,gBAAgB;EACxBC,OAAO,EAAEL,OAAO;EAChBM,OAAO,EAAE;IACPC,qBAAqB,EAAE;EACzB;AACF,CAAC;AAKD,OAAO,SAASC,8BAA8BA,CAC5CC,cAAkC,EAClCH,OAAmC,EACQ;EAC3C,OAAOP,eAAe,CAACE,mBAAmB,EAAEQ,cAAc,EAAEH,OAAO,CAAC;AACtE;AAEA,OAAO,MAAMI,6BAA2C,GAAGT,mBAAmB"}
|
|
@@ -40,8 +40,8 @@ function handleExtFeatureMetadataExtension(attributes, extFeatureMetadata, image
|
|
|
40
40
|
}
|
|
41
41
|
const featureTexture = (extFeatureMetadata === null || extFeatureMetadata === void 0 ? void 0 : extFeatureMetadata.featureTextures) && (extFeatureMetadata === null || extFeatureMetadata === void 0 ? void 0 : extFeatureMetadata.featureTextures[0]);
|
|
42
42
|
if (featureTexture) {
|
|
43
|
-
|
|
44
|
-
return
|
|
43
|
+
const batchIdsAttribute = attributes[featureTexture];
|
|
44
|
+
return batchIdsAttribute.value;
|
|
45
45
|
}
|
|
46
46
|
return [];
|
|
47
47
|
}
|
|
@@ -84,7 +84,7 @@ function generateBatchIdsFromTexture(featureIdTexture, textureCoordinates, image
|
|
|
84
84
|
const image = images[textureIndex];
|
|
85
85
|
const batchIds = [];
|
|
86
86
|
const channels = CHANNELS_MAP[featureChannel];
|
|
87
|
-
if (
|
|
87
|
+
if (image && image !== null && image !== void 0 && image.width && image !== null && image !== void 0 && image.height && image !== null && image !== void 0 && image.components) {
|
|
88
88
|
for (let index = 0; index < textureCoordinates.length; index += 2) {
|
|
89
89
|
const u = textureCoordinates[index];
|
|
90
90
|
const v = textureCoordinates[index + 1];
|
|
@@ -95,7 +95,7 @@ function generateBatchIdsFromTexture(featureIdTexture, textureCoordinates, image
|
|
|
95
95
|
batchIds.push(batchId);
|
|
96
96
|
}
|
|
97
97
|
} else {
|
|
98
|
-
console.warn("Can't get batch Ids from ".concat(image.mimeType, " compressed texture"));
|
|
98
|
+
console.warn("Can't get batch Ids from ".concat((image === null || image === void 0 ? void 0 : image.mimeType) || '', " compressed texture"));
|
|
99
99
|
}
|
|
100
100
|
return batchIds;
|
|
101
101
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"batch-ids-extensions.js","names":["EXT_MESH_FEATURES","EXT_FEATURE_METADATA","handleBatchIdsExtensions","attributes","primitive","images","extensions","extensionName","extensionData","Object","entries","handleExtFeatureMetadataExtension","console","warn","extFeatureMetadata","_extFeatureMetadata$f","_featureIdAttribute$f","_featureIdAttribute$f2","_featureIdAttribute$f3","featureIdAttribute","featureIdAttributes","featureIds","attribute","batchIdsAttribute","value","hasOwnProperty","_attributes$POSITIONS","featuresCount","POSITIONS","length","generateImplicitFeatureIds","constant","divisor","featureIdTexture","featureIdTextures","_featureIdTexture$fea","_featureIdTexture$fea2","textureAttributeIndex","texture","texCoord","textCoordAttribute","concat","textureCoordinates","generateBatchIdsFromTexture","featureTexture","featureTextures","arguments","undefined","currentValue","devisorCounter","index","push","Array","fill","_featureIdTexture$fea3","_featureIdTexture$fea4","_featureIdTexture$fea5","CHANNELS_MAP","r","g","b","a","textureIndex","featureChannel","channels","image","batchIds","compressed","u","v","tx","Math","min","emod","width","ty","height","offset","components","batchId","Uint8Array","data","mimeType","n"],"sources":["../../../../src/i3s-converter/helpers/batch-ids-extensions.ts"],"sourcesContent":["import {\n GLTFAccessorPostprocessed,\n GLTFImagePostprocessed,\n GLTFMeshPrimitivePostprocessed\n} from '@loaders.gl/gltf';\nimport type {\n GLTF_EXT_feature_metadata_attribute,\n GLTF_EXT_feature_metadata_primitive\n} from 'modules/gltf/src/lib/types/gltf-json-schema';\n\nconst EXT_MESH_FEATURES = 'EXT_mesh_features';\nconst EXT_FEATURE_METADATA = 'EXT_feature_metadata';\n\n/**\n * Getting batchIds from 3DTilesNext extensions.\n * @param attributes - gltf accessors\n * @param primitive - gltf primitive data\n * @param images - gltf texture images\n */\nexport function handleBatchIdsExtensions(\n attributes: {\n [key: string]: GLTFAccessorPostprocessed;\n },\n primitive: GLTFMeshPrimitivePostprocessed,\n images: GLTFImagePostprocessed[]\n): number[] {\n const extensions = primitive?.extensions;\n\n if (!extensions) {\n return [];\n }\n\n for (const [extensionName, extensionData] of Object.entries(extensions || {})) {\n switch (extensionName) {\n case EXT_FEATURE_METADATA:\n return handleExtFeatureMetadataExtension(\n attributes,\n extensionData as GLTF_EXT_feature_metadata_primitive,\n images\n );\n case EXT_MESH_FEATURES:\n console.warn('EXT_mesh_features extension is not supported yet');\n return [];\n default:\n return [];\n }\n }\n\n return [];\n}\n\n/**\n * Get batchIds from EXT_feature_metadata extension.\n * Docs - https://github.com/CesiumGS/glTF/tree/3d-tiles-next/extensions/2.0/Vendor/EXT_feature_metadata\n * @param attributes\n * @param extFeatureMetadata\n * @param textures\n */\nfunction handleExtFeatureMetadataExtension(\n attributes: {\n [key: string]: GLTFAccessorPostprocessed;\n },\n extFeatureMetadata: GLTF_EXT_feature_metadata_primitive,\n images: GLTFImagePostprocessed[]\n): number[] {\n // Take only first extension object to get batchIds attribute name.\n const featureIdAttribute = extFeatureMetadata?.featureIdAttributes?.[0];\n\n if (featureIdAttribute?.featureIds?.attribute) {\n const batchIdsAttribute = attributes[featureIdAttribute.featureIds.attribute];\n return batchIdsAttribute.value;\n }\n\n if (\n featureIdAttribute?.featureIds?.hasOwnProperty('constant') &&\n featureIdAttribute?.featureIds?.hasOwnProperty('divisor')\n ) {\n const featuresCount = attributes?.POSITIONS?.value.length / 3 || 0;\n return generateImplicitFeatureIds(\n featuresCount,\n featureIdAttribute.featureIds.constant,\n featureIdAttribute.featureIds.divisor\n );\n }\n\n // Take only first extension object to get batchIds attribute name.\n const featureIdTexture =\n extFeatureMetadata?.featureIdTextures && extFeatureMetadata?.featureIdTextures[0];\n\n if (featureIdTexture) {\n const textureAttributeIndex = featureIdTexture?.featureIds?.texture?.texCoord || 0;\n const textCoordAttribute = `TEXCOORD_${textureAttributeIndex}`;\n const textureCoordinates = attributes[textCoordAttribute].value;\n return generateBatchIdsFromTexture(featureIdTexture, textureCoordinates, images);\n }\n\n // Take only first extension texture to get batchIds from the root EXT_feature_metadata object.\n const featureTexture =\n extFeatureMetadata?.featureTextures && extFeatureMetadata?.featureTextures[0];\n\n /**\n * TODO need to get batchIds from root extension\n */\n if (featureTexture) {\n console.warn(\"EXT_feature_metadata doesn't yet support featureTextures in primitive\");\n return [];\n }\n\n return [];\n}\n\n/**\n * Generates implicit feature ids\n * Spec - https://github.com/CesiumGS/glTF/tree/3d-tiles-next/extensions/2.0/Vendor/EXT_feature_metadata#implicit-feature-ids\n * @param featuresCount\n * @param constant\n * @param devisor\n */\nfunction generateImplicitFeatureIds(\n featuresCount: number,\n constant: number = 0,\n divisor: number = 0\n): number[] {\n let featureIds: number[] = [];\n\n if (divisor > 0) {\n let currentValue = constant;\n let devisorCounter = divisor;\n\n for (let index = 0; index < featuresCount; index++) {\n featureIds.push(currentValue);\n\n devisorCounter -= 1;\n\n if (devisorCounter === 0) {\n currentValue++;\n devisorCounter = divisor;\n }\n }\n } else {\n featureIds = Array<number>(featuresCount).fill(constant, 0, featuresCount);\n }\n\n return featureIds;\n}\n\n/**\n * Get batchIds from texture.\n * @param primitive\n * @param featureIdTextures\n */\nfunction generateBatchIdsFromTexture(\n featureIdTexture: GLTF_EXT_feature_metadata_attribute,\n textureCoordinates: Float32Array,\n images: GLTFImagePostprocessed[]\n) {\n if (!images?.length) {\n return [];\n }\n\n const CHANNELS_MAP = {\n r: 0,\n g: 1,\n b: 2,\n a: 3\n };\n\n const textureIndex = featureIdTexture?.featureIds?.texture?.index;\n const featureChannel = featureIdTexture?.featureIds?.channels;\n\n if (!featureChannel || textureIndex === undefined) {\n return [];\n }\n\n const image = images[textureIndex];\n const batchIds: number[] = [];\n const channels = CHANNELS_MAP[featureChannel];\n\n if (!image.compressed) {\n for (let index = 0; index < textureCoordinates.length; index += 2) {\n const u = textureCoordinates[index];\n const v = textureCoordinates[index + 1];\n\n const tx = Math.min((emod(u) * image.width) | 0, image.width - 1);\n const ty = Math.min((emod(v) * image.height) | 0, image.height - 1);\n\n const offset = (ty * image.width + tx) * image.components + channels;\n const batchId = new Uint8Array(image.data)[offset];\n\n batchIds.push(batchId);\n }\n } else {\n console.warn(`Can't get batch Ids from ${image.mimeType} compressed texture`);\n }\n\n return batchIds;\n}\n\n/**\n * Handle UVs if they are out of range [0,1].\n * @param n\n * @param m\n */\nfunction emod(n: number): number {\n return ((n % 1) + 1) % 1;\n}\n"],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"batch-ids-extensions.js","names":["EXT_MESH_FEATURES","EXT_FEATURE_METADATA","handleBatchIdsExtensions","attributes","primitive","images","extensions","extensionName","extensionData","Object","entries","handleExtFeatureMetadataExtension","console","warn","extFeatureMetadata","_extFeatureMetadata$f","_featureIdAttribute$f","_featureIdAttribute$f2","_featureIdAttribute$f3","featureIdAttribute","featureIdAttributes","featureIds","attribute","batchIdsAttribute","value","hasOwnProperty","_attributes$POSITIONS","featuresCount","POSITIONS","length","generateImplicitFeatureIds","constant","divisor","featureIdTexture","featureIdTextures","_featureIdTexture$fea","_featureIdTexture$fea2","textureAttributeIndex","texture","texCoord","textCoordAttribute","concat","textureCoordinates","generateBatchIdsFromTexture","featureTexture","featureTextures","arguments","undefined","currentValue","devisorCounter","index","push","Array","fill","_featureIdTexture$fea3","_featureIdTexture$fea4","_featureIdTexture$fea5","CHANNELS_MAP","r","g","b","a","textureIndex","featureChannel","channels","image","batchIds","width","height","components","u","v","tx","Math","min","emod","ty","offset","batchId","Uint8Array","data","mimeType","n"],"sources":["../../../../src/i3s-converter/helpers/batch-ids-extensions.ts"],"sourcesContent":["import {GLTFAccessorPostprocessed, GLTFMeshPrimitivePostprocessed} from '@loaders.gl/gltf';\nimport type {NumericArray} from '@loaders.gl/loader-utils';\nimport type {\n GLTF_EXT_feature_metadata_attribute,\n GLTF_EXT_feature_metadata_primitive\n} from '@loaders.gl/gltf';\nimport {TypedArray} from '@math.gl/core';\nimport {TextureImageProperties} from '../../i3s-attributes-worker';\n\nconst EXT_MESH_FEATURES = 'EXT_mesh_features';\nconst EXT_FEATURE_METADATA = 'EXT_feature_metadata';\n\n/**\n * Getting batchIds from 3DTilesNext extensions.\n * @param attributes - gltf accessors\n * @param primitive - gltf primitive data\n * @param images - gltf texture images\n */\nexport function handleBatchIdsExtensions(\n attributes: {\n [key: string]: GLTFAccessorPostprocessed;\n },\n primitive: GLTFMeshPrimitivePostprocessed,\n images: (TextureImageProperties | null)[]\n): NumericArray {\n const extensions = primitive?.extensions;\n\n if (!extensions) {\n return [];\n }\n\n for (const [extensionName, extensionData] of Object.entries(extensions || {})) {\n switch (extensionName) {\n case EXT_FEATURE_METADATA:\n return handleExtFeatureMetadataExtension(\n attributes,\n extensionData as GLTF_EXT_feature_metadata_primitive,\n images\n );\n case EXT_MESH_FEATURES:\n console.warn('EXT_mesh_features extension is not supported yet');\n return [];\n default:\n return [];\n }\n }\n\n return [];\n}\n\n/**\n * Get batchIds from EXT_feature_metadata extension.\n * Docs - https://github.com/CesiumGS/glTF/tree/3d-tiles-next/extensions/2.0/Vendor/EXT_feature_metadata\n * @param attributes\n * @param extFeatureMetadata\n * @param textures\n */\nfunction handleExtFeatureMetadataExtension(\n attributes: {\n [key: string]: GLTFAccessorPostprocessed;\n },\n extFeatureMetadata: GLTF_EXT_feature_metadata_primitive,\n images: (TextureImageProperties | null)[]\n): NumericArray {\n // Take only first extension object to get batchIds attribute name.\n const featureIdAttribute = extFeatureMetadata?.featureIdAttributes?.[0];\n\n if (featureIdAttribute?.featureIds?.attribute) {\n const batchIdsAttribute = attributes[featureIdAttribute.featureIds.attribute];\n return batchIdsAttribute.value;\n }\n\n if (\n featureIdAttribute?.featureIds?.hasOwnProperty('constant') &&\n featureIdAttribute?.featureIds?.hasOwnProperty('divisor')\n ) {\n const featuresCount = attributes?.POSITIONS?.value.length / 3 || 0;\n return generateImplicitFeatureIds(\n featuresCount,\n featureIdAttribute.featureIds.constant,\n featureIdAttribute.featureIds.divisor\n );\n }\n\n // Take only first extension object to get batchIds attribute name.\n const featureIdTexture =\n extFeatureMetadata?.featureIdTextures && extFeatureMetadata?.featureIdTextures[0];\n\n if (featureIdTexture) {\n const textureAttributeIndex = featureIdTexture?.featureIds?.texture?.texCoord || 0;\n const textCoordAttribute = `TEXCOORD_${textureAttributeIndex}`;\n const textureCoordinates = attributes[textCoordAttribute].value;\n return generateBatchIdsFromTexture(featureIdTexture, textureCoordinates, images);\n }\n\n // Take only first extension texture to get batchIds from the root EXT_feature_metadata object.\n const featureTexture =\n extFeatureMetadata?.featureTextures && extFeatureMetadata?.featureTextures[0];\n\n if (featureTexture) {\n const batchIdsAttribute = attributes[featureTexture];\n return batchIdsAttribute.value;\n }\n\n return [];\n}\n\n/**\n * Generates implicit feature ids\n * Spec - https://github.com/CesiumGS/glTF/tree/3d-tiles-next/extensions/2.0/Vendor/EXT_feature_metadata#implicit-feature-ids\n * @param featuresCount\n * @param constant\n * @param devisor\n */\nfunction generateImplicitFeatureIds(\n featuresCount: number,\n constant: number = 0,\n divisor: number = 0\n): number[] {\n let featureIds: number[] = [];\n\n if (divisor > 0) {\n let currentValue = constant;\n let devisorCounter = divisor;\n\n for (let index = 0; index < featuresCount; index++) {\n featureIds.push(currentValue);\n\n devisorCounter -= 1;\n\n if (devisorCounter === 0) {\n currentValue++;\n devisorCounter = divisor;\n }\n }\n } else {\n featureIds = Array<number>(featuresCount).fill(constant, 0, featuresCount);\n }\n\n return featureIds;\n}\n\n/**\n * Get batchIds from texture.\n * @param primitive\n * @param featureIdTextures\n */\nfunction generateBatchIdsFromTexture(\n featureIdTexture: GLTF_EXT_feature_metadata_attribute,\n textureCoordinates: TypedArray,\n images: (TextureImageProperties | null)[]\n) {\n if (!images?.length) {\n return [];\n }\n\n const CHANNELS_MAP = {\n r: 0,\n g: 1,\n b: 2,\n a: 3\n };\n\n const textureIndex = featureIdTexture?.featureIds?.texture?.index;\n const featureChannel = featureIdTexture?.featureIds?.channels;\n\n if (!featureChannel || textureIndex === undefined) {\n return [];\n }\n\n const image = images[textureIndex];\n const batchIds: number[] = [];\n const channels = CHANNELS_MAP[featureChannel];\n\n if (image && image?.width && image?.height && image?.components) {\n for (let index = 0; index < textureCoordinates.length; index += 2) {\n const u = textureCoordinates[index];\n const v = textureCoordinates[index + 1];\n\n const tx = Math.min((emod(u) * image.width) | 0, image.width - 1);\n const ty = Math.min((emod(v) * image.height) | 0, image.height - 1);\n\n const offset = (ty * image.width + tx) * image.components + channels;\n const batchId = new Uint8Array(image.data)[offset];\n\n batchIds.push(batchId);\n }\n } else {\n console.warn(`Can't get batch Ids from ${image?.mimeType || ''} compressed texture`);\n }\n\n return batchIds;\n}\n\n/**\n * Handle UVs if they are out of range [0,1].\n * @param n\n * @param m\n */\nfunction emod(n: number): number {\n return ((n % 1) + 1) % 1;\n}\n"],"mappings":"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"}
|
|
@@ -1,19 +1,18 @@
|
|
|
1
1
|
import { Matrix3, Quaternion, Vector3 } from '@math.gl/core';
|
|
2
2
|
import { Ellipsoid } from '@math.gl/geospatial';
|
|
3
3
|
import { OrientedBoundingBox, makeOrientedBoundingBoxFromPoints, makeBoundingSphereFromPoints, BoundingSphere } from '@math.gl/culling';
|
|
4
|
-
export function createBoundingVolumes(
|
|
4
|
+
export function createBoundingVolumes(sourceBoundingVolume, geoidHeightModel) {
|
|
5
5
|
let radius;
|
|
6
6
|
let halfSize;
|
|
7
7
|
let quaternion;
|
|
8
|
-
const
|
|
9
|
-
const cartographicCenter = Ellipsoid.WGS84.cartesianToCartographic(boundingVolume.center, new Vector3());
|
|
8
|
+
const cartographicCenter = Ellipsoid.WGS84.cartesianToCartographic(sourceBoundingVolume.center, new Vector3());
|
|
10
9
|
cartographicCenter[2] = cartographicCenter[2] - geoidHeightModel.getHeight(cartographicCenter[1], cartographicCenter[0]);
|
|
11
|
-
if (
|
|
12
|
-
halfSize =
|
|
10
|
+
if (sourceBoundingVolume instanceof OrientedBoundingBox) {
|
|
11
|
+
halfSize = sourceBoundingVolume.halfSize;
|
|
13
12
|
radius = new Vector3(halfSize[0], halfSize[1], halfSize[2]).len();
|
|
14
|
-
quaternion =
|
|
13
|
+
quaternion = sourceBoundingVolume.quaternion;
|
|
15
14
|
} else {
|
|
16
|
-
radius =
|
|
15
|
+
radius = sourceBoundingVolume.radius;
|
|
17
16
|
halfSize = [radius, radius, radius];
|
|
18
17
|
quaternion = new Quaternion().fromMatrix3(new Matrix3([halfSize[0], 0, 0, 0, halfSize[1], 0, 0, 0, halfSize[2]])).normalize();
|
|
19
18
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"coordinate-converter.js","names":["Matrix3","Quaternion","Vector3","Ellipsoid","OrientedBoundingBox","makeOrientedBoundingBoxFromPoints","makeBoundingSphereFromPoints","BoundingSphere","createBoundingVolumes","tile","geoidHeightModel","radius","halfSize","quaternion","boundingVolume","cartographicCenter","WGS84","cartesianToCartographic","center","getHeight","len","fromMatrix3","normalize","mbs","obb","createBoundingVolumesFromGeometry","cartesianPositions","positionVectors","convertPositionsToVectors","geometryObb","geometryMbs","mbsCenter","obbCenter","positions","result","i","length","positionVector","push","convertBoundingVolumeToI3SFullExtent","sphere","getBoundingSphere","vertexMax","vertexMin","xmin","Math","min","xmax","max","ymin","ymax","zmin","zmax","createObbFromMbs","halfAxex"],"sources":["../../../../src/i3s-converter/helpers/coordinate-converter.ts"],"sourcesContent":["import type {BoundingVolumes, FullExtent, Mbs, Obb} from '@loaders.gl/i3s';\n\nimport {Matrix3, Quaternion, Vector3} from '@math.gl/core';\nimport {Ellipsoid} from '@math.gl/geospatial';\nimport {\n OrientedBoundingBox,\n makeOrientedBoundingBoxFromPoints,\n makeBoundingSphereFromPoints,\n BoundingSphere\n} from '@math.gl/culling';\nimport {Tile3D} from '@loaders.gl/tiles';\nimport {Geoid} from '@math.gl/geoid';\n\n/**\n * Create bounding volumes object from tile and geoid height model.\n * @param tile\n * @param geoidHeightModel\n * @returns - Bounding volumes object\n */\nexport function createBoundingVolumes(tile: Tile3D, geoidHeightModel: Geoid): BoundingVolumes {\n let radius;\n let halfSize;\n let quaternion;\n\n const boundingVolume = tile.boundingVolume;\n const cartographicCenter = Ellipsoid.WGS84.cartesianToCartographic(\n boundingVolume.center,\n new Vector3()\n );\n cartographicCenter[2] =\n cartographicCenter[2] -\n geoidHeightModel.getHeight(cartographicCenter[1], cartographicCenter[0]);\n if (boundingVolume instanceof OrientedBoundingBox) {\n halfSize = boundingVolume.halfSize;\n radius = new Vector3(halfSize[0], halfSize[1], halfSize[2]).len();\n quaternion = boundingVolume.quaternion;\n } else {\n radius = tile.boundingVolume.radius;\n halfSize = [radius, radius, radius];\n quaternion = new Quaternion()\n .fromMatrix3(new Matrix3([halfSize[0], 0, 0, 0, halfSize[1], 0, 0, 0, halfSize[2]]))\n .normalize();\n }\n\n return {\n mbs: [cartographicCenter[0], cartographicCenter[1], cartographicCenter[2], radius],\n obb: {\n center: [cartographicCenter[0], cartographicCenter[1], cartographicCenter[2]],\n halfSize,\n quaternion\n }\n };\n}\n\n/**\n * Generates bounding volumes from geometry positions\n * @param cartesianPositions\n * @param geoidHeightModel\n */\nexport function createBoundingVolumesFromGeometry(\n cartesianPositions: Float32Array,\n geoidHeightModel: Geoid\n): {mbs: Mbs; obb: Obb} {\n const positionVectors = convertPositionsToVectors(cartesianPositions);\n\n const geometryObb = makeOrientedBoundingBoxFromPoints(positionVectors);\n const geometryMbs = makeBoundingSphereFromPoints(positionVectors);\n\n let mbsCenter = Ellipsoid.WGS84.cartesianToCartographic(geometryMbs.center, new Vector3());\n let obbCenter = Ellipsoid.WGS84.cartesianToCartographic(geometryObb.center, new Vector3());\n\n mbsCenter[2] = mbsCenter[2] - geoidHeightModel.getHeight(mbsCenter[1], mbsCenter[0]);\n obbCenter[2] = obbCenter[2] - geoidHeightModel.getHeight(obbCenter[1], obbCenter[0]);\n\n return {\n mbs: [mbsCenter[0], mbsCenter[1], mbsCenter[2], geometryMbs.radius],\n obb: {\n center: obbCenter,\n halfSize: geometryObb.halfSize,\n quaternion: geometryObb.quaternion\n }\n };\n}\n\n/**\n * Create array of posisitons where each vertex is vector\n * @param {array} positions\n * @returns {Vector3[]}\n */\nexport function convertPositionsToVectors(positions: Float32Array): Vector3[] {\n const result: Vector3[] = [];\n\n for (let i = 0; i < positions.length; i += 3) {\n // TODO: (perf) new Vector3 is not optimal but required in `makeOrientedBoundingBoxFromPoints`.\n // modify `makeOrientedBoundingBoxFromPoints` to use scratch vectors\n const positionVector = new Vector3([positions[i], positions[i + 1], positions[i + 2]]);\n result.push(positionVector);\n }\n\n return result;\n}\n\n/**\n * Convert common coordinate to fullExtent https://github.com/Esri/i3s-spec/blob/master/docs/1.8/fullExtent.cmn.md\n * @param\n * @param boundingVolume\n * @returns - fullExtent object\n */\nexport function convertBoundingVolumeToI3SFullExtent(\n boundingVolume: OrientedBoundingBox | BoundingSphere\n): FullExtent {\n let sphere: BoundingSphere;\n if (boundingVolume instanceof BoundingSphere) {\n sphere = boundingVolume;\n } else {\n sphere = boundingVolume.getBoundingSphere();\n }\n const center: Vector3 = sphere.center;\n const radius: number = sphere.radius;\n const vertexMax = Ellipsoid.WGS84.cartesianToCartographic(\n new Vector3(center[0] + radius, center[1] + radius, center[2] + radius),\n new Vector3()\n );\n const vertexMin = Ellipsoid.WGS84.cartesianToCartographic(\n new Vector3(center[0] - radius, center[1] - radius, center[2] - radius),\n new Vector3()\n );\n\n // Converter sometimes returns min values that are bigger then max,\n // so we should check and take bigger value from max and smaller for nim\n return {\n xmin: Math.min(vertexMin[0], vertexMax[0]),\n xmax: Math.max(vertexMin[0], vertexMax[0]),\n ymin: Math.min(vertexMin[1], vertexMax[1]),\n ymax: Math.max(vertexMin[1], vertexMax[1]),\n zmin: Math.min(vertexMin[2], vertexMax[2]),\n zmax: Math.max(vertexMin[2], vertexMax[2])\n };\n}\n\n/**\n * Creates oriented boundinb box from mbs.\n * @param mbs - Minimum Bounding Sphere\n * @returns - Oriented BOunding Box\n */\nexport function createObbFromMbs(mbs: Mbs): Obb {\n const radius = mbs[3];\n const center = new Vector3(mbs[0], mbs[1], mbs[2]);\n const halfAxex = new Matrix3([radius, 0, 0, 0, radius, 0, 0, 0, radius]);\n return new OrientedBoundingBox(center, halfAxex);\n}\n"],"mappings":"AAEA,SAAQA,OAAO,EAAEC,UAAU,EAAEC,OAAO,QAAO,eAAe;AAC1D,SAAQC,SAAS,QAAO,qBAAqB;AAC7C,SACEC,mBAAmB,EACnBC,iCAAiC,EACjCC,4BAA4B,EAC5BC,cAAc,QACT,kBAAkB;AAUzB,OAAO,SAASC,qBAAqBA,CAACC,IAAY,EAAEC,gBAAuB,EAAmB;EAC5F,IAAIC,MAAM;EACV,IAAIC,QAAQ;EACZ,IAAIC,UAAU;EAEd,MAAMC,cAAc,GAAGL,IAAI,CAACK,cAAc;EAC1C,MAAMC,kBAAkB,GAAGZ,SAAS,CAACa,KAAK,CAACC,uBAAuB,CAChEH,cAAc,CAACI,MAAM,EACrB,IAAIhB,OAAO,CAAC,CACd,CAAC;EACDa,kBAAkB,CAAC,CAAC,CAAC,GACnBA,kBAAkB,CAAC,CAAC,CAAC,GACrBL,gBAAgB,CAACS,SAAS,CAACJ,kBAAkB,CAAC,CAAC,CAAC,EAAEA,kBAAkB,CAAC,CAAC,CAAC,CAAC;EAC1E,IAAID,cAAc,YAAYV,mBAAmB,EAAE;IACjDQ,QAAQ,GAAGE,cAAc,CAACF,QAAQ;IAClCD,MAAM,GAAG,IAAIT,OAAO,CAACU,QAAQ,CAAC,CAAC,CAAC,EAAEA,QAAQ,CAAC,CAAC,CAAC,EAAEA,QAAQ,CAAC,CAAC,CAAC,CAAC,CAACQ,GAAG,CAAC,CAAC;IACjEP,UAAU,GAAGC,cAAc,CAACD,UAAU;EACxC,CAAC,MAAM;IACLF,MAAM,GAAGF,IAAI,CAACK,cAAc,CAACH,MAAM;IACnCC,QAAQ,GAAG,CAACD,MAAM,EAAEA,MAAM,EAAEA,MAAM,CAAC;IACnCE,UAAU,GAAG,IAAIZ,UAAU,CAAC,CAAC,CAC1BoB,WAAW,CAAC,IAAIrB,OAAO,CAAC,CAACY,QAAQ,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAEA,QAAQ,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAEA,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CACnFU,SAAS,CAAC,CAAC;EAChB;EAEA,OAAO;IACLC,GAAG,EAAE,CAACR,kBAAkB,CAAC,CAAC,CAAC,EAAEA,kBAAkB,CAAC,CAAC,CAAC,EAAEA,kBAAkB,CAAC,CAAC,CAAC,EAAEJ,MAAM,CAAC;IAClFa,GAAG,EAAE;MACHN,MAAM,EAAE,CAACH,kBAAkB,CAAC,CAAC,CAAC,EAAEA,kBAAkB,CAAC,CAAC,CAAC,EAAEA,kBAAkB,CAAC,CAAC,CAAC,CAAC;MAC7EH,QAAQ;MACRC;IACF;EACF,CAAC;AACH;AAOA,OAAO,SAASY,iCAAiCA,CAC/CC,kBAAgC,EAChChB,gBAAuB,EACD;EACtB,MAAMiB,eAAe,GAAGC,yBAAyB,CAACF,kBAAkB,CAAC;EAErE,MAAMG,WAAW,GAAGxB,iCAAiC,CAACsB,eAAe,CAAC;EACtE,MAAMG,WAAW,GAAGxB,4BAA4B,CAACqB,eAAe,CAAC;EAEjE,IAAII,SAAS,GAAG5B,SAAS,CAACa,KAAK,CAACC,uBAAuB,CAACa,WAAW,CAACZ,MAAM,EAAE,IAAIhB,OAAO,CAAC,CAAC,CAAC;EAC1F,IAAI8B,SAAS,GAAG7B,SAAS,CAACa,KAAK,CAACC,uBAAuB,CAACY,WAAW,CAACX,MAAM,EAAE,IAAIhB,OAAO,CAAC,CAAC,CAAC;EAE1F6B,SAAS,CAAC,CAAC,CAAC,GAAGA,SAAS,CAAC,CAAC,CAAC,GAAGrB,gBAAgB,CAACS,SAAS,CAACY,SAAS,CAAC,CAAC,CAAC,EAAEA,SAAS,CAAC,CAAC,CAAC,CAAC;EACpFC,SAAS,CAAC,CAAC,CAAC,GAAGA,SAAS,CAAC,CAAC,CAAC,GAAGtB,gBAAgB,CAACS,SAAS,CAACa,SAAS,CAAC,CAAC,CAAC,EAAEA,SAAS,CAAC,CAAC,CAAC,CAAC;EAEpF,OAAO;IACLT,GAAG,EAAE,CAACQ,SAAS,CAAC,CAAC,CAAC,EAAEA,SAAS,CAAC,CAAC,CAAC,EAAEA,SAAS,CAAC,CAAC,CAAC,EAAED,WAAW,CAACnB,MAAM,CAAC;IACnEa,GAAG,EAAE;MACHN,MAAM,EAAEc,SAAS;MACjBpB,QAAQ,EAAEiB,WAAW,CAACjB,QAAQ;MAC9BC,UAAU,EAAEgB,WAAW,CAAChB;IAC1B;EACF,CAAC;AACH;AAOA,OAAO,SAASe,yBAAyBA,CAACK,SAAuB,EAAa;EAC5E,MAAMC,MAAiB,GAAG,EAAE;EAE5B,KAAK,IAAIC,CAAC,GAAG,CAAC,EAAEA,CAAC,GAAGF,SAAS,CAACG,MAAM,EAAED,CAAC,IAAI,CAAC,EAAE;IAG5C,MAAME,cAAc,GAAG,IAAInC,OAAO,CAAC,CAAC+B,SAAS,CAACE,CAAC,CAAC,EAAEF,SAAS,CAACE,CAAC,GAAG,CAAC,CAAC,EAAEF,SAAS,CAACE,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;IACtFD,MAAM,CAACI,IAAI,CAACD,cAAc,CAAC;EAC7B;EAEA,OAAOH,MAAM;AACf;AAQA,OAAO,SAASK,oCAAoCA,CAClDzB,cAAoD,EACxC;EACZ,IAAI0B,MAAsB;EAC1B,IAAI1B,cAAc,YAAYP,cAAc,EAAE;IAC5CiC,MAAM,GAAG1B,cAAc;EACzB,CAAC,MAAM;IACL0B,MAAM,GAAG1B,cAAc,CAAC2B,iBAAiB,CAAC,CAAC;EAC7C;EACA,MAAMvB,MAAe,GAAGsB,MAAM,CAACtB,MAAM;EACrC,MAAMP,MAAc,GAAG6B,MAAM,CAAC7B,MAAM;EACpC,MAAM+B,SAAS,GAAGvC,SAAS,CAACa,KAAK,CAACC,uBAAuB,CACvD,IAAIf,OAAO,CAACgB,MAAM,CAAC,CAAC,CAAC,GAAGP,MAAM,EAAEO,MAAM,CAAC,CAAC,CAAC,GAAGP,MAAM,EAAEO,MAAM,CAAC,CAAC,CAAC,GAAGP,MAAM,CAAC,EACvE,IAAIT,OAAO,CAAC,CACd,CAAC;EACD,MAAMyC,SAAS,GAAGxC,SAAS,CAACa,KAAK,CAACC,uBAAuB,CACvD,IAAIf,OAAO,CAACgB,MAAM,CAAC,CAAC,CAAC,GAAGP,MAAM,EAAEO,MAAM,CAAC,CAAC,CAAC,GAAGP,MAAM,EAAEO,MAAM,CAAC,CAAC,CAAC,GAAGP,MAAM,CAAC,EACvE,IAAIT,OAAO,CAAC,CACd,CAAC;EAID,OAAO;IACL0C,IAAI,EAAEC,IAAI,CAACC,GAAG,CAACH,SAAS,CAAC,CAAC,CAAC,EAAED,SAAS,CAAC,CAAC,CAAC,CAAC;IAC1CK,IAAI,EAAEF,IAAI,CAACG,GAAG,CAACL,SAAS,CAAC,CAAC,CAAC,EAAED,SAAS,CAAC,CAAC,CAAC,CAAC;IAC1CO,IAAI,EAAEJ,IAAI,CAACC,GAAG,CAACH,SAAS,CAAC,CAAC,CAAC,EAAED,SAAS,CAAC,CAAC,CAAC,CAAC;IAC1CQ,IAAI,EAAEL,IAAI,CAACG,GAAG,CAACL,SAAS,CAAC,CAAC,CAAC,EAAED,SAAS,CAAC,CAAC,CAAC,CAAC;IAC1CS,IAAI,EAAEN,IAAI,CAACC,GAAG,CAACH,SAAS,CAAC,CAAC,CAAC,EAAED,SAAS,CAAC,CAAC,CAAC,CAAC;IAC1CU,IAAI,EAAEP,IAAI,CAACG,GAAG,CAACL,SAAS,CAAC,CAAC,CAAC,EAAED,SAAS,CAAC,CAAC,CAAC;EAC3C,CAAC;AACH;AAOA,OAAO,SAASW,gBAAgBA,CAAC9B,GAAQ,EAAO;EAC9C,MAAMZ,MAAM,GAAGY,GAAG,CAAC,CAAC,CAAC;EACrB,MAAML,MAAM,GAAG,IAAIhB,OAAO,CAACqB,GAAG,CAAC,CAAC,CAAC,EAAEA,GAAG,CAAC,CAAC,CAAC,EAAEA,GAAG,CAAC,CAAC,CAAC,CAAC;EAClD,MAAM+B,QAAQ,GAAG,IAAItD,OAAO,CAAC,CAACW,MAAM,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAEA,MAAM,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAEA,MAAM,CAAC,CAAC;EACxE,OAAO,IAAIP,mBAAmB,CAACc,MAAM,EAAEoC,QAAQ,CAAC;AAClD"}
|
|
1
|
+
{"version":3,"file":"coordinate-converter.js","names":["Matrix3","Quaternion","Vector3","Ellipsoid","OrientedBoundingBox","makeOrientedBoundingBoxFromPoints","makeBoundingSphereFromPoints","BoundingSphere","createBoundingVolumes","sourceBoundingVolume","geoidHeightModel","radius","halfSize","quaternion","cartographicCenter","WGS84","cartesianToCartographic","center","getHeight","len","fromMatrix3","normalize","mbs","obb","createBoundingVolumesFromGeometry","cartesianPositions","positionVectors","convertPositionsToVectors","geometryObb","geometryMbs","mbsCenter","obbCenter","positions","result","i","length","positionVector","push","convertBoundingVolumeToI3SFullExtent","boundingVolume","sphere","getBoundingSphere","vertexMax","vertexMin","xmin","Math","min","xmax","max","ymin","ymax","zmin","zmax","createObbFromMbs","halfAxex"],"sources":["../../../../src/i3s-converter/helpers/coordinate-converter.ts"],"sourcesContent":["import type {BoundingVolumes, FullExtent, Mbs, Obb} from '@loaders.gl/i3s';\n\nimport {Matrix3, Quaternion, Vector3} from '@math.gl/core';\nimport {Ellipsoid} from '@math.gl/geospatial';\nimport {\n OrientedBoundingBox,\n makeOrientedBoundingBoxFromPoints,\n makeBoundingSphereFromPoints,\n BoundingSphere\n} from '@math.gl/culling';\nimport {Geoid} from '@math.gl/geoid';\n\n/**\n * Create bounding volumes object from tile and geoid height model.\n * @param sourceBoundingVolume - initialized bounding volume of the source tile\n * @param geoidHeightModel - instance of Geoid class that converts elevation from geoidal to ellipsoidal and back\n * @returns - Bounding volumes object\n */\nexport function createBoundingVolumes(\n sourceBoundingVolume: OrientedBoundingBox | BoundingSphere,\n geoidHeightModel: Geoid\n): BoundingVolumes {\n let radius;\n let halfSize;\n let quaternion;\n\n const cartographicCenter = Ellipsoid.WGS84.cartesianToCartographic(\n sourceBoundingVolume.center,\n new Vector3()\n );\n cartographicCenter[2] =\n cartographicCenter[2] -\n geoidHeightModel.getHeight(cartographicCenter[1], cartographicCenter[0]);\n if (sourceBoundingVolume instanceof OrientedBoundingBox) {\n halfSize = sourceBoundingVolume.halfSize;\n radius = new Vector3(halfSize[0], halfSize[1], halfSize[2]).len();\n quaternion = sourceBoundingVolume.quaternion;\n } else {\n radius = sourceBoundingVolume.radius;\n halfSize = [radius, radius, radius];\n quaternion = new Quaternion()\n .fromMatrix3(new Matrix3([halfSize[0], 0, 0, 0, halfSize[1], 0, 0, 0, halfSize[2]]))\n .normalize();\n }\n\n return {\n mbs: [cartographicCenter[0], cartographicCenter[1], cartographicCenter[2], radius],\n obb: {\n center: [cartographicCenter[0], cartographicCenter[1], cartographicCenter[2]],\n halfSize,\n quaternion\n }\n };\n}\n\n/**\n * Generates bounding volumes from geometry positions\n * @param cartesianPositions\n * @param geoidHeightModel\n */\nexport function createBoundingVolumesFromGeometry(\n cartesianPositions: Float32Array,\n geoidHeightModel: Geoid\n): {mbs: Mbs; obb: Obb} {\n const positionVectors = convertPositionsToVectors(cartesianPositions);\n\n const geometryObb = makeOrientedBoundingBoxFromPoints(positionVectors);\n const geometryMbs = makeBoundingSphereFromPoints(positionVectors);\n\n let mbsCenter = Ellipsoid.WGS84.cartesianToCartographic(geometryMbs.center, new Vector3());\n let obbCenter = Ellipsoid.WGS84.cartesianToCartographic(geometryObb.center, new Vector3());\n\n mbsCenter[2] = mbsCenter[2] - geoidHeightModel.getHeight(mbsCenter[1], mbsCenter[0]);\n obbCenter[2] = obbCenter[2] - geoidHeightModel.getHeight(obbCenter[1], obbCenter[0]);\n\n return {\n mbs: [mbsCenter[0], mbsCenter[1], mbsCenter[2], geometryMbs.radius],\n obb: {\n center: obbCenter,\n halfSize: geometryObb.halfSize,\n quaternion: geometryObb.quaternion\n }\n };\n}\n\n/**\n * Create array of posisitons where each vertex is vector\n * @param {array} positions\n * @returns {Vector3[]}\n */\nexport function convertPositionsToVectors(positions: Float32Array): Vector3[] {\n const result: Vector3[] = [];\n\n for (let i = 0; i < positions.length; i += 3) {\n // TODO: (perf) new Vector3 is not optimal but required in `makeOrientedBoundingBoxFromPoints`.\n // modify `makeOrientedBoundingBoxFromPoints` to use scratch vectors\n const positionVector = new Vector3([positions[i], positions[i + 1], positions[i + 2]]);\n result.push(positionVector);\n }\n\n return result;\n}\n\n/**\n * Convert common coordinate to fullExtent https://github.com/Esri/i3s-spec/blob/master/docs/1.8/fullExtent.cmn.md\n * @param\n * @param boundingVolume\n * @returns - fullExtent object\n */\nexport function convertBoundingVolumeToI3SFullExtent(\n boundingVolume: OrientedBoundingBox | BoundingSphere\n): FullExtent {\n let sphere: BoundingSphere;\n if (boundingVolume instanceof BoundingSphere) {\n sphere = boundingVolume;\n } else {\n sphere = boundingVolume.getBoundingSphere();\n }\n const center: Vector3 = sphere.center;\n const radius: number = sphere.radius;\n const vertexMax = Ellipsoid.WGS84.cartesianToCartographic(\n new Vector3(center[0] + radius, center[1] + radius, center[2] + radius),\n new Vector3()\n );\n const vertexMin = Ellipsoid.WGS84.cartesianToCartographic(\n new Vector3(center[0] - radius, center[1] - radius, center[2] - radius),\n new Vector3()\n );\n\n // Converter sometimes returns min values that are bigger then max,\n // so we should check and take bigger value from max and smaller for nim\n return {\n xmin: Math.min(vertexMin[0], vertexMax[0]),\n xmax: Math.max(vertexMin[0], vertexMax[0]),\n ymin: Math.min(vertexMin[1], vertexMax[1]),\n ymax: Math.max(vertexMin[1], vertexMax[1]),\n zmin: Math.min(vertexMin[2], vertexMax[2]),\n zmax: Math.max(vertexMin[2], vertexMax[2])\n };\n}\n\n/**\n * Creates oriented boundinb box from mbs.\n * @param mbs - Minimum Bounding Sphere\n * @returns - Oriented BOunding Box\n */\nexport function createObbFromMbs(mbs: Mbs): Obb {\n const radius = mbs[3];\n const center = new Vector3(mbs[0], mbs[1], mbs[2]);\n const halfAxex = new Matrix3([radius, 0, 0, 0, radius, 0, 0, 0, radius]);\n return new OrientedBoundingBox(center, halfAxex);\n}\n"],"mappings":"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"}
|
|
@@ -11,6 +11,7 @@ import { prepareDataForAttributesConversion } from './gltf-attributes';
|
|
|
11
11
|
import { handleBatchIdsExtensions } from './batch-ids-extensions';
|
|
12
12
|
import { checkPropertiesLength, flattenPropertyTableByFeatureIds } from './feature-attributes';
|
|
13
13
|
import { GL } from '@loaders.gl/math';
|
|
14
|
+
import { generateSyntheticIndices } from '../../lib/utils/geometry-utils';
|
|
14
15
|
const DEFAULT_ROUGHNESS_FACTOR = 1;
|
|
15
16
|
const DEFAULT_METALLIC_FACTOR = 1;
|
|
16
17
|
const VALUES_PER_VERTEX = 3;
|
|
@@ -24,11 +25,11 @@ const BATCHED_ID_POSSIBLE_ATTRIBUTE_NAMES = ['CUSTOM_ATTRIBUTE_2', '_BATCHID', '
|
|
|
24
25
|
const EXT_FEATURE_METADATA = 'EXT_feature_metadata';
|
|
25
26
|
const EXT_MESH_FEATURES = 'EXT_mesh_features';
|
|
26
27
|
let scratchVector = new Vector3();
|
|
27
|
-
export default async function convertB3dmToI3sGeometry(tileContent, addNodeToNodePage, propertyTable, featuresHashArray, attributeStorageInfo, draco, generateBoundingVolumes, shouldMergeMaterials, geoidHeightModel, workerSource) {
|
|
28
|
+
export default async function convertB3dmToI3sGeometry(tileContent, tileTransform, tileBoundingVolume, addNodeToNodePage, propertyTable, featuresHashArray, attributeStorageInfo, draco, generateBoundingVolumes, shouldMergeMaterials, geoidHeightModel, workerSource) {
|
|
28
29
|
var _tileContent$gltf;
|
|
29
30
|
const useCartesianPositions = generateBoundingVolumes;
|
|
30
31
|
const materialAndTextureList = await convertMaterials((_tileContent$gltf = tileContent.gltf) === null || _tileContent$gltf === void 0 ? void 0 : _tileContent$gltf.materials, shouldMergeMaterials);
|
|
31
|
-
const dataForAttributesConversion = prepareDataForAttributesConversion(tileContent);
|
|
32
|
+
const dataForAttributesConversion = prepareDataForAttributesConversion(tileContent, tileTransform, tileBoundingVolume);
|
|
32
33
|
const convertedAttributesMap = await convertAttributes(dataForAttributesConversion, materialAndTextureList, useCartesianPositions);
|
|
33
34
|
if (generateBoundingVolumes) {
|
|
34
35
|
_generateBoundingVolumesFromGeometry(convertedAttributesMap, geoidHeightModel);
|
|
@@ -228,23 +229,24 @@ function convertMesh(mesh, images, cartographicOrigin, cartesianModelMatrix, att
|
|
|
228
229
|
let materialUvRegion;
|
|
229
230
|
if (primitive.material) {
|
|
230
231
|
var _outputAttributes, _outputAttributes$mer;
|
|
231
|
-
outputAttributes = attributesMap.get(primitive.material.
|
|
232
|
+
outputAttributes = attributesMap.get(primitive.material.id);
|
|
232
233
|
materialUvRegion = (_outputAttributes = outputAttributes) === null || _outputAttributes === void 0 ? void 0 : (_outputAttributes$mer = _outputAttributes.mergedMaterials.find(_ref2 => {
|
|
233
234
|
var _primitive$material;
|
|
234
235
|
let {
|
|
235
236
|
originalMaterialId
|
|
236
237
|
} = _ref2;
|
|
237
|
-
return originalMaterialId === ((_primitive$material = primitive.material) === null || _primitive$material === void 0 ? void 0 : _primitive$material.
|
|
238
|
+
return originalMaterialId === ((_primitive$material = primitive.material) === null || _primitive$material === void 0 ? void 0 : _primitive$material.id);
|
|
238
239
|
})) === null || _outputAttributes$mer === void 0 ? void 0 : _outputAttributes$mer.uvRegion;
|
|
239
240
|
} else if (attributesMap.has('default')) {
|
|
240
241
|
outputAttributes = attributesMap.get('default');
|
|
241
242
|
}
|
|
242
243
|
assert(outputAttributes !== null, 'Primitive - material mapping failed');
|
|
244
|
+
assert(primitive.mode === undefined || primitive.mode === GL.TRIANGLES || primitive.mode === GL.TRIANGLE_STRIP, "Primitive - unsupported mode ".concat(primitive.mode));
|
|
243
245
|
const attributes = primitive.attributes;
|
|
244
246
|
if (!outputAttributes) {
|
|
245
247
|
continue;
|
|
246
248
|
}
|
|
247
|
-
const indices =
|
|
249
|
+
const indices = normalizeIndices(primitive);
|
|
248
250
|
outputAttributes.positions = concatenateTypedArrays(outputAttributes.positions, transformVertexArray({
|
|
249
251
|
vertices: attributes.POSITION.value,
|
|
250
252
|
cartographicOrigin,
|
|
@@ -272,9 +274,13 @@ function convertMesh(mesh, images, cartographicOrigin, cartesianModelMatrix, att
|
|
|
272
274
|
outputAttributes.featureIndicesGroups.push(flattenBatchIds(getBatchIds(attributes, primitive, images), indices));
|
|
273
275
|
}
|
|
274
276
|
}
|
|
275
|
-
function
|
|
277
|
+
function normalizeIndices(primitive) {
|
|
276
278
|
var _primitive$indices;
|
|
277
279
|
let indices = (_primitive$indices = primitive.indices) === null || _primitive$indices === void 0 ? void 0 : _primitive$indices.value;
|
|
280
|
+
if (!indices) {
|
|
281
|
+
const positions = primitive.attributes.POSITION.value;
|
|
282
|
+
return generateSyntheticIndices(positions.length / VALUES_PER_VERTEX);
|
|
283
|
+
}
|
|
278
284
|
if (indices && primitive.mode === GL.TRIANGLE_STRIP) {
|
|
279
285
|
const TypedArrayConstructor = indices.constructor;
|
|
280
286
|
const newIndices = new TypedArrayConstructor((indices.length - 2) * 3);
|
|
@@ -517,10 +523,9 @@ function convertMaterial(sourceMaterial) {
|
|
|
517
523
|
textureSetDefinitionId: 0
|
|
518
524
|
};
|
|
519
525
|
}
|
|
520
|
-
|
|
521
|
-
sourceMaterial.uniqueId = uniqueId;
|
|
526
|
+
sourceMaterial.id = Number.isFinite(sourceMaterial.id) ? sourceMaterial.id : uuidv4();
|
|
522
527
|
let mergedMaterials = [{
|
|
523
|
-
originalMaterialId:
|
|
528
|
+
originalMaterialId: sourceMaterial.id
|
|
524
529
|
}];
|
|
525
530
|
if (!texture) {
|
|
526
531
|
var _sourceMaterial$pbrMe4;
|
|
@@ -619,22 +624,25 @@ function extractSharedResourcesMaterialInfo(baseColorFactor) {
|
|
|
619
624
|
};
|
|
620
625
|
}
|
|
621
626
|
function extractSharedResourcesTextureInfo(texture, nodeId) {
|
|
622
|
-
var _texture$source, _texture$source2, _texture$source3;
|
|
627
|
+
var _texture$source, _texture$source2, _texture$source3, _texture$source4;
|
|
623
628
|
return {
|
|
624
629
|
encoding: texture !== null && texture !== void 0 && (_texture$source = texture.source) !== null && _texture$source !== void 0 && _texture$source.mimeType ? [texture.source.mimeType] : undefined,
|
|
625
630
|
images: [{
|
|
626
631
|
id: generateImageId(texture, nodeId),
|
|
627
632
|
size: (_texture$source2 = texture.source) === null || _texture$source2 === void 0 ? void 0 : _texture$source2.image.width,
|
|
628
|
-
length:
|
|
633
|
+
length: (_texture$source3 = texture.source) !== null && _texture$source3 !== void 0 && _texture$source3.image.data.length ? [(_texture$source4 = texture.source) === null || _texture$source4 === void 0 ? void 0 : _texture$source4.image.data.length] : undefined
|
|
629
634
|
}]
|
|
630
635
|
};
|
|
631
636
|
}
|
|
632
637
|
function generateImageId(texture, nodeId) {
|
|
633
|
-
var _texture$
|
|
638
|
+
var _texture$source5;
|
|
634
639
|
const {
|
|
635
640
|
width,
|
|
636
641
|
height
|
|
637
|
-
} = (_texture$
|
|
642
|
+
} = ((_texture$source5 = texture.source) === null || _texture$source5 === void 0 ? void 0 : _texture$source5.image) || {};
|
|
643
|
+
if (!width || !height) {
|
|
644
|
+
return '';
|
|
645
|
+
}
|
|
638
646
|
const levelCountOfTexture = 1;
|
|
639
647
|
const indexOfLevel = 0;
|
|
640
648
|
const indexOfTextureInStore = nodeId + 1;
|
|
@@ -818,6 +826,9 @@ function generateFeatureIndexAttribute(featureIndex, faceRange) {
|
|
|
818
826
|
return orderedFeatureIndices;
|
|
819
827
|
}
|
|
820
828
|
export function getPropertyTable(tileContent) {
|
|
829
|
+
if (!tileContent) {
|
|
830
|
+
return null;
|
|
831
|
+
}
|
|
821
832
|
const batchTableJson = tileContent === null || tileContent === void 0 ? void 0 : tileContent.batchTableJson;
|
|
822
833
|
if (batchTableJson) {
|
|
823
834
|
return batchTableJson;
|
|
@@ -865,10 +876,6 @@ function getPropertyTableExtension(tileContent) {
|
|
|
865
876
|
};
|
|
866
877
|
}
|
|
867
878
|
function getPropertyTableFromExtFeatureMetadata(extension) {
|
|
868
|
-
if (extension !== null && extension !== void 0 && extension.featureTextures) {
|
|
869
|
-
console.warn('The I3S converter does not yet support the EXT_feature_metadata feature textures');
|
|
870
|
-
return null;
|
|
871
|
-
}
|
|
872
879
|
if (extension !== null && extension !== void 0 && extension.featureTables) {
|
|
873
880
|
var _Object$keys;
|
|
874
881
|
const firstFeatureTableName = (_Object$keys = Object.keys(extension.featureTables)) === null || _Object$keys === void 0 ? void 0 : _Object$keys[0];
|
|
@@ -881,7 +888,19 @@ function getPropertyTableFromExtFeatureMetadata(extension) {
|
|
|
881
888
|
return propertyTable;
|
|
882
889
|
}
|
|
883
890
|
}
|
|
884
|
-
|
|
891
|
+
if (extension !== null && extension !== void 0 && extension.featureTextures) {
|
|
892
|
+
var _Object$keys2;
|
|
893
|
+
const firstTextureName = (_Object$keys2 = Object.keys(extension.featureTextures)) === null || _Object$keys2 === void 0 ? void 0 : _Object$keys2[0];
|
|
894
|
+
if (firstTextureName) {
|
|
895
|
+
const featureTable = extension === null || extension === void 0 ? void 0 : extension.featureTextures[firstTextureName];
|
|
896
|
+
const propertyTable = {};
|
|
897
|
+
for (const propertyName in featureTable.properties) {
|
|
898
|
+
propertyTable[propertyName] = featureTable.properties[propertyName].data;
|
|
899
|
+
}
|
|
900
|
+
return propertyTable;
|
|
901
|
+
}
|
|
902
|
+
}
|
|
903
|
+
console.warn("The I3S converter couldn't handle EXT_feature_metadata extension: There is neither featureTables, no featureTextures in the extension.");
|
|
885
904
|
return null;
|
|
886
905
|
}
|
|
887
906
|
//# sourceMappingURL=geometry-converter.js.map
|