@loaders.gl/tile-converter 4.0.0-alpha.6 → 4.0.0-alpha.8

package/dist/lib/utils/geometry-utils.d.ts

@@ -0,0 +1,9 @@
+/**
+ * luma.gl can not work without indices now:
+ * https://github.com/visgl/luma.gl/blob/d8cad75b9f8ca3e578cf078ed9d19e619c2ddbc9/modules/experimental/src/gltf/gltf-instantiator.js#L115
+ * This method generates syntetic indices array: [0, 1, 2, 3, .... , vertexCount-1]
+ * @param {number} vertexCount - vertex count in the geometry
+ * @returns {Uint32Array} indices array.
+ */
+export declare const generateSyntheticIndices: (vertexCount: number) => Uint32Array;
+//# sourceMappingURL=geometry-utils.d.ts.map

package/dist/lib/utils/geometry-utils.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"geometry-utils.d.ts","sourceRoot":"","sources":["../../../src/lib/utils/geometry-utils.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AACH,eAAO,MAAM,wBAAwB,gBAAiB,MAAM,KAAG,WAM9D,CAAC"}

package/dist/lib/utils/geometry-utils.js

@@ -0,0 +1,18 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.generateSyntheticIndices = void 0;
+/**
+ * luma.gl can not work without indices now:
+ * https://github.com/visgl/luma.gl/blob/d8cad75b9f8ca3e578cf078ed9d19e619c2ddbc9/modules/experimental/src/gltf/gltf-instantiator.js#L115
+ * This method generates syntetic indices array: [0, 1, 2, 3, .... , vertexCount-1]
+ * @param {number} vertexCount - vertex count in the geometry
+ * @returns {Uint32Array} indices array.
+ */
+const generateSyntheticIndices = (vertexCount) => {
+    const result = new Uint32Array(vertexCount);
+    for (let index = 0; index < vertexCount; index++) {
+        result[index] = index;
+    }
+    return result;
+};
+exports.generateSyntheticIndices = generateSyntheticIndices;

package/dist/lib/utils/lod-conversion-utils.d.ts

@@ -1,3 +1,4 @@
+import { Tiles3DTileJSONPostprocessed } from '@loaders.gl/3d-tiles';
 import { BoundingVolumes } from '@loaders.gl/i3s';
 import { Tile3D } from '@loaders.gl/tiles';
 /**
@@ -13,7 +14,7 @@ import { Tile3D } from '@loaders.gl/tiles';
  * To avoid infinity values when we do calculations of maxError we shold replace 0 with value which allows us
  * to make child maxError bigger than his parent maxError.
  *
- * @param tile - 3d-tiles tile Object
+ * @param tile - 3d-tiles tile JSON
  * @param coordinates - node converted coordinates
  * @returns An array of LOD metrics in format compatible with i3s 3DNodeIndexDocument.lodSelection
  * @example
@@ -28,7 +29,7 @@ import { Tile3D } from '@loaders.gl/tiles';
         }
     ]
  */
