Merge remote-tracking branch 'origin/main' into UpdateTilesetCollisionChannelResponse

Author: kring

.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-dev 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 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
           df -h
           sudo rm -rf /usr/local/lib/android || true
           sudo rm -rf /usr/share/dotnet || true

CHANGES.md

@@ -1,6 +1,17 @@
 # Change Log {#changes}
 
-- adding a function to change the collision response of a Cesium3DTileset by collision channel.
+### ? - ?
+
+##### Additions :tada:
+
+- Added `CesiumAzureMapsRasterOverlay`.
+- Added the interface `ICesium3DTilesetLifecycleEventReceiver`: when an implementation is registered on a tileset (with `ACesium3DTileset::SetLifecycleEventReceiver`), its functions will be called at various points in a tile's lifecycle, like when a mesh component is created, when a material is instanced, when the tile changes visibility, when it is unloaded, etc.
+- Added `ACesium3DTileset::SetCollisionResponseToChannel`, allowing change of the the collision response of a tileset by collision channel.
+
+##### Fixes :wrench:
+
+- Fixed a bug where `CesiumCreditSystem` would not filter out empty credits, resulting in duplicate on-screen delimiters.
+- Fixed a problem where multi-selecting `UCesiumGlobeAnchorComponent` could cause the selected components to teleport to 0 degrees longitude and 0 degrees latitude. Now, the geospatial position and orientation fields are hidden while multi-selecting.
 
 ### v2.20.0 - 2025-10-01
 

Source/CesiumEditor/Private/CesiumGlobeAnchorCustomization.cpp

@@ -7,8 +7,12 @@
 #include "CesiumGlobeAnchorComponent.h"
 #include "DetailCategoryBuilder.h"
 #include "DetailLayoutBuilder.h"
+#include "DetailWidgetRow.h"
 #include "IDetailGroup.h"
 #include "Widgets/SToolTip.h"
+#include "Widgets/Text/STextBlock.h"
+
+#define LOCTEXT_NAMESPACE "CesiumGlobeAnchorCustomization"
 
 FName FCesiumGlobeAnchorCustomization::RegisteredLayoutName;
 
@@ -36,6 +40,7 @@ FCesiumGlobeAnchorCustomization::MakeInstance() {
 void FCesiumGlobeAnchorCustomization::CustomizeDetails(
     IDetailLayoutBuilder& DetailBuilder) {
   DetailBuilder.GetObjectsBeingCustomized(this->SelectedObjects);
+  const bool bIsMultiSelect = this->SelectedObjects.Num() > 1;
 
   IDetailCategoryBuilder& CesiumCategory = DetailBuilder.EditCategory("Cesium");
 
@@ -67,11 +72,29 @@ void FCesiumGlobeAnchorCustomization::CustomizeDetails(
       UCesiumGlobeAnchorComponent,
       TeleportWhenUpdatingTransform));
 
-  this->UpdateDerivedProperties();
-
-  this->CreatePositionLongitudeLatitudeHeight(DetailBuilder, CesiumCategory);
-  this->CreatePositionEarthCenteredEarthFixed(DetailBuilder, CesiumCategory);
-  this->CreateRotationEastSouthUp(DetailBuilder, CesiumCategory);
+  if (!bIsMultiSelect) {
+    this->UpdateDerivedProperties();
+    this->CreatePositionLongitudeLatitudeHeight(DetailBuilder, CesiumCategory);
+    this->CreatePositionEarthCenteredEarthFixed(DetailBuilder, CesiumCategory);
+    this->CreateRotationEastSouthUp(DetailBuilder, CesiumCategory);
+  } else {
+    FDetailWidgetRow& Row =
+        CesiumCategory
+            .AddCustomRow(
+                LOCTEXT("MultipleSelectionFilter", "Multiple Selection"))
+            .FilterString(LOCTEXT(
+                "MultipleSelectionFilters",
+                "Latitude Longitude Height ECEF ESU"));
+
+    Row.WholeRowContent()[SNew(SBox).Padding(FMargin(
+        0.f,
+        4.f))[SNew(STextBlock)
+                  .Text(LOCTEXT(
+                      "MultiSelectInfo",
+                      "Multiple actors selected. Geodetic position (Latitude, Longitude, Height; ECEF) and "
+                      "ESU rotation cannot be edited in multi-select. Select a single actor to edit these values."))
+                  .AutoWrapText(true)]];
+  }
 }
 
 void FCesiumGlobeAnchorCustomization::CreatePositionEarthCenteredEarthFixed(
@@ -296,3 +319,5 @@ TStatId UCesiumGlobeAnchorDerivedProperties::GetStatId() const {
       UCesiumGlobeAnchorRotationEastSouthUp,
       STATGROUP_Tickables);
 }
