@loaders.gl/tile-converter 3.4.0-alpha.3 → 3.4.0-alpha.4

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;AA6BpG;;;;;;;;;;;;;;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;AA8lCD;;;;;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;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"}

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

@@ -39,6 +39,7 @@ const coordinate_converter_1 = require("./coordinate-converter");
 const gltf_attributes_1 = require("./gltf-attributes");
 const batch_ids_extensions_1 = require("./batch-ids-extensions");
 const feature_attributes_1 = require("./feature-attributes");
+const math_1 = require("@loaders.gl/math");
 // Spec - https://github.com/Esri/i3s-spec/blob/master/docs/1.7/pbrMetallicRoughness.cmn.md
 const DEFAULT_ROUGHNESS_FACTOR = 1;
 const DEFAULT_METALLIC_FACTOR = 1;
@@ -334,12 +335,13 @@ function convertMesh(mesh, images, cartographicOrigin, cartesianModelMatrix, att
         if (!outputAttributes) {
             continue;
         }
+        const indices = getIndices(primitive);
         outputAttributes.positions = (0, loader_utils_1.concatenateTypedArrays)(outputAttributes.positions, transformVertexArray({
             vertices: attributes.POSITION.value,
             cartographicOrigin,
             cartesianModelMatrix,
             nodeMatrix: matrix,
-            indices: primitive.indices?.value,
+            indices,
             attributeSpecificTransformation: transformVertexPositions,
             useCartesianPositions
         }));
@@ -348,19 +350,55 @@ function convertMesh(mesh, images, cartographicOrigin, cartesianModelMatrix, att
             cartographicOrigin,
             cartesianModelMatrix,
             nodeMatrix: matrix,
-            indices: primitive.indices?.value,
+            indices,
             attributeSpecificTransformation: transformVertexNormals,
             useCartesianPositions: false
         }));
-        outputAttributes.texCoords = (0, loader_utils_1.concatenateTypedArrays)(outputAttributes.texCoords, flattenTexCoords(attributes.TEXCOORD_0 && attributes.TEXCOORD_0.value, primitive.indices?.value));
-        outputAttributes.colors = (0, loader_utils_1.concatenateTypedArrays)(outputAttributes.colors, flattenColors(attributes.COLOR_0, primitive.indices?.value));
+        outputAttributes.texCoords = (0, loader_utils_1.concatenateTypedArrays)(outputAttributes.texCoords, flattenTexCoords(attributes.TEXCOORD_0 && attributes.TEXCOORD_0.value, indices));
+        outputAttributes.colors = (0, loader_utils_1.concatenateTypedArrays)(outputAttributes.colors, flattenColors(attributes.COLOR_0, indices));
         if (materialUvRegion) {
-            outputAttributes.uvRegions = (0, loader_utils_1.concatenateTypedArrays)(outputAttributes.uvRegions, createUvRegion(materialUvRegion, primitive.indices?.value));
+            outputAttributes.uvRegions = (0, loader_utils_1.concatenateTypedArrays)(outputAttributes.uvRegions, createUvRegion(materialUvRegion, indices));
         }
         outputAttributes.featureIndicesGroups = outputAttributes.featureIndicesGroups || [];
-        outputAttributes.featureIndicesGroups.push(flattenBatchIds(getBatchIds(attributes, primitive, images), primitive.indices?.value));
+        outputAttributes.featureIndicesGroups.push(flattenBatchIds(getBatchIds(attributes, primitive, images), indices));
     }
 }