-export declare function convertGeometricErrorToScreenThreshold(tile: Tile3D, coordinates: BoundingVolumes): {
+export declare function convertGeometricErrorToScreenThreshold(tile: Tiles3DTileJSONPostprocessed, coordinates: BoundingVolumes): {
     metricType: string;
     maxError: number;
 }[];

package/dist/lib/utils/lod-conversion-utils.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"lod-conversion-utils.d.ts","sourceRoot":"","sources":["../../../src/lib/utils/lod-conversion-utils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,eAAe,EAAC,MAAM,iBAAiB,CAAC;AAChD,OAAO,EAAC,MAAM,EAAC,MAAM,mBAAmB,CAAC;AAIzC;;;;;;;;;;;;;;;;;;;;;;;;;;;GA2BG;AACH,wBAAgB,sCAAsC,CAAC,IAAI,EAAE,MAAM,EAAE,WAAW,EAAE,eAAe;gBAC9D,MAAM;cAAY,MAAM;IAqB1D;AAED;;;;GAIG;AACH,wBAAgB,sCAAsC,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAe3E"}
+{"version":3,"file":"lod-conversion-utils.d.ts","sourceRoot":"","sources":["../../../src/lib/utils/lod-conversion-utils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,4BAA4B,EAAC,MAAM,sBAAsB,CAAC;AAClE,OAAO,EAAC,eAAe,EAAC,MAAM,iBAAiB,CAAC;AAChD,OAAO,EAAC,MAAM,EAAC,MAAM,mBAAmB,CAAC;AAIzC;;;;;;;;;;;;;;;;;;;;;;;;;;;GA2BG;AACH,wBAAgB,sCAAsC,CACpD,IAAI,EAAE,4BAA4B,EAClC,WAAW,EAAE,eAAe;gBAEK,MAAM;cAAY,MAAM;IAqB1D;AAED;;;;GAIG;AACH,wBAAgB,sCAAsC,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAe3E"}

package/dist/lib/utils/lod-conversion-utils.js

@@ -16,7 +16,7 @@ const DEFAULT_MAXIMUM_SCREEN_SPACE_ERROR = 16;
  * To avoid infinity values when we do calculations of maxError we shold replace 0 with value which allows us
  * to make child maxError bigger than his parent maxError.
  *
- * @param tile - 3d-tiles tile Object
+ * @param tile - 3d-tiles tile JSON
  * @param coordinates - node converted coordinates
  * @returns An array of LOD metrics in format compatible with i3s 3DNodeIndexDocument.lodSelection
  * @example

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@loaders.gl/tile-converter",
-  "version": "4.0.0-alpha.6",
+  "version": "4.0.0-alpha.8",
   "description": "Converter",
   "license": "MIT",
   "publishConfig": {
@@ -44,19 +44,18 @@
     "build-3d-tiles-attributes-worker": "esbuild src/workers/3d-tiles-attributes-worker.ts --outfile=dist/3d-tiles-attributes-worker.js --platform=node --target=esnext,node14 --external:join-images --minify --bundle --sourcemap --define:__VERSION__=\\\"$npm_package_version\\\""
   },
   "dependencies": {
-    "@loaders.gl/3d-tiles": "4.0.0-alpha.6",
-    "@loaders.gl/crypto": "4.0.0-alpha.6",
-    "@loaders.gl/draco": "4.0.0-alpha.6",
-    "@loaders.gl/gltf": "4.0.0-alpha.6",
-    "@loaders.gl/i3s": "4.0.0-alpha.6",
-    "@loaders.gl/images": "4.0.0-alpha.6",
-    "@loaders.gl/loader-utils": "4.0.0-alpha.6",
-    "@loaders.gl/polyfills": "4.0.0-alpha.6",
-    "@loaders.gl/schema": "4.0.0-alpha.6",
-    "@loaders.gl/textures": "4.0.0-alpha.6",
-    "@loaders.gl/tiles": "4.0.0-alpha.6",
-    "@loaders.gl/worker-utils": "4.0.0-alpha.6",
-    "@loaders.gl/zip": "4.0.0-alpha.6",
+    "@loaders.gl/3d-tiles": "4.0.0-alpha.8",
+    "@loaders.gl/crypto": "4.0.0-alpha.8",
+    "@loaders.gl/draco": "4.0.0-alpha.8",
+    "@loaders.gl/gltf": "4.0.0-alpha.8",
+    "@loaders.gl/i3s": "4.0.0-alpha.8",
+    "@loaders.gl/images": "4.0.0-alpha.8",
+    "@loaders.gl/loader-utils": "4.0.0-alpha.8",
+    "@loaders.gl/polyfills": "4.0.0-alpha.8",
+    "@loaders.gl/textures": "4.0.0-alpha.8",
+    "@loaders.gl/tiles": "4.0.0-alpha.8",
+    "@loaders.gl/worker-utils": "4.0.0-alpha.8",
+    "@loaders.gl/zip": "4.0.0-alpha.8",
     "@math.gl/core": "^3.5.1",
     "@math.gl/culling": "^3.5.1",
     "@math.gl/geoid": "^3.5.1",
@@ -73,11 +72,11 @@
     "uuid": "^8.1.0"
   },
   "peerDependencies": {
-    "@loaders.gl/core": "4.0.0-alpha.5"
+    "@loaders.gl/core": "4.0.0-alpha.6"
   },
   "quarantinedDependencies": {
     "join-images": "^1.1.3",
     "sharp": "^0.31.3"
   },
-  "gitHead": "acc1985050dfaa0f1f0c066f8da5bce7454a046c"
+  "gitHead": "c35d6640c8d26deab99e277a8e698b5174233789"
 }

package/src/3d-tiles-converter/3d-tiles-converter.ts

@@ -1,5 +1,5 @@
 import type {AttributeStorageInfo, FeatureAttribute, NodeReference} from '@loaders.gl/i3s';
-import type {Node3D} from '@loaders.gl/3d-tiles';
+import type {Tiles3DTileJSON} from '@loaders.gl/3d-tiles';
 
 import {join} from 'path';
 import process from 'process';
@@ -86,10 +86,11 @@ export default class Tiles3DConverter {
       loadOptions: {
         _nodeWorkers: true,
         reuseWorkers: true,
-        'i3s-content-nodejs': {
-          workerUrl: './modules/i3s/dist/i3s-content-nodejs-worker.js'
-        },
         i3s: {coordinateSystem: COORDINATE_SYSTEM.LNGLAT_OFFSETS, decodeTextures: false}
+        // TODO should no longer be needed with new workers
+        // 'i3s-content-nodejs': {
+        //   workerUrl: './modules/i3s/dist/i3s-content-nodejs-worker.js'
+        // }
       }
     });
 