+
+#undef LOCTEXT_NAMESPACE

Source/CesiumRuntime/Private/Cesium3DTileset.cpp

@@ -1,6 +1,7 @@
 // Copyright 2020-2024 CesiumGS, Inc. and Contributors
 
 #include "Cesium3DTileset.h"
+
 #include "Async/Async.h"
 #include "Camera/CameraTypes.h"
 #include "Camera/PlayerCameraManager.h"
@@ -9,6 +10,7 @@
 #include "Cesium3DTilesSelection/TilesetLoadFailureDetails.h"
 #include "Cesium3DTilesSelection/TilesetOptions.h"
 #include "Cesium3DTilesSelection/TilesetSharedAssetSystem.h"
+#include "Cesium3DTilesetLifecycleEventReceiver.h"
 #include "Cesium3DTilesetLoadFailureDetails.h"
 #include "Cesium3DTilesetRoot.h"
 #include "CesiumActors.h"
@@ -48,12 +50,14 @@
 #include "StereoRendering.h"
 #include "UnrealPrepareRendererResources.h"
 #include "VecMath.h"
+
 #include <glm/gtc/matrix_inverse.hpp>
 #include <memory>
 #include <spdlog/spdlog.h>
 
 #ifdef CESIUM_DEBUG_TILE_STATES
 #include "HAL/PlatformFileManager.h"
+
 #include <Cesium3DTilesSelection/DebugTileStateDatabase.h>
 #endif
 
@@ -2360,4 +2364,17 @@ void ACesium3DTileset::SetCollisionResponseToChannel(
       }
     }
   }
-}
+}
+
+ICesium3DTilesetLifecycleEventReceiver*
+ACesium3DTileset::GetLifecycleEventReceiver() {
+  return Cast<ICesium3DTilesetLifecycleEventReceiver>(
+      this->_pLifecycleEventReceiver);
+}
+
+void ACesium3DTileset::SetLifecycleEventReceiver(UObject* InEventReceiver) {
+  if (UKismetSystemLibrary::DoesImplementInterface(
+          InEventReceiver,
+          UCesium3DTilesetLifecycleEventReceiver::StaticClass()))
+    this->_pLifecycleEventReceiver = InEventReceiver;
+}

Source/CesiumRuntime/Private/Cesium3DTilesetLifecycleEventReceiver.cpp

@@ -0,0 +1,33 @@
+// Copyright 2020-2025 CesiumGS, Inc. and Contributors
+
+#include "Cesium3DTilesetLifecycleEventReceiver.h"
+
+#include "Materials/MaterialInstanceDynamic.h"
+
+UMaterialInstanceDynamic*
+ICesium3DTilesetLifecycleEventReceiver::CreateMaterial(
+    ICesiumLoadedTilePrimitive& TilePrimitive,
+    UMaterialInterface* DefaultBaseMaterial,
+    const FName& Name) {
+  // Default implementation: just create a new instance
+  return UMaterialInstanceDynamic::Create(DefaultBaseMaterial, nullptr, Name);
+}
+
+void ICesium3DTilesetLifecycleEventReceiver::CustomizeMaterial(
+    ICesiumLoadedTilePrimitive& TilePrimitive,
+    UMaterialInstanceDynamic& Material,
+    const UCesiumMaterialUserData* CesiumData,
+    const CesiumGltf::Material& GltfMaterial) {}
+
+void ICesium3DTilesetLifecycleEventReceiver::OnTileMeshPrimitiveLoaded(
+    ICesiumLoadedTilePrimitive& TilePrimitive) {}
+
+void ICesium3DTilesetLifecycleEventReceiver::OnTileLoaded(
+    ICesiumLoadedTile& Tile) {}
+
+void ICesium3DTilesetLifecycleEventReceiver::OnTileVisibilityChanged(
+    ICesiumLoadedTile& Tile,
+    bool bVisible) {}
+
+void ICesium3DTilesetLifecycleEventReceiver::OnTileUnloading(
+    ICesiumLoadedTile& Tile) {}

Source/CesiumRuntime/Private/CesiumAzureMapsRasterOverlay.cpp