+/**
+ * Converts TRIANGLE-STRIPS to independent TRIANGLES
+ * @param {MeshPrimitive} primitive - the primitive to get the indices from
+ * @returns indices of vertices of the independent triangles
+ */
+function getIndices(primitive) {
+    let indices = primitive.indices?.value;
+    if (indices && primitive.mode === math_1.GL.TRIANGLE_STRIP) {
+        /*
+        TRIANGLE_STRIP geometry contains n+2 vertices for n triangles;
+        TRIANGLE geometry contains n*3 vertices for n triangles.
+        The conversion from TRIANGLE_STRIP to TRIANGLE implies duplicating adjacent vertices.
+        */
+        const TypedArrayConstructor = indices.constructor;
+        const newIndices = new TypedArrayConstructor((indices.length - 2) * 3);
+        // Copy the first triangle indices with no modification like [i0, i1, i2, ...] -> [i0, i1, i2, ...]
+        let triangleIndex = 0;
+        let currentTriangle = indices.slice(0, 3);
+        newIndices.set(currentTriangle, 0);
+        // The rest triangle indices are being taken from strips using the following logic:
+        // [i1, i2, i3, i4, i5, i6, ...] -> [i3, i2, i1,   i2, i3, i4,   i5, i4, i3,   i4, i5, i6, ...]
+        for (let i = 1; i + 2 < indices.length; i++) {
+            triangleIndex += 3;
+            currentTriangle = indices.slice(i, i + 3);
+            if (i % 2 === 0) {
+                newIndices.set(currentTriangle, triangleIndex);
+            }
+            else {
+                // The following "reverce" is necessary to calculate normals correctly
+                newIndices.set(currentTriangle.reverse(), triangleIndex);
+            }
+        }
+        indices = newIndices;
+    }
+    return indices;
+}
 /**
  * Convert vertices attributes (POSITIONS or NORMALS) to i3s compatible format
  * @param args

package/dist/i3s-converter/helpers/node-debug.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"node-debug.d.ts","sourceRoot":"","sources":["../../../src/i3s-converter/helpers/node-debug.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAM,mBAAmB,EAAM,MAAM,iBAAiB,CAAC;AASnE;;;;GAIG;AACH,wBAAgB,2BAA2B,CAAC,IAAI,EAAE,mBAAmB,GAAG,MAAM,EAAE,CAW/E"}
+{"version":3,"file":"node-debug.d.ts","sourceRoot":"","sources":["../../../src/i3s-converter/helpers/node-debug.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAM,mBAAmB,EAAM,MAAM,iBAAiB,CAAC;AAiBnE;;;;GAIG;AACH,wBAAgB,2BAA2B,CAAC,IAAI,EAAE,mBAAmB,GAAG,MAAM,EAAE,CAW/E"}

package/dist/i3s-converter/helpers/node-debug.js

@@ -2,9 +2,17 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.validateNodeBoundingVolumes = void 0;
 const culling_1 = require("@math.gl/culling");
-const engine_1 = require("@luma.gl/engine");
 const core_1 = require("@math.gl/core");
 const geospatial_1 = require("@math.gl/geospatial");
+// prettier-ignore
+const CUBE_POSITIONS = new Float32Array([
+    -1, -1, 1, 1, -1, 1, 1, 1, 1, -1, 1, 1,
+    -1, -1, -1, -1, 1, -1, 1, 1, -1, 1, -1, -1,
+    -1, 1, -1, -1, 1, 1, 1, 1, 1, 1, 1, -1,
+    -1, -1, -1, 1, -1, -1, 1, -1, 1, -1, -1, 1,
+    1, -1, -1, 1, 1, -1, 1, 1, 1, 1, -1, 1,
+    -1, -1, -1, -1, -1, 1, -1, 1, 1, -1, 1, -1
+]);
 // TODO Unite Tile validation logic in i3s-17-and-debug with this code.
 /**
  * Do validation of bounding volumes for particular node.
@@ -75,11 +83,9 @@ function createBoundingBoxFromTileObb(obb) {
  * @param node
  */
 function getTileObbVertices(node) {
-    const geometry = new engine_1.CubeGeometry();
     // @ts-expect-error
     const halfSize = node.obb.halfSize;
-    const attributes = geometry.getAttributes();
-    const positions = new Float32Array(attributes.POSITION.value);
+    const positions = CUBE_POSITIONS;
     // @ts-expect-error
     const obbCenterCartesian = geospatial_1.Ellipsoid.WGS84.cartographicToCartesian(node.obb.center);
     let vertices = [];

package/dist/i3s-converter/types.d.ts

@@ -141,4 +141,5 @@ export type MergedMaterial = {
     /** Uint16Array of 4 elements https://github.com/Esri/i3s-spec/blob/master/docs/1.7/geometryUVRegion.cmn.md */
     uvRegion?: Uint16Array;
 };
+export type TypedArrayConstructor = Uint8ArrayConstructor | Int8ArrayConstructor | Uint16ArrayConstructor | Int16ArrayConstructor | Int32ArrayConstructor | Uint32ArrayConstructor | Float32ArrayConstructor | Float64ArrayConstructor;
 //# sourceMappingURL=types.d.ts.map

package/dist/i3s-converter/types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../src/i3s-converter/types.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../src/i3s-converter/types.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,sBAAsB,EAAC,MAAM,kBAAkB,CAAC;AACxD,OAAO,EACL,eAAe,EACf,qBAAqB,EACrB,sBAAsB,EACtB,qBAAqB,EACtB,MAAM,iBAAiB,CAAC;AAEzB,4CAA4C;AAC5C,MAAM,MAAM,qBAAqB,GAAG;IAClC;;OAEG;IACH,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB;;;OAGG;IACH,QAAQ,EAAE,WAAW,GAAG,IAAI,CAAC;IAC7B;;OAEG;IACH,kBAAkB,CAAC,EAAE,OAAO,CAAC,WAAW,CAAC,GAAG,IAAI,CAAC;IACjD;;OAEG;IACH,OAAO,EAAE,GAAG,GAAG,IAAI,CAAC;IACpB;;OAEG;IACH,YAAY,EAAE,OAAO,CAAC;IACtB;;OAEG;IACH,eAAe,EAAE,qBAAqB,GAAG,IAAI,CAAC;IAC9C;;OAEG;IACH,YAAY,CAAC,EAAE,qBAAqB,GAAG,IAAI,CAAC;IAC5C;;OAEG;IACH,WAAW,EAAE,MAAM,GAAG,IAAI,CAAC;IAC3B;;OAEG;IACH,UAAU,EAAE,WAAW,EAAE,GAAG,IAAI,CAAC;IACjC;;OAEG;IACH,YAAY,EAAE,MAAM,GAAG,IAAI,CAAC;IAC5B;;OAEG;IACH,eAAe,EAAE,eAAe,GAAG,IAAI,CAAC;CACzC,CAAC;AAEF;;GAEG;AACH,MAAM,MAAM,mBAAmB,GAAG;IAChC,+BAA+B;IAC/B,SAAS,EAAE,YAAY,CAAC;IACxB,6BAA6B;IAC7B,OAAO,EAAE,YAAY,CAAC;IACtB,iCAAiC;IACjC,SAAS,EAAE,YAAY,CAAC;IACxB,8BAA8B;IAC9B,MAAM,EAAE,UAAU,CAAC;IACnB,6CAA6C;IAC7C,SAAS,EAAE,WAAW,CAAC;IACvB;;OAEG;IACH,oBAAoB,CAAC,EAAE,MAAM,EAAE,EAAE,CAAC;IAClC,iDAAiD;IACjD,cAAc,EAAE,MAAM,EAAE,CAAC;IACzB;;OAEG;IACH,eAAe,EAAE,IAAI,GAAG,eAAe,CAAC;IACxC,4BAA4B;IAC5B,eAAe,EAAE,cAAc,EAAE,CAAC;CACnC,CAAC;AAEF;;GAEG;AACH,MAAM,MAAM,kBAAkB,GAAG;IAC/B,+BAA+B;IAC/B,SAAS,EAAE,YAAY,CAAC;IACxB,6BAA6B;IAC7B,OAAO,EAAE,YAAY,CAAC;IACtB,iCAAiC;IACjC,SAAS,EAAE,YAAY,CAAC;IACxB,8BAA8B;IAC9B,MAAM,EAAE,UAAU,CAAC;IACnB,6CAA6C;IAC7C,SAAS,EAAE,WAAW,CAAC;IACvB,kCAAkC;IAClC,SAAS,EAAE,WAAW,CAAC;IACvB,kCAAkC;IAClC,UAAU,EAAE,MAAM,EAAE,CAAC;IACrB,qCAAqC;IACrC,YAAY,EAAE,MAAM,CAAC;CACtB,CAAC;AAEF,8DAA8D;AAC9D,MAAM,MAAM,4BAA4B,GAAG;IACzC,iBAAiB;IACjB,SAAS,EAAE,MAAM,CAAC;IAClB,+BAA+B;IAC/B,SAAS,EAAE,YAAY,CAAC;IACxB,6BAA6B;IAC7B,OAAO,EAAE,YAAY,CAAC;IACtB,8BAA8B;IAC9B,MAAM,EAAE,UAAU,CAAC;IACnB,6CAA6C;IAC7C,SAAS,EAAE,WAAW,CAAC;IACvB,iCAAiC;IACjC,SAAS,EAAE,YAAY,CAAC;CACzB,CAAC;AAEF,+CAA+C;AAC/C,MAAM,MAAM,qBAAqB,GAAG;IAClC,oHAAoH;IACpH,uBAAuB,CAAC,EAAE,sBAAsB,EAAE,CAAC;IACnD,kHAAkH;IAClH,sBAAsB,CAAC,EAAE,qBAAqB,EAAE,CAAC;IACjD,gDAAgD;IAChD,QAAQ,CAAC,EAAE,MAAM,CAAC;CACnB,CAAC;AAEF,2EAA2E;AAC3E,MAAM,MAAM,sBAAsB,GAAG;IACnC,2GAA2G;IAC3G,QAAQ,EAAE,qBAAqB,CAAC;IAChC,8BAA8B;IAC9B,OAAO,CAAC,EAAE,sBAAsB,CAAC;IACjC,uCAAuC;IACvC,eAAe,EAAE,cAAc,EAAE,CAAC;CACnC,CAAC;AAEF,wCAAwC;AACxC,MAAM,MAAM,cAAc,GAAG;IAC3B,uBAAuB;IACvB,kBAAkB,EAAE,MAAM,CAAC;IAC3B,4BAA4B;IAC5B,WAAW,CAAC,EAAE;QACZ,KAAK,EAAE,MAAM,CAAC;QACd,MAAM,EAAE,MAAM,CAAC;KAChB,CAAC;IACF,8GAA8G;IAC9G,QAAQ,CAAC,EAAE,WAAW,CAAC;CACxB,CAAC;AAEF,MAAM,MAAM,qBAAqB,GAC7B,qBAAqB,GACrB,oBAAoB,GACpB,sBAAsB,GACtB,qBAAqB,GACrB,qBAAqB,GACrB,sBAAsB,GACtB,uBAAuB,GACvB,uBAAuB,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@loaders.gl/tile-converter",
-  "version": "3.4.0-alpha.3",
+  "version": "3.4.0-alpha.4",
   "description": "Converter",
   "license": "MIT",
   "publishConfig": {
@@ -44,20 +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.0-alpha.3",
-    "@loaders.gl/crypto": "3.4.0-alpha.3",
-    "@loaders.gl/draco": "3.4.0-alpha.3",
-    "@loaders.gl/gltf": "3.4.0-alpha.3",
-    "@loaders.gl/i3s": "3.4.0-alpha.3",
-    "@loaders.gl/images": "3.4.0-alpha.3",
-    "@loaders.gl/loader-utils": "3.4.0-alpha.3",
-    "@loaders.gl/polyfills": "3.4.0-alpha.3",
-    "@loaders.gl/schema": "3.4.0-alpha.3",
-    "@loaders.gl/textures": "3.4.0-alpha.3",
-    "@loaders.gl/tiles": "3.4.0-alpha.3",
-    "@loaders.gl/worker-utils": "3.4.0-alpha.3",
-    "@loaders.gl/zip": "3.4.0-alpha.3",
-    "@luma.gl/engine": "^8.5.19",
+    "@loaders.gl/3d-tiles": "3.4.0-alpha.4",
+    "@loaders.gl/crypto": "3.4.0-alpha.4",
+    "@loaders.gl/draco": "3.4.0-alpha.4",
+    "@loaders.gl/gltf": "3.4.0-alpha.4",
+    "@loaders.gl/i3s": "3.4.0-alpha.4",
+    "@loaders.gl/images": "3.4.0-alpha.4",
+    "@loaders.gl/loader-utils": "3.4.0-alpha.4",
+    "@loaders.gl/polyfills": "3.4.0-alpha.4",
+    "@loaders.gl/schema": "3.4.0-alpha.4",
+    "@loaders.gl/textures": "3.4.0-alpha.4",
+    "@loaders.gl/tiles": "3.4.0-alpha.4",
+    "@loaders.gl/worker-utils": "3.4.0-alpha.4",
+    "@loaders.gl/zip": "3.4.0-alpha.4",
     "@math.gl/core": "^3.5.1",
     "@math.gl/culling": "^3.5.1",
     "@math.gl/geoid": "^3.5.1",
@@ -80,5 +79,5 @@
     "join-images": "^1.1.3",
     "sharp": "^0.31.3"
   },
-  "gitHead": "a954528dd1d78a1f128d8f6b07e4baeb7a296924"
+  "gitHead": "f039a523df8b908a91f26c5ba8c4cfc1924b6140"
 }

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

