Merge branch 'main' into primitive-edges

Author: timoore

.github/workflows/buildLinux.yml

@@ -39,7 +39,7 @@ jobs:
       - name: Removed unneeded packages to gain disk space
         run: |
           sudo apt update
-          sudo apt remove google-chrome-stable clang-13 clang-14 clang-15 clang-format-13 clang-format-14 clang-format-15 llvm-13-dev llvm-13-linker-tools llvm-13-runtime llvm-13-tools llvm-13 llvm-14-dev llvm-14-linker-tools llvm-14-runtime llvm-14-tools llvm-14 llvm-15-dev llvm-15-linker-tools llvm-15-runtime llvm-15-tools llvm-15 x11-common xserver-common aspnetcore-runtime-6.0 aspnetcore-runtime-7.0 aspnetcore-runtime-8.0 aspnetcore-runtime-9.0 aspnetcore-targeting-pack-6.0 aspnetcore-targeting-pack-7.0 aspnetcore-targeting-pack-8.0 aspnetcore-targeting-pack-9.0 docker-ce-cli docker-ce dotnet-apphost-pack-6.0 dotnet-apphost-pack-7.0 dotnet-apphost-pack-8.0 dotnet-apphost-pack-9.0 dotnet-host dotnet-hostfxr-6.0 dotnet-hostfxr-7.0 dotnet-hostfxr-8.0 dotnet-hostfxr-9.0 dotnet-runtime-6.0 dotnet-runtime-7.0 dotnet-runtime-8.0 dotnet-runtime-9.0 dotnet-runtime-deps-6.0 dotnet-runtime-deps-7.0 dotnet-runtime-deps-8.0 dotnet-runtime-deps-9.0 dotnet-sdk-6.0 dotnet-sdk-7.0 dotnet-sdk-8.0 dotnet-sdk-9.0 dotnet-targeting-pack-6.0 dotnet-targeting-pack-7.0 dotnet-targeting-pack-8.0 dotnet-targeting-pack-9.0 eatmydata emacsen-common firebird3.0-common-doc firebird3.0-common firefox kubectl mercurial-common mercurial microsoft-edge-stable mssql-tools mysql-client-8.0 mysql-client-core-8.0 mysql-client mysql-common mysql-server-8.0 php8.1 postgresql-14 azure-cli microsoft-edge-stable google-cloud-cli temurin-21-jdk temurin-17-jdk temurin-11-jdk temurin-8-jdk powershell google-cloud-cli-anthoscli mysql-server-core-8.0 containerd.io libllvm15 libllvm14 libllvm13 mono-devel libclang-common-15-dev libclang-common-14-dev libclang-common-13-dev apache2-bin apache2-data apache2-utils apache2 containerd.io cpp-9 cpp-10 cpp-11 cpp-12 cpp docker-ce-cli docker-ce emacsen-common g++-9 g++-10 g++-11 g++-12 g++ gcc-9-base gcc-10-base gcc-11-base gcc-9 gcc-10 gcc-11 gcc-12 gcc gfortran-9 gfortran-10 gfortran-11 gfortran-12 gfortran ruby-dev ruby-full ruby-net-telnet ruby-rubygems ruby-webrick ruby-xmlrpc ruby3.0-dev ruby3.0-doc ruby3.0 ruby rubygems-integration alsa-topology-conf alsa-ucm-conf ant byobu cifs-utils conmon crun debugedit dirmngr imagemagick-6.q16 imagemagick-6-common imagemagick golang-github-containernetworking-plugin-dnsname golang-github-containers-common golang-github-containers-image java-common javascript-common postgresql-client-14 postgresql-client-common postgresql-common vim vim-common vim-runtime vim-tiny tex-common texinfo
+          sudo apt remove google-chrome-stable clang-13 clang-14 clang-15 clang-format-13 clang-format-14 clang-format-15 llvm-13-dev llvm-13-linker-tools llvm-13-runtime llvm-13-tools llvm-13 llvm-14-dev llvm-14-linker-tools llvm-14-runtime llvm-14-tools llvm-14 llvm-15-dev llvm-15-linker-tools llvm-15-runtime llvm-15-tools llvm-15 x11-common xserver-common aspnetcore-runtime-6.0 aspnetcore-runtime-7.0 aspnetcore-runtime-8.0 aspnetcore-runtime-9.0 aspnetcore-targeting-pack-6.0 aspnetcore-targeting-pack-7.0 aspnetcore-targeting-pack-8.0 aspnetcore-targeting-pack-9.0 docker-ce-cli docker-ce dotnet-apphost-pack-6.0 dotnet-apphost-pack-7.0 dotnet-apphost-pack-8.0 dotnet-apphost-pack-9.0 dotnet-host dotnet-hostfxr-6.0 dotnet-hostfxr-7.0 dotnet-hostfxr-8.0 dotnet-hostfxr-9.0 dotnet-runtime-6.0 dotnet-runtime-7.0 dotnet-runtime-8.0 dotnet-runtime-9.0 dotnet-runtime-deps-6.0 dotnet-runtime-deps-7.0 dotnet-runtime-deps-8.0 dotnet-runtime-deps-9.0 dotnet-sdk-6.0 dotnet-sdk-7.0 dotnet-sdk-8.0 dotnet-sdk-9.0 dotnet-targeting-pack-6.0 dotnet-targeting-pack-7.0 dotnet-targeting-pack-8.0 dotnet-targeting-pack-9.0 eatmydata emacsen-common firebird3.0-common-doc firebird3.0-common firefox kubectl mercurial-common mercurial microsoft-edge-stable mssql-tools mysql-client-8.0 mysql-client-core-8.0 mysql-client mysql-common mysql-server-8.0 php8.1 postgresql-14 azure-cli microsoft-edge-stable google-cloud-cli temurin-21-jdk temurin-17-jdk temurin-11-jdk temurin-8-jdk powershell mysql-server-core-8.0 containerd.io libllvm15 libllvm14 libllvm13 mono-devel libclang-common-15-dev libclang-common-14-dev libclang-common-13-dev apache2-bin apache2-data apache2-utils apache2 containerd.io cpp-9 cpp-10 cpp-11 cpp-12 cpp docker-ce-cli docker-ce emacsen-common g++-9 g++-10 g++-11 g++-12 g++ gcc-9-base gcc-10-base gcc-11-base gcc-9 gcc-10 gcc-11 gcc-12 gcc gfortran-9 gfortran-10 gfortran-11 gfortran-12 gfortran ruby-dev ruby-full ruby-net-telnet ruby-rubygems ruby-webrick ruby-xmlrpc ruby3.0-dev ruby3.0-doc ruby3.0 ruby rubygems-integration alsa-topology-conf alsa-ucm-conf ant byobu cifs-utils conmon crun debugedit dirmngr imagemagick-6.q16 imagemagick-6-common imagemagick golang-github-containernetworking-plugin-dnsname golang-github-containers-common golang-github-containers-image java-common javascript-common postgresql-client-14 postgresql-client-common postgresql-common vim vim-common vim-runtime vim-tiny tex-common texinfo
           df -h
           sudo rm -rf /usr/local/lib/android || true
           sudo rm -rf /usr/share/dotnet || true

