From 53a9f1b5316399ad63a5c1a6d4f0cbdcd2f600fc Mon Sep 17 00:00:00 2001 From: Kevin Ring Date: Tue, 19 Nov 2024 19:15:22 +1100 Subject: [PATCH 1/3] Update cesium-native. --- .../CesiumRuntime/Private/Tests/CesiumPropertyTable.spec.cpp | 4 ++-- .../Private/Tests/CesiumPropertyTexture.spec.cpp | 4 ++-- extern/cesium-native | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Source/CesiumRuntime/Private/Tests/CesiumPropertyTable.spec.cpp b/Source/CesiumRuntime/Private/Tests/CesiumPropertyTable.spec.cpp index 6f3a89394..5b90f4261 100644 --- a/Source/CesiumRuntime/Private/Tests/CesiumPropertyTable.spec.cpp +++ b/Source/CesiumRuntime/Private/Tests/CesiumPropertyTable.spec.cpp @@ -22,7 +22,7 @@ void FCesiumPropertyTableSpec::Define() { model = CesiumGltf::Model(); pExtension = &model.addExtension(); - pExtension->schema = CesiumGltf::Schema(); + pExtension->schema.emplace(); pPropertyTable = &pExtension->propertyTables.emplace_back(); }); @@ -42,7 +42,7 @@ void FCesiumPropertyTableSpec::Define() { }); It("constructs invalid instance for missing schema", [this]() { - pExtension->schema = std::nullopt; + pExtension->schema.reset(); FCesiumPropertyTable propertyTable(model, *pPropertyTable); TestEqual( diff --git a/Source/CesiumRuntime/Private/Tests/CesiumPropertyTexture.spec.cpp b/Source/CesiumRuntime/Private/Tests/CesiumPropertyTexture.spec.cpp index 9007930ae..430a7e3c0 100644 --- a/Source/CesiumRuntime/Private/Tests/CesiumPropertyTexture.spec.cpp +++ b/Source/CesiumRuntime/Private/Tests/CesiumPropertyTexture.spec.cpp @@ -34,7 +34,7 @@ void FCesiumPropertyTextureSpec::Define() { BeforeEach([this]() { model = Model(); pExtension = &model.addExtension(); - pExtension->schema = Schema(); + pExtension->schema.emplace(); pPropertyTexture = &pExtension->propertyTextures.emplace_back(); }); @@ -53,7 +53,7 @@ void FCesiumPropertyTextureSpec::Define() { }); It("constructs invalid instance for missing schema", [this]() { - pExtension->schema = std::nullopt; + pExtension->schema.reset(); FCesiumPropertyTexture propertyTexture(model, *pPropertyTexture); TestEqual( diff --git a/extern/cesium-native b/extern/cesium-native index 2313ce01c..90470470f 160000 --- a/extern/cesium-native +++ b/extern/cesium-native @@ -1 +1 @@ -Subproject commit 2313ce01cc567e35588c25795831fb973975e162 +Subproject commit 90470470f6ae26175ffa0f60176c8b9a6353ac48 From 6b938d788894155fc41c26626ea1122493239b86 Mon Sep 17 00:00:00 2001 From: Kevin Ring Date: Tue, 19 Nov 2024 19:17:15 +1100 Subject: [PATCH 2/3] Update cesium-native. --- extern/cesium-native | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/extern/cesium-native b/extern/cesium-native index 90470470f..fd22a9c80 160000 --- a/extern/cesium-native +++ b/extern/cesium-native @@ -1 +1 @@ -Subproject commit 90470470f6ae26175ffa0f60176c8b9a6353ac48 +Subproject commit fd22a9c80f47f5750ee39e64a727aac4ea6a62f5 From c54b9b55147795b2ea312ce4b587513a0c4ab9ce Mon Sep 17 00:00:00 2001 From: Kevin Ring Date: Wed, 20 Nov 2024 21:17:04 +1100 Subject: [PATCH 3/3] Use fix-variable-shadowing branch of cesium-native. --- extern/cesium-native | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/extern/cesium-native b/extern/cesium-native index fd22a9c80..4f9c917be 160000 --- a/extern/cesium-native +++ b/extern/cesium-native @@ -1 +1 @@ -Subproject commit fd22a9c80f47f5750ee39e64a727aac4ea6a62f5 +Subproject commit 4f9c917beee6238539d5d849bf8b88d33383d12f