@@ -40,6 +40,15 @@ import {B3DMAttributesData /*, transformI3SAttributesOnWorker*/} from '../../i3s
 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'.
+  So the following import is replaced with the local import
+  import type {TypedArrayConstructor} from '@math.gl/types'; 
+*/
+import type {TypedArrayConstructor} from '../types';
 
 // Spec - https://github.com/Esri/i3s-spec/blob/master/docs/1.7/pbrMetallicRoughness.cmn.md
 const DEFAULT_ROUGHNESS_FACTOR = 1;
@@ -507,6 +516,8 @@ function convertMesh(
     if (!outputAttributes) {
       continue;
     }
+
+    const indices = getIndices(primitive);
     outputAttributes.positions = concatenateTypedArrays(
       outputAttributes.positions,
       transformVertexArray({
@@ -514,7 +525,7 @@ function convertMesh(
         cartographicOrigin,
         cartesianModelMatrix,
         nodeMatrix: matrix,
-        indices: primitive.indices?.value,
+        indices,
         attributeSpecificTransformation: transformVertexPositions,
         useCartesianPositions
       })
@@ -526,37 +537,71 @@ function convertMesh(
         cartographicOrigin,
         cartesianModelMatrix,
         nodeMatrix: matrix,
-        indices: primitive.indices?.value,
+        indices,
         attributeSpecificTransformation: transformVertexNormals,
         useCartesianPositions: false
       })
     );
     outputAttributes.texCoords = concatenateTypedArrays(
       outputAttributes.texCoords,
-      flattenTexCoords(
-        attributes.TEXCOORD_0 && attributes.TEXCOORD_0.value,
-        primitive.indices?.value
-      )
+      flattenTexCoords(attributes.TEXCOORD_0 && attributes.TEXCOORD_0.value, indices)
     );
 
     outputAttributes.colors = concatenateTypedArrays(
       outputAttributes.colors,
-      flattenColors(attributes.COLOR_0, primitive.indices?.value)
+      flattenColors(attributes.COLOR_0, indices)
     );
 
     if (materialUvRegion) {
       outputAttributes.uvRegions = concatenateTypedArrays(
         outputAttributes.uvRegions,
-        createUvRegion(materialUvRegion, primitive.indices?.value)
+        createUvRegion(materialUvRegion, indices)
       );
     }
 
     outputAttributes.featureIndicesGroups = outputAttributes.featureIndicesGroups || [];
     outputAttributes.featureIndicesGroups.push(
-      flattenBatchIds(getBatchIds(attributes, primitive, images), primitive.indices?.value)
+      flattenBatchIds(getBatchIds(attributes, primitive, images), indices)
     );
   }
 }
