Merge branch 'main' into linux

Author: timoore

.github/workflows/build.yml

@@ -64,8 +64,6 @@ jobs:
             vcpkg-windows-${{ hashFiles('native~/vcpkg/ports/**/vcpkg.json', 'native~/vcpkg/triplets/**/*', 'native~/extern/*toolchain.cmake') }}-
       - name: Install latest ninja and cmake
         uses: lukka/get-cmake@latest
-        with:
-          cmakeVersion: "3.31.6"
       - name: Install nasm
         uses: ilammy/setup-nasm@v1.5.1
       - name: Install wget

CHANGES.md

@@ -1,6 +1,14 @@
 # Change Log {#changes}
 
-## ? - ?
+## v1.24.0 - 2026-07-01
+
+##### Additions :tada:
+
+- Added support for rendering glTFs with line primitives.
+
+In addition to the above, this release updates [cesium-native](https://github.com/CesiumGS/cesium-native) from v0.61.0 to v0.62.0. See the [changelog](https://github.com/CesiumGS/cesium-native/blob/main/CHANGES.md) for a complete list of changes in cesium-native.
+
+## v1.23.3 - 2026-06-01
 
 ##### Additions :tada:
 
@@ -10,6 +18,8 @@
 
 - The native Android library (`libCesiumForUnityNative.so`) is now built with 16 KB ELF segment alignment, enabling compatibility with Android 15+ devices that use 16 KB memory pages.
 
+In addition to the above, this release updates [cesium-native](https://github.com/CesiumGS/cesium-native) from v0.60.0 to v0.61.0. See the [changelog](https://github.com/CesiumGS/cesium-native/blob/main/CHANGES.md) for a complete list of changes in cesium-native.
+
 ## v1.23.2 - 2026-05-01
 
 This release updates [cesium-native](https://github.com/CesiumGS/cesium-native) from v0.59.0 to v0.60.0. See the [changelog](https://github.com/CesiumGS/cesium-native/blob/main/CHANGES.md) for a complete list of changes in cesium-native.

Documentation~/release-guide.md

@@ -46,7 +46,8 @@ If the uploaded package is later found to have problems during testing, this ste
 
 1. Clone a fresh copy of [cesium-unity-samples](https://github.com/CesiumGS/cesium-unity-samples) to a new directory.
 2. Before opening the project, go to the Packages folder and open `Packages/manifest.json` in a text editor. Find the `com.cesium.unity` dependency under the `"dependencies"` object and change the version to the version number of the in-progress release.
-3. Create a new Cesium ion token for this release under the "CesiumJS" account:
+3. Open `ProjectSettings/ProjectSettings.asset` and find the `bundleVersion` key (under `PlayerSettings`). Set this to the version number of the in-progress release.
+4. Create a new Cesium ion token for this release under the "CesiumJS" account:
    - Visit https://ion.cesium.com.
    - Log in using your own `@cesium.com` email address.
    - Click your name in the top-right corner and choose "Switch to CesiumJS". If you don't see this option, ask someone on the ion team to add you to the CesiumJS account.
@@ -56,8 +57,8 @@ If the uploaded package is later found to have problems during testing, this ste
    - Set the other properties as follows (these should be the defaults):
      - `Allow URLs`: "All Urls"
      - `Resources`: "All assets"
-4. Open `Assets/CesiumSettings/Resources/CesiumIonServers/ion.cesium.com.asset` in a text editor and change the `defaultIonAccessToken` property to the new token you created above.
-5. Commit the above changes but do _not_ push it yet. If you do, anyone trying to use cesium-unity-samples will be broken until the new version is published.
+5. Open `Assets/CesiumSettings/Resources/CesiumIonServers/ion.cesium.com.asset` in a text editor and change the `defaultIonAccessToken` property to the new token you created above.
+6. Commit the above changes but do _not_ push it yet. If you do, anyone trying to use cesium-unity-samples will be broken until the new version is published.
 
 ## Test the release candidate
 

native~/CMakeLists.txt

@@ -189,6 +189,7 @@ target_link_libraries(
       Cesium3DTilesSelection
       CesiumAsync
       CesiumIonClient
+      CesiumVectorOverlays
     PRIVATE
       tidy-static
       enum-flags

native~/extern/cesium-native

@@ -10,6 +10,7 @@
 #include <Cesium3DTilesSelection/EllipsoidTilesetLoader.h>
 #include <Cesium3DTilesSelection/Tileset.h>
 #include <CesiumGeospatial/GlobeTransforms.h>
+#include <CesiumImage/Ktx2TranscodeTargets.h>
 #include <CesiumIonClient/Connection.h>
 #include <CesiumRasterOverlays/IonRasterOverlay.h>
 
@@ -580,54 +581,10 @@ void Cesium3DTilesetImpl::DestroyTileset(
   this->_destroyTilesetOnNextUpdate = false;
 }
 
-void Cesium3DTilesetImpl::LoadTileset(
-    const DotNet::CesiumForUnity::Cesium3DTileset& tileset) {
-  TilesetOptions options{};
-  options.rendererOptions = std::make_any<CreateModelOptions>(tileset);
-  options.maximumScreenSpaceError = tileset.maximumScreenSpaceError();
-  options.preloadAncestors = tileset.preloadAncestors();
-  options.preloadSiblings = tileset.preloadSiblings();
-  options.forbidHoles = tileset.forbidHoles();
-  options.maximumSimultaneousTileLoads = tileset.maximumSimultaneousTileLoads();
-  options.maximumCachedBytes = tileset.maximumCachedBytes();
-  options.loadingDescendantLimit = tileset.loadingDescendantLimit();
-  options.enableFrustumCulling = tileset.enableFrustumCulling();
-  options.enableFogCulling = tileset.enableFogCulling();
-  options.enforceCulledScreenSpaceError =
-      tileset.enforceCulledScreenSpaceError();
-  options.culledScreenSpaceError = tileset.culledScreenSpaceError();
-  // options.enableLodTransitionPeriod = tileset.useLodTransitions();
-  // options.lodTransitionLength = tileset.lodTransitionLength();
-  options.showCreditsOnScreen = tileset.showCreditsOnScreen();
-  options.loadErrorCallback =
-      [tileset](const TilesetLoadFailureDetails& details) {
-        int typeValue = (int)details.type;
-        CesiumForUnity::Cesium3DTilesetLoadFailureDetails unityDetails(
-            tileset,
-            CesiumForUnity::Cesium3DTilesetLoadType(typeValue),
-            details.statusCode,
-            System::String(details.message));
-
-        CesiumForUnity::Cesium3DTileset::BroadcastCesium3DTilesetLoadFailure(
-            unityDetails);
-      };
-
-  // Generous per-frame time limits for loading / unloading on main thread.
-  options.mainThreadLoadingTimeLimit = 5.0;
-  options.tileCacheUnloadTimeLimit = 5.0;
-
-  DotNet::CesiumForUnity::CesiumGeoreference georeferenceComponent =
-      tileset.gameObject()
-          .GetComponentInParent<DotNet::CesiumForUnity::CesiumGeoreference>();
-  if (georeferenceComponent != nullptr) {
-    options.ellipsoid =
-        georeferenceComponent.ellipsoid().NativeImplementation().GetEllipsoid();
-  }
-
-  TilesetContentOptions contentOptions{};
-  contentOptions.generateMissingNormalsSmooth = tileset.generateSmoothNormals();
-
-  CesiumGltf::SupportedGpuCompressedPixelFormats supportedFormats;
+namespace {
+CesiumImage::SupportedGpuCompressedPixelFormats
+getSupportedGpuCompressedPixelFormats() {
+  CesiumImage::SupportedGpuCompressedPixelFormats supportedFormats;
   supportedFormats.ETC2_RGBA = UnityEngine::SystemInfo::IsFormatSupported(
       DotNet::UnityEngine::Experimental::Rendering::GraphicsFormat::
           RGBA_ETC2_SRGB,
@@ -681,12 +638,69 @@ void Cesium3DTilesetImpl::LoadTileset(
           DotNet::UnityEngine::Experimental::Rendering::GraphicsFormat::
               RG_EAC_UNorm,
           DotNet::UnityEngine::Experimental::Rendering::FormatUsage::Sample);
+  return supportedFormats;
+}
+} // namespace
+
+void Cesium3DTilesetImpl::LoadTileset(
+    const DotNet::CesiumForUnity::Cesium3DTileset& tileset) {
+  TilesetOptions options{};
+  options.rendererOptions = std::make_any<CreateModelOptions>(tileset);
+  options.maximumScreenSpaceError = tileset.maximumScreenSpaceError();
+  options.preloadAncestors = tileset.preloadAncestors();
+  options.preloadSiblings = tileset.preloadSiblings();
+  options.forbidHoles = tileset.forbidHoles();
+  options.maximumSimultaneousTileLoads = tileset.maximumSimultaneousTileLoads();
+  options.maximumCachedBytes = tileset.maximumCachedBytes();
+  options.loadingDescendantLimit = tileset.loadingDescendantLimit();
+  options.enableFrustumCulling = tileset.enableFrustumCulling();
+  options.enableFogCulling = tileset.enableFogCulling();
+  options.enforceCulledScreenSpaceError =
+      tileset.enforceCulledScreenSpaceError();
+  options.culledScreenSpaceError = tileset.culledScreenSpaceError();
+  // options.enableLodTransitionPeriod = tileset.useLodTransitions();
+  // options.lodTransitionLength = tileset.lodTransitionLength();
+  options.showCreditsOnScreen = tileset.showCreditsOnScreen();
+  options.loadErrorCallback =
+      [tileset](const TilesetLoadFailureDetails& details) {
+        int typeValue = (int)details.type;
+        CesiumForUnity::Cesium3DTilesetLoadFailureDetails unityDetails(
+            tileset,
+            CesiumForUnity::Cesium3DTilesetLoadType(typeValue),
+            details.statusCode,
+            System::String(details.message));
+
+        CesiumForUnity::Cesium3DTileset::BroadcastCesium3DTilesetLoadFailure(
+            unityDetails);
+      };
+
+  // Generous per-frame time limits for loading / unloading on main thread.
+  options.mainThreadLoadingTimeLimit = 5.0;
+  options.tileCacheUnloadTimeLimit = 5.0;
 
-  contentOptions.ktx2TranscodeTargets =
-      CesiumGltf::Ktx2TranscodeTargets(supportedFormats, false);
+  DotNet::CesiumForUnity::CesiumGeoreference georeferenceComponent =
+      tileset.gameObject()
+          .GetComponentInParent<DotNet::CesiumForUnity::CesiumGeoreference>();
+  if (georeferenceComponent != nullptr) {
+    options.ellipsoid =
+        georeferenceComponent.ellipsoid().NativeImplementation().GetEllipsoid();
+  }
 
+  TilesetContentOptions contentOptions{};
+  contentOptions.generateMissingNormalsSmooth = tileset.generateSmoothNormals();
+  contentOptions.ktx2TranscodeTargets = CesiumImage::Ktx2TranscodeTargets(
+      getSupportedGpuCompressedPixelFormats(),
+      false);
   contentOptions.applyTextureTransform = false;
 
+  // Although Unity provides MeshTopology.LineStrip, it crashes when given an
+  // index buffer with a primitive restart constant. Therefore, ensure all
+  // primitive modes are converted before they are processed by Unity.
+  contentOptions.primitiveModeOptions.convertLineLoop = true;
+  contentOptions.primitiveModeOptions.convertLineStrip = true;
+  contentOptions.primitiveModeOptions.convertTriangleFan = true;
+  contentOptions.primitiveModeOptions.convertTriangleStrip = true;
+
   options.contentOptions = contentOptions;
 
   CesiumForUnity::CesiumCameraManager cameraManager =

native~/src/Runtime/Cesium3DTilesetImpl.cpp

@@ -91,7 +91,7 @@ std::int64_t CesiumFeatureIdTextureImpl::GetFeatureIdFromRaycastHit(
     return -1;
   }
 
-  if (this->_positionAccessor.status() !=
+  if (std::visit(CesiumGltf::StatusFromAccessor{}, this->_positionAccessor) !=
       CesiumGltf::AccessorViewStatus::Valid) {
     return -1;
   }
@@ -107,7 +107,7 @@ std::int64_t CesiumFeatureIdTextureImpl::GetFeatureIdFromRaycastHit(
       this->_indexAccessor);
 
   std::array<glm::dvec2, 3> uvs;
-  std::array<glm::vec3, 3> positions;
+  std::array<glm::dvec3, 3> positions;
 
   for (size_t i = 0; i < positions.size(); i++) {
     int64_t index = vertexIndices[i];
@@ -123,10 +123,13 @@ std::int64_t CesiumFeatureIdTextureImpl::GetFeatureIdFromRaycastHit(
     }
     uvs[i] = *maybeTexCoord;
 
-    CesiumGltf::AccessorTypes::VEC3<float> position =
-        this->_positionAccessor[index];
-    positions[i] =
-        glm::vec3(position.value[0], position.value[1], position.value[2]);
+    std::optional<glm::dvec3> maybePosition = std::visit(
+        CesiumGltf::PositionFromAccessor{index},
+        this->_positionAccessor);
+    if (!maybePosition) {
+      return -1;
+    }
+    positions[i] = *maybePosition;
   }
 
   // The barycentric coordinates in RaycastHit don't align with the positions
@@ -140,9 +143,9 @@ std::int64_t CesiumFeatureIdTextureImpl::GetFeatureIdFromRaycastHit(
   glm::dvec3 barycentricCoordinates;
   bool foundIntersection = CesiumGeometry::IntersectionTests::pointInTriangle(
       glm::dvec3(localPosition.x, localPosition.y, localPosition.z),
-      glm::dvec3(positions[0]),
-      glm::dvec3(positions[1]),
-      glm::dvec3(positions[2]),
+      positions[0],
+      positions[1],
+      positions[2],
       barycentricCoordinates);
   if (!foundIntersection) {
     return -1;

native~/src/Runtime/CesiumFeatureIdTextureImpl.cpp

@@ -7,10 +7,10 @@
 #include "UnityExternals.h"
 
 #include <Cesium3DTilesSelection/Tileset.h>
-#include <CesiumRasterOverlays/GeoJsonDocumentRasterOverlay.h>
 #include <CesiumUtility/Color.h>
 #include <CesiumVectorData/GeoJsonDocument.h>
 #include <CesiumVectorData/VectorStyle.h>
+#include <CesiumVectorOverlays/GeoJsonDocumentRasterOverlay.h>
 
 #include <DotNet/CesiumForUnity/Cesium3DTileset.h>
 #include <DotNet/CesiumForUnity/CesiumGeoJsonDocument.h>
@@ -22,6 +22,7 @@
 #include <spdlog/spdlog.h>
 
 using namespace Cesium3DTilesSelection;
+using namespace CesiumVectorOverlays;
 using namespace CesiumRasterOverlays;
 using namespace CesiumVectorData;
 using namespace DotNet;

native~/src/Runtime/CesiumGeoJsonDocumentRasterOverlayImpl.cpp

@@ -9,7 +9,7 @@ class Cesium3DTileset;
 class CesiumGeoJsonDocumentRasterOverlay;
 } // namespace DotNet::CesiumForUnity
 
-namespace CesiumRasterOverlays {
+namespace CesiumVectorOverlays {
 class GeoJsonDocumentRasterOverlay;
 }
 
@@ -34,7 +34,7 @@ class CesiumGeoJsonDocumentRasterOverlayImpl
 
 private:
   CesiumUtility::IntrusivePointer<
-      CesiumRasterOverlays::GeoJsonDocumentRasterOverlay>
+      CesiumVectorOverlays::GeoJsonDocumentRasterOverlay>
       _pOverlay;
 };
 

native~/src/Runtime/CesiumGeoJsonDocumentRasterOverlayImpl.h

@@ -15,13 +15,14 @@
 #include <cstring>
 
 using namespace CesiumGltf;
+using namespace CesiumImage;
 using namespace DotNet;
 
 namespace CesiumForUnityNative {
 
 namespace {
 UnityEngine::TextureFormat
-getCompressedPixelFormat(const CesiumGltf::ImageAsset& image) {
+getCompressedPixelFormat(const CesiumImage::ImageAsset& image) {
   switch (image.compressedPixelFormat) {
   case GpuCompressedPixelFormat::ETC1_RGB:
     return UnityEngine::TextureFormat::ETC_RGB4;
@@ -55,7 +56,7 @@ getCompressedPixelFormat(const CesiumGltf::ImageAsset& image) {
 }
 
 UnityEngine::TextureFormat
-getUncompressedPixelFormat(const CesiumGltf::ImageAsset& image) {
+getUncompressedPixelFormat(const CesiumImage::ImageAsset& image) {
   switch (image.channels) {
   case 1:
     return UnityEngine::TextureFormat::R8;
@@ -72,7 +73,7 @@ getUncompressedPixelFormat(const CesiumGltf::ImageAsset& image) {
 } // namespace
 
 UnityEngine::Texture
-TextureLoader::loadTexture(const CesiumGltf::ImageAsset& image, bool sRGB) {
+TextureLoader::loadTexture(const CesiumImage::ImageAsset& image, bool sRGB) {
   CESIUM_TRACE("TextureLoader::loadTexture");
   std::int32_t mipCount =
       image.mipPositions.empty() ? 1 : std::int32_t(image.mipPositions.size());