@loaders.gl/tile-converter 3.2.0-alpha.1 → 3.2.0-alpha.4

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

@@ -1,8 +1,8 @@
-import type { BoundingVolumes, Extent, Mbs, Obb } from '@loaders.gl/i3s';
+import type { BoundingVolumes, FullExtent, Mbs, Obb } from '@loaders.gl/i3s';
 import { Vector3 } from '@math.gl/core';
+import { OrientedBoundingBox, BoundingSphere } from '@math.gl/culling';
 import TileHeader from '@loaders.gl/tiles/src/tileset/tile-3d';
 import { Geoid } from '@math.gl/geoid';
-import { Tileset3D } from '@loaders.gl/tiles';
 /**
  * Create bounding volumes object from tile and geoid height model.
  * @param tile
@@ -26,12 +26,12 @@ export declare function createBoundingVolumesFromGeometry(cartesianPositions: Fl
  */
 export declare function convertPositionsToVectors(positions: Float32Array): Vector3[];
 /**
- * Convert common coordinate to extent coordinate
- * @param tileset
- * @returns - Extent
- * @todo why lodMetricValue is radius? need to check this function
+ * Convert common coordinate to fullExtent https://github.com/Esri/i3s-spec/blob/master/docs/1.8/fullExtent.cmn.md
+ * @param
+ * @param boundingVolume
+ * @returns - fullExtent object
  */
-export declare function convertCommonToI3SExtentCoordinate(tileset: Tileset3D | null): Extent | null;
+export declare function convertBoundingVolumeToI3SFullExtent(boundingVolume: OrientedBoundingBox | BoundingSphere): FullExtent;
 /**
  * Creates oriented boundinb box from mbs.
  * @param mbs - Minimum Bounding Sphere

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

@@ -1 +1 @@
-{"version":3,"file":"coordinate-converter.d.ts","sourceRoot":"","sources":["../../../src/i3s-converter/helpers/coordinate-converter.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAC,eAAe,EAAE,MAAM,EAAE,GAAG,EAAE,GAAG,EAAC,MAAM,iBAAiB,CAAC;AAEvE,OAAO,EAAsB,OAAO,EAAC,MAAM,eAAe,CAAC;AAO3D,OAAO,UAAU,MAAM,uCAAuC,CAAC;AAC/D,OAAO,EAAC,KAAK,EAAC,MAAM,gBAAgB,CAAC;AACrC,OAAO,EAAC,SAAS,EAAC,MAAM,mBAAmB,CAAC;AAE5C;;;;;GAKG;AACH,wBAAgB,qBAAqB,CAAC,IAAI,EAAE,UAAU,EAAE,gBAAgB,EAAE,KAAK,GAAG,eAAe,CAiChG;AAED;;;;GAIG;AACH,wBAAgB,iCAAiC,CAC/C,kBAAkB,EAAE,YAAY,EAChC,gBAAgB,EAAE,KAAK,GACtB;IAAC,GAAG,EAAE,GAAG,CAAC;IAAC,GAAG,EAAE,GAAG,CAAA;CAAC,CAoBtB;AAED;;;;GAIG;AACH,wBAAgB,yBAAyB,CAAC,SAAS,EAAE,YAAY,GAAG,OAAO,EAAE,CAW5E;AAED;;;;;GAKG;AACH,wBAAgB,kCAAkC,CAAC,OAAO,EAAE,SAAS,GAAG,IAAI,GAAG,MAAM,GAAG,IAAI,CAuB3F;AAED;;;;GAIG;AACH,wBAAgB,gBAAgB,CAAC,GAAG,EAAE,GAAG,GAAG,GAAG,CAK9C"}
+{"version":3,"file":"coordinate-converter.d.ts","sourceRoot":"","sources":["../../../src/i3s-converter/helpers/coordinate-converter.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAC,eAAe,EAAE,UAAU,EAAE,GAAG,EAAE,GAAG,EAAC,MAAM,iBAAiB,CAAC;AAE3E,OAAO,EAAsB,OAAO,EAAC,MAAM,eAAe,CAAC;AAE3D,OAAO,EACL,mBAAmB,EAGnB,cAAc,EACf,MAAM,kBAAkB,CAAC;AAC1B,OAAO,UAAU,MAAM,uCAAuC,CAAC;AAC/D,OAAO,EAAC,KAAK,EAAC,MAAM,gBAAgB,CAAC;AAErC;;;;;GAKG;AACH,wBAAgB,qBAAqB,CAAC,IAAI,EAAE,UAAU,EAAE,gBAAgB,EAAE,KAAK,GAAG,eAAe,CAiChG;AAED;;;;GAIG;AACH,wBAAgB,iCAAiC,CAC/C,kBAAkB,EAAE,YAAY,EAChC,gBAAgB,EAAE,KAAK,GACtB;IAAC,GAAG,EAAE,GAAG,CAAC;IAAC,GAAG,EAAE,GAAG,CAAA;CAAC,CAoBtB;AAED;;;;GAIG;AACH,wBAAgB,yBAAyB,CAAC,SAAS,EAAE,YAAY,GAAG,OAAO,EAAE,CAW5E;AAED;;;;;GAKG;AACH,wBAAgB,oCAAoC,CAClD,cAAc,EAAE,mBAAmB,GAAG,cAAc,GACnD,UAAU,CA0BZ;AAED;;;;GAIG;AACH,wBAAgB,gBAAgB,CAAC,GAAG,EAAE,GAAG,GAAG,GAAG,CAK9C"}

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

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.createObbFromMbs = exports.convertCommonToI3SExtentCoordinate = exports.convertPositionsToVectors = exports.createBoundingVolumesFromGeometry = exports.createBoundingVolumes = void 0;
+exports.createObbFromMbs = exports.convertBoundingVolumeToI3SFullExtent = exports.convertPositionsToVectors = exports.createBoundingVolumesFromGeometry = exports.createBoundingVolumes = void 0;
 const core_1 = require("@math.gl/core");
 const geospatial_1 = require("@math.gl/geospatial");
 const culling_1 = require("@math.gl/culling");
@@ -81,29 +81,33 @@ function convertPositionsToVectors(positions) {
 }
 exports.convertPositionsToVectors = convertPositionsToVectors;
 /**
- * Convert common coordinate to extent coordinate
- * @param tileset
- * @returns - Extent
- * @todo why lodMetricValue is radius? need to check this function
+ * Convert common coordinate to fullExtent https://github.com/Esri/i3s-spec/blob/master/docs/1.8/fullExtent.cmn.md
+ * @param
+ * @param boundingVolume
+ * @returns - fullExtent object
  */
-function convertCommonToI3SExtentCoordinate(tileset) {
-    const cartesianCenter = tileset?.cartesianCenter;
-    if (!cartesianCenter) {
-        return null;
+function convertBoundingVolumeToI3SFullExtent(boundingVolume) {
+    let sphere;
+    if (boundingVolume instanceof culling_1.BoundingSphere) {
+        sphere = boundingVolume;
     }
-    const radius = tileset?.lodMetricValue;
-    const rightTop = geospatial_1.Ellipsoid.WGS84.cartesianToCartographic(new core_1.Vector3(cartesianCenter[0] + radius, cartesianCenter[1] + radius, cartesianCenter[2]), new core_1.Vector3());
-    const leftBottom = geospatial_1.Ellipsoid.WGS84.cartesianToCartographic(new core_1.Vector3(cartesianCenter[0] - radius, cartesianCenter[1] - radius, cartesianCenter[2]), new core_1.Vector3());
-    const isFirstRight = rightTop[0] < leftBottom[0];
-    const isFirstTop = rightTop[1] < leftBottom[1];
-    return [
-        isFirstRight ? rightTop[0] : leftBottom[0],
-        isFirstTop ? rightTop[1] : leftBottom[1],
-        isFirstRight ? leftBottom[0] : rightTop[0],
-        isFirstTop ? leftBottom[1] : rightTop[1]
-    ];
+    else {
+        sphere = boundingVolume.getBoundingSphere();
+    }
+    const center = sphere.center;
+    const radius = sphere.radius;
+    const vertexMax = geospatial_1.Ellipsoid.WGS84.cartesianToCartographic(new core_1.Vector3(center[0] + radius, center[1] + radius, center[2] + radius), new core_1.Vector3());
+    const vertexMin = geospatial_1.Ellipsoid.WGS84.cartesianToCartographic(new core_1.Vector3(center[0] - radius, center[1] - radius, center[2] - radius), new core_1.Vector3());
+    return {
+        xmin: vertexMin[0],
+        xmax: vertexMax[0],
+        ymin: vertexMin[1],
+        ymax: vertexMax[1],
+        zmin: vertexMin[2],
+        zmax: vertexMax[2]
+    };
 }
-exports.convertCommonToI3SExtentCoordinate = convertCommonToI3SExtentCoordinate;
+exports.convertBoundingVolumeToI3SFullExtent = convertBoundingVolumeToI3SFullExtent;
 /**
  * Creates oriented boundinb box from mbs.
  * @param mbs - Minimum Bounding Sphere

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

@@ -1,8 +1,8 @@
-import type { GeometryAttributes, AttributesData } from '../types';
+import type { GeometryAttributes, ConvertedAttributes } from '../types';
 /**
  * Generate geometry attributes with faceRange and featureCount
  * @param attributes
  * @returns attirbutes with featureCount, featureIds and changed faceRange.
  */
-export declare function generateAttributes(attributes: AttributesData): GeometryAttributes;
+export declare function generateAttributes(attributes: ConvertedAttributes): GeometryAttributes;
 //# sourceMappingURL=geometry-attributes.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"geometry-attributes.d.ts","sourceRoot":"","sources":["../../../src/i3s-converter/helpers/geometry-attributes.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAC,kBAAkB,EAAE,cAAc,EAA+B,MAAM,UAAU,CAAC;AAM/F;;;;GAIG;AACH,wBAAgB,kBAAkB,CAAC,UAAU,EAAE,cAAc,GAAG,kBAAkB,CAuBjF"}
+{"version":3,"file":"geometry-attributes.d.ts","sourceRoot":"","sources":["../../../src/i3s-converter/helpers/geometry-attributes.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAC,kBAAkB,EAAE,mBAAmB,EAA+B,MAAM,UAAU,CAAC;AAMpG;;;;GAIG;AACH,wBAAgB,kBAAkB,CAAC,UAAU,EAAE,mBAAmB,GAAG,kBAAkB,CAwBtF"}

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

@@ -10,7 +10,8 @@ const POSITIONS_AND_NORMALS_PER_TRIANGLE = 9;
  * @returns attirbutes with featureCount, featureIds and changed faceRange.
  */
 function generateAttributes(attributes) {
-    const { positions, normals, texCoords, colors, featureIndices, triangleCount } = attributes;
+    const { positions, normals, texCoords, colors, featureIndices } = attributes;
+    const triangleCount = positions.length / POSITIONS_AND_NORMALS_PER_TRIANGLE;
     if (!featureIndices.length) {
         return {
             faceRange: new Uint32Array([0, triangleCount - 1]),

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

@@ -1,12 +1,29 @@
-export default function convertB3dmToI3sGeometry(tileContent: any, nodeId: any, featuresHashArray: any, attributeStorageInfo: any, draco: any, generateBoundingVolumes: any, geoidHeightModel: any): Promise<{
-    geometry: Uint8Array;
-    compressedGeometry: any;
-    texture: any;
-    sharedResources: any;
-    meshMaterial: any;
-    vertexCount: number;
-    attributes: any[];
-    featureCount: number;
-    boundingVolumes: any;
-}[] | null>;
+import { ConvertedAttributes, I3SConvertedResources } from '../types';
+import { B3DMContent } from '@loaders.gl/3d-tiles';
+import { AttributeStorageInfo } from '@loaders.gl/i3s';
+import { Geoid } from '@math.gl/geoid';
+import { B3DMAttributesData } from '../../i3s-attributes-worker';
+/**
+ * Convert binary data from b3dm file to i3s resources
+ *
+ * @param tileContent - 3d tile content
+ * @param nodeId - target nodeId. If a few nodes will be created - ids will be nodeId+n where n - index in the resulting array
+ * @param featuresHashArray - hash array of features that is needed to not to mix up same features in parent and child nodes
+ * @param attributeStorageInfo - attributes metadata from 3DSceneLayer json
+ * @param draco - is converter should create draco compressed geometry
+ * @param generateBoundingVolumes - is converter should create accurate bounding voulmes from geometry attributes
+ * @param geoidHeightModel - model to convert elevation from elipsoidal to geoid
+ * @returns Array of node resources to create one or more i3s nodes
+ */
+export default function convertB3dmToI3sGeometry(tileContent: B3DMContent, nodeId: number, featuresHashArray: string[], attributeStorageInfo: AttributeStorageInfo[] | undefined, draco: boolean, generateBoundingVolumes: boolean, geoidHeightModel: Geoid, workerSource: {
+    [key: string]: string;
+}): Promise<I3SConvertedResources[] | null>;
+/**
+ * Convert attributes from the gltf nodes tree to i3s plain geometry
+ * @param tileContent - 3d tile content
+ * @param useCartesianPositions - convert positions to absolute cartesian coordinates instead of cartographic offsets.
+ * Cartesian coordinates will be required for creating bounding voulmest from geometry positions
+ * @returns map of converted geometry attributes
+ */
+export declare function convertAttributes(attributesData: B3DMAttributesData, useCartesianPositions: boolean): Promise<Map<string, ConvertedAttributes>>;
 //# sourceMappingURL=geometry-converter.d.ts.map

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.js"],"names":[],"mappings":"AA+BA;;;;;;;;;;YAuDC"}
+{"version":3,"file":"geometry-converter.d.ts","sourceRoot":"","sources":["../../../src/i3s-converter/helpers/geometry-converter.ts"],"names":[],"mappings":"AASA,OAAO,EACL,mBAAmB,EACnB,qBAAqB,EAGtB,MAAM,UAAU,CAAC;AAClB,OAAO,EAAC,WAAW,EAAC,MAAM,sBAAsB,CAAC;AAEjD,OAAO,EACL,oBAAoB,EAIrB,MAAM,iBAAiB,CAAC;AAEzB,OAAO,EAAC,KAAK,EAAC,MAAM,gBAAgB,CAAC;AAMrC,OAAO,EAAC,kBAAkB,EAAqC,MAAM,6BAA6B,CAAC;AAwBnG;;;;;;;;;;;GAWG;AACH,wBAA8B,wBAAwB,CACpD,WAAW,EAAE,WAAW,EACxB,MAAM,EAAE,MAAM,EACd,iBAAiB,EAAE,MAAM,EAAE,EAC3B,oBAAoB,EAAE,oBAAoB,EAAE,GAAG,SAAS,EACxD,KAAK,EAAE,OAAO,EACd,uBAAuB,EAAE,OAAO,EAChC,gBAAgB,EAAE,KAAK,EACvB,YAAY,EAAE;IAAC,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAAA;CAAC,2CAoEtC;AAiID;;;;;;GAMG;AACH,wBAAsB,iBAAiB,CACrC,cAAc,EAAE,kBAAkB,EAClC,qBAAqB,EAAE,OAAO,GAC7B,OAAO,CAAC,GAAG,CAAC,MAAM,EAAE,mBAAmB,CAAC,CAAC,CA0C3C"}