+/**
+ * Converts TRIANGLE-STRIPS to independent TRIANGLES
+ * @param {MeshPrimitive} primitive - the primitive to get the indices from
+ * @returns indices of vertices of the independent triangles
+ */
+function getIndices(primitive: MeshPrimitive): TypedArray {
+  let indices: TypedArray = primitive.indices?.value;
+  if (indices && primitive.mode === GL.TRIANGLE_STRIP) {
+    /*
+    TRIANGLE_STRIP geometry contains n+2 vertices for n triangles;
+    TRIANGLE geometry contains n*3 vertices for n triangles.
+    The conversion from TRIANGLE_STRIP to TRIANGLE implies duplicating adjacent vertices.
+    */
+    const TypedArrayConstructor = indices.constructor as TypedArrayConstructor;
+    const newIndices = new TypedArrayConstructor((indices.length - 2) * 3);
+
+    // Copy the first triangle indices with no modification like [i0, i1, i2, ...] -> [i0, i1, i2, ...]
+    let triangleIndex = 0;
+    let currentTriangle = indices.slice(0, 3);
+    newIndices.set(currentTriangle, 0);
+
+    // The rest triangle indices are being taken from strips using the following logic:
+    // [i1, i2, i3, i4, i5, i6, ...] -> [i3, i2, i1,   i2, i3, i4,   i5, i4, i3,   i4, i5, i6, ...]
+    for (let i = 1; i + 2 < indices.length; i++) {
+      triangleIndex += 3;
+      currentTriangle = indices.slice(i, i + 3);
+      if (i % 2 === 0) {
+        newIndices.set(currentTriangle, triangleIndex);
+      } else {
+        // The following "reverce" is necessary to calculate normals correctly
+        newIndices.set(currentTriangle.reverse(), triangleIndex);
+      }
+    }
+    indices = newIndices;
+  }
+  return indices;
+}
 
 /**
  * Convert vertices attributes (POSITIONS or NORMALS) to i3s compatible format
@@ -575,7 +620,7 @@ function transformVertexArray(args: {
   cartographicOrigin: number[];
   cartesianModelMatrix: number[];
   nodeMatrix: Matrix4;
-  indices: Uint8Array;
+  indices: TypedArray;
   attributeSpecificTransformation: Function;
   useCartesianPositions: boolean;
 }) {
@@ -654,7 +699,7 @@ function transformVertexNormals(vertexVector, calleeArgs): number[] {
  * @param indices - gltf primitive indices
  * @returns flattened texture coordinates
  */
