Merge pull request #463 from CesiumGS/update-native

Update cesium-native, bump version.
CesiumGS · Jun 3, 2024 · af825c6 · af825c6
2 parents 6e82d93 + 9f1fe52
commit af825c6
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 6 deletions.
diff --git a/CHANGES.md b/CHANGES.md
@@ -1,5 +1,9 @@
 # Change Log
 
+### v1.10.1 - 2024-06-03
+
+This release updates [cesium-native](https://github.com/CesiumGS/cesium-native) from v0.35.0 to v0.36.0. See the [changelog](https://github.com/CesiumGS/cesium-native/blob/main/CHANGES.md) for a complete list of changes in cesium-native.
+
 ### v1.10.0 - 2024-05-01
 
 ##### Additions :tada:

diff --git a/native~/Runtime/src/CesiumFeaturesMetadataUtility.cpp b/native~/Runtime/src/CesiumFeaturesMetadataUtility.cpp
@@ -73,7 +73,7 @@ CesiumFeaturesMetadataUtility::addPrimitiveFeatures(
     CesiumForUnity::CesiumFeatureIdSet featureIdSet = featureIdSets[i];
     featureIdSet.label(System::String(gltfFeatureId.label.value_or("")));
     featureIdSet.nullFeatureId(gltfFeatureId.nullFeatureId.value_or(-1));
-    featureIdSet.propertyTableIndex(gltfFeatureId.propertyTable.value_or(-1));
+    featureIdSet.propertyTableIndex(gltfFeatureId.propertyTable);
   }
 
   return primitiveFeatures;

diff --git a/native~/Runtime/src/CesiumMetadataImpl.cpp b/native~/Runtime/src/CesiumMetadataImpl.cpp
@@ -129,9 +129,9 @@ CesiumForUnityNative::CesiumMetadataImpl::GetFeatures(
     features.Item(i, feature);
 
     const CesiumGltf::FeatureId& featureIdSet = *featureIdAttributes[i];
-    if (!featureIdSet.propertyTable || *featureIdSet.propertyTable < 0 ||
-        *featureIdSet.propertyTable >=
-            static_cast<int64_t>(pModelMetadata->propertyTables.size())) {
+    if (featureIdSet.propertyTable < 0 ||
+        size_t(featureIdSet.propertyTable) >=
+            pModelMetadata->propertyTables.size()) {
       continue;
     }
 

diff --git a/native~/extern/cesium-native b/native~/extern/cesium-native
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "com.cesium.unity",
-  "version": "1.10.0",
+  "version": "1.10.1",
   "displayName": "Cesium for Unity",
   "description": "Cesium for Unity brings the 3D geospatial ecosystem to Unity. By combining a high-accuracy full-scale WGS84 globe, open APIs and open standards for spatial indexing such as 3D Tiles, and cloud-based real-world content from [Cesium ion](https://cesium.com/cesium-ion) with Unity, this plugin enables 3D geospatial workflows and applications in Unity.",
   "license": "Apache-2.0",
+78 −116		.github/workflows/build.yml
+37 −0		CHANGES.md
+28 −4		CMakeLists.txt
+6 −2		Cesium3DTilesContent/include/Cesium3DTilesContent/B3dmToGltfConverter.h
+9 −2		Cesium3DTilesContent/include/Cesium3DTilesContent/BinaryToGltfConverter.h
+6 −2		Cesium3DTilesContent/include/Cesium3DTilesContent/CmptToGltfConverter.h
+5 −0		Cesium3DTilesContent/include/Cesium3DTilesContent/GltfConverterResult.h
+132 −0		Cesium3DTilesContent/include/Cesium3DTilesContent/GltfConverterUtility.h
+50 −8		Cesium3DTilesContent/include/Cesium3DTilesContent/GltfConverters.h
+22 −0		Cesium3DTilesContent/include/Cesium3DTilesContent/I3dmToGltfConverter.h
+6 −2		Cesium3DTilesContent/include/Cesium3DTilesContent/PntsToGltfConverter.h
+27 −23		Cesium3DTilesContent/src/B3dmToGltfConverter.cpp
+10 −1		Cesium3DTilesContent/src/BinaryToGltfConverter.cpp
+29 −27		Cesium3DTilesContent/src/CmptToGltfConverter.cpp
+137 −0		Cesium3DTilesContent/src/GltfConverterUtility.cpp
+52 −9		Cesium3DTilesContent/src/GltfConverters.cpp
+791 −0		Cesium3DTilesContent/src/I3dmToGltfConverter.cpp
+14 −13		Cesium3DTilesContent/src/PntsToGltfConverter.cpp
+2 −0		Cesium3DTilesContent/src/registerAllTileContentTypes.cpp
+53 −0		Cesium3DTilesContent/test/ConvertTileToGltf.cpp
+15 −8		Cesium3DTilesContent/test/ConvertTileToGltf.h
+82 −0		Cesium3DTilesContent/test/TestI3dmToGltfConverter.cpp
+1 −1		Cesium3DTilesContent/test/TestUpgradeBatchTableToExtStructuralMetadata.cpp
+42 −27		Cesium3DTilesSelection/src/ImplicitOctreeLoader.cpp
+42 −27		Cesium3DTilesSelection/src/ImplicitQuadtreeLoader.cpp
+79 −69		Cesium3DTilesSelection/src/TilesetJsonLoader.cpp
+ −		Cesium3DTilesSelection/test/data/i3dm/InstancedOrientation/instancedOrientation.i3dm
+29 −0		Cesium3DTilesSelection/test/data/i3dm/InstancedOrientation/tileset.json
+ −		Cesium3DTilesSelection/test/data/i3dm/InstancedWithBatchTable/instancedWithBatchTable.i3dm
+29 −0		Cesium3DTilesSelection/test/data/i3dm/InstancedWithBatchTable/tileset.json
+ −		Cesium3DTilesSelection/test/data/i3dm/ObsoleteGltf/instancedWithBatchTable.i3dm
+29 −0		Cesium3DTilesSelection/test/data/i3dm/ObsoleteGltf/tileset.json
+2 −0		Cesium3DTilesWriter/src/SchemaWriter.cpp
+2 −0		Cesium3DTilesWriter/src/SubtreeWriter.cpp
+2 −0		Cesium3DTilesWriter/src/TilesetWriter.cpp
+7 −7		CesiumAsync/include/CesiumAsync/Impl/QueuedScheduler.h
+38 −0		CesiumAsync/test/TestAsyncSystem.cpp
+1 −1		CesiumGeospatial/include/CesiumGeospatial/GlobeRectangle.h
+2 −2		CesiumGltf/generated/include/CesiumGltf/ExtensionMeshPrimitiveExtStructuralMetadata.h
+1 −1		CesiumGltf/generated/include/CesiumGltf/FeatureId.h
+17 −0		CesiumGltf/include/CesiumGltf/AccessorUtility.h
+58 −13		CesiumGltf/include/CesiumGltf/Model.h
+34 −0		CesiumGltf/src/AccessorUtility.cpp
+170 −90		CesiumGltf/src/Model.cpp
+322 −11		CesiumGltf/test/TestModel.cpp
+3 −0		CesiumGltfContent/include/CesiumGltfContent/GltfUtilities.h
+190 −52		CesiumGltfContent/src/GltfUtilities.cpp
+1 −0		CesiumGltfContent/src/ImageManipulation.cpp
+229 −11		CesiumGltfContent/test/TestGltfUtilities.cpp
+2 −2		CesiumGltfReader/generated/src/ExtensionMeshPrimitiveExtStructuralMetadataJsonHandler.h
+1 −1		CesiumGltfReader/generated/src/FeatureIdJsonHandler.h
+1 −0		CesiumGltfReader/src/GltfReader.cpp
+10 −0		CesiumGltfReader/src/decodeDataUrls.cpp
+14 −0		CesiumGltfReader/src/decodeMeshOpt.cpp
+15 −0		CesiumGltfReader/src/dequantizeMeshData.cpp
+50 −1		CesiumGltfReader/test/TestGltfReader.cpp
+1 −1		CesiumGltfWriter/generated/src/ModelJsonWriter.cpp
+12 −1		CesiumGltfWriter/src/GltfWriter.cpp
+25 −0		CesiumGltfWriter/test/TestGltfWriter.cpp
+9 −0		CesiumJsonReader/include/CesiumJsonReader/JsonReaderOptions.h
+10 −0		CesiumJsonReader/src/JsonReaderOptions.cpp
+20 −27		CesiumJsonWriter/include/CesiumJsonWriter/ExtensionWriterContext.h
+18 −3		CesiumJsonWriter/include/CesiumJsonWriter/JsonWriter.h
+13 −2		CesiumJsonWriter/include/CesiumJsonWriter/writeJsonExtensions.h
+23 −4		CesiumJsonWriter/src/ExtensionWriterContext.cpp
+27 −27		CesiumJsonWriter/src/JsonWriter.cpp
+25 −0		CesiumNativeTests/include/CesiumNativeTests/FileAccessor.h
+49 −0		CesiumNativeTests/include/CesiumNativeTests/RandomVector.h
+79 −0		CesiumNativeTests/src/FileAccessor.cpp
+83 −0		CesiumQuantizedMeshTerrain/include/CesiumQuantizedMeshTerrain/LayerWriter.h
+48 −0		CesiumQuantizedMeshTerrain/src/LayerWriter.cpp
+0 −5		CesiumQuantizedMeshTerrain/src/QuantizedMeshLoader.cpp
+91 −0		CesiumQuantizedMeshTerrain/test/TestLayerWriter.cpp
+17 −2		CesiumRasterOverlays/src/RasterOverlayUtilities.cpp
+47 −0		CesiumUtility/include/CesiumUtility/Math.h
+97 −0		CesiumUtility/include/CesiumUtility/Uri.h
+126 −0		CesiumUtility/src/Uri.cpp
+51 −0		CesiumUtility/test/TestMath.cpp
+62 −0		CesiumUtility/test/TestUri.cpp
+4 −0		extern/CMakeLists.txt
+2 −2		package-lock.json