diff --git a/Runtime/CesiumSampleHeightResult.cs b/Runtime/CesiumSampleHeightResult.cs index 0e813393..a1d63ce4 100644 --- a/Runtime/CesiumSampleHeightResult.cs +++ b/Runtime/CesiumSampleHeightResult.cs @@ -18,7 +18,7 @@ public class CesiumSampleHeightResult /// values from its input. Its height will either be the height sampled from /// the tileset at that position, or the original input height if the sample /// was unsuccessful. To determine which, look at the value of - /// at the same index. + /// at the same index. /// /// /// The returned height is measured from the ellipsoid (usually WGS84) and @@ -37,7 +37,7 @@ public class CesiumSampleHeightResult /// the height sampled from the tileset. If false, the height could not be sampled for /// the position, so its height is the same as the original input height. /// - public bool[] heightSampled { get; set; } + public bool[] sampleSuccess { get; set; } /// /// Any warnings that occurred while sampling heights. diff --git a/Runtime/ConfigureReinterop.cs b/Runtime/ConfigureReinterop.cs index 1bbe21ac..c746a914 100644 --- a/Runtime/ConfigureReinterop.cs +++ b/Runtime/ConfigureReinterop.cs @@ -894,7 +894,7 @@ Cesium3DTilesetLoadFailureDetails tilesetDetails promise.SetException(new Exception("message")); CesiumSampleHeightResult result = new CesiumSampleHeightResult(); result.longitudeLatitudeHeightPositions = null; - result.heightSampled = null; + result.sampleSuccess = null; result.warnings = null; promise.SetResult(result); Task task = promise.Task; diff --git a/Tests/TestCesium3DTileset.cs b/Tests/TestCesium3DTileset.cs index bb25b82a..a5abd41a 100644 --- a/Tests/TestCesium3DTileset.cs +++ b/Tests/TestCesium3DTileset.cs @@ -28,10 +28,10 @@ public IEnumerator SampleHeightMostDetailedWorksWithAnEmptyArrayOfPositions() CesiumSampleHeightResult result = task.Result; Assert.IsNotNull(result); Assert.IsNotNull(result.longitudeLatitudeHeightPositions); - Assert.IsNotNull(result.heightSampled); + Assert.IsNotNull(result.sampleSuccess); Assert.IsNotNull(result.warnings); Assert.AreEqual(result.longitudeLatitudeHeightPositions.Length, 0); - Assert.AreEqual(result.heightSampled.Length, 0); + Assert.AreEqual(result.sampleSuccess.Length, 0); Assert.AreEqual(result.warnings.Length, 0); } @@ -54,13 +54,13 @@ public IEnumerator SampleHeightMostDetailedWorksWithASinglePosition() CesiumSampleHeightResult result = task.Result; Assert.IsNotNull(result); Assert.IsNotNull(result.longitudeLatitudeHeightPositions); - Assert.IsNotNull(result.heightSampled); + Assert.IsNotNull(result.sampleSuccess); Assert.IsNotNull(result.warnings); Assert.AreEqual(result.longitudeLatitudeHeightPositions.Length, 1); - Assert.AreEqual(result.heightSampled.Length, 1); + Assert.AreEqual(result.sampleSuccess.Length, 1); Assert.AreEqual(result.warnings.Length, 0); - Assert.AreEqual(result.heightSampled[0], true); + Assert.AreEqual(result.sampleSuccess[0], true); Assert.AreEqual(result.longitudeLatitudeHeightPositions[0].x, -105.1, 1e-12); Assert.AreEqual(result.longitudeLatitudeHeightPositions[0].y, 40.1, 1e-12); // Returned height should be different from the original height (1.0) by at least one meter. @@ -88,19 +88,19 @@ public IEnumerator SampleHeightMostDetailedWorksWithMultiplePositions() CesiumSampleHeightResult result = task.Result; Assert.IsNotNull(result); Assert.IsNotNull(result.longitudeLatitudeHeightPositions); - Assert.IsNotNull(result.heightSampled); + Assert.IsNotNull(result.sampleSuccess); Assert.IsNotNull(result.warnings); Assert.AreEqual(result.longitudeLatitudeHeightPositions.Length, 2); - Assert.AreEqual(result.heightSampled.Length, 2); + Assert.AreEqual(result.sampleSuccess.Length, 2); Assert.AreEqual(result.warnings.Length, 0); - Assert.AreEqual(result.heightSampled[0], true); + Assert.AreEqual(result.sampleSuccess[0], true); Assert.AreEqual(result.longitudeLatitudeHeightPositions[0].x, -105.1, 1e-12); Assert.AreEqual(result.longitudeLatitudeHeightPositions[0].y, 40.1, 1e-12); // Returned height should be different from the original height (1.0) by at least one meter. Assert.IsTrue(math.abs(result.longitudeLatitudeHeightPositions[0].z - 1.0) > 1.0); - Assert.AreEqual(result.heightSampled[1], true); + Assert.AreEqual(result.sampleSuccess[1], true); Assert.AreEqual(result.longitudeLatitudeHeightPositions[1].x, 105.1, 1e-12); Assert.AreEqual(result.longitudeLatitudeHeightPositions[1].y, -40.1, 1e-12); // Returned height should be different from the original height (1.0) by at least one meter. @@ -127,13 +127,13 @@ public IEnumerator SampleHeightMostDetailedIndicatesNotSampledForPositionOutside CesiumSampleHeightResult result = task.Result; Assert.IsNotNull(result); Assert.IsNotNull(result.longitudeLatitudeHeightPositions); - Assert.IsNotNull(result.heightSampled); + Assert.IsNotNull(result.sampleSuccess); Assert.IsNotNull(result.warnings); Assert.AreEqual(result.longitudeLatitudeHeightPositions.Length, 1); - Assert.AreEqual(result.heightSampled.Length, 1); + Assert.AreEqual(result.sampleSuccess.Length, 1); Assert.AreEqual(result.warnings.Length, 0); - Assert.AreEqual(result.heightSampled[0], false); + Assert.AreEqual(result.sampleSuccess[0], false); Assert.AreEqual(result.longitudeLatitudeHeightPositions[0].x, 151.20972, 1e-12); Assert.AreEqual(result.longitudeLatitudeHeightPositions[0].y, -33.87100, 1e-12); Assert.AreEqual(result.longitudeLatitudeHeightPositions[0].z, 1.0, 1e-12); diff --git a/native~/Runtime/src/Cesium3DTilesetImpl.cpp b/native~/Runtime/src/Cesium3DTilesetImpl.cpp index d9a017f8..bbae8ef4 100644 --- a/native~/Runtime/src/Cesium3DTilesetImpl.cpp +++ b/native~/Runtime/src/Cesium3DTilesetImpl.cpp @@ -445,7 +445,7 @@ Cesium3DTilesetImpl::SampleHeightMostDetailed( CesiumForUnity::CesiumSampleHeightResult unityResult; unityResult.longitudeLatitudeHeightPositions(positions); - unityResult.heightSampled(heightSampled); + unityResult.sampleSuccess(heightSampled); unityResult.warnings(warnings); promise.SetResult(unityResult);