@loaders.gl/tile-converter 3.1.0-alpha.4 → 3.1.0-beta.5

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 {