@loaders.gl/tile-converter 3.2.0-alpha.1 → 3.2.0-alpha.2

package/src/3d-tiles-attributes-worker.ts

@@ -0,0 +1,43 @@
+import type {WorkerObject} from '@loaders.gl/worker-utils';
+import type {FeatureAttribute} from '@loaders.gl/i3s';
+
+import {processOnWorker} from '@loaders.gl/worker-utils';
+
+// __VERSION__ is injected by babel-plugin-version-inline
+// @ts-ignore TS2304: Cannot find name '__VERSION__'.
+const VERSION = typeof __VERSION__ !== 'undefined' ? __VERSION__ : 'latest';
+
+export type Tile3DAttributesWorkerOptions = {
+  featureAttributes: FeatureAttribute | null;
+  source: string;
+};
+
+export type I3SAttributesData = {
+  tileContent: any;
+  textureFormat: string;
+};
+
+/**
+ * I3S Attributes Worker to handle B3DM object
+ */
+export const Tile3dAttributesWorker = {
+  id: '3d-tiles-attributes',
+  name: '3DTiles Attributes Worker',
+  module: 'tile-converter',
+  version: VERSION,
+  options: {
+    attributes: null
+  }
+};
+
+/**
+ * Performs I3S attributes transformation
+ */
+export function transform3DTilesAttributesOnWorker(
+  i3sAttributesData: I3SAttributesData,
+  options: Tile3DAttributesWorkerOptions
+): Promise<ArrayBuffer> {
+  return processOnWorker(Tile3dAttributesWorker, i3sAttributesData, options);
+}
+
+export const _typecheckI3SAttributesWorker: WorkerObject = Tile3dAttributesWorker;

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

@@ -4,7 +4,7 @@ import type {Node3D} from '@loaders.gl/3d-tiles';
 import {join} from 'path';
 import process from 'process';
 import transform from 'json-map-transform';
-import {load} from '@loaders.gl/core';
+import {fetchFile, getLoaderOptions, load} from '@loaders.gl/core';
 import {I3SLoader, I3SAttributeLoader, COORDINATE_SYSTEM} from '@loaders.gl/i3s';
 import {Tileset3D, Tile3D} from '@loaders.gl/tiles';
 import {Geoid} from '@math.gl/geoid';
@@ -17,6 +17,12 @@ import {calculateFilesSize, timeConverter} from '../lib/utils/statistic-utills';
 import {TILESET as tilesetTemplate} from './json-templates/tileset';
 import B3dmConverter from './helpers/b3dm-converter';
 import {createObbFromMbs} from '../i3s-converter/helpers/coordinate-converter';
+import {
+  I3SAttributesData,
+  Tile3dAttributesWorker
+  /*transform3DTilesAttributesOnWorker*/
+} from '../3d-tiles-attributes-worker';
+import {getWorkerURL, WorkerFarm} from '@loaders.gl/worker-utils';
 
 const I3S = 'I3S';
 
