@loaders.gl/3d-tiles 4.2.0-alpha.4 → 4.2.0-alpha.5

package/dist/lib/parsers/helpers/normalize-3d-tile-normals.js

@@ -1,26 +1,29 @@
+// loaders.gl
+// SPDX-License-Identifier: MIT
+// Copyright vis.gl contributors
 import { Vector3 } from '@math.gl/core';
 import { GL, octDecode } from '@loaders.gl/math';
 const scratchNormal = new Vector3();
 export function normalize3DTileNormalAttribute(tile, normals) {
-  if (!normals) {
-    return null;
-  }
-  if (tile.isOctEncoded16P) {
-    const decodedArray = new Float32Array((tile.pointsLength || 0) * 3);
-    for (let i = 0; i < (tile.pointsLength || 0); i++) {
-      octDecode(normals[i * 2], normals[i * 2 + 1], scratchNormal);
-      scratchNormal.toArray(decodedArray, i * 3);
+    if (!normals) {
+        return null;
+    }
+    if (tile.isOctEncoded16P) {
+        const decodedArray = new Float32Array((tile.pointsLength || 0) * 3);
+        for (let i = 0; i < (tile.pointsLength || 0); i++) {
+            octDecode(normals[i * 2], normals[i * 2 + 1], scratchNormal);
+            // @ts-ignore
+            scratchNormal.toArray(decodedArray, i * 3);
+        }
+        return {
+            type: GL.FLOAT,
+            size: 2,
+            value: decodedArray
+        };
     }
     return {
-      type: GL.FLOAT,
-      size: 2,
-      value: decodedArray
+        type: GL.FLOAT,
+        size: 2,
+        value: normals
     };
-  }
-  return {
-    type: GL.FLOAT,
-    size: 2,
-    value: normals
-  };
 }
-//# sourceMappingURL=normalize-3d-tile-normals.js.map

package/dist/lib/parsers/helpers/normalize-3d-tile-positions.js

@@ -1,26 +1,41 @@
+// loaders.gl
+// SPDX-License-Identifier: MIT
+// Copyright vis.gl contributors
 import { Vector3 } from '@math.gl/core';
 import { GL } from '@loaders.gl/math';
+// Prepare attribute for positions
 export function normalize3DTilePositionAttribute(tile, positions, options) {
-  if (!tile.isQuantized) {
-    return positions;
-  }
-  if (options['3d-tiles'] && options['3d-tiles'].decodeQuantizedPositions) {
-    tile.isQuantized = false;
-    return decodeQuantizedPositions(tile, positions);
-  }
-  return {
-    type: GL.UNSIGNED_SHORT,
-    value: positions,
-    size: 3,
-    normalized: true
-  };
+    if (!tile.isQuantized) {
+        return positions;
+    }
+    // For quantized posititions, either expand to Float32Array or return custom accessor
+    // https://github.com/AnalyticalGraphicsInc/3d-tiles/blob/master/specification/TileFormats/Instanced3DModel/README.md#quantized-positions
+    // Optionally decodes quantized positions on GPU, for simpler renderers that don't accept normalized attributes
+    if (options['3d-tiles'] && options['3d-tiles'].decodeQuantizedPositions) {
+        tile.isQuantized = false;
+        return decodeQuantizedPositions(tile, positions);
+    }
+    // Default: Use normalized shorts directly, no copying/processing.
+    // NOTE: The "missing" offset/scaling operations are automatically added to modelMatrix if `tile.isQuantized === true`
+    return {
+        type: GL.UNSIGNED_SHORT,
+        value: positions,
+        size: 3,
+        normalized: true
+    };
 }
+// Pre-scale quantized positions on CPU
 function decodeQuantizedPositions(tile, positions) {
-  const scratchPosition = new Vector3();
-  const decodedArray = new Float32Array(tile.pointCount * 3);
-  for (let i = 0; i < tile.pointCount; i++) {
-    scratchPosition.set(positions[i * 3], positions[i * 3 + 1], positions[i * 3 + 2]).scale(1 / tile.quantizedRange).multiply(tile.quantizedVolumeScale).add(tile.quantizedVolumeOffset).toArray(decodedArray, i * 3);
-  }
-  return decodedArray;
+    const scratchPosition = new Vector3();
+    const decodedArray = new Float32Array(tile.pointCount * 3);
+    for (let i = 0; i < tile.pointCount; i++) {
+        // POSITION = POSITION_QUANTIZED / 65535.0 * QUANTIZED_VOLUME_SCALE + QUANTIZED_VOLUME_OFFSET
+        scratchPosition
+            .set(positions[i * 3], positions[i * 3 + 1], positions[i * 3 + 2])
+            .scale(1 / tile.quantizedRange)
+            .multiply(tile.quantizedVolumeScale)
+            .add(tile.quantizedVolumeOffset)
+            .toArray(decodedArray, i * 3);
+    }
+    return decodedArray;
 }
-//# sourceMappingURL=normalize-3d-tile-positions.js.map

package/dist/lib/parsers/helpers/parse-3d-implicit-tiles.d.ts

@@ -1,7 +1,7 @@
-import type { Subtree } from '../../../types';
-import type { S2VolumeInfo } from '../../utils/obb/s2-corners-to-obb';
-import { Tiles3DLoaderOptions } from '../../../tiles-3d-loader';
-import { ImplicitOptions } from '../parse-3d-tile-header';
+import type { Subtree } from "../../../types.js";
+import type { S2VolumeInfo } from "../../utils/obb/s2-corners-to-obb.js";
+import { Tiles3DLoaderOptions } from "../../../tiles-3d-loader.js";
+import { ImplicitOptions } from "../parse-3d-tile-header.js";
 /**
  *  S2VolumeBox is an extention of BoundingVolume of type "box"
  */

package/dist/lib/parsers/helpers/parse-3d-implicit-tiles.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"parse-3d-implicit-tiles.d.ts","sourceRoot":"","sources":["../../../../src/lib/parsers/helpers/parse-3d-implicit-tiles.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAqC,OAAO,EAAC,MAAM,gBAAgB,CAAC;AAMhF,OAAO,KAAK,EAAC,YAAY,EAAC,MAAM,mCAAmC,CAAC;AAGpE,OAAO,EAAC,oBAAoB,EAAC,MAAM,0BAA0B,CAAC;AAC9D,OAAO,EAAC,eAAe,EAAC,MAAM,yBAAyB,CAAC;AAUxD;;GAEG;AACH,MAAM,MAAM,WAAW,GAAG;IACxB,yFAAyF;IACzF,GAAG,EAAE,MAAM,EAAE,CAAC;IACd,uGAAuG;IACvG,YAAY,EAAE,YAAY,CAAC;CAC5B,CAAC;AA6CF;;;;;;;;;;;GAWG;AAEH,wBAAsB,kBAAkB,CAAC,MAAM,EAAE;IAC/C,OAAO,EAAE,OAAO,CAAC;IACjB,eAAe,EAAE,eAAe,CAAC;IACjC,UAAU,CAAC,EAAE;QAAC,WAAW,EAAE,MAAM,CAAC;QAAC,CAAC,EAAE,MAAM,CAAC;QAAC,CAAC,EAAE,MAAM,CAAC;QAAC,CAAC,EAAE,MAAM,CAAA;KAAC,CAAC;IACpE,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,UAAU,CAAC,EAAE;QAAC,KAAK,EAAE,MAAM,CAAC;QAAC,WAAW,EAAE,MAAM,CAAC;QAAC,CAAC,EAAE,MAAM,CAAC;QAAC,CAAC,EAAE,MAAM,CAAC;QAAC,CAAC,EAAE,MAAM,CAAA;KAAC,CAAC;IACnF,WAAW,CAAC,EAAE,WAAW,CAAC;IAC1B,aAAa,EAAE,oBAAoB,CAAC;CACrC;;;;GAyJA;AAmJD;;;;;;;GAOG;AACH,wBAAgB,yBAAyB,CACvC,WAAW,EAAE,MAAM,EACnB,KAAK,EAAE,MAAM,EACb,CAAC,EAAE,MAAM,EACT,CAAC,EAAE,MAAM,EACT,CAAC,EAAE,MAAM,GACR,MAAM,CAGR"}
+{"version":3,"file":"parse-3d-implicit-tiles.d.ts","sourceRoot":"","sources":["../../../../src/lib/parsers/helpers/parse-3d-implicit-tiles.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAqC,OAAO,EAAC,0BAAuB;AAMhF,OAAO,KAAK,EAAC,YAAY,EAAC,6CAA0C;AAGpE,OAAO,EAAC,oBAAoB,EAAC,oCAAiC;AAC9D,OAAO,EAAC,eAAe,EAAC,mCAAgC;AAUxD;;GAEG;AACH,MAAM,MAAM,WAAW,GAAG;IACxB,yFAAyF;IACzF,GAAG,EAAE,MAAM,EAAE,CAAC;IACd,uGAAuG;IACvG,YAAY,EAAE,YAAY,CAAC;CAC5B,CAAC;AA6CF;;;;;;;;;;;GAWG;AAEH,wBAAsB,kBAAkB,CAAC,MAAM,EAAE;IAC/C,OAAO,EAAE,OAAO,CAAC;IACjB,eAAe,EAAE,eAAe,CAAC;IACjC,UAAU,CAAC,EAAE;QAAC,WAAW,EAAE,MAAM,CAAC;QAAC,CAAC,EAAE,MAAM,CAAC;QAAC,CAAC,EAAE,MAAM,CAAC;QAAC,CAAC,EAAE,MAAM,CAAA;KAAC,CAAC;IACpE,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,UAAU,CAAC,EAAE;QAAC,KAAK,EAAE,MAAM,CAAC;QAAC,WAAW,EAAE,MAAM,CAAC;QAAC,CAAC,EAAE,MAAM,CAAC;QAAC,CAAC,EAAE,MAAM,CAAC;QAAC,CAAC,EAAE,MAAM,CAAA;KAAC,CAAC;IACnF,WAAW,CAAC,EAAE,WAAW,CAAC;IAC1B,aAAa,EAAE,oBAAoB,CAAC;CACrC;;;;GAyJA;AAmJD;;;;;;;GAOG;AACH,wBAAgB,yBAAyB,CACvC,WAAW,EAAE,MAAM,EACnB,KAAK,EAAE,MAAM,EACb,CAAC,EAAE,MAAM,EACT,CAAC,EAAE,MAAM,EACT,CAAC,EAAE,MAAM,GACR,MAAM,CAGR"}