@loaders.gl/tile-converter 3.1.0-alpha.3 → 3.1.0-beta.2

package/dist/esm/lib/utils/statistic-utills.d.ts

@@ -0,0 +1,25 @@
+/**
+ * Do milliseconds time conversion to readable time string.
+ * @param tile - 3d-tiles tile Object
+ * @param coordinates - node converted coordinates
+ * @returns String which characterizes conversion time period
+ */
+export function timeConverter(time: [number, number]): String;
+
+/**
+ * Calculate files sizes after conversion.
+ * @param params - Object with params of conversion.
+ * @returns Promise with generated files size in bytes.
+ */
+export function calculateFilesSize(params: {
+  slpk: boolean;
+  outputPath: string;
+  tilesetName: string;
+}): Number;
+
+/**
+ * Reqursivelly calculate files sizes in directory.
+ * @param dirPath - Directory path.
+ * @returns Promise with files size in directory.
+ */
+export function getTotalFilesSize(dirPath: string): Number;

package/dist/{lib → esm/lib}/utils/statistic-utills.js

@@ -13,19 +13,19 @@ export function timeConverter(time) {
   let result = '';
 
   if (hours) {
-    result += `${hours}h `;
+    result += "".concat(hours, "h ");
   }
 
   if (minutes) {
-    result += `${minutes}m `;
+    result += "".concat(minutes, "m ");
   }
 
   if (seconds) {
-    result += `${seconds}s`;
+    result += "".concat(seconds, "s");
   }
 
   if (!result) {
-    result += `${milliseconds}ms`;
+    result += "".concat(milliseconds, "ms");
   }
 
   return result;
@@ -40,7 +40,7 @@ export async function calculateFilesSize(params) {
 
   try {
     if (slpk) {
-      const slpkPath = join(fullOutputPath, `${tilesetName}.slpk`);
+      const slpkPath = join(fullOutputPath, "".concat(tilesetName, ".slpk"));
       const stat = await fs.stat(slpkPath);
       return stat.size;
     }

package/dist/esm/lib/utils/statistic-utills.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../../../../src/lib/utils/statistic-utills.js"],"names":["join","promises","fs","getAbsoluteFilePath","timeConverter","time","nanoSecondsInMillisecond","timeInSeconds","hours","Math","floor","minutes","seconds","milliseconds","result","calculateFilesSize","params","slpk","outputPath","tilesetName","fullOutputPath","slpkPath","stat","size","directoryPath","totalSize","getTotalFilesSize","error","console","log","dirPath","totalFileSize","files","readdir","file","fileStat","isDirectory"],"mappings":"AAAA,SAAQA,IAAR,QAAmB,MAAnB;AACA,SAAQC,QAAQ,IAAIC,EAApB,QAA6B,IAA7B;AACA,SAAQC,mBAAR,QAAkC,cAAlC;AAEA,OAAO,SAASC,aAAT,CAAuBC,IAAvB,EAA6B;AAClC,QAAMC,wBAAwB,GAAG,GAAjC;AACA,MAAIC,aAAa,GAAGF,IAAI,CAAC,CAAD,CAAxB;AACA,QAAMG,KAAK,GAAGC,IAAI,CAACC,KAAL,CAAWH,aAAa,GAAG,IAA3B,CAAd;AACAA,EAAAA,aAAa,GAAGA,aAAa,GAAGC,KAAK,GAAG,IAAxC;AACA,QAAMG,OAAO,GAAGF,IAAI,CAACC,KAAL,CAAWH,aAAa,GAAG,EAA3B,CAAhB;AACAA,EAAAA,aAAa,GAAGA,aAAa,GAAGI,OAAO,GAAG,EAA1C;AACA,QAAMC,OAAO,GAAGH,IAAI,CAACC,KAAL,CAAWH,aAAX,CAAhB;AACA,QAAMM,YAAY,GAAGR,IAAI,CAAC,CAAD,CAAJ,GAAUC,wBAA/B;AACA,MAAIQ,MAAM,GAAG,EAAb;;AAEA,MAAIN,KAAJ,EAAW;AACTM,IAAAA,MAAM,cAAON,KAAP,OAAN;AACD;;AAED,MAAIG,OAAJ,EAAa;AACXG,IAAAA,MAAM,cAAOH,OAAP,OAAN;AACD;;AAED,MAAIC,OAAJ,EAAa;AACXE,IAAAA,MAAM,cAAOF,OAAP,MAAN;AACD;;AAED,MAAI,CAACE,MAAL,EAAa;AACXA,IAAAA,MAAM,cAAOD,YAAP,OAAN;AACD;;AAED,SAAOC,MAAP;AACD;AAED,OAAO,eAAeC,kBAAf,CAAkCC,MAAlC,EAA0C;AAC/C,QAAM;AAACC,IAAAA,IAAD;AAAOC,IAAAA,UAAP;AAAmBC,IAAAA;AAAnB,MAAkCH,MAAxC;AACA,QAAMI,cAAc,GAAGjB,mBAAmB,CAACe,UAAD,CAA1C;;AAEA,MAAI;AACF,QAAID,IAAJ,EAAU;AACR,YAAMI,QAAQ,GAAGrB,IAAI,CAACoB,cAAD,YAAoBD,WAApB,WAArB;AACA,YAAMG,IAAI,GAAG,MAAMpB,EAAE,CAACoB,IAAH,CAAQD,QAAR,CAAnB;AACA,aAAOC,IAAI,CAACC,IAAZ;AACD;;AAED,UAAMC,aAAa,GAAGxB,IAAI,CAACoB,cAAD,EAAiBD,WAAjB,CAA1B;AACA,UAAMM,SAAS,GAAG,MAAMC,iBAAiB,CAACF,aAAD,CAAzC;AACA,WAAOC,SAAP;AACD,GAVD,CAUE,OAAOE,KAAP,EAAc;AACdC,IAAAA,OAAO,CAACC,GAAR,CAAY,8BAAZ,EAA4CF,KAA5C;AACA,WAAO,IAAP;AACD;AACF;;AAED,eAAeD,iBAAf,CAAiCI,OAAjC,EAA0C;AACxC,MAAIC,aAAa,GAAG,CAApB;AAEA,QAAMC,KAAK,GAAG,MAAM9B,EAAE,CAAC+B,OAAH,CAAWH,OAAX,CAApB;;AAEA,OAAK,MAAMI,IAAX,IAAmBF,KAAnB,EAA0B;AACxB,UAAMG,QAAQ,GAAG,MAAMjC,EAAE,CAACoB,IAAH,CAAQtB,IAAI,CAAC8B,OAAD,EAAUI,IAAV,CAAZ,CAAvB;;AACA,QAAIC,QAAQ,CAACC,WAAT,EAAJ,EAA4B;AAC1BL,MAAAA,aAAa,IAAI,MAAML,iBAAiB,CAAC1B,IAAI,CAAC8B,OAAD,EAAUI,IAAV,CAAL,CAAxC;AACD,KAFD,MAEO;AACLH,MAAAA,aAAa,IAAII,QAAQ,CAACZ,IAA1B;AACD;AACF;;AACD,SAAOQ,aAAP;AACD","sourcesContent":["import {join} from 'path';\nimport {promises as fs} from 'fs';\nimport {getAbsoluteFilePath} from './file-utils';\n\nexport function timeConverter(time) {\n  const nanoSecondsInMillisecond = 1e6;\n  let timeInSeconds = time[0];\n  const hours = Math.floor(timeInSeconds / 3600);\n  timeInSeconds = timeInSeconds - hours * 3600;\n  const minutes = Math.floor(timeInSeconds / 60);\n  timeInSeconds = timeInSeconds - minutes * 60;\n  const seconds = Math.floor(timeInSeconds);\n  const milliseconds = time[1] / nanoSecondsInMillisecond;\n  let result = '';\n\n  if (hours) {\n    result += `${hours}h `;\n  }\n\n  if (minutes) {\n    result += `${minutes}m `;\n  }\n\n  if (seconds) {\n    result += `${seconds}s`;\n  }\n\n  if (!result) {\n    result += `${milliseconds}ms`;\n  }\n\n  return result;\n}\n\nexport async function calculateFilesSize(params) {\n  const {slpk, outputPath, tilesetName} = params;\n  const fullOutputPath = getAbsoluteFilePath(outputPath);\n\n  try {\n    if (slpk) {\n      const slpkPath = join(fullOutputPath, `${tilesetName}.slpk`);\n      const stat = await fs.stat(slpkPath);\n      return stat.size;\n    }\n\n    const directoryPath = join(fullOutputPath, tilesetName);\n    const totalSize = await getTotalFilesSize(directoryPath);\n    return totalSize;\n  } catch (error) {\n    console.log('Calculate file sizes error: ', error); // eslint-disable-line\n    return null;\n  }\n}\n\nasync function getTotalFilesSize(dirPath) {\n  let totalFileSize = 0;\n\n  const files = await fs.readdir(dirPath);\n\n  for (const file of files) {\n    const fileStat = await fs.stat(join(dirPath, file));\n    if (fileStat.isDirectory()) {\n      totalFileSize += await getTotalFilesSize(join(dirPath, file));\n    } else {\n      totalFileSize += fileStat.size;\n    }\n  }\n  return totalFileSize;\n}\n"],"file":"statistic-utills.js"}

package/dist/{pgm-loader.js → esm/pgm-loader.js}

@@ -1,4 +1,4 @@
-const VERSION = typeof "3.1.0-alpha.3" !== 'undefined' ? "3.1.0-alpha.3" : 'latest';
+const VERSION = typeof "3.1.0-beta.2" !== 'undefined' ? "3.1.0-beta.2" : 'latest';
 import { parsePgm } from './lib/pgm-parser';
 export const PGMLoader = {
   name: 'PGM - Netpbm grayscale image format',

package/dist/esm/pgm-loader.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../../src/pgm-loader.ts"],"names":["VERSION","parsePgm","PGMLoader","name","id","module","version","mimeTypes","parse","arrayBuffer","options","Uint8Array","extensions","cubic"],"mappings":"AAIA,MAAMA,OAAO,GAAG,0BAAuB,WAAvB,oBAAmD,QAAnE;AAEA,SAAQC,QAAR,QAAuB,kBAAvB;AAKA,OAAO,MAAMC,SAA2B,GAAG;AACzCC,EAAAA,IAAI,EAAE,qCADmC;AAEzCC,EAAAA,EAAE,EAAE,KAFqC;AAGzCC,EAAAA,MAAM,EAAE,gBAHiC;AAIzCC,EAAAA,OAAO,EAAEN,OAJgC;AAKzCO,EAAAA,SAAS,EAAE,CAAC,0BAAD,CAL8B;AAMzCC,EAAAA,KAAK,EAAE,CAACC,WAAD,EAAcC,OAAd,KAA0BT,QAAQ,CAAC,IAAIU,UAAJ,CAAeF,WAAf,CAAD,EAA8BC,OAA9B,CANA;AAOzCE,EAAAA,UAAU,EAAE,CAAC,KAAD,CAP6B;AAQzCF,EAAAA,OAAO,EAAE;AAEPG,IAAAA,KAAK,EAAE;AAFA;AARgC,CAApC","sourcesContent":["import type {LoaderWithParser} from '@loaders.gl/loader-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\nimport {parsePgm} from './lib/pgm-parser';\n\n/**\n * Loader for PGM - Netpbm grayscale image format\n */\nexport const PGMLoader: LoaderWithParser = {\n  name: 'PGM - Netpbm grayscale image format',\n  id: 'pgm',\n  module: 'tile-converter',\n  version: VERSION,\n  mimeTypes: ['image/x-portable-graymap'],\n  parse: (arrayBuffer, options) => parsePgm(new Uint8Array(arrayBuffer), options),\n  extensions: ['pgm'],\n  options: {\n    // TODO - use pgm namespace\n    cubic: false\n  }\n};\n"],"file":"pgm-loader.js"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@loaders.gl/tile-converter",
-  "version": "3.1.0-alpha.3",
+  "version": "3.1.0-beta.2",
   "description": "Converter",
   "license": "MIT",
   "publishConfig": {
@@ -15,9 +15,9 @@
     "3dTiles",
     "i3s"
   ],
-  "types": "src/index.ts",
-  "main": "dist/index.js",
-  "module": "dist/index.js",
+  "types": "dist/index.d.ts",
+  "main": "dist/es5/index.js",
+  "module": "dist/esm/index.js",
   "sideEffects": false,
   "bin": {
     "tile-converter": "./bin/converter.js",
@@ -33,24 +33,24 @@
     "fs": false
   },
   "scripts": {
-    "pre-build": "npm run build-bin && npm run build-bundle",
-    "build-bundle": "webpack --display=minimal --config ../../scripts/webpack/bundle.js",
-    "build-bin": "BABEL_ENV=es5 babel scripts --config-file ../../babel.config.js --out-dir dist/scripts",
-    "build-converter-bundle": "webpack --config ./converter-webpack/bundle.js"
+    "pre-build": "npm run build-bundle",
+    "post-build": "npm run build-converter-bundle",
+    "build-bundle": "esbuild ./src/index.ts --bundle --outfile=dist/bundle.js --platform=node",
+    "build-converter-bundle": "webpack --display errors-only --config ./converter-webpack/bundle.js",
+    "build-bin": "BABEL_ENV=es5 babel scripts --config-file ../../babel.config.js --out-dir dist/scripts"
   },
   "dependencies": {
-    "@loaders.gl/3d-tiles": "3.1.0-alpha.3",
-    "@loaders.gl/core": "3.1.0-alpha.3",
-    "@loaders.gl/crypto": "3.1.0-alpha.3",
-    "@loaders.gl/draco": "3.1.0-alpha.3",
-    "@loaders.gl/gltf": "3.1.0-alpha.3",
-    "@loaders.gl/i3s": "3.1.0-alpha.3",
-    "@loaders.gl/images": "3.1.0-alpha.3",
-    "@loaders.gl/loader-utils": "3.1.0-alpha.3",
-    "@loaders.gl/polyfills": "3.1.0-alpha.3",
-    "@loaders.gl/tiles": "3.1.0-alpha.3",
-    "@loaders.gl/worker-utils": "3.1.0-alpha.3",
-    "@loaders.gl/zip": "3.1.0-alpha.3",
+    "@loaders.gl/3d-tiles": "3.1.0-beta.2",
+    "@loaders.gl/crypto": "3.1.0-beta.2",
+    "@loaders.gl/draco": "3.1.0-beta.2",
+    "@loaders.gl/gltf": "3.1.0-beta.2",
+    "@loaders.gl/i3s": "3.1.0-beta.2",
+    "@loaders.gl/images": "3.1.0-beta.2",
+    "@loaders.gl/loader-utils": "3.1.0-beta.2",
+    "@loaders.gl/polyfills": "3.1.0-beta.2",
+    "@loaders.gl/tiles": "3.1.0-beta.2",
+    "@loaders.gl/worker-utils": "3.1.0-beta.2",
+    "@loaders.gl/zip": "3.1.0-beta.2",
     "@luma.gl/engine": "^8.5.4",
     "@math.gl/core": "^3.5.1",
     "@math.gl/culling": "^3.5.1",
@@ -66,5 +66,8 @@
     "morgan": "~1.9.1",
     "uuid": "^8.1.0"
   },
-  "gitHead": "68e1c443d1b63aa2515436a7411ed0a029b42c15"
+  "peerDependencies": {
+    "@loaders.gl/core": "3.1.0-beta.1"
+  },
+  "gitHead": "90f487e7b3f15c554d57c92497d3a12d71676818"
 }

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

@@ -5,7 +5,7 @@ import {join} from 'path';
 import process from 'process';
 import transform from 'json-map-transform';
 import {load} from '@loaders.gl/core';
-import {I3SLoader, I3SAttributeLoader} from '@loaders.gl/i3s';
+import {I3SLoader, I3SAttributeLoader, COORDINATE_SYSTEM} from '@loaders.gl/i3s';
 import {Tileset3D, Tile3D} from '@loaders.gl/tiles';
 
 import {PGMLoader} from '../pgm-loader';
@@ -67,7 +67,9 @@ export default class Tiles3DConverter {
     console.log('Loading egm file completed!'); // eslint-disable-line
 
     const sourceTilesetJson = await load(inputUrl, I3SLoader, {});
-    this.sourceTileset = new Tileset3D(sourceTilesetJson, {});
+    this.sourceTileset = new Tileset3D(sourceTilesetJson, {
+      loadOptions: {i3s: {coordinateSystem: COORDINATE_SYSTEM.LNGLAT_OFFSETS}}
+    });
 
     if (!this.sourceTileset.root.header.obb) {
       this.sourceTileset.root.header.obb = createObbFromMbs(this.sourceTileset.root.header.mbs);

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

@@ -3,8 +3,11 @@ import {GLTFScenegraph, GLTFWriter} from '@loaders.gl/gltf';
 import {Tile3DWriter} from '@loaders.gl/3d-tiles';
 import {ImageWriter} from '@loaders.gl/images';
 import {Matrix4, Vector3} from '@math.gl/core';
+import {Ellipsoid} from '@math.gl/geospatial';
+import {convertTextureAtlas} from './texture-atlas';
 
 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();
 
 export default class B3dmConverter {
   async convert(i3sTile, attributes = null) {
@@ -23,7 +26,14 @@ export default class B3dmConverter {
   }
 
   async buildGltf(i3sTile) {
-    const {material, attributes, indices: originalIndices, cartesianOrigin} = i3sTile.content;
+    const {
+      material,
+      attributes,
+      indices: originalIndices,
+      cartesianOrigin,
+      cartographicOrigin,
+      modelMatrix
+    } = i3sTile.content;
     const gltfBuilder = new GLTFScenegraph();
 
     const textureIndex = await this._addI3sTextureToGltf(i3sTile, gltfBuilder);
@@ -32,7 +42,20 @@ export default class B3dmConverter {
 
     const positions = attributes.positions;
     const positionsValue = positions.value;
-    attributes.positions.value = this._normalizePositions(positionsValue, cartesianOrigin);
+
+    if (attributes.uvRegions && attributes.texCoords) {
+      attributes.texCoords.value = convertTextureAtlas(
+        attributes.texCoords.value,
+        attributes.uvRegions.value
+      );
+    }
+
+    attributes.positions.value = this._normalizePositions(
+      positionsValue,
+      cartesianOrigin,
+      cartographicOrigin,
+      modelMatrix
+    );
     if (attributes.normals && !this._checkNormals(attributes.normals.value)) {
       delete attributes.normals;
     }
@@ -88,15 +111,20 @@ export default class B3dmConverter {
    * Generate a positions array which is correct for 3DTiles/GLTF format
    * @param {Float64Array} positionsValue - the input geometry positions array
    * @param {number[]} cartesianOrigin - the tile center in the cartesian coordinate system
+   * @param {number[]} cartographicOrigin - the tile center in the cartographic coordinate system
+   * @param {number[]} modelMatrix - the model matrix of geometry
    * @returns {Float32Array} - the output geometry positions array
    */
-  _normalizePositions(positionsValue, cartesianOrigin) {
+  _normalizePositions(positionsValue, cartesianOrigin, cartographicOrigin, modelMatrix) {
     const newPositionsValue = new Float32Array(positionsValue.length);
     for (let index = 0; index < positionsValue.length; index += 3) {
       const vertex = positionsValue.subarray(index, index + 3);
-      const originVector = new Vector3(cartesianOrigin);
-      let vertexVector = new Vector3(Array.from(vertex));
-      vertexVector = vertexVector.subtract(originVector);
+      const cartesianOriginVector = new Vector3(cartesianOrigin);
+      let vertexVector = new Vector3(Array.from(vertex))
+        .transform(modelMatrix)
+        .add(cartographicOrigin);
+      Ellipsoid.WGS84.cartographicToCartesian(vertexVector, scratchVector);
+      vertexVector = scratchVector.subtract(cartesianOriginVector);
       newPositionsValue.set(vertexVector, index);
     }
     return newPositionsValue;
@@ -267,7 +295,7 @@ export default class B3dmConverter {
       return 0;
     }
     const firstKey = Object.keys(attributes)[0];
-    return attributes[firstKey].length;
+    return firstKey ? attributes[firstKey].length : 0;
   }
 
   /* Checks that normals buffer is correct

package/src/3d-tiles-converter/helpers/texture-atlas.ts

@@ -0,0 +1,55 @@
+/**
+ * Apply uvRegions to texture coordinates.
+ * Spec - https://github.com/Esri/i3s-spec/blob/master/docs/1.7/geometryUVRegion.cmn.md
+ * Shader formula vec2 uv = fract(texCoords) * (uvRegions.zw - uvRegions.xy) + uvRegions.xy;
+ * @param texCoords
+ * @param uvRegions
+ */
+export function convertTextureAtlas(texCoords: Float32Array, uvRegions: Uint16Array): Float32Array {
+  const convertedTexCoords = new Float32Array(texCoords.length);
+  const normalisedRegions = normalizeRegions(uvRegions);
+
+  for (let index = 0; index < texCoords.length; index += 2) {
+    const uv = texCoords.subarray(index, index + 2);
+    const regions = normalisedRegions.slice(index * 2, index * 2 + 4);
+    // fract(texCoords)
+    const fractatedUV = fract(uv);
+    // (uvRegions.zw - uvRegions.xy)
+    const subtracted = [regions[2] - regions[0], regions[3] - regions[1]];
+    // fract(texCoords) * (uvRegions.zw - uvRegions.xy)
+    const multiplicationResult = [fractatedUV[0] * subtracted[0], fractatedUV[1] * subtracted[1]];
+    // fract(texCoords) * (uvRegions.zw - uvRegions.xy) + uvRegions.xy;
+    const convertedUV = [
+      multiplicationResult[0] + regions[0],
+      multiplicationResult[1] + regions[1]
+    ];
+
+    convertedTexCoords[index] = convertedUV[0];
+    convertedTexCoords[index + 1] = convertedUV[1];
+  }
+
+  return convertedTexCoords;
+}
+
+/**
+ * Do fractation of UV array.
+ * @param uv
+ */
+function fract(uv: number[2]): number[2] {
+  return [uv[0] - Math.floor(uv[0]), uv[1] - Math.floor(uv[1])];
+}
+
+/**
+ * Normalize uvRegions by dividing by the maximum Uint16 value
+ * @param regions
+ */
+function normalizeRegions(regions: Uint16Array): number[4] {
+  const MAX_UINT_16_VALUE = 65535;
+  const normalizedRegions = [];
+
+  for (let index = 0; index < regions.length; index++) {
+    normalizedRegions[index] = regions[index] / MAX_UINT_16_VALUE;
+  }
+
+  return normalizedRegions;
+}

package/src/i3s-converter/helpers/geometry-converter.js

@@ -40,8 +40,12 @@ export default async function convertB3dmToI3sGeometry(
 
   const result = [];
   let nodesCounter = nodeId;
-  for (let i = 0; i < (tileContent.gltf.materials.length || 1); i++) {
-    const sourceMaterial = tileContent.gltf.materials[i] || {id: 'default'};
+  let {materials = []} = tileContent.gltf;
+  if (!materials.length === 0) {
+    materials.push({id: 'default'});
+  }
+  for (let i = 0; i < materials.length; i++) {
+    const sourceMaterial = materials[i];
     if (!convertedAttributesMap.has(sourceMaterial.id)) {
       continue; // eslint-disable-line no-continue
     }
@@ -62,6 +66,9 @@ export default async function convertB3dmToI3sGeometry(
     nodesCounter++;
   }
 
+  if (!result.length) {
+    return null;
+  }
   return result;
 }
 
@@ -158,7 +165,7 @@ function convertAttributes(tileContent) {
     });
   }
 
-  const nodes = tileContent.gltf.scene.nodes;
+  const nodes = (tileContent.gltf.scene || tileContent.gltf.scenes?.[0] || tileContent.gltf).nodes;
   convertNodes(nodes, tileContent, attributesMap);
 
   for (const attrKey of attributesMap.keys()) {
@@ -167,19 +174,6 @@ function convertAttributes(tileContent) {
       attributesMap.delete(attrKey);
       continue; // eslint-disable-line no-continue
     }
-    const vertexCount = attributes.positions.length / VALUES_PER_VERTEX;
-    if (!attributes.colors.length) {
-      attributes.colors = new Uint8Array(vertexCount * VALUES_PER_COLOR_ELEMENT);
-      for (let index = 0; index < attributes.colors.length; index += 4) {
-        attributes.colors.set([255, 255, 255, 255], index);
-      }
-    }
-    if (!attributes.texCoords.length) {
-      attributes.texCoords = new Float32Array(vertexCount * VALUES_PER_TEX_COORD);
-      for (let index = 0; index < attributes.texCoords.length; index += 2) {
-        attributes.texCoords.set([1, 1], index);
-      }
-    }
     attributes.featureIndices = attributes.featureIndices.reduce((acc, value) => acc.concat(value));
   }
 
@@ -366,10 +360,13 @@ function transformVertexNormals(vertexVector, calleeArgs) {
  * @returns {Float32Array}
  */
 function flattenTexCoords(texCoords, indices) {
+  const newTexCoords = new Float32Array(indices.length * VALUES_PER_TEX_COORD);
   if (!texCoords) {
-    return new Float32Array(0);
+    // We need dummy UV0s because it is required in 1.6
+    // https://github.com/Esri/i3s-spec/blob/master/docs/1.6/vertexAttribute.cmn.md
+    newTexCoords.fill(1);
+    return newTexCoords;
   }
-  const newTexCoords = new Float32Array(indices.length * VALUES_PER_TEX_COORD);
   for (let i = 0; i < indices.length; i++) {
     const coordIndex = indices[i] * VALUES_PER_TEX_COORD;
     const texCoord = texCoords.subarray(coordIndex, coordIndex + VALUES_PER_TEX_COORD);
@@ -386,12 +383,14 @@ function flattenTexCoords(texCoords, indices) {
  * @returns {Uint8Array}
  */
 function flattenColors(colorsAttribute, indices) {
+  const components = colorsAttribute?.components || VALUES_PER_COLOR_ELEMENT;
+  const newColors = new Uint8Array(indices.length * components);
   if (!colorsAttribute) {
-    return new Uint8Array(0);
+    // Vertex color multiplies by material color so it must be normalized 1 by default
+    newColors.fill(255);
+    return newColors;
   }
-  const components = colorsAttribute.components;
   const colors = colorsAttribute.value;
-  const newColors = new Uint8Array(indices.length * components);
   for (let i = 0; i < indices.length; i++) {
     const colorIndex = indices[i] * components;
     const color = colors.subarray(colorIndex, colorIndex + components);
@@ -445,7 +444,7 @@ function getBatchIdsByAttributeName(attributes) {
 
 function convertMaterials(tileContent) {
   const result = [];
-  const sourceMaterials = tileContent.gltf.materials;
+  const sourceMaterials = tileContent.gltf.materials || [];
   for (const sourceMaterial of sourceMaterials) {
     result.push(convertMaterial(sourceMaterial));
   }

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

@@ -19,9 +19,9 @@ import type {
   Field,
   PopupInfo
 } from '@loaders.gl/i3s';
-import {load} from '@loaders.gl/core';
+import {load, encode} from '@loaders.gl/core';
 import {Tileset3D} from '@loaders.gl/tiles';
-import {CesiumIonLoader} from '@loaders.gl/3d-tiles';
+import {CesiumIonLoader, Tiles3DLoader} from '@loaders.gl/3d-tiles';
 import {join} from 'path';
 import {v4 as uuidv4} from 'uuid';
 import process from 'process';
@@ -51,6 +51,8 @@ import {SHARED_RESOURCES_TEMPLATE} from './json-templates/shared-resources';
 import {validateNodeBoundingVolumes} from './helpers/node-debug';
 import {GeoidHeightModel} from '../lib/geoid-height-model';
 import TileHeader from '@loaders.gl/tiles/src/tileset/tile-3d';
+import {KTX2BasisUniversalTextureWriter} from '@loaders.gl/textures';
+import {LoaderWithParser} from '@loaders.gl/loader-utils';
 
 const ION_DEFAULT_TOKEN =
   process.env.IonToken || // eslint-disable-line
@@ -63,6 +65,7 @@ const SHORT_INT_TYPE = 'Int32';
 const DOUBLE_TYPE = 'double';
 const OBJECT_ID_TYPE = 'OBJECTID';
 const REFRESH_TOKEN_TIMEOUT = 1800; // 30 minutes in seconds
+const CESIUM_DATASET_PREFIX = 'https://';
 // const FS_FILE_TOO_LARGE = 'ERR_FS_FILE_TOO_LARGE';
 
 /**
@@ -88,6 +91,7 @@ export default class I3SConverter {
   refreshTokenTime: [number, number];
   sourceTileset: Tileset3D | null;
   geoidHeightModel: GeoidHeightModel | null;
+  Loader: LoaderWithParser = Tiles3DLoader;
 
   constructor() {
     this.nodePages = new NodePages(writeFile, HARDCODED_NODES_PER_PAGE);
@@ -148,6 +152,7 @@ export default class I3SConverter {
     } = options;
     this.options = {maxDepth, slpk, sevenZipExe, egmFilePath, draco, token, inputUrl};
     this.validate = validate;
+    this.Loader = inputUrl.indexOf(CESIUM_DATASET_PREFIX) !== -1 ? CesiumIonLoader : Tiles3DLoader;
 
     console.log('Loading egm file...'); // eslint-disable-line
     this.geoidHeightModel = await load(egmFilePath, PGMLoader);
@@ -163,7 +168,7 @@ export default class I3SConverter {
       tilesetOptions.loadOptions.fetch = {headers: preloadOptions.headers};
     }
     Object.assign(tilesetOptions, preloadOptions);
-    const sourceTilesetJson = await load(inputUrl, CesiumIonLoader, tilesetOptions.loadOptions);
+    const sourceTilesetJson = await load(inputUrl, this.Loader, tilesetOptions.loadOptions);
     // console.log(tilesetJson); // eslint-disable-line
     this.sourceTileset = new Tileset3D(sourceTilesetJson, tilesetOptions);
 
@@ -636,14 +641,14 @@ export default class I3SConverter {
     parentId: number,
     resources: I3SGeometry
   ): NodeInPage {
-    const {meshMaterial, texture, vertexCount, featureCount} = resources;
+    const {meshMaterial, texture, vertexCount, featureCount, geometry} = resources;
     const nodeInPage = {
       lodThreshold: maxScreenThresholdSQ.maxError,
       obb: boundingVolumes.obb,
       children: [],
       mesh: null
     };
-    if (sourceTile.content && sourceTile.content.type === 'b3dm') {
+    if (geometry && sourceTile.content && sourceTile.content.type === 'b3dm') {
       nodeInPage.mesh = {
         geometry: {
           definition: texture ? 0 : 1
@@ -717,7 +722,7 @@ export default class I3SConverter {
       node.sharedResource = {href: './shared'};
 
       if (texture) {
-        node.textureData = [{href: './textures/0'}];
+        node.textureData = [{href: './textures/0'}, {href: './textures/1'}];
       }
 
       if (
@@ -852,24 +857,41 @@ export default class I3SConverter {
             {
               name: '0',
               format
+            },
+            {
+              name: '1',
+              format: 'ktx2'
             }
           ]
         });
       }
 
       const textureData = texture.bufferView.data;
+      const ktx2TextureData = await encode(texture.image, KTX2BasisUniversalTextureWriter);
+
       if (this.options.slpk) {
         const slpkTexturePath = join(childPath, 'textures');
         const compress = false;
+
         this.fileMap[`${slpkChildPath}/textures/0.${format}`] = await writeFileForSlpk(
           slpkTexturePath,
           textureData,
           `0.${format}`,
           compress
         );
+
+        this.fileMap[`${slpkChildPath}/textures/1.ktx2`] = await writeFileForSlpk(
+          slpkTexturePath,
+          ktx2TextureData,
+          `1.ktx2`,
+          compress
+        );
       } else {
         const texturePath = join(childPath, 'textures/0/');
         await writeFile(texturePath, textureData, `index.${format}`);
+
+        const ktx2TexturePath = join(childPath, 'textures/1/');
+        await writeFile(ktx2TexturePath, ktx2TextureData, `index.ktx2`);
       }
     }
   }
@@ -1159,10 +1181,13 @@ export default class I3SConverter {
    * Fetch preload options for ION tileset
    */
   private async _fetchPreloadOptions(): Promise<any> {
+    if (!this.Loader.preload) {
+      return {};
+    }
     const options = {
       'cesium-ion': {accessToken: this.options.token || ION_DEFAULT_TOKEN}
     };
-    const preloadOptions = await CesiumIonLoader.preload(this.options.inputUrl, options);
+    const preloadOptions = await this.Loader.preload(this.options.inputUrl, options);
     this.refreshTokenTime = process.hrtime();
     return {...options, ...preloadOptions};
   }

package/src/i3s-converter/json-templates/metadata.js

@@ -13,7 +13,7 @@ export const METADATA = {
   },
   I3SVersion: {
     path: 'I3SVersion',
-    default: '1.7'
+    default: '1.8'
   },
   nodeCount: {
     path: 'nodeCount'

package/src/i3s-converter/json-templates/scene-server.js

@@ -14,7 +14,7 @@ export const SCENE_SERVER_TEMPLATE = {
   },
   serviceVersion: {
     path: 'serviceVersion',
-    default: '1.7'
+    default: '1.8'
   },
   supportedBindings: {
     path: 'supportedBindings',

package/src/i3s-converter/json-templates/store.js

@@ -9,7 +9,7 @@ export const STORE = {
   },
   version: {
     path: 'version',
-    default: '1.7'
+    default: '1.8'
   },
   resourcePattern: {
     path: 'resourcePattern',
@@ -40,7 +40,7 @@ export const STORE = {
   },
   textureEncoding: {
     path: 'textureEncoding',
-    default: ['image/jpeg']
+    default: ['image/jpeg', 'image/ktx2']
   },
   lodType: {
     path: 'lodType',

package/src/i3s-server/controllers/index-controller.js

@@ -7,7 +7,7 @@ const I3S_LAYER_PATH = process.env.I3sLayerPath || ''; // eslint-disable-line no
 const FULL_LAYER_PATH = path.join(process.cwd(), I3S_LAYER_PATH); // eslint-disable-line no-undef
 
 async function getFileNameByUrl(url) {
-  const extensions = ['json', 'bin', 'jpg', 'jpeg', 'png', 'bin.dds'];
+  const extensions = ['json', 'bin', 'jpg', 'jpeg', 'png', 'bin.dds', 'ktx2'];
   for (const ext of extensions) {
     const fileName = `${FULL_LAYER_PATH}${url}/index.${ext}`;
     try {

package/dist/3d-tiles-converter/3d-tiles-converter.js.map

@@ -1 +0,0 @@
-{"version":3,"sources":["../../src/3d-tiles-converter/3d-tiles-converter.ts"],"names":["join","process","transform","load","I3SLoader","I3SAttributeLoader","Tileset3D","Tile3D","PGMLoader","i3sObbTo3dTilesObb","convertScreenThresholdToGeometricError","writeFile","removeDir","calculateFilesSize","timeConverter","TILESET","tilesetTemplate","B3dmConverter","createObbFromMbs","I3S","Tiles3DConverter","constructor","options","tilesetPath","vertexCounter","conversionStartTime","geoidHeightModel","sourceTileset","attributeStorageInfo","convert","inputUrl","outputPath","tilesetName","maxDepth","egmFilePath","hrtime","console","log","sourceTilesetJson","root","header","obb","mbs","e","rootTile","boundingVolume","box","geometricError","children","_addChildren","tileset","JSON","stringify","_finishConversion","slpk","parentSourceNode","parentNode","level","childNodeInfo","sourceChild","_loadChildNode","push","contentUrl","_loadTile","content","vertexCount","attributes","_loadChildAttributes","child","b3dm","uri","id","Uint8Array","unloadContent","nodePages","nodePagesTile","formTileFromNodePages","loader","nodeUrl","_relativeUrlToFullUrl","url","href","i3s","loadOptions","isTileHeader","loadContent","baseUrl","relativeUrl","resultArray","split","relativeUrlArray","folder","slice","promises","attributeUrls","index","length","attribute","attributeName","name","attributeType","_getAttributeType","attributesList","Promise","all","_replaceNestedArrays","Object","assign","attributeValues","valueType","objectIds","attributeObject","key","Array","from","params","filesSize","diff","conversionTime"],"mappings":"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","sourcesContent":["import type {AttributeStorageInfo, FeatureAttribute, NodeReference} from '@loaders.gl/i3s';\nimport type {Node3D} from '@loaders.gl/3d-tiles';\n\nimport {join} from 'path';\nimport process from 'process';\nimport transform from 'json-map-transform';\nimport {load} from '@loaders.gl/core';\nimport {I3SLoader, I3SAttributeLoader} from '@loaders.gl/i3s';\nimport {Tileset3D, Tile3D} from '@loaders.gl/tiles';\n\nimport {PGMLoader} from '../pgm-loader';\nimport {i3sObbTo3dTilesObb} from './helpers/i3s-obb-to-3d-tiles-obb';\nimport {convertScreenThresholdToGeometricError} from '../lib/utils/lod-conversion-utils';\nimport {writeFile, removeDir} from '../lib/utils/file-utils';\nimport {calculateFilesSize, timeConverter} from '../lib/utils/statistic-utills';\nimport {TILESET as tilesetTemplate} from './json-templates/tileset';\nimport B3dmConverter from './helpers/b3dm-converter';\nimport {createObbFromMbs} from '../i3s-converter/helpers/coordinate-converter';\nimport {GeoidHeightModel} from '../lib/geoid-height-model';\n\nconst I3S = 'I3S';\n\n/**\n * Converter from i3s to 3d-tiles\n */\nexport default class Tiles3DConverter {\n  options: any;\n  tilesetPath: string;\n  vertexCounter: number;\n  conversionStartTime: [number, number];\n  geoidHeightModel: GeoidHeightModel;\n  sourceTileset: Tileset3D;\n  attributeStorageInfo: AttributeStorageInfo;\n\n  constructor() {\n    this.options = {};\n    this.tilesetPath = '';\n    this.vertexCounter = 0;\n    this.conversionStartTime = [0, 0];\n    this.geoidHeightModel = null;\n    this.sourceTileset = null;\n    this.attributeStorageInfo = null;\n  }\n\n  /**\n   * Convert i3s format data to 3dTiles\n   * @param options\n   * @param options.inputUrl the url to read the tileset from\n   * @param options.outputPath the output filename\n   * @param options.tilesetName the output name of the tileset\n   * @param options.egmFilePath location of *.pgm file to convert heights from ellipsoidal to gravity-related format\n   * @param options.maxDepth The max tree depth of conversion\n   */\n  private async convert(options: {\n    inputUrl: string;\n    outputPath: string;\n    tilesetName: string;\n    maxDepth: number;\n    egmFilePath: string;\n  }): Promise<any> {\n    const {inputUrl, outputPath, tilesetName, maxDepth, egmFilePath} = options;\n    this.conversionStartTime = process.hrtime();\n    this.options = {maxDepth};\n\n    console.log('Loading egm file...'); // eslint-disable-line\n    this.geoidHeightModel = await load(egmFilePath, PGMLoader);\n    console.log('Loading egm file completed!'); // eslint-disable-line\n\n    const sourceTilesetJson = await load(inputUrl, I3SLoader, {});\n    this.sourceTileset = new Tileset3D(sourceTilesetJson, {});\n\n    if (!this.sourceTileset.root.header.obb) {\n      this.sourceTileset.root.header.obb = createObbFromMbs(this.sourceTileset.root.header.mbs);\n    }\n\n    this.tilesetPath = join(`${outputPath}`, `${tilesetName}`);\n    this.attributeStorageInfo = sourceTilesetJson.attributeStorageInfo;\n    // Removing the tilesetPath needed to exclude erroneous files after conversion\n    try {\n      await removeDir(this.tilesetPath);\n    } catch (e) {\n      // do nothing\n    }\n\n    const rootTile: Node3D = {\n      boundingVolume: {\n        box: i3sObbTo3dTilesObb(this.sourceTileset.root.header.obb, this.geoidHeightModel)\n      },\n      geometricError: convertScreenThresholdToGeometricError(this.sourceTileset.root),\n      children: []\n    };\n\n    await this._addChildren(this.sourceTileset.root, rootTile, 1);\n\n    const tileset = transform({root: rootTile}, tilesetTemplate);\n    await writeFile(this.tilesetPath, JSON.stringify(tileset), 'tileset.json');\n\n    this._finishConversion({slpk: false, outputPath, tilesetName});\n  }\n\n  /**\n   * The recursive function of traversal of a nodes tree\n   * @param parentSourceNode the parent node tile object (@loaders.gl/tiles/Tile3D)\n   * @param parentNode object in resulting tileset\n   * @param level a current level of a tree depth\n   */\n  private async _addChildren(\n    parentSourceNode: Tile3D,\n    parentNode: Node3D,\n    level: number\n  ): Promise<void> {\n    if (this.options.maxDepth && level > this.options.maxDepth) {\n      return;\n    }\n    for (const childNodeInfo of parentSourceNode.header.children || []) {\n      const sourceChild = await this._loadChildNode(parentSourceNode, childNodeInfo);\n      parentSourceNode.children.push(sourceChild);\n      if (sourceChild.contentUrl) {\n        await this.sourceTileset._loadTile(sourceChild);\n        this.vertexCounter += sourceChild.content.vertexCount;\n\n        let attributes = null;\n        if (this.attributeStorageInfo) {\n          attributes = await this._loadChildAttributes(sourceChild, this.attributeStorageInfo);\n        }\n\n        if (!sourceChild.header.obb) {\n          sourceChild.header.obb = createObbFromMbs(sourceChild.header.mbs);\n        }\n\n        const boundingVolume = {\n          box: i3sObbTo3dTilesObb(sourceChild.header.obb, this.geoidHeightModel)\n        };\n        const child: Node3D = {\n          boundingVolume,\n          geometricError: convertScreenThresholdToGeometricError(sourceChild),\n          children: []\n        };\n\n        const b3dm = await new B3dmConverter().convert(sourceChild, attributes);\n        child.content = {\n          uri: `${sourceChild.id}.b3dm`,\n          boundingVolume\n        };\n        await writeFile(this.tilesetPath, new Uint8Array(b3dm), `${sourceChild.id}.b3dm`);\n        parentNode.children.push(child);\n\n        sourceChild.unloadContent();\n        await this._addChildren(sourceChild, child, level + 1);\n      } else {\n        await this._addChildren(sourceChild, parentNode, level + 1);\n      }\n    }\n  }\n\n  /**\n   * Load a child node having information from the node header\n   * @param parentNode a parent node tile object (@loaders.gl/tiles/Tile3D)\n   * @param childNodeInfo child information from 3DNodeIndexDocument\n   *   (https://github.com/Esri/i3s-spec/blob/master/docs/1.7/nodeReference.cmn.md)\n   */\n  private async _loadChildNode(parentNode: Tile3D, childNodeInfo: NodeReference): Promise<Tile3D> {\n    let header;\n    if (this.sourceTileset.tileset.nodePages) {\n      console.log(`Node conversion: ${childNodeInfo.id}`); // eslint-disable-line no-console,no-undef\n      header = await this.sourceTileset.tileset.nodePagesTile.formTileFromNodePages(\n        childNodeInfo.id\n      );\n    } else {\n      const {loader} = this.sourceTileset;\n      const nodeUrl = this._relativeUrlToFullUrl(parentNode.url, childNodeInfo.href);\n      // load metadata\n      const options = {\n        i3s: {\n          ...this.sourceTileset.loadOptions,\n          isTileHeader: true,\n          loadContent: false\n        }\n      };\n\n      console.log(`Node conversion: ${nodeUrl}`); // eslint-disable-line no-console,no-undef\n      header = await load(nodeUrl, loader, options);\n    }\n    return new Tile3D(this.sourceTileset, header, parentNode);\n  }\n\n  /**\n   * Make an url of a resource from its relative url having the base url\n   * @param baseUrl the base url. A resulting url will be related from this url\n   * @param relativeUrl a realtive url of a resource\n   */\n  private _relativeUrlToFullUrl(baseUrl: string, relativeUrl: string): string {\n    let resultArray = baseUrl.split('/');\n    const relativeUrlArray = relativeUrl.split('/');\n    for (const folder of relativeUrlArray) {\n      switch (folder) {\n        case '.':\n          continue; // eslint-disable-line no-continue\n        case '..':\n          resultArray = resultArray.slice(0, -1);\n          break;\n        default:\n          resultArray.push(folder);\n      }\n    }\n    return resultArray.join('/');\n  }\n\n  /**\n   * Do loading all attributes related to particular node.\n   * @param sourceChild\n   * @param attributeStorageInfo\n   * @returns Promise of attributes object.\n   */\n  private async _loadChildAttributes(\n    sourceChild: Tile3D,\n    attributeStorageInfo: AttributeStorageInfo\n  ): Promise<FeatureAttribute> {\n    const promises = [];\n    const {attributeUrls} = sourceChild.header;\n\n    for (let index = 0; index < attributeUrls.length; index++) {\n      const inputUrl = attributeUrls[index];\n      const attribute = attributeStorageInfo[index];\n      const options = {\n        attributeName: attribute.name,\n        attributeType: this._getAttributeType(attribute)\n      };\n\n      promises.push(load(inputUrl, I3SAttributeLoader, options));\n    }\n    const attributesList = await Promise.all(promises);\n    this._replaceNestedArrays(attributesList);\n    return Object.assign({}, ...attributesList);\n  }\n\n  /**\n   * Returns attribute type for loading attributes\n   * @param attribute\n   * Workaround for I3S v1.6. There is no attribute.attributeValues.valueType field in attribute.\n   * There is an 'Oid32' type if attribute has objectIds property.\n   * Doc: https://github.com/Esri/i3s-spec/blob/master/docs/1.6/attributeStorageInfo.cmn.md\n   */\n  private _getAttributeType(attribute: AttributeStorageInfo): string {\n    if (attribute.attributeValues) {\n      return attribute.attributeValues.valueType;\n    } else if (attribute.objectIds) {\n      return 'Oid32';\n    }\n    return '';\n  }\n\n  /**\n   * Make simple arrays from attribute typed arrays.\n   * @param attributesList\n   */\n  private _replaceNestedArrays(attributesList: FeatureAttribute[]): void {\n    for (let index = 0; index < attributesList.length; index++) {\n      const attributeObject = attributesList[index];\n\n      for (const key in attributeObject) {\n        attributeObject[key] = Array.from(attributeObject[key]);\n      }\n    }\n  }\n\n  /**\n   * Print statistics in the end of conversion\n   * @param params - output files data\n   */\n  private async _finishConversion(params: {\n    slpk: boolean;\n    outputPath: string;\n    tilesetName: string;\n  }): Promise<void> {\n    const filesSize = await calculateFilesSize(params);\n    const diff = process.hrtime(this.conversionStartTime);\n    const conversionTime = timeConverter(diff);\n\n    console.log(`------------------------------------------------`); // eslint-disable-line\n    console.log(`Finish conversion of ${I3S}`); // eslint-disable-line\n    console.log(`Total conversion time: ${conversionTime}`); // eslint-disable-line\n    console.log(`Vertex count: `, this.vertexCounter); // eslint-disable-line\n    console.log(`File(s) size: `, filesSize, ' bytes'); // eslint-disable-line\n    console.log(`------------------------------------------------`); // eslint-disable-line\n  }\n}\n"],"file":"3d-tiles-converter.js"}