Merge remote-tracking branch 'origin/deprecate-geotransforms' into gl…

…obe-anchor-improvements
CesiumGS · Sep 11, 2023 · d948021 · d948021
2 parents e1d02e6 + bdcb2b5
commit d948021
Show file tree

Hide file tree

Showing 6 changed files with 24 additions and 15 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -660,7 +660,7 @@ jobs:
           name: ${{ env.BUILD_CESIUM_UNREAL_PACKAGE_NAME}}
           path: packages
   iOS52:
-    runs-on: macos-13
+    runs-on: macos-12
     env:
       AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
       AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}

diff --git a/Source/CesiumRuntime/Private/Cesium3DTileset.cpp b/Source/CesiumRuntime/Private/Cesium3DTileset.cpp
@@ -2001,6 +2001,13 @@ void ACesium3DTileset::Tick(float DeltaTime) {
   glm::dmat4 unrealWorldToCesiumTileset =
       glm::affineInverse(ueTilesetToUeWorld * cesiumTilesetToUeTileset);
 
+  if (glm::isnan(unrealWorldToCesiumTileset[3].x) ||
+      glm::isnan(unrealWorldToCesiumTileset[3].y) ||
+      glm::isnan(unrealWorldToCesiumTileset[3].z)) {
+    // Probably caused by a zero scale.
+    return;
+  }
+
   std::vector<Cesium3DTilesSelection::ViewState> frustums;
   for (const FCesiumCamera& camera : cameras) {
     frustums.push_back(

diff --git a/Source/CesiumRuntime/Private/CesiumGeoreference.cpp b/Source/CesiumRuntime/Private/CesiumGeoreference.cpp
@@ -56,6 +56,8 @@ createCoordinateSystem(const FVector& center, double scale) {
 
 } // namespace
 
+/*static*/ const double ACesiumGeoreference::kMinimumScale = 1.0e-6;
+
 /*static*/ ACesiumGeoreference*
 ACesiumGeoreference::GetDefaultGeoreference(const UObject* WorldContextObject) {
   UWorld* world = WorldContextObject->GetWorld();
@@ -195,8 +197,8 @@ void ACesiumGeoreference::SetOriginHeight(double NewValue) {
 double ACesiumGeoreference::GetScale() const { return this->Scale; }
 
 void ACesiumGeoreference::SetScale(double NewValue) {
-  if (NewValue < 1e-6) {
-    this->Scale = 1e-6;
+  if (NewValue < ACesiumGeoreference::kMinimumScale) {
+    this->Scale = ACesiumGeoreference::kMinimumScale;
   } else {
     this->Scale = NewValue;
   }

diff --git a/Source/CesiumRuntime/Private/CesiumPolygonRasterOverlay.cpp b/Source/CesiumRuntime/Private/CesiumPolygonRasterOverlay.cpp
@@ -20,10 +20,9 @@ std::unique_ptr<Cesium3DTilesSelection::RasterOverlay>
 UCesiumPolygonRasterOverlay::CreateOverlay(
     const Cesium3DTilesSelection::RasterOverlayOptions& options) {
   ACesium3DTileset* pTileset = this->GetOwner<ACesium3DTileset>();
-  if (pTileset == nullptr)
-    return nullptr;
 
-  FTransform worldToTileset = pTileset->GetActorTransform().Inverse();
+  FTransform worldToTileset =
+      pTileset ? pTileset->GetActorTransform().Inverse() : FTransform::Identity;
 
   std::vector<CartographicPolygon> polygons;
   polygons.reserve(this->Polygons.Num());

diff --git a/Source/CesiumRuntime/Private/CesiumSunSky.cpp b/Source/CesiumRuntime/Private/CesiumSunSky.cpp
@@ -218,9 +218,6 @@ void ACesiumSunSky::BeginPlay() {
   if (this->UpdateAtmosphereAtRuntime) {
     this->UpdateAtmosphereRadius();
   }
-
-  if (this->SkyAtmosphere->AtmosphereHeight != this->AtmosphereHeight) {
-  }
 }
 
 void ACesiumSunSky::EndPlay(const EEndPlayReason::Type EndPlayReason) {

diff --git a/Source/CesiumRuntime/Public/CesiumGeoreference.h b/Source/CesiumRuntime/Public/CesiumGeoreference.h
@@ -35,6 +35,11 @@ UCLASS()
 class CESIUMRUNTIME_API ACesiumGeoreference : public AActor {
   GENERATED_BODY()
 public:
+  /**
+   * The minimum allowed value for the Scale property, 1e-6.
+   */
+  static const double kMinimumScale;
+
   /**
    * Finds and returns the actor labeled `CesiumGeoreferenceDefault` in the
    * persistent level of the calling object's world. If not found, it creates a
@@ -715,18 +720,17 @@ class CESIUMRUNTIME_API ACesiumGeoreference : public AActor {
 public:
   ACesiumGeoreference();
 
-  /**
-   * Recomputes all world georeference transforms. Usually there is no need to
-   * explicitly call this from external code.
-   */
-  void UpdateGeoreference();
-
   const CesiumGeospatial::LocalHorizontalCoordinateSystem&
   getCoordinateSystem() const noexcept {
     return this->_coordinateSystem;
   }
 
 private:
+  /**
+   * Recomputes all world georeference transforms.
+   */
+  void UpdateGeoreference();
+
   /**
    * A tag that is assigned to Georeferences when they are created
    * as the "default" Georeference for a certain world.