@@ -0,0 +1,65 @@
+// Copyright 2020-2025 CesiumGS, Inc. and Contributors
+
+#include "CesiumAzureMapsRasterOverlay.h"
+#include <Cesium3DTilesSelection/Tileset.h>
+#include <CesiumRasterOverlays/AzureMapsRasterOverlay.h>
+
+using namespace CesiumRasterOverlays;
+
+namespace {
+std::string getTilesetId(EAzureMapsTilesetId tilesetId) {
+  switch (tilesetId) {
+  case EAzureMapsTilesetId::BaseDarkGrey:
+    return AzureMapsTilesetId::baseDarkGrey;
+  case EAzureMapsTilesetId::BaseLabelsRoad:
+    return AzureMapsTilesetId::baseLabelsRoad;
+  case EAzureMapsTilesetId::BaseLabelsDarkGrey:
+    return AzureMapsTilesetId::baseLabelsDarkGrey;
+  case EAzureMapsTilesetId::BaseHybridRoad:
+    return AzureMapsTilesetId::baseHybridRoad;
+  case EAzureMapsTilesetId::BaseHybridDarkGrey:
+    return AzureMapsTilesetId::baseHybridDarkGrey;
+  case EAzureMapsTilesetId::Imagery:
+    return AzureMapsTilesetId::imagery;
+  case EAzureMapsTilesetId::Terra:
+    return AzureMapsTilesetId::terra;
+  case EAzureMapsTilesetId::WeatherRadar:
+    return AzureMapsTilesetId::weatherRadar;
+  case EAzureMapsTilesetId::WeatherInfrared:
+    return AzureMapsTilesetId::weatherInfrared;
+  case EAzureMapsTilesetId::TrafficAbsolute:
+    return AzureMapsTilesetId::trafficAbsolute;
+  case EAzureMapsTilesetId::TrafficRelativeMain:
+    return AzureMapsTilesetId::trafficRelativeMain;
+  case EAzureMapsTilesetId::TrafficRelativeDark:
+    return AzureMapsTilesetId::trafficRelativeDark;
+  case EAzureMapsTilesetId::TrafficDelay:
+    return AzureMapsTilesetId::trafficDelay;
+  case EAzureMapsTilesetId::TrafficReduced:
+    return AzureMapsTilesetId::trafficReduced;
+  case EAzureMapsTilesetId::BaseRoad:
+  default:
+    return AzureMapsTilesetId::baseRoad;
+  }
+}
+} // namespace
+
+std::unique_ptr<CesiumRasterOverlays::RasterOverlay>
+UCesiumAzureMapsRasterOverlay::CreateOverlay(
+    const CesiumRasterOverlays::RasterOverlayOptions& options) {
+  if (this->Key.IsEmpty()) {
+    // We must have a key to create this overlay.
+    return nullptr;
+  }
+
+  return std::make_unique<AzureMapsRasterOverlay>(
+      TCHAR_TO_UTF8(*this->MaterialLayerKey),
+      AzureMapsSessionParameters{
+          .key = TCHAR_TO_UTF8(*this->Key),
+          .apiVersion = TCHAR_TO_UTF8(*this->ApiVersion),
+          .tilesetId = getTilesetId(this->TilesetId),
+          .language = TCHAR_TO_UTF8(*this->Language),
+          .view = TCHAR_TO_UTF8(*this->View),
+      },
+      options);
+}

Source/CesiumRuntime/Private/CesiumCreditSystem.cpp

@@ -340,15 +340,19 @@ void ACesiumCreditSystem::Tick(float DeltaTime) {
     for (int i = 0; i < creditsToShowThisFrame.size(); i++) {
       const CesiumUtility::Credit& credit = creditsToShowThisFrame[i];
 
-      FString CreditRtf;
+      FString creditRtf;
       const std::string& html = _pCreditSystem->getHtml(credit);
 
       auto htmlFind = _htmlToRtf.find(html);
       if (htmlFind != _htmlToRtf.end()) {
-        CreditRtf = htmlFind->second;
+        creditRtf = htmlFind->second;
       } else {
-        CreditRtf = ConvertHtmlToRtf(html);
-        _htmlToRtf.insert({html, CreditRtf});
+        creditRtf = ConvertHtmlToRtf(html);
+        _htmlToRtf.insert({html, creditRtf});
+      }
+
+      if (creditRtf.IsEmpty()) {
+        continue;
       }
 
       if (_pCreditSystem->shouldBeShownOnScreen(credit)) {
@@ -358,13 +362,13 @@ void ACesiumCreditSystem::Tick(float DeltaTime) {
           OnScreenCredits += TEXT(" \u2022 ");
         }
 
-        OnScreenCredits += CreditRtf;
+        OnScreenCredits += creditRtf;
       } else {
         if (i != 0) {
           Credits += "\n";
         }
 
-        Credits += CreditRtf;
+        Credits += creditRtf;
       }
     }