Merge branch 'ue55' of https://github.com/CesiumGS/cesium-unreal into…

… ue55
CesiumGS · Nov 25, 2024 · 9134d0b · 9134d0b
2 parents 6a44c2f + 2cc7f7e
commit 9134d0b
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 3 deletions.
diff --git a/Source/CesiumRuntime/Private/CesiumBingMapsRasterOverlay.cpp b/Source/CesiumRuntime/Private/CesiumBingMapsRasterOverlay.cpp
@@ -43,6 +43,5 @@ UCesiumBingMapsRasterOverlay::CreateOverlay(
       TCHAR_TO_UTF8(*this->BingMapsKey),
       mapStyle,
       "",
-      CesiumGeospatial::Ellipsoid::WGS84,
       options);
 }
diff --git a/Source/CesiumRuntime/Private/CesiumGltfComponent.cpp b/Source/CesiumRuntime/Private/CesiumGltfComponent.cpp
@@ -3393,6 +3393,10 @@ void UCesiumGltfComponent::AttachRasterTile(
                     EMaterialParameterAssociation::LayerParameter,
                     i),
                 translationAndScale);
+            check(
+                textureCoordinateID >= 0 &&
+                textureCoordinateID <
+                    primData.overlayTextureCoordinateIDToUVIndex.size());
             pMaterial->SetScalarParameterValueByInfo(
                 FMaterialParameterInfo(
                     "TextureCoordinateIndex",

diff --git a/Source/CesiumRuntime/Private/CesiumWebMapTileServiceRasterOverlay.cpp b/Source/CesiumRuntime/Private/CesiumWebMapTileServiceRasterOverlay.cpp
@@ -57,8 +57,7 @@ UCesiumWebMapTileServiceRasterOverlay::CreateOverlay(
   wmtsOptions.tileWidth = this->TileWidth;
   wmtsOptions.tileHeight = this->TileHeight;
 
-  const CesiumGeospatial::Ellipsoid& ellipsoid =
-      options.ellipsoid.value_or(CesiumGeospatial::Ellipsoid::WGS84);
+  const CesiumGeospatial::Ellipsoid& ellipsoid = options.ellipsoid;
 
   if (this->Projection ==
       ECesiumWebMapTileServiceRasterOverlayProjection::Geographic) {