Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix raster overlay undefined behavior #1554

Merged
merged 8 commits into from
Nov 25, 2024
Merged

Fix raster overlay undefined behavior #1554

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
1c73dd5
Fix undefined behavior in raster overlays by updating Native.
kring Nov 20, 2024
1b1571f
Update cesium-native.
kring Nov 20, 2024
90bad7a
Merge remote-tracking branch 'origin/update-native' into fix-raster-o…
kring Nov 20, 2024
027a8dc
Adjust for changes in cesium-native.
kring Nov 20, 2024
c5a0957
Update cesium-native.
kring Nov 20, 2024
52741cd
Merge remote-tracking branch 'origin/main' into fix-raster-overlay-ub
kring Nov 21, 2024
07c5bea
Merge remote-tracking branch 'origin/ue55' into fix-raster-overlay-ub
kring Nov 24, 2024
d677faa
Merge branch 'ue55' into fix-raster-overlay-ub
j9liu Nov 25, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion Source/CesiumRuntime/Private/CesiumBingMapsRasterOverlay.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,5 @@ UCesiumBingMapsRasterOverlay::CreateOverlay(
TCHAR_TO_UTF8(*this->BingMapsKey),
mapStyle,
"",
CesiumGeospatial::Ellipsoid::WGS84,
options);
}
4 changes: 4 additions & 0 deletions Source/CesiumRuntime/Private/CesiumGltfComponent.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3393,6 +3393,10 @@ void UCesiumGltfComponent::AttachRasterTile(
EMaterialParameterAssociation::LayerParameter,
i),
translationAndScale);
check(
textureCoordinateID >= 0 &&
textureCoordinateID <
primData.overlayTextureCoordinateIDToUVIndex.size());
pMaterial->SetScalarParameterValueByInfo(
FMaterialParameterInfo(
"TextureCoordinateIndex",
Expand Down
3 changes: 1 addition & 2 deletions Source/CesiumRuntime/Private/CesiumWebMapTileServiceRasterOverlay.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
2 changes: 1 addition & 1 deletion extern/cesium-native
Open in desktop
Submodule cesium-native updated 13 files
+4 −0 CHANGES.md
+0 −5 CesiumRasterOverlays/include/CesiumRasterOverlays/BingMapsRasterOverlay.h
+0 −3 CesiumRasterOverlays/include/CesiumRasterOverlays/DebugColorizeTilesRasterOverlay.h
+1 −1 CesiumRasterOverlays/include/CesiumRasterOverlays/RasterOverlay.h
+0 −9 CesiumRasterOverlays/include/CesiumRasterOverlays/TileMapServiceRasterOverlay.h
+0 −5 CesiumRasterOverlays/include/CesiumRasterOverlays/WebMapServiceRasterOverlay.h
+0 −9 CesiumRasterOverlays/include/CesiumRasterOverlays/WebMapTileServiceRasterOverlay.h
+2 −4 CesiumRasterOverlays/src/BingMapsRasterOverlay.cpp
+2 −3 CesiumRasterOverlays/src/DebugColorizeTilesRasterOverlay.cpp
+5 −2 CesiumRasterOverlays/src/IonRasterOverlay.cpp
+1 −1 CesiumRasterOverlays/src/TileMapServiceRasterOverlay.cpp
+1 −2 CesiumRasterOverlays/src/WebMapServiceRasterOverlay.cpp
+2 −3 CesiumRasterOverlays/src/WebMapTileServiceRasterOverlay.cpp