From 9f1fe521221928840d99eca32ce29750788d3ae4 Mon Sep 17 00:00:00 2001 From: Kevin Ring Date: Mon, 3 Jun 2024 12:02:12 +1000 Subject: [PATCH] Update cesium-native, bump version. --- CHANGES.md | 4 ++++ native~/Runtime/src/CesiumFeaturesMetadataUtility.cpp | 2 +- native~/Runtime/src/CesiumMetadataImpl.cpp | 6 +++--- native~/extern/cesium-native | 2 +- package.json | 2 +- 5 files changed, 10 insertions(+), 6 deletions(-) diff --git a/CHANGES.md b/CHANGES.md index f02fede9..b9076cad 100644 --- 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 index 0b993307..a07083ac 100644 --- 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 index 2b593ea9..76ef23e1 100644 --- 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(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 index cd67f6f4..b647e633 160000 --- a/native~/extern/cesium-native +++ b/native~/extern/cesium-native @@ -1 +1 @@ -Subproject commit cd67f6f4094324414fd416fec8d5c837cdc75287 +Subproject commit b647e633b69be4e6936db9cee3fefdd7c7e95e12 diff --git a/package.json b/package.json index 900efafd..0c946909 100644 --- 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",