Merge branch 'main' into for-each-renderable-tile

CHANGES.md

@@ -1,5 +1,16 @@
 # Change Log
 
+### ? - ?
+
+##### Additions :tada:
+
+- Added universal (Intel and Apple Silicon) binaries for Unreal Engine 5.2. Unreal Engine 5.3 and 5.4 already had universal binaries.
+
+##### Fixes :wrench:
+
+- Fixed a bug introduced in the previous release that caused instanced tilesets to render incorrectly.
+- Debug sections are no longer compressed on Linux and Android, improving compatibility.
+
 ### v2.7.1 - 2024-08-01
 
 ##### Fixes :wrench:

Source/CesiumEditor/CesiumEditor.Build.cs

@@ -73,10 +73,6 @@ public CesiumEditor(ReadOnlyTargetRules Target) : base(Target)
 
         string[] allLibs = Directory.GetFiles(libPath, libSearchPattern);
 
-        // Remove libssl and libcrypto because these come from Unreal Engine itself
-        // TODO: Exclude these from the cesium-native side instead of excluding them here.
-        allLibs = allLibs.Where(l => !l.Contains("libssl") && !l.Contains("libcrypto")).ToArray();
-
         PublicAdditionalLibraries.AddRange(allLibs);
 
         PublicDependencyModuleNames.AddRange(

Source/CesiumRuntime/CesiumRuntime.Build.cs

@@ -72,10 +72,6 @@ public CesiumRuntime(ReadOnlyTargetRules Target) : base(Target)
 
         string[] allLibs = Directory.GetFiles(libPath, libSearchPattern);
 
-        // Remove libssl and libcrypto because these come from Unreal Engine itself
-        // TODO: Exclude these from the cesium-native side instead of excluding them here.
-        allLibs = allLibs.Where(l => !l.Contains("libssl") && !l.Contains("libcrypto")).ToArray();
-
         PublicAdditionalLibraries.AddRange(allLibs);
 
         PublicDependencyModuleNames.AddRange(

Source/CesiumRuntime/Private/CesiumGltfComponent.cpp

@@ -1937,8 +1937,9 @@ static void loadInstancingData(
     if (translationAccessor.status() == AccessorViewStatus::Valid) {
       for (int64_t i = 0; i < count; ++i) {
         glm::dvec3 translation(translationAccessor[i]);
-        instanceTransforms[i] =
-            glm::translate(instanceTransforms[i], translation);
+        instanceTransforms[i] = glm::translate(
+            instanceTransforms[i],
+            translation * CesiumPrimitiveData::positionScaleFactor);
       }
     }
   } else {

extern/CMakeLists.txt

@@ -121,6 +121,10 @@ if (NOT VCPKG_TRIPLET)
     endif()
 endif()
 
+# Our OpenSSL is part of Unreal Engine, so need to install it.
+set(CESIUM_EXCLUDE_INSTALL_HEADERS openssl)
+set(CESIUM_EXCLUDE_INSTALL_STATIC_LIBS openssl)
+
 add_subdirectory(cesium-native)
 
 # cesium-native doesn't require this header to be public, but Cesium for Unreal wants to use it.

extern/vcpkg-overlays/zlib-ng/portfile.cmake

@@ -20,7 +20,7 @@ vcpkg_cmake_configure(
         # "NOT ARCH STREQUAL \"aarch64\"" that is meant to set `WITH_ARMV6` to FALSE is not
         # triggered because our ARCH is `aarch64-none-linux-android21`. It's not clear if this
         # is something quirky about our environment or if the fix is just not robust.
-        # Either way, forcing WITH_ARMV6=OFF here fixes the probelm and should be reasonable
+        # Either way, forcing WITH_ARMV6=OFF here fixes the problem and should be reasonable
         # on all platforms that Cesium for Unreal supports.
         -DWITH_ARMV6=OFF
     OPTIONS_RELEASE