@@ -108,7 +109,7 @@ export default class Tiles3DConverter {
       // do nothing
     }
 
-    const rootTile: Node3D = {
+    const rootTile: Tiles3DTileJSON = {
       boundingVolume: {
         box: i3sObbTo3dTilesObb(rootNode.header.obb, this.geoidHeightModel)
       },
@@ -137,7 +138,7 @@ export default class Tiles3DConverter {
    */
   private async convertChildNode(
     parentSourceNode: Tile3D,
-    parentNode: Node3D,
+    parentNode: Tiles3DTileJSON,
     level: number,
     childNodeInfo: NodeReference
   ): Promise<void> {
@@ -159,7 +160,7 @@ export default class Tiles3DConverter {
       const boundingVolume = {
         box: i3sObbTo3dTilesObb(sourceChild.header.obb, this.geoidHeightModel)
       };
-      const child: Node3D = {
+      const child: Tiles3DTileJSON = {
         boundingVolume,
         geometricError: convertScreenThresholdToGeometricError(sourceChild),
         children: []
@@ -197,7 +198,7 @@ export default class Tiles3DConverter {
    */
   private async _addChildren(
     parentSourceNode: Tile3D,
-    parentNode: Node3D,
+    parentNode: Tiles3DTileJSON,
     level: number
   ): Promise<void> {
     if (this.options.maxDepth && level > this.options.maxDepth) {

package/src/3d-tiles-converter/helpers/b3dm-converter.ts

@@ -6,6 +6,7 @@ import {Tile3DWriter} from '@loaders.gl/3d-tiles';
 import {Matrix4, Vector3} from '@math.gl/core';
 import {Ellipsoid} from '@math.gl/geospatial';
 import {convertTextureAtlas} from './texture-atlas';
+import {generateSyntheticIndices} from '../../lib/utils/geometry-utils';
 
 const Z_UP_TO_Y_UP_MATRIX = new Matrix4([1, 0, 0, 0, 0, 0, -1, 0, 0, 1, 0, 0, 0, 0, 0, 1]);
 const scratchVector = new Vector3();
@@ -85,7 +86,7 @@ export default class B3dmConverter {
       delete attributes.normals;
     }
     const indices =
-      originalIndices || this._generateSynteticIndices(positionsValue.length / positions.size);
+      originalIndices || generateSyntheticIndices(positionsValue.length / positions.size);
     const meshIndex = gltfBuilder.addMesh({
       attributes,
       indices,
@@ -191,21 +192,6 @@ export default class B3dmConverter {
     };
   }
 
-  /**
-   * luma.gl can not work without indices now:
-   * https://github.com/visgl/luma.gl/blob/d8cad75b9f8ca3e578cf078ed9d19e619c2ddbc9/modules/experimental/src/gltf/gltf-instantiator.js#L115
-   * This method generates syntetic indices array: [0, 1, 2, 3, .... , vertexCount-1]
-   * @param {number} vertexCount - vertex count in the geometry
-   * @returns {Uint32Array} indices array.
-   */
-  _generateSynteticIndices(vertexCount) {
-    const result = new Uint32Array(vertexCount);
-    for (let index = 0; index < vertexCount; index++) {
-      result.set([index], index);
-    }
-    return result;
-  }
-
   /**
    * Deduce mime type by format from `textureSetDefinition.formats[0].format`
    * https://github.com/Esri/i3s-spec/blob/master/docs/1.7/textureSetDefinitionFormat.cmn.md

package/src/deps-installer/deps-installer.ts

@@ -35,13 +35,13 @@ export class DepsInstaller {
     await writeFile(depsPath, new Uint8Array(fileMap['geoids/egm2008-5.pgm']), 'egm2008-5.pgm');
 
     console.log('Installing "I3S Content Loader worker"'); // eslint-disable-line no-console
-    await this.installWorker('i3s', 'i3s-content-nodejs-worker.js', workersPath);
+    await this.installWorker('i3s', 'i3s-content-worker-node.js', workersPath);
 
     console.log('Installing "Draco Loader worker"'); // eslint-disable-line no-console
-    await this.installWorker('draco', 'draco-nodejs-worker.js', workersPath);
+    await this.installWorker('draco', 'draco-worker-node.js', workersPath);
 
     console.log('Installing "Basis Loader worker"'); // eslint-disable-line no-console
-    await this.installWorker('textures', 'basis-nodejs-worker.js', workersPath);
+    await this.installWorker('textures', 'basis-worker-node.js', workersPath);
 
     console.log('Installing "join-images" npm package');
     const childProcess = new ChildProcessProxy();
@@ -50,7 +50,7 @@ export class DepsInstaller {
       // `npm install sharp join-images` works unstable. It fails because installed `sharp` version
       // may be different from the version required by `join-images`. Pointing to specific versions
       // resolve this issue
-      arguments: ['install', 'sharp@^0.30.4', 'join-images@^1.1.3'],
+      arguments: ['install', 'sharp@0.30.4', 'join-images@1.1.3'],
       wait: 0
     });
 

package/src/i3s-attributes-worker.ts

@@ -1,7 +1,7 @@
 import type {WorkerObject} from '@loaders.gl/worker-utils';
 import type {ConvertedAttributes} from './i3s-converter/types';
 import type {Matrix4, Vector3} from '@math.gl/core';
-import type {GLTFImagePostprocessed, GLTFNodePostprocessed} from '@loaders.gl/gltf';
+import type {GLTFNodePostprocessed} from '@loaders.gl/gltf';
 
 import {processOnWorker} from '@loaders.gl/worker-utils';
 
@@ -16,10 +16,19 @@ export type I3SAttributesWorkerOptions = {
   source: string;
 };
 
+export type TextureImageProperties = {
+  data: Uint8Array;
+  compressed?: boolean;
+  height?: number;
+  width?: number;
+  components?: number;
+  mimeType?: string;
+};
+
 export type B3DMAttributesData = {
   gltfMaterials?: {id: string}[];
   nodes: GLTFNodePostprocessed[];
-  images: GLTFImagePostprocessed[];
+  images: (null | TextureImageProperties)[];
   cartographicOrigin: Vector3;
   cartesianModelMatrix: Matrix4;
 };

package/src/i3s-converter/helpers/batch-ids-extensions.ts

@@ -1,12 +1,11 @@
-import {
-  GLTFAccessorPostprocessed,
-  GLTFImagePostprocessed,
-  GLTFMeshPrimitivePostprocessed
-} from '@loaders.gl/gltf';
+import {GLTFAccessorPostprocessed, GLTFMeshPrimitivePostprocessed} from '@loaders.gl/gltf';
+import type {NumericArray} from '@loaders.gl/loader-utils';
 import type {
   GLTF_EXT_feature_metadata_attribute,
   GLTF_EXT_feature_metadata_primitive
-} from 'modules/gltf/src/lib/types/gltf-json-schema';
+} from '@loaders.gl/gltf';
+import {TypedArray} from '@math.gl/core';
+import {TextureImageProperties} from '../../i3s-attributes-worker';
 
 const EXT_MESH_FEATURES = 'EXT_mesh_features';
 const EXT_FEATURE_METADATA = 'EXT_feature_metadata';
@@ -22,8 +21,8 @@ export function handleBatchIdsExtensions(
     [key: string]: GLTFAccessorPostprocessed;
   },
   primitive: GLTFMeshPrimitivePostprocessed,
-  images: GLTFImagePostprocessed[]
-): number[] {
+  images: (TextureImageProperties | null)[]
+): NumericArray {
   const extensions = primitive?.extensions;
 
   if (!extensions) {
@@ -61,8 +60,8 @@ function handleExtFeatureMetadataExtension(
     [key: string]: GLTFAccessorPostprocessed;
   },
   extFeatureMetadata: GLTF_EXT_feature_metadata_primitive,
-  images: GLTFImagePostprocessed[]
-): number[] {
+  images: (TextureImageProperties | null)[]
+): NumericArray {
   // Take only first extension object to get batchIds attribute name.
   const featureIdAttribute = extFeatureMetadata?.featureIdAttributes?.[0];
 
@@ -98,12 +97,9 @@ function handleExtFeatureMetadataExtension(
   const featureTexture =
     extFeatureMetadata?.featureTextures && extFeatureMetadata?.featureTextures[0];
 
-  /**
-   * TODO need to get batchIds from root extension
-   */
   if (featureTexture) {
-    console.warn("EXT_feature_metadata doesn't yet support featureTextures in primitive");
-    return [];
+    const batchIdsAttribute = attributes[featureTexture];
+    return batchIdsAttribute.value;
   }
 
   return [];
@@ -151,8 +147,8 @@ function generateImplicitFeatureIds(
  */
 function generateBatchIdsFromTexture(
   featureIdTexture: GLTF_EXT_feature_metadata_attribute,
-  textureCoordinates: Float32Array,
-  images: GLTFImagePostprocessed[]
+  textureCoordinates: TypedArray,
+  images: (TextureImageProperties | null)[]
 ) {
   if (!images?.length) {
     return [];
@@ -176,7 +172,7 @@ function generateBatchIdsFromTexture(
   const batchIds: number[] = [];
   const channels = CHANNELS_MAP[featureChannel];
 
-  if (!image.compressed) {
+  if (image && image?.width && image?.height && image?.components) {
     for (let index = 0; index < textureCoordinates.length; index += 2) {
       const u = textureCoordinates[index];
       const v = textureCoordinates[index + 1];
@@ -190,7 +186,7 @@ function generateBatchIdsFromTexture(
       batchIds.push(batchId);
     }
   } else {
-    console.warn(`Can't get batch Ids from ${image.mimeType} compressed texture`);
+    console.warn(`Can't get batch Ids from ${image?.mimeType || ''} compressed texture`);
   }
 
   return batchIds;

package/src/i3s-converter/helpers/coordinate-converter.ts

@@ -8,34 +8,35 @@ import {
   makeBoundingSphereFromPoints,
   BoundingSphere
 } from '@math.gl/culling';
-import {Tile3D} from '@loaders.gl/tiles';
 import {Geoid} from '@math.gl/geoid';
 
 /**
  * Create bounding volumes object from tile and geoid height model.
- * @param tile
- * @param geoidHeightModel
+ * @param sourceBoundingVolume - initialized bounding volume of the source tile
+ * @param geoidHeightModel - instance of Geoid class that converts elevation from geoidal to ellipsoidal and back
  * @returns - Bounding volumes object
  */
-export function createBoundingVolumes(tile: Tile3D, geoidHeightModel: Geoid): BoundingVolumes {
+export function createBoundingVolumes(
+  sourceBoundingVolume: OrientedBoundingBox | BoundingSphere,
+  geoidHeightModel: Geoid
+): BoundingVolumes {
   let radius;
   let halfSize;
   let quaternion;
 
-  const boundingVolume = tile.boundingVolume;
   const cartographicCenter = Ellipsoid.WGS84.cartesianToCartographic(
-    boundingVolume.center,
+    sourceBoundingVolume.center,
     new Vector3()
   );
   cartographicCenter[2] =
     cartographicCenter[2] -
     geoidHeightModel.getHeight(cartographicCenter[1], cartographicCenter[0]);
-  if (boundingVolume instanceof OrientedBoundingBox) {
-    halfSize = boundingVolume.halfSize;
+  if (sourceBoundingVolume instanceof OrientedBoundingBox) {
+    halfSize = sourceBoundingVolume.halfSize;
     radius = new Vector3(halfSize[0], halfSize[1], halfSize[2]).len();
-    quaternion = boundingVolume.quaternion;
+    quaternion = sourceBoundingVolume.quaternion;
   } else {
-    radius = tile.boundingVolume.radius;
+    radius = sourceBoundingVolume.radius;
     halfSize = [radius, radius, radius];
     quaternion = new Quaternion()
       .fromMatrix3(new Matrix3([halfSize[0], 0, 0, 0, halfSize[1], 0, 0, 0, halfSize[2]]))