@@ -31,6 +37,7 @@ export default class Tiles3DConverter {
   geoidHeightModel: Geoid | null;
   sourceTileset: Tileset3D | null;
   attributeStorageInfo: AttributeStorageInfo | null;
+  workerSource: {[key: string]: string} = {};
 
   constructor() {
     this.options = {};
@@ -40,6 +47,7 @@ export default class Tiles3DConverter {
     this.geoidHeightModel = null;
     this.sourceTileset = null;
     this.attributeStorageInfo = null;
+    this.workerSource = {};
   }
 
   /**
@@ -66,6 +74,8 @@ export default class Tiles3DConverter {
     this.geoidHeightModel = await load(egmFilePath, PGMLoader);
     console.log('Loading egm file completed!'); // eslint-disable-line
 
+    await this.loadWorkers();
+
     const sourceTilesetJson = await load(inputUrl, I3SLoader, {});
 
     this.sourceTileset = new Tileset3D(sourceTilesetJson, {
@@ -74,6 +84,7 @@ export default class Tiles3DConverter {
       }
     });
 
+    await this.sourceTileset.tilesetInitializationPromise;
     const rootNode = this.sourceTileset.root!;
     if (!rootNode.header.obb) {
       rootNode.header.obb = createObbFromMbs(rootNode.header.mbs);
@@ -102,6 +113,10 @@ export default class Tiles3DConverter {
     await writeFile(this.tilesetPath, JSON.stringify(tileset), 'tileset.json');
 
     this._finishConversion({slpk: false, outputPath, tilesetName});
+
+    // Clean up worker pools
+    const workerFarm = WorkerFarm.getWorkerFarm({});
+    workerFarm.destroy();
   }
 
   /**
@@ -125,9 +140,12 @@ export default class Tiles3DConverter {
         await this.sourceTileset!._loadTile(sourceChild);
         this.vertexCounter += sourceChild.content.vertexCount;
 
-        let attributes: FeatureAttribute | null = null;
+        let featureAttributes: FeatureAttribute | null = null;
         if (this.attributeStorageInfo) {
-          attributes = await this._loadChildAttributes(sourceChild, this.attributeStorageInfo);
+          featureAttributes = await this._loadChildAttributes(
+            sourceChild,
+            this.attributeStorageInfo
+          );
         }
 
         if (!sourceChild.header.obb) {
@@ -143,7 +161,19 @@ export default class Tiles3DConverter {
           children: []
         };
 
-        const b3dm = await new B3dmConverter().convert(sourceChild, attributes);
+        const i3sAttributesData: I3SAttributesData = {
+          tileContent: sourceChild.content,
+          textureFormat: sourceChild?.header?.textureFormat
+        };
+
+        // TODO Uncomment when 3d-tiles-attributes-worker will be published on CDN.
+        // const b3dm = await transform3DTilesAttributesOnWorker(i3sAttributesData, {
+        //   source: this.workerSource.tile3dWorkerSource,
+        //   featureAttributes
+        // });
+
+        const b3dm = await new B3dmConverter().convert(i3sAttributesData, featureAttributes);
+
         child.content = {
           uri: `${sourceChild.id}.b3dm`,
           boundingVolume
@@ -290,4 +320,14 @@ export default class Tiles3DConverter {
     console.log(`File(s) size: `, filesSize, ' bytes'); // eslint-disable-line
     console.log(`------------------------------------------------`); // eslint-disable-line
   }
+
+  private async loadWorkers(): Promise<void> {
+    console.log(`Loading workers source...`); // eslint-disable-line no-undef, no-console
+    const tile3dAttributesWorkerUrl = getWorkerURL(Tile3dAttributesWorker, {...getLoaderOptions()});
+    const sourceResponse = await fetchFile(tile3dAttributesWorkerUrl);
+    const source = await sourceResponse.text();
+
+    this.workerSource.tile3dWorkerSource = source;
+    console.log(`Loading workers source completed!`); // eslint-disable-line no-undef, no-console
+  }
 }

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

@@ -1,3 +1,5 @@
+import type {I3SAttributesData} from '../../3d-tiles-attributes-worker';
+
 import {encodeSync} from '@loaders.gl/core';
 import {GLTFScenegraph, GLTFWriter} from '@loaders.gl/gltf';
 import {Tile3DWriter} from '@loaders.gl/3d-tiles';
@@ -21,15 +23,17 @@ export default class B3dmConverter {
    * @param i3sTile - Tile3D instance for I3S node
    * @returns - encoded content
    */
-  async convert(i3sTile: Object, attributes: any = null): Promise<ArrayBuffer> {
-    this.i3sTile = i3sTile;
-    const gltf = await this.buildGltf(i3sTile);
+  async convert(
+    i3sAttributesData: I3SAttributesData,
+    featureAttributes: any = null
+  ): Promise<ArrayBuffer> {
+    const gltf = await this.buildGltf(i3sAttributesData);
     const b3dm = encodeSync(
       {
         gltfEncoded: new Uint8Array(gltf),
         type: 'b3dm',
-        featuresLength: this._getFeaturesLength(attributes),
-        batchTable: attributes
+        featuresLength: this._getFeaturesLength(featureAttributes),
+        batchTable: featureAttributes
       },
       Tile3DWriter
     );
@@ -41,7 +45,8 @@ export default class B3dmConverter {
    * @param i3sTile - Tile3D instance for I3S node
    * @returns - encoded glb content
    */
-  async buildGltf(i3sTile): Promise<ArrayBuffer> {
+  async buildGltf(i3sAttributesData: I3SAttributesData): Promise<ArrayBuffer> {
+    const {tileContent, textureFormat} = i3sAttributesData;
     const {
       material,
       attributes,
@@ -49,10 +54,10 @@ export default class B3dmConverter {
       cartesianOrigin,
       cartographicOrigin,
       modelMatrix
-    } = i3sTile.content;
+    } = tileContent;
     const gltfBuilder = new GLTFScenegraph();
 
-    const textureIndex = await this._addI3sTextureToGltf(i3sTile, gltfBuilder);
+    const textureIndex = await this._addI3sTextureToGltf(tileContent, textureFormat, gltfBuilder);
     const pbrMaterialInfo = this._convertI3sMaterialToGltfMaterial(material, textureIndex);
     const materialIndex = gltfBuilder.addMaterial(pbrMaterialInfo);
 
@@ -101,11 +106,8 @@ export default class B3dmConverter {
    * @param {GLTFScenegraph} gltfBuilder - gltfScenegraph instance to construct GLTF
    * @returns {Promise<number | null>} - GLTF texture index
    */
-  async _addI3sTextureToGltf(i3sTile, gltfBuilder) {
-    const {
-      content: {texture, material, attributes},
-      header: {textureFormat}
-    } = i3sTile;
+  async _addI3sTextureToGltf(tileContent, textureFormat, gltfBuilder) {
+    const {texture, material, attributes} = tileContent;
     let textureIndex = null;
     let selectedTexture = texture;
     if (!texture && material) {

package/src/i3s-attributes-worker.ts

@@ -0,0 +1,46 @@
+import type {WorkerObject} from '@loaders.gl/worker-utils';
+import type {ConvertedAttributes} from './i3s-converter/types';
+import type {Matrix4, Vector3} from '@math.gl/core';
+
+import {processOnWorker} from '@loaders.gl/worker-utils';
+
+// __VERSION__ is injected by babel-plugin-version-inline
+// @ts-ignore TS2304: Cannot find name '__VERSION__'.
+const VERSION = typeof __VERSION__ !== 'undefined' ? __VERSION__ : 'latest';
+
+export type I3SAttributesWorkerOptions = {
+  useCartesianPositions: boolean;
+  source: string;
+};
+
+export type B3DMAttributesData = {
+  gltfMaterials?: {id: string}[];
+  nodes: any;
+  cartographicOrigin: Vector3;
+  cartesianModelMatrix: Matrix4;
+};
+
+/**
+ * I3S Attributes Worker to handle B3DM object
+ */
+export const I3SAttributesWorker = {
+  id: 'i3s-attributes',
+  name: 'I3S Attributes Worker',
+  module: 'tile-converter',
+  version: VERSION,
+  options: {
+    useCartesianPositions: false
+  }
+};
+
+/**
+ * Performs I3S attributes transformation
+ */
+export function transformI3SAttributesOnWorker(
+  attributesData: B3DMAttributesData,
+  options: I3SAttributesWorkerOptions
+): Promise<Map<string, ConvertedAttributes>> {
+  return processOnWorker(I3SAttributesWorker, attributesData, options);
+}
+
+export const _typecheckI3SAttributesWorker: WorkerObject = I3SAttributesWorker;

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

@@ -1,15 +1,15 @@
-import type {BoundingVolumes, Extent, Mbs, Obb} from '@loaders.gl/i3s';
+import type {BoundingVolumes, FullExtent, Mbs, Obb} from '@loaders.gl/i3s';
 
 import {Matrix3, Quaternion, Vector3} from '@math.gl/core';
 import {Ellipsoid} from '@math.gl/geospatial';
 import {
   OrientedBoundingBox,
   makeOrientedBoundingBoxFromPoints,
-  makeBoundingSphereFromPoints
+  makeBoundingSphereFromPoints,
+  BoundingSphere
 } from '@math.gl/culling';
 import TileHeader from '@loaders.gl/tiles/src/tileset/tile-3d';
 import {Geoid} from '@math.gl/geoid';
-import {Tileset3D} from '@loaders.gl/tiles';
 
 /**
  * Create bounding volumes object from tile and geoid height model.
@@ -101,34 +101,39 @@ export function convertPositionsToVectors(positions: Float32Array): Vector3[] {
 }
 
 /**
- * Convert common coordinate to extent coordinate
- * @param tileset
- * @returns - Extent
- * @todo why lodMetricValue is radius? need to check this function
+ * Convert common coordinate to fullExtent https://github.com/Esri/i3s-spec/blob/master/docs/1.8/fullExtent.cmn.md
+ * @param
+ * @param boundingVolume
+ * @returns - fullExtent object
  */
-export function convertCommonToI3SExtentCoordinate(tileset: Tileset3D | null): Extent | null {
-  const cartesianCenter = tileset?.cartesianCenter;
-  if (!cartesianCenter) {
-    return null;
+export function convertBoundingVolumeToI3SFullExtent(
+  boundingVolume: OrientedBoundingBox | BoundingSphere
+): FullExtent {
+  let sphere: BoundingSphere;
+  if (boundingVolume instanceof BoundingSphere) {
+    sphere = boundingVolume;
+  } else {
+    sphere = boundingVolume.getBoundingSphere();
   }
-  const radius = tileset?.lodMetricValue;
-  const rightTop = Ellipsoid.WGS84.cartesianToCartographic(
-    new Vector3(cartesianCenter[0] + radius, cartesianCenter[1] + radius, cartesianCenter[2]),
+  const center: Vector3 = sphere.center;
+  const radius: number = sphere.radius;
+  const vertexMax = Ellipsoid.WGS84.cartesianToCartographic(
+    new Vector3(center[0] + radius, center[1] + radius, center[2] + radius),
     new Vector3()
   );
-  const leftBottom = Ellipsoid.WGS84.cartesianToCartographic(
-    new Vector3(cartesianCenter[0] - radius, cartesianCenter[1] - radius, cartesianCenter[2]),
+  const vertexMin = Ellipsoid.WGS84.cartesianToCartographic(
+    new Vector3(center[0] - radius, center[1] - radius, center[2] - radius),
     new Vector3()
   );
-  const isFirstRight = rightTop[0] < leftBottom[0];
-  const isFirstTop = rightTop[1] < leftBottom[1];
 
-  return [
-    isFirstRight ? rightTop[0] : leftBottom[0],
-    isFirstTop ? rightTop[1] : leftBottom[1],
-    isFirstRight ? leftBottom[0] : rightTop[0],
-    isFirstTop ? leftBottom[1] : rightTop[1]
-  ];
+  return {
+    xmin: vertexMin[0],
+    xmax: vertexMax[0],
+    ymin: vertexMin[1],
+    ymax: vertexMax[1],
+    zmin: vertexMin[2],
+    zmax: vertexMax[2]
+  };
 }
 
 /**

package/src/i3s-converter/helpers/geometry-attributes.ts

@@ -1,4 +1,4 @@
-import type {GeometryAttributes, AttributesData, GroupedByFeatureIdAttributes} from '../types';
+import type {GeometryAttributes, ConvertedAttributes, GroupedByFeatureIdAttributes} from '../types';
 import {concatenateTypedArrays} from '@loaders.gl/loader-utils';
 
 const VALUES_PER_VERTEX = 3;
@@ -9,8 +9,9 @@ const POSITIONS_AND_NORMALS_PER_TRIANGLE = 9;
  * @param attributes
  * @returns attirbutes with featureCount, featureIds and changed faceRange.
  */
-export function generateAttributes(attributes: AttributesData): GeometryAttributes {
-  const {positions, normals, texCoords, colors, featureIndices, triangleCount} = attributes;
+export function generateAttributes(attributes: ConvertedAttributes): GeometryAttributes {
+  const {positions, normals, texCoords, colors, featureIndices} = attributes;
+  const triangleCount = positions.length / POSITIONS_AND_NORMALS_PER_TRIANGLE;
 
   if (!featureIndices.length) {
     return {