Add RequestHeaders property to Cesium3DTileset

CHANGES.md

@@ -4,6 +4,7 @@
 
 ##### Additions :tada:
 
+- Added `RequestHeaders` property to `Cesium3DTileset`, allowing per-tileset headers to be specified.
 - Added `CesiumUrlTemplateRasterOverlay`, allowing a raster overlay to be added using tiles requested based on a specified URL template.
 
 ##### Fixes :wrench:

Source/CesiumRuntime/CesiumRuntime.Build.cs

@@ -113,7 +113,7 @@ public CesiumRuntime(ReadOnlyTargetRules Target) : base(Target)
                 "LIBASYNC_STATIC",
                 "GLM_FORCE_XYZW_ONLY",
                 "GLM_FORCE_EXPLICIT_CTOR",
-                "GLM_FORCE_SIZE_T_LENGTH",
+                "GLM_ENABLE_EXPERIMENTAL",
                 "TIDY_STATIC",
                 "URI_STATIC_BUILD",
                 "SWL_VARIANT_NO_CONSTEXPR_EMPLACE",

Source/CesiumRuntime/Private/Cesium3DTileset.cpp

@@ -385,6 +385,31 @@ void ACesium3DTileset::SetTilesetSource(ETilesetSource InSource) {
   }
 }
 
+bool CompareMaps(
+    const TMap<FString, FString>& Lhs,
+    const TMap<FString, FString>& Rhs) {
+  if (Lhs.Num() != Rhs.Num()) {
+    return false;
+  }
+
+  for (const auto& [Key, Value] : Lhs) {
+    const FString* RhsVal = Rhs.Find(Key);
+    if (!RhsVal || *RhsVal != Value) {
+      return false;
+    }
+  }
+
+  return true;
+}
+
+void ACesium3DTileset::SetRequestHeaders(
+    const TMap<FString, FString>& InRequestHeaders) {
+  if (!CompareMaps(InRequestHeaders, this->RequestHeaders)) {
+    this->DestroyTileset();
+    this->RequestHeaders = InRequestHeaders;
+  }
+}
+
 void ACesium3DTileset::SetUrl(const FString& InUrl) {
   if (InUrl != this->Url) {
     if (this->TilesetSource == ETilesetSource::FromUrl) {
@@ -1287,6 +1312,14 @@ void ACesium3DTileset::LoadTileset() {
 
   options.contentOptions.applyTextureTransform = false;
 
+  options.requestHeaders.reserve(this->RequestHeaders.Num());
+
+  for (const auto& [Key, Value] : this->RequestHeaders) {
+    options.requestHeaders.emplace_back(CesiumAsync::IAssetAccessor::THeader{
+        TCHAR_TO_UTF8(*Key),
+        TCHAR_TO_UTF8(*Value)});
+  }
+
   switch (this->TilesetSource) {
   case ETilesetSource::FromEllipsoid:
     UE_LOG(LogCesium, Log, TEXT("Loading tileset from ellipsoid"));
@@ -2368,6 +2401,7 @@ void ACesium3DTileset::PostEditChangeProperty(
           GET_MEMBER_NAME_CHECKED(ACesium3DTileset, ShowCreditsOnScreen) ||
       PropName == GET_MEMBER_NAME_CHECKED(ACesium3DTileset, Root) ||
       PropName == GET_MEMBER_NAME_CHECKED(ACesium3DTileset, CesiumIonServer) ||
+      PropName == GET_MEMBER_NAME_CHECKED(ACesium3DTileset, RequestHeaders) ||
       // For properties nested in structs, GET_MEMBER_NAME_CHECKED will prefix
       // with the struct name, so just do a manual string comparison.
       PropNameAsString == TEXT("RenderCustomDepth") ||

Source/CesiumRuntime/Private/GeoTransforms.cpp

@@ -8,7 +8,6 @@
 #include "VecMath.h"
 #include <glm/gtc/matrix_inverse.hpp>
 
-#define GLM_ENABLE_EXPERIMENTAL
 #include <glm/gtx/quaternion.hpp>
 
 using namespace CesiumGeospatial;

Source/CesiumRuntime/Public/Cesium3DTileset.h

@@ -764,6 +764,16 @@ class CESIUMRUNTIME_API ACesium3DTileset : public AActor {
       meta = (EditCondition = "TilesetSource==ETilesetSource::FromCesiumIon"))
   UCesiumIonServer* CesiumIonServer;
 
+  /**
+   * Headers to be attached to each request made for this tileset.
+   */
+  UPROPERTY(
+      EditAnywhere,
+      BlueprintGetter = GetRequestHeaders,
+      BlueprintSetter = SetRequestHeaders,
+      Category = "Cesium")
+  TMap<FString, FString> RequestHeaders;
+
   /**
    * Check if the Cesium ion token used to access this tileset is working
    * correctly, and fix it if necessary.
@@ -972,6 +982,12 @@ class CESIUMRUNTIME_API ACesium3DTileset : public AActor {
   UFUNCTION(BlueprintSetter, Category = "Cesium")
   void SetUrl(const FString& InUrl);
 
+  UFUNCTION(BlueprintGetter, Category = "Cesium")
+  TMap<FString, FString> GetRequestHeaders() const { return RequestHeaders; }
+
+  UFUNCTION(BlueprintSetter, Category = "Cesium")
+  void SetRequestHeaders(const TMap<FString, FString>& InRequestHeaders);
+
   UFUNCTION(BlueprintGetter, Category = "Cesium")
   int64 GetIonAssetID() const { return IonAssetID; }