Merge remote-tracking branch 'upstream/main' into bounding-volume-generalizations

Author: javagl

.eslintrc.json

@@ -6,12 +6,14 @@
   ],
   "parser": "@typescript-eslint/parser",
   "parserOptions": {
-    "ecmaVersion": 2020
+    "ecmaVersion": 2020,
+    "project": "./tsconfig.json"
   },
   "plugins": ["@typescript-eslint"],
   "root": true,
   "rules": {
     "@typescript-eslint/no-explicit-any": "off",
-    "@typescript-eslint/no-empty-interface": "off"
+    "@typescript-eslint/no-empty-interface": "off",
+    "@typescript-eslint/no-floating-promises": "error"
   }
 }

.gitignore

@@ -1,6 +1,7 @@
 
 package-lock.json
 .eslintcache
+/.vscode
 /.nyc_output
 /coverage
 /node_modules

.npmignore

@@ -9,6 +9,7 @@
 /node_modules
 /output
 /specs
+/.vscode
 .eslintcache
 .eslintignore
 .eslintrc.json

CHANGES.md

@@ -1,13 +1,31 @@
 Change Log
 ==========
 
+### 0.5.0 - 2025-02-17
+
+- Fix the `upgrade` command to properly handle a `gltfUpAxis` that may be defined in the tileset JSON, via [#166](https://github.com/CesiumGS/3d-tiles-tools/pull/166)
+- **Breaking**: Change the `TilesetSource` and `TilesetTarget` interfaces to be completely asynchronous, via [#167](https://github.com/CesiumGS/3d-tiles-tools/pull/167)
+  - Clients that used the functions from this interface will generally just have to `await` the results of calling these functions
+  - As part of this change, the `TraversedTile` now returns a subtree URI only for the implicit tileset root, and not for the explicit tile that defines the implicit tiling
+- **Breaking**: Consistently use `undefined` instead of `null` as return types, via [#169](https://github.com/CesiumGS/3d-tiles-tools/pull/169)
+  - Clients will have to update their checks from `null` to `undefined` accordingly. This change does _not_ apply to glTF extension implementations that are based on glTF-Transform.
+- Handle the presence of the `CESIUM_RTC` extension in glTF 2.0 during the `upgrade`, via [#172](https://github.com/CesiumGS/3d-tiles-tools/pull/172)
+- Fix several smaller bugs for reading 3TZ files, e.g. ones that used 'extras' in the ZIP file headers, via [#173](https://github.com/CesiumGS/3d-tiles-tools/pull/173)
+
+### 0.4.4 - 2024-12-03
+
+- Updated the `better-sqlite3` dependency from 8.0.1 to 11.5.0 to support NodeJS 22
+- Updated the NodeJS version requirement to >=18 for compatibility with latest CesiumJS version
+- Fixed a bug where applying the `merge` or `mergeJson` command to multiple implicit tilesets created an invalid result, via [#161](https://github.com/CesiumGS/3d-tiles-tools/pull/161)
+- Fixed a bug where resolving binary glTF data failed for glTF that used the `EXT_meshopt_compression` glTF extension with fallback buffers, via [#160](https://github.com/CesiumGS/3d-tiles-tools/pull/160)
+
 ### 0.4.3 - 2024-09-14
 
 - Fixed the handling of legacy B3DM files that contain glTF 1.0 data with texture coordinates that are stored as "quantized" 3D coordinates, via [#148](https://github.com/CesiumGS/3d-tiles-tools/pull/148)
 - Fixed the `upgrade` command for `targetVersion 1.1` for the case that the input data contains very old B3DM files that do not define a `BATCHID` attribute, via [#147](https://github.com/CesiumGS/3d-tiles-tools/pull/147).
 - Added a `mergeJson` command to create a tileset JSON that refers to other tilesets as external tilesets, without copying the input tilesets to the output directory, via [#140](https://github.com/CesiumGS/3d-tiles-tools/pull/140) and [#143](https://github.com/CesiumGS/3d-tiles-tools/pull/143).
 - Fixed a bug where the `combine` command did not properly update the content URIs when an external tileset in a subdirectory referred to another external tileset in the same subdirectory, via [#139](https://github.com/CesiumGS/3d-tiles-tools/pull/139)
-- Added an `updateAlignment` command that can process a B3DM, I3DM, PNGS, or CMPT file, to ensure that the alignment requirements for the batch- and feature table and the tile data as a whole are met, via [#136](https://github.com/CesiumGS/3d-tiles-tools/pull/136)
+- Added an `updateAlignment` command that can process a B3DM, I3DM, PNTS, or CMPT file, to ensure that the alignment requirements for the batch- and feature table and the tile data as a whole are met, via [#136](https://github.com/CesiumGS/3d-tiles-tools/pull/136)
 
 ### 0.4.2 - 2024-05-15
 

README.md

@@ -312,15 +312,16 @@ Additional command line options:
 | Flag | Description | Required |
 | ---- | ----------- | -------- |
 |`--cartographicPositionDegrees`|An array of either two or three values, which are the (longitude, latitude) or (longitude, latitude, height) of the target position. The longitude and latitude are given in degrees, and the height is given in meters.| No |
+|`--rotationDegrees`|An array of three values, which are the (heading, pitch, roll) rotation at the target position, in degrees.| No |
 
 If the input is a single file, then this will result in a single (root) tile with the input file as its tile content. If the input is a directory, then all content files in this directory will be used as tile content, recursively. The exact set of file types that are considered to be 'tile content' is not specified, but it will include GLB, B3DM, PNTS, I3DM, and CMPT files.
 
 Examples:
 
 ```
-npx 3d-tiles-tools createTilesetJson -i ./input/ -o ./output/tileset.json --cartographicPositionDegrees -75.152 39.94 10
+npx 3d-tiles-tools createTilesetJson -i ./input/ -o ./output/tileset.json --cartographicPositionDegrees -75.152 39.94 10 --rotationDegrees 45 0 0
 ```
-This creates the specified tileset JSON file, which will refer to all tile content files in the given input directory as its tile contents. The root node of the tileset will have a transform that will place it at the given cartographic position.
+This creates the specified tileset JSON file, which will refer to all tile content files in the given input directory as its tile contents. The root node of the tileset will have a transform that will place it at the given cartographic position, with the specified rotation.
 
 
 

ThirdParty.json

@@ -4,23 +4,23 @@
     "license": [
       "MIT"
     ],
-    "version": "3.10.1",
+    "version": "3.9.0",
     "url": "https://www.npmjs.com/package/@gltf-transform/core"
   },
   {
     "name": "@gltf-transform/extensions",
     "license": [
       "MIT"
     ],
-    "version": "3.10.1",
+    "version": "3.9.0",
     "url": "https://www.npmjs.com/package/@gltf-transform/extensions"
   },
   {
     "name": "@gltf-transform/functions",
     "license": [
       "MIT"
     ],
-    "version": "3.10.1",
+    "version": "3.9.0",
     "url": "https://www.npmjs.com/package/@gltf-transform/functions"
   },
   {
@@ -36,15 +36,15 @@
     "license": [
       "MIT"
     ],
-    "version": "8.7.0",
+    "version": "11.6.0",
     "url": "https://www.npmjs.com/package/better-sqlite3"
   },
   {
     "name": "cesium",
     "license": [
       "Apache-2.0"
     ],
-    "version": "1.121.1",
+    "version": "1.124.0",
     "url": "https://www.npmjs.com/package/cesium"
   },
   {

demos/.eslintrc.json

@@ -0,0 +1,19 @@
+{
+  "extends": [
+    "eslint:recommended",
+    "plugin:@typescript-eslint/recommended",
+    "prettier"
+  ],
+  "parser": "@typescript-eslint/parser",
+  "parserOptions": {
+    "ecmaVersion": 2020,
+    "project": "./demos/tsconfig.json"
+  },
+  "plugins": ["@typescript-eslint"],
+  "root": true,
+  "rules": {
+    "@typescript-eslint/no-explicit-any": "off",
+    "@typescript-eslint/no-empty-interface": "off",
+    "@typescript-eslint/no-floating-promises": "error"
+  }
+}

demos/base/ContentDataTypeChecksDemo.ts

@@ -32,4 +32,4 @@ async function testContentDataTypeChecks() {
   }
 }
 
-testContentDataTypeChecks();
+void testContentDataTypeChecks();

demos/base/ContentDataTypeRegistryDemo.ts

@@ -30,4 +30,4 @@ async function testContentDataTypeRegistry() {
   }
 }
 
-testContentDataTypeRegistry();
+void testContentDataTypeRegistry();

demos/gltf-extensions/ExtInstanceFeaturesDemo.ts

@@ -135,5 +135,5 @@ async function runReadingExample() {
   console.log(s);
 }
 
-runCreationExample();
-runReadingExample();
+void runCreationExample();
+void runReadingExample();