-function flattenTexCoords(texCoords: Float32Array, indices: Uint8Array): Float32Array {
+function flattenTexCoords(texCoords: Float32Array, indices: TypedArray): Float32Array {
   const newTexCoords = new Float32Array(indices.length * VALUES_PER_TEX_COORD);
   if (!texCoords) {
     // We need dummy UV0s because it is required in 1.6
@@ -679,7 +724,7 @@ function flattenTexCoords(texCoords: Float32Array, indices: Uint8Array): Float32
  */
 function flattenColors(
   colorsAttribute: GLTFAccessorPostprocessed,
-  indices: Uint8Array
+  indices: TypedArray
 ): Uint8Array {
   const components = colorsAttribute?.components || VALUES_PER_COLOR_ELEMENT;
   const newColors = new Uint8Array(indices.length * components);
@@ -707,7 +752,7 @@ function flattenColors(
  * @param indices - geometry indices data
  * @returns - uv-region array
  */
-function createUvRegion(materialUvRegion: Uint16Array, indices: Uint8Array): Uint16Array {
+function createUvRegion(materialUvRegion: Uint16Array, indices: TypedArray): Uint16Array {
   const result = new Uint16Array(indices.length * 4);
   for (let i = 0; i < result.length; i += 4) {
     result.set(materialUvRegion, i);
@@ -721,7 +766,7 @@ function createUvRegion(materialUvRegion: Uint16Array, indices: Uint8Array): Uin
  * @param indices - gltf primitive indices
  * @returns flattened batch ids
  */
-function flattenBatchIds(batchedIds: number[], indices: Uint8Array): number[] {
+function flattenBatchIds(batchedIds: number[], indices: TypedArray): number[] {
   if (!batchedIds.length || !indices.length) {
     return [];
   }

package/src/i3s-converter/helpers/node-debug.ts

@@ -1,10 +1,18 @@
 import type {Mbs, Node3DIndexDocument, Obb} from '@loaders.gl/i3s';
-
 import {OrientedBoundingBox, BoundingSphere} from '@math.gl/culling';
-import {CubeGeometry} from '@luma.gl/engine';
 import {Vector3} from '@math.gl/core';
 import {Ellipsoid} from '@math.gl/geospatial';
 
+// prettier-ignore
+const CUBE_POSITIONS = new Float32Array([
+  -1,  -1,  1, 1,  -1,  1,  1,  1,  1,  -1,  1,  1,
+  -1,  -1,  -1,  -1,  1,  -1,  1,  1,  -1,  1,  -1,  -1,
+  -1,  1,  -1,  -1,  1,  1,  1,  1,  1,  1,  1,  -1,
+  -1,  -1,  -1,  1,  -1,  -1,  1,  -1,  1,  -1,  -1,  1,
+  1,  -1,  -1,  1,  1,  -1,  1,  1,  1,  1,  -1,  1,
+  -1,  -1,  -1,  -1,  -1,  1,  -1,  1,  1,  -1,  1,  -1
+]);
+
 // TODO Unite Tile validation logic in i3s-17-and-debug with this code.
 
 /**
@@ -86,11 +94,9 @@ function createBoundingBoxFromTileObb(obb: Obb): OrientedBoundingBox {
  * @param node
  */
 function getTileObbVertices(node: Node3DIndexDocument): number[] {
-  const geometry = new CubeGeometry();
   // @ts-expect-error
   const halfSize = node.obb.halfSize;
-  const attributes = geometry.getAttributes();
-  const positions = new Float32Array(attributes.POSITION.value);
+  const positions = CUBE_POSITIONS;
   // @ts-expect-error
   const obbCenterCartesian = Ellipsoid.WGS84.cartographicToCartesian(node.obb.center);
 

package/src/i3s-converter/types.ts

@@ -153,3 +153,13 @@ export type MergedMaterial = {
   /** Uint16Array of 4 elements https://github.com/Esri/i3s-spec/blob/master/docs/1.7/geometryUVRegion.cmn.md */
   uvRegion?: Uint16Array;
 };
+
+export type TypedArrayConstructor =
+  | Uint8ArrayConstructor
+  | Int8ArrayConstructor
+  | Uint16ArrayConstructor
+  | Int16ArrayConstructor
+  | Int32ArrayConstructor
+  | Uint32ArrayConstructor
+  | Float32ArrayConstructor
+  | Float64ArrayConstructor;