@loaders.gl/tile-converter 3.4.13 → 3.4.15

package/dist/i3s-converter/helpers/geometry-converter.d.ts

@@ -1,7 +1,7 @@
 import type { B3DMContent, FeatureTableJson } from '@loaders.gl/3d-tiles';
-import { ConvertedAttributes, I3SConvertedResources, I3SMaterialWithTexture } from '../types';
 import { AttributeStorageInfo } from '@loaders.gl/i3s';
 import { Geoid } from '@math.gl/geoid';
+import { ConvertedAttributes, I3SConvertedResources, I3SMaterialWithTexture } from '../types';
 /** Usage of worker here brings more overhead than advantage */
 import { B3DMAttributesData } from '../../i3s-attributes-worker';
 /**

package/dist/i3s-converter/helpers/geometry-converter.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"geometry-converter.d.ts","sourceRoot":"","sources":["../../../src/i3s-converter/helpers/geometry-converter.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAC,WAAW,EAAE,gBAAgB,EAAC,MAAM,sBAAsB,CAAC;AAsBxE,OAAO,EACL,mBAAmB,EACnB,qBAAqB,EACrB,sBAAsB,EAGvB,MAAM,UAAU,CAAC;AAClB,OAAO,EACL,oBAAoB,EAIrB,MAAM,iBAAiB,CAAC;AAEzB,OAAO,EAAC,KAAK,EAAC,MAAM,gBAAgB,CAAC;AACrC,+DAA+D;AAC/D,OAAO,EAAC,kBAAkB,EAAsC,MAAM,6BAA6B,CAAC;AAsCpG;;;;;;;;;;;;;;GAcG;AACH,wBAA8B,wBAAwB,CACpD,WAAW,EAAE,WAAW,EACxB,iBAAiB,EAAE,MAAM,OAAO,CAAC,MAAM,CAAC,EACxC,aAAa,EAAE,gBAAgB,GAAG,IAAI,EACtC,iBAAiB,EAAE,MAAM,EAAE,EAC3B,oBAAoB,EAAE,oBAAoB,EAAE,GAAG,SAAS,EACxD,KAAK,EAAE,OAAO,EACd,uBAAuB,EAAE,OAAO,EAChC,oBAAoB,EAAE,OAAO,EAC7B,gBAAgB,EAAE,KAAK,EACvB,YAAY,EAAE;IAAC,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAAA;CAAC,GACpC,OAAO,CAAC,qBAAqB,EAAE,GAAG,IAAI,CAAC,CA0DzC;AA6ID;;;;;;;GAOG;AACH,wBAAsB,iBAAiB,CACrC,cAAc,EAAE,kBAAkB,EAClC,sBAAsB,EAAE,sBAAsB,EAAE,EAChD,qBAAqB,EAAE,OAAO,GAC7B,OAAO,CAAC,GAAG,CAAC,MAAM,EAAE,mBAAmB,CAAC,CAAC,CAgD3C;AAkoCD;;;;;GAKG;AACH,wBAAgB,gBAAgB,CAAC,WAAW,EAAE,WAAW,GAAG,gBAAgB,GAAG,IAAI,CAoBlF"}
+{"version":3,"file":"geometry-converter.d.ts","sourceRoot":"","sources":["../../../src/i3s-converter/helpers/geometry-converter.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAC,WAAW,EAAE,gBAAgB,EAAC,MAAM,sBAAsB,CAAC;AAYxE,OAAO,EACL,oBAAoB,EAIrB,MAAM,iBAAiB,CAAC;AAIzB,OAAO,EAAC,KAAK,EAAC,MAAM,gBAAgB,CAAC;AAWrC,OAAO,EACL,mBAAmB,EACnB,qBAAqB,EACrB,sBAAsB,EAGvB,MAAM,UAAU,CAAC;AAClB,+DAA+D;AAC/D,OAAO,EAAC,kBAAkB,EAAsC,MAAM,6BAA6B,CAAC;AAoCpG;;;;;;;;;;;;;;GAcG;AACH,wBAA8B,wBAAwB,CACpD,WAAW,EAAE,WAAW,EACxB,iBAAiB,EAAE,MAAM,OAAO,CAAC,MAAM,CAAC,EACxC,aAAa,EAAE,gBAAgB,GAAG,IAAI,EACtC,iBAAiB,EAAE,MAAM,EAAE,EAC3B,oBAAoB,EAAE,oBAAoB,EAAE,GAAG,SAAS,EACxD,KAAK,EAAE,OAAO,EACd,uBAAuB,EAAE,OAAO,EAChC,oBAAoB,EAAE,OAAO,EAC7B,gBAAgB,EAAE,KAAK,EACvB,YAAY,EAAE;IAAC,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAAA;CAAC,GACpC,OAAO,CAAC,qBAAqB,EAAE,GAAG,IAAI,CAAC,CA0DzC;AA6ID;;;;;;;GAOG;AACH,wBAAsB,iBAAiB,CACrC,cAAc,EAAE,kBAAkB,EAClC,sBAAsB,EAAE,sBAAsB,EAAE,EAChD,qBAAqB,EAAE,OAAO,GAC7B,OAAO,CAAC,GAAG,CAAC,MAAM,EAAE,mBAAmB,CAAC,CAAC,CAgD3C;AAkoCD;;;;;GAKG;AACH,wBAAgB,gBAAgB,CAAC,WAAW,EAAE,WAAW,GAAG,gBAAgB,GAAG,IAAI,CAoBlF"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@loaders.gl/tile-converter",
-  "version": "3.4.13",
+  "version": "3.4.15",
   "description": "Converter",
   "license": "MIT",
   "publishConfig": {
@@ -44,19 +44,19 @@
     "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": "3.4.13",
-    "@loaders.gl/crypto": "3.4.13",
-    "@loaders.gl/draco": "3.4.13",
-    "@loaders.gl/gltf": "3.4.13",
-    "@loaders.gl/i3s": "3.4.13",
-    "@loaders.gl/images": "3.4.13",
-    "@loaders.gl/loader-utils": "3.4.13",
-    "@loaders.gl/polyfills": "3.4.13",
-    "@loaders.gl/schema": "3.4.13",
-    "@loaders.gl/textures": "3.4.13",
-    "@loaders.gl/tiles": "3.4.13",
-    "@loaders.gl/worker-utils": "3.4.13",
-    "@loaders.gl/zip": "3.4.13",
+    "@loaders.gl/3d-tiles": "3.4.15",
+    "@loaders.gl/crypto": "3.4.15",
+    "@loaders.gl/draco": "3.4.15",
+    "@loaders.gl/gltf": "3.4.15",
+    "@loaders.gl/i3s": "3.4.15",
+    "@loaders.gl/images": "3.4.15",
+    "@loaders.gl/loader-utils": "3.4.15",
+    "@loaders.gl/polyfills": "3.4.15",
+    "@loaders.gl/schema": "3.4.15",
+    "@loaders.gl/textures": "3.4.15",
+    "@loaders.gl/tiles": "3.4.15",
+    "@loaders.gl/worker-utils": "3.4.15",
+    "@loaders.gl/zip": "3.4.15",
     "@math.gl/core": "^3.5.1",
     "@math.gl/culling": "^3.5.1",
     "@math.gl/geoid": "^3.5.1",
@@ -79,5 +79,5 @@
     "join-images": "^1.1.3",
     "sharp": "^0.31.3"
   },
-  "gitHead": "be8849c02972ce541e01720d29b976f830d6af92"
+  "gitHead": "19e941d5805568e449ef9092490d6568a4853298"
 }

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

@@ -6,7 +6,7 @@ import {
 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';
 
 const EXT_MESH_FEATURES = 'EXT_mesh_features';
 const EXT_FEATURE_METADATA = 'EXT_feature_metadata';

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

@@ -5,11 +5,21 @@ import type {
   GLTFMaterialPostprocessed,
   GLTFNodePostprocessed,
   GLTFImagePostprocessed,
+  GLTFTexturePostprocessed,
   GLTFMeshPrimitivePostprocessed,
-  GLTFMeshPostprocessed,
-  GLTFTexturePostprocessed
+  GLTFMeshPostprocessed
 } from '@loaders.gl/gltf';
 
+import {
+  AttributeStorageInfo,
+  I3SMaterialDefinition,
+  MaterialDefinitionInfo,
+  TextureDefinitionInfo
+} from '@loaders.gl/i3s';
+
+import {TypedArray} from '@loaders.gl/schema';
+import {GL} from '@loaders.gl/math';
+import {Geoid} from '@math.gl/geoid';
 import {Vector3, Matrix4, Vector4} from '@math.gl/core';
 import {Ellipsoid} from '@math.gl/geospatial';
 
@@ -27,21 +37,11 @@ import {
   MergedMaterial,
   SharedResourcesArrays
 } from '../types';
-import {
-  AttributeStorageInfo,
-  I3SMaterialDefinition,
-  MaterialDefinitionInfo,
-  TextureDefinitionInfo
-} from '@loaders.gl/i3s';
-import {TypedArray} from '@loaders.gl/schema';
-import {Geoid} from '@math.gl/geoid';
 /** Usage of worker here brings more overhead than advantage */
 import {B3DMAttributesData /*, transformI3SAttributesOnWorker*/} from '../../i3s-attributes-worker';
 import {prepareDataForAttributesConversion} from './gltf-attributes';
 import {handleBatchIdsExtensions} from './batch-ids-extensions';
 import {checkPropertiesLength, flattenPropertyTableByFeatureIds} from './feature-attributes';
-import {MeshPrimitive} from 'modules/gltf/src/lib/types/gltf-postprocessed-schema';
-import {GL} from '@loaders.gl/math';
 
 /*
   At the moment of writing the type TypedArrayConstructor is not exported in '@math.gl/types'.
@@ -567,10 +567,10 @@ function convertMesh(
 }
 /**
  * Converts TRIANGLE-STRIPS to independent TRIANGLES
- * @param {MeshPrimitive} primitive - the primitive to get the indices from
+ * @param primitive - the primitive to get the indices from
  * @returns indices of vertices of the independent triangles
  */
-function getIndices(primitive: MeshPrimitive): TypedArray {
+function getIndices(primitive: GLTFMeshPrimitivePostprocessed): TypedArray {
   let indices: TypedArray = primitive.indices?.value;
   if (indices && primitive.mode === GL.TRIANGLE_STRIP) {
     /*