CHANGES.md

@@ -2,11 +2,17 @@
 
 ### ? - ?
 
+##### Additions :tada:
+
+- Added `CesiumVectorTilesRasterOverlay` supporting vector data loaded from 3D Tiles tilesets.
+- Added support for displaying points in `CesiumGeoJsonDocumentRasterOverlay` and `CesiumVectorTilesRasterOverlay`.
+
 ##### Fixes :wrench:
 
 - Added missing includes that introduced compilation failures when building the plugin from source against UE 5.7's bundled clang 20.1.8 toolchain (introduced in v2.25.0 by #1685; binary plugin users were unaffected).
 - Fixed the case where glTF line primitives caused excessive log spam due to Chaos attempting to generate physics bodies for small non-triangle meshes.
 - Fixed an incorrect transform that reversed the appearance of data in box voxel tilesets.
+- Fixed a crash in `UCesiumGaussianSplatSubsystem::Tick` when `GetPrimaryWorld()` returns `nullptr` (e.g. between PIE shutdown and Standalone-Game launch, or on nDisplay secondary nodes during world bind-up). Restores the validity check ordering that shipped in v2.24.1 and was inadvertently inverted in v2.26.0 (#1841).
 
 ### v2.26.0 - 2026-05-01
 

Source/CesiumRuntime/Private/CesiumGaussianSplatSubsystem.cpp

@@ -229,13 +229,6 @@ void UCesiumGaussianSplatSubsystem::Tick(float DeltaTime) {
   }
 
   UWorld* pWorld = GetPrimaryWorld();
-  // Gaussian splats are purely visual, so we don't need to initialize them if
-  // we can't render anything. Besides, the Niagara component will fail to
-  // spawn if either of these conditions are false (they are checked in
-  // UNiagaraFunctionLibrary::CreateNiagaraSystem).
-  if (!FApp::CanEverRender() || pWorld->IsNetMode(NM_DedicatedServer)) {
-    return;
-  }
 
   if (!IsValid(pWorld)) {
     if (IsValid(this->_pNiagaraActor)) {
@@ -245,6 +238,14 @@ void UCesiumGaussianSplatSubsystem::Tick(float DeltaTime) {
     return;
   }
 
+  // Gaussian splats are purely visual, so we don't need to initialize them if
+  // we can't render anything. Besides, the Niagara component will fail to
+  // spawn if either of these conditions are false (they are checked in
+  // UNiagaraFunctionLibrary::CreateNiagaraSystem).
+  if (!FApp::CanEverRender() || pWorld->IsNetMode(NM_DedicatedServer)) {
+    return;
+  }
+
   if (!IsValid(this->_pNiagaraActor) || pWorld != this->_pLastCreatedWorld) {
     this->initializeForWorld(*pWorld);
   }

Source/CesiumRuntime/Private/CesiumGeoJsonDocumentRasterOverlay.cpp

@@ -6,8 +6,8 @@
 #include "CesiumGeometry/QuadtreeTilingScheme.h"
 #include "CesiumGeospatial/GlobeRectangle.h"
 #include "CesiumGeospatial/Projection.h"
-#include "CesiumRasterOverlays/GeoJsonDocumentRasterOverlay.h"
 #include "CesiumVectorData/VectorStyle.h"
+#include "CesiumVectorOverlays/GeoJsonDocumentRasterOverlay.h"
 
 #include "CesiumRuntime.h"
 
@@ -52,7 +52,7 @@ UCesiumGeoJsonDocumentRasterOverlay::CreateOverlay(
     return nullptr;
   }
 
-  CesiumRasterOverlays::GeoJsonDocumentRasterOverlayOptions vectorOptions{
+  CesiumVectorOverlays::GeoJsonDocumentRasterOverlayOptions vectorOptions{
       this->DefaultStyle.toNative(),
       options.ellipsoid,
       this->MipLevels};
@@ -63,7 +63,7 @@ UCesiumGeoJsonDocumentRasterOverlay::CreateOverlay(
       this->CesiumIonServer = UCesiumIonServer::GetServerForNewObjects();
     }
 
-    return std::make_unique<CesiumRasterOverlays::GeoJsonDocumentRasterOverlay>(
+    return std::make_unique<CesiumVectorOverlays::GeoJsonDocumentRasterOverlay>(
         TCHAR_TO_UTF8(*this->MaterialLayerKey),
         wrapLoaderFuture(
             this,
@@ -85,7 +85,7 @@ UCesiumGeoJsonDocumentRasterOverlay::CreateOverlay(
       headers.push_back({TCHAR_TO_UTF8(*k), TCHAR_TO_UTF8(*v)});
     }
 
-    return std::make_unique<CesiumRasterOverlays::GeoJsonDocumentRasterOverlay>(
+    return std::make_unique<CesiumVectorOverlays::GeoJsonDocumentRasterOverlay>(
         TCHAR_TO_UTF8(*this->MaterialLayerKey),
         wrapLoaderFuture(
             this,
@@ -102,7 +102,7 @@ UCesiumGeoJsonDocumentRasterOverlay::CreateOverlay(
     this->OnDocumentLoaded.Execute(this->GeoJsonDocument);
   }
 
-  return std::make_unique<CesiumRasterOverlays::GeoJsonDocumentRasterOverlay>(
+  return std::make_unique<CesiumVectorOverlays::GeoJsonDocumentRasterOverlay>(
       getAsyncSystem(),
       TCHAR_TO_UTF8(*this->MaterialLayerKey),
       this->GeoJsonDocument.GetDocument(),

Source/CesiumRuntime/Private/CesiumGltfComponent.cpp

@@ -3518,7 +3518,7 @@ ConstructedPrimitiveComponent createPrimitiveComponent(
     const TSharedPtr<FCesiumPrimitiveFeatures>& pInstanceFeatures) {
   ConstructedPrimitiveComponent result;
 
-  if (!instanceTransforms.empty()) {
+  if (instanceTransforms.size()) {
     auto* pInstancedComponent =
         NewObject<UCesiumGltfInstancedComponent>(pGltf, componentName);
 
@@ -3536,35 +3536,35 @@ ConstructedPrimitiveComponent createPrimitiveComponent(
     }
     result.pAsMeshComponent = pInstancedComponent;
     result.pAsCesiumPrimitive = pInstancedComponent;
-  }
-
-  switch (primitiveMode) {
-  case CesiumGltf::MeshPrimitive::Mode::POINTS: {
-    auto* pPointMesh =
-        NewObject<UCesiumGltfPointsComponent>(pGltf, componentName);
-    pPointMesh->UsesAdditiveRefinement =
-        tile.getRefine() == Cesium3DTilesSelection::TileRefine::Add;
-    pPointMesh->GeometricError = static_cast<float>(tile.getGeometricError());
-    pPointMesh->Dimensions = loadResult.dimensions;
-    result.pAsMeshComponent = pPointMesh;
-    result.pAsCesiumPrimitive = pPointMesh;
-    break;
-  }
-  case CesiumGltf::MeshPrimitive::Mode::LINES:
-  case CesiumGltf::MeshPrimitive::Mode::LINE_LOOP:
-  case CesiumGltf::MeshPrimitive::Mode::LINE_STRIP: {
-    auto* pLinesComponent =
-        NewObject<UCesiumGltfLinesComponent>(pGltf, componentName);
-    result.pAsMeshComponent = pLinesComponent;
-    result.pAsCesiumPrimitive = pLinesComponent;
-    break;
-  }
-  default:
-    auto* pPrimitiveComponent =
-        NewObject<UCesiumGltfPrimitiveComponent>(pGltf, componentName);
-    result.pAsMeshComponent = pPrimitiveComponent;
-    result.pAsCesiumPrimitive = pPrimitiveComponent;
-    break;
+  } else {
+    switch (primitiveMode) {
+    case CesiumGltf::MeshPrimitive::Mode::POINTS: {
+      auto* pPointMesh =
+          NewObject<UCesiumGltfPointsComponent>(pGltf, componentName);
+      pPointMesh->UsesAdditiveRefinement =
+          tile.getRefine() == Cesium3DTilesSelection::TileRefine::Add;
+      pPointMesh->GeometricError = static_cast<float>(tile.getGeometricError());
+      pPointMesh->Dimensions = loadResult.dimensions;
+      result.pAsMeshComponent = pPointMesh;
+      result.pAsCesiumPrimitive = pPointMesh;
+      break;
+    }
+    case CesiumGltf::MeshPrimitive::Mode::LINES:
+    case CesiumGltf::MeshPrimitive::Mode::LINE_LOOP:
+    case CesiumGltf::MeshPrimitive::Mode::LINE_STRIP: {
+      auto* pLinesComponent =
+          NewObject<UCesiumGltfLinesComponent>(pGltf, componentName);
+      result.pAsMeshComponent = pLinesComponent;
+      result.pAsCesiumPrimitive = pLinesComponent;
+      break;
+    }
+    default:
+      auto* pPrimitiveComponent =
+          NewObject<UCesiumGltfPrimitiveComponent>(pGltf, componentName);
+      result.pAsMeshComponent = pPrimitiveComponent;
+      result.pAsCesiumPrimitive = pPrimitiveComponent;
+      break;
+    }
   }
 
   CESIUM_ASSERT(result.pAsMeshComponent && result.pAsCesiumPrimitive);
@@ -3654,7 +3654,7 @@ UStaticMesh* createStaticMesh(
     TUniquePtr<FStaticMeshRenderData>&& pRenderData) {
   TRACE_CPUPROFILER_EVENT_SCOPE(Cesium::SetupMesh)
 
-  auto pStaticMesh = NewObject<UStaticMesh>(pMeshComponent, componentName);
+  auto* pStaticMesh = NewObject<UStaticMesh>(pMeshComponent, componentName);
   // Unreal will crash trying to generate ray tracing information for a
   // static mesh without triangles (and it doesn't make sense anyways!)
   switch (primitiveMode) {

Source/CesiumRuntime/Private/CesiumGltfInstancedComponent.cpp

@@ -28,8 +28,7 @@ void UCesiumGltfInstancedComponent::BeginDestroy() {
   // Clear everything we can in order to reduce memory usage, because this
   // UObject might not actually get deleted by the garbage collector until
   // much later.
-  ICesiumPrimitive* pCesiumPrimitive = Cast<ICesiumPrimitive>(this);
-  pCesiumPrimitive->getPrimitiveData().destroy();
+  this->getPrimitiveData().destroy();
 
   if (UMaterialInstanceDynamic* pMaterial =
           Cast<UMaterialInstanceDynamic>(this->GetMaterial(0))) {
@@ -49,15 +48,15 @@ void UCesiumGltfInstancedComponent::BeginDestroy() {
 FBoxSphereBounds UCesiumGltfInstancedComponent::CalcBounds(
     const FTransform& LocalToWorld) const {
   const CesiumPrimitiveData& primitiveData = this->getPrimitiveData();
-  if (!primitiveData.boundingVolume) {
-    return Super::CalcBounds(LocalToWorld);
-  }
 
-  std::optional<FBoxSphereBounds> maybeBounds = std::visit(
-      CalcBoundsOperation{
-          LocalToWorld,
-          primitiveData.highPrecisionNodeTransform},
-      *primitiveData.boundingVolume);
+  std::optional<FBoxSphereBounds> maybeBounds = std::nullopt;
+  if (primitiveData.boundingVolume) {
+    maybeBounds = std::visit(
+        CalcBoundsOperation{
+            LocalToWorld,
+            primitiveData.highPrecisionNodeTransform},
+        *primitiveData.boundingVolume);
+  }
   return maybeBounds.value_or(Super::CalcBounds(LocalToWorld));
 }
 

Source/CesiumRuntime/Private/CesiumGltfPrimitiveComponent.cpp

@@ -29,8 +29,7 @@ void UCesiumGltfPrimitiveComponent::BeginDestroy() {
   // Clear everything we can in order to reduce memory usage, because this
   // UObject might not actually get deleted by the garbage collector until
   // much later.
-  ICesiumPrimitive* pCesiumPrimitive = Cast<ICesiumPrimitive>(this);
-  pCesiumPrimitive->getPrimitiveData().destroy();
+  this->getPrimitiveData().destroy();
 
   if (UMaterialInstanceDynamic* pMaterial =
           Cast<UMaterialInstanceDynamic>(this->GetMaterial(0))) {
@@ -50,15 +49,15 @@ void UCesiumGltfPrimitiveComponent::BeginDestroy() {
 FBoxSphereBounds UCesiumGltfPrimitiveComponent::CalcBounds(
     const FTransform& LocalToWorld) const {
   const CesiumPrimitiveData& primitiveData = this->getPrimitiveData();
-  if (!primitiveData.boundingVolume) {
-    return Super::CalcBounds(LocalToWorld);
-  }
 
-  std::optional<FBoxSphereBounds> maybeBounds = std::visit(
-      CalcBoundsOperation{
-          LocalToWorld,
-          primitiveData.highPrecisionNodeTransform},
-      *primitiveData.boundingVolume);
+  std::optional<FBoxSphereBounds> maybeBounds = std::nullopt;
+  if (primitiveData.boundingVolume) {
+    maybeBounds = std::visit(
+        CalcBoundsOperation{
+            LocalToWorld,
+            primitiveData.highPrecisionNodeTransform},
+        *primitiveData.boundingVolume);
+  }
   return maybeBounds.value_or(Super::CalcBounds(LocalToWorld));
 }