HeightSampled -> SampleSuccess, update cesium-native.

CesiumGS · Sep 27, 2024 · 07d8954 · 07d8954
1 parent 78d279d
commit 07d8954
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 14 deletions.
diff --git a/Source/CesiumRuntime/Private/Cesium3DTileset.cpp b/Source/CesiumRuntime/Private/Cesium3DTileset.cpp
@@ -164,11 +164,11 @@ void ACesium3DTileset::SampleHeightMostDetailed(
         if (!IsValid(this))
           return;
 
-        check(result.positions.size() == result.heightSampled.size());
+        check(result.positions.size() == result.sampleSuccess.size());
 
         // This should do nothing, but will prevent undefined behavior if
         // the array sizes are unexpectedly different.
-        result.heightSampled.resize(result.positions.size(), false);
+        result.sampleSuccess.resize(result.positions.size(), false);
 
         TArray<FCesiumSampleHeightResult> sampleHeightResults;
         sampleHeightResults.Reserve(result.positions.size());
@@ -181,7 +181,7 @@ void ACesium3DTileset::SampleHeightMostDetailed(
               CesiumUtility::Math::radiansToDegrees(position.longitude),
               CesiumUtility::Math::radiansToDegrees(position.latitude),
               position.height);
-          unrealResult.HeightSampled = result.heightSampled[i];
+          unrealResult.SampleSuccess = result.sampleSuccess[i];
 
           sampleHeightResults.Emplace(std::move(unrealResult));
         }

diff --git a/Source/CesiumRuntime/Private/Tests/SampleHeightMostDetailed.perf.cpp b/Source/CesiumRuntime/Private/Tests/SampleHeightMostDetailed.perf.cpp
@@ -218,7 +218,7 @@ bool RunSingleQueryTest(
       const FVector& queryLongitudeLatitudeHeight =
           testResults.heightResults[resultIndex].LongitudeLatitudeHeight;
 
-      if (!testResults.heightResults[resultIndex].HeightSampled) {
+      if (!testResults.heightResults[resultIndex].SampleSuccess) {
         UE_LOG(
             LogCesium,
             Error,
@@ -401,7 +401,7 @@ bool RunMultipleQueryTest(
 
                 const FVector& newCoordinate =
                     results[0].LongitudeLatitudeHeight;
-                if (!results[0].HeightSampled) {
+                if (!results[0].SampleSuccess) {
                   UE_LOG(
                       LogCesium,
                       Error,

diff --git a/Source/CesiumRuntime/Private/Tests/SampleHeightMostDetailed.spec.cpp b/Source/CesiumRuntime/Private/Tests/SampleHeightMostDetailed.spec.cpp
@@ -72,7 +72,7 @@ void FSampleHeightMostDetailedSpec::Define() {
                       const TArray<FString>& warnings) {
                     TestEqual("Number of results", result.Num(), 1);
                     TestEqual("Number of warnings", warnings.Num(), 0);
-                    TestTrue("HeightSampled", result[0].HeightSampled);
+                    TestTrue("SampleSuccess", result[0].SampleSuccess);
                     TestEqual(
                         "Longitude",
                         result[0].LongitudeLatitudeHeight.X,
@@ -106,7 +106,7 @@ void FSampleHeightMostDetailedSpec::Define() {
                       const TArray<FString>& warnings) {
                     TestEqual("Number of results", result.Num(), 2);
                     TestEqual("Number of warnings", warnings.Num(), 0);
-                    TestTrue("HeightSampled", result[0].HeightSampled);
+                    TestTrue("SampleSuccess", result[0].SampleSuccess);
                     TestEqual(
                         "Longitude",
                         result[0].LongitudeLatitudeHeight.X,
@@ -123,7 +123,7 @@ void FSampleHeightMostDetailedSpec::Define() {
                             result[0].LongitudeLatitudeHeight.Z,
                             1.0,
                             1.0));
-                    TestTrue("HeightSampled", result[1].HeightSampled);
+                    TestTrue("SampleSuccess", result[1].SampleSuccess);
                     TestEqual(
                         "Longitude",
                         result[1].LongitudeLatitudeHeight.X,
@@ -178,7 +178,7 @@ void FSampleHeightMostDetailedSpec::Define() {
                       const TArray<FString>& warnings) {
                     TestEqual("Number of results", result.Num(), 1);
                     TestEqual("Number of warnings", warnings.Num(), 0);
-                    TestTrue("HeightSampled", !result[0].HeightSampled);
+                    TestTrue("SampleSuccess", !result[0].SampleSuccess);
                     TestEqual(
                         "Longitude",
                         result[0].LongitudeLatitudeHeight.X,
@@ -215,7 +215,7 @@ void FSampleHeightMostDetailedSpec::Define() {
                   const TArray<FString>& warnings) {
                 TestEqual("Number of results", result.Num(), 1);
                 TestEqual("Number of warnings", warnings.Num(), 0);
-                TestTrue("HeightSampled", result[0].HeightSampled);
+                TestTrue("SampleSuccess", result[0].SampleSuccess);
                 TestEqual(
                     "Longitude",
                     result[0].LongitudeLatitudeHeight.X,

diff --git a/Source/CesiumRuntime/Public/CesiumSampleHeightResult.h b/Source/CesiumRuntime/Public/CesiumSampleHeightResult.h
@@ -14,8 +14,8 @@ struct CESIUMRUNTIME_API FCesiumSampleHeightResult {
 
   /**
    * The Longitude (X) and Latitude (Y) are the same values provided on input.
-   * The Height (Z) is the height sampled from the tileset if the HeightSampled
-   * property is true, or the original height provided on input if HeightSampled
+   * The Height (Z) is the height sampled from the tileset if the SampleSuccess
+   * property is true, or the original height provided on input if SampleSuccess
    * is false.
    */
   UPROPERTY(BlueprintReadWrite, Category = "Cesium")
@@ -28,5 +28,5 @@ struct CESIUMRUNTIME_API FCesiumSampleHeightResult {
    * will have more information about the problem.
    */
   UPROPERTY(BlueprintReadWrite, Category = "Cesium")
-  bool HeightSampled;
+  bool SampleSuccess;
 };
diff --git a/extern/cesium-native b/extern/cesium-native
+4 −1		CHANGES.md
+15 −13		Cesium3DTilesSelection/include/Cesium3DTilesSelection/SampleHeightResult.h
+5 −5		Cesium3DTilesSelection/include/Cesium3DTilesSelection/Tile.h
+2 −2		Cesium3DTilesSelection/include/Cesium3DTilesSelection/Tileset.h
+27 −0		Cesium3DTilesSelection/src/EmptyRasterOverlayTileProvider.cpp
+20 −0		Cesium3DTilesSelection/src/EmptyRasterOverlayTileProvider.h
+23 −7		Cesium3DTilesSelection/src/RasterMappedTo3DTile.cpp
+22 −11		Cesium3DTilesSelection/src/RasterOverlayCollection.cpp
+9 −0		Cesium3DTilesSelection/src/Tileset.cpp
+6 −6		Cesium3DTilesSelection/src/TilesetContentManager.cpp
+17 −0		Cesium3DTilesSelection/src/TilesetContentManager.h
+20 −12		Cesium3DTilesSelection/src/TilesetHeightQuery.cpp
+37 −25		Cesium3DTilesSelection/src/TilesetHeightQuery.h
+0 −1		Cesium3DTilesSelection/test/TestTilesetContentManager.cpp
+22 −9		Cesium3DTilesSelection/test/TestTilesetHeightQueries.cpp
+5 −11		CesiumRasterOverlays/include/CesiumRasterOverlays/RasterOverlayTileProvider.h
+19 −7		CesiumRasterOverlays/src/QuadtreeRasterOverlayTileProvider.cpp
+29 −24		CesiumRasterOverlays/src/RasterOverlayTileProvider.cpp
+3 −2		CesiumRasterOverlays/src/TileMapServiceRasterOverlay.cpp
+1 −1		CesiumRasterOverlays/test/TestQuadtreeRasterOverlayTileProvider.cpp