Skip to content

Commit fe8d2f0

Browse files
committed
Merge branch 'main' of github.com:CesiumGS/cesium-native into gaussian-splats
2 parents d6e4d5d + 396dfc1 commit fe8d2f0

File tree

65 files changed

+3357
-354
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

65 files changed

+3357
-354
lines changed

CHANGES.md

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,22 @@
11
# Change Log
22

3-
### ? - ?
3+
### v0.50.0 - 2025-08-01
4+
5+
##### Breaking Changes :mega:
6+
7+
- The `RasterOverlayTileProvider` and `QuadtreeRasterOverlayTileProvider` constructors now require a `CreditSystem` parameter.
48

59
##### Additions :tada:
610

11+
- Added `GeoJsonDocumentRasterOverlay` for displaying GeoJSON documents as a raster overlay.
12+
- Improved performance of `RasterizedPolygonsOverlay`, especially when using lots of cartographic polygons at once.
713
- Added `ImplicitTilingUtilities::getParentID` to derive the ID of the parent for a given tile ID.
14+
- `IonRasterOverlay` now automatically handles refreshing the Cesium ion asset token as needed.
15+
- Added `CesiumIonAssetAccessor`, which is useful for implementing token refresh for Cesium ion assets.
16+
- Added `refreshTileProviderWithNewKey` method to `BingMapsRasterOverlay`.
17+
- Added `refreshTileProviderWithNewUrlAndHeaders` method to `TileMapServiceRasterOverlay`.
18+
- Added `getAsyncDestructionCompleteEvent` method to `RasterOverlayTileProvider`.
19+
- Added `getCreditSystem` method to `RasterOverlayTileProvider`.
820

921
### v0.49.0 - 2025-07-01
1022

CMakeLists.txt

Lines changed: 19 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -95,6 +95,14 @@ set(PACKAGES_PRIVATE
9595
earcut-hpp cpp-httplib[core] libmorton zstd
9696
)
9797

98+
# asmjit needed by blend2d on non-iOS platforms (iOS doesn't support JIT)
99+
if(NOT IOS AND NOT VCPKG_CMAKE_SYSTEM_NAME MATCHES "iOS")
100+
list(APPEND PACKAGES_PRIVATE blend2d asmjit)
101+
else()
102+
# Use [core] feature to disable default jit feature.
103+
list(APPEND PACKAGES_PRIVATE blend2d[core])
104+
endif()
105+
98106
if(NOT CESIUM_DISABLE_CURL)
99107
list(APPEND PACKAGES_PRIVATE curl)
100108
endif()
@@ -129,7 +137,7 @@ endif()
129137
include("cmake/defaults.cmake")
130138

131139
project(cesium-native
132-
VERSION 0.48.0
140+
VERSION 0.50.0
133141
LANGUAGES CXX C
134142
)
135143

@@ -312,6 +320,16 @@ find_package(spdlog CONFIG REQUIRED)
312320
find_package(tinyxml2 CONFIG REQUIRED)
313321
find_package(unofficial-sqlite3 CONFIG REQUIRED)
314322
find_package(WebP CONFIG REQUIRED)
323+
find_package(blend2d CONFIG REQUIRED)
324+
# asmjit should not be included with iOS builds as iOS doesn't support JIT compilation.
325+
if(NOT IOS AND NOT VCPKG_CMAKE_SYSTEM_NAME MATCHES "iOS")
326+
find_package(asmjit CONFIG REQUIRED)
327+
endif()
328+
329+
if(NOT CESIUM_DISABLE_CURL)
330+
find_package(CURL REQUIRED)
331+
endif()
332+
315333

316334
if(NOT CESIUM_DISABLE_CURL)
317335
find_package(CURL REQUIRED)

Cesium3DTilesSelection/include/Cesium3DTilesSelection/RasterOverlayCollection.h

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -206,9 +206,8 @@ class CESIUM3DTILESSELECTION_API RasterOverlayCollection final {
206206
// that create tile providers from overlays need to have somewhere to write
207207
// the result. And we can't extend the lifetime of the entire
208208
// RasterOverlayCollection until the async operations complete because the
209-
// RasterOverlayCollection has a pointer to the tile LoadedLinkedList, which
210-
// is owned externally and may become invalid before the async operations
211-
// complete.
209+
// RasterOverlayCollection has a LoadedTileEnumerator, which is owned
210+
// externally and may become invalid before the async operations complete.
212211
struct OverlayList
213212
: public CesiumUtility::ReferenceCountedNonThreadSafe<OverlayList> {
214213
std::vector<

0 commit comments

Comments
 (0)