Use the vcpkg-enabled version of cesium-native.

Source/CesiumEditor/CesiumEditor.Build.cs

@@ -26,71 +26,52 @@ public CesiumEditor(ReadOnlyTargetRules Target) : base(Target)
             }
         );
 
-        string libPrefix;
-        string libPostfix;
         string platform;
-        if (Target.Platform == UnrealTargetPlatform.Win64) {
-            platform = "Windows-x64";
-            libPostfix = ".lib";
-            libPrefix = "";
+        string libSearchPattern;
+        if (Target.Platform == UnrealTargetPlatform.Win64)
+        {
+            platform = "Windows-AMD64-";
+            libSearchPattern = "*.lib";
         }
-        else if (Target.Platform == UnrealTargetPlatform.Mac) {
-            platform = "Darwin-x64";
-            libPostfix = ".a";
-            libPrefix = "lib";
+        else if (Target.Platform == UnrealTargetPlatform.Mac)
+        {
+            platform = "Darwin-AMD64-";
+            libSearchPattern = "lib*.a";
         }
-        else if(Target.Platform == UnrealTargetPlatform.Android) {
-            platform = "Android-xaarch64";
-            libPostfix = ".a";
-            libPrefix = "lib";
+        else if (Target.Platform == UnrealTargetPlatform.Android)
+        {
+            platform = "Android-ARM64-";
+            libSearchPattern = "lib*.a";
         }
-        else if(Target.Platform == UnrealTargetPlatform.Linux) {
-            platform = "Linux-x64";
-            libPostfix = ".a";
-            libPrefix = "lib";
+        else if (Target.Platform == UnrealTargetPlatform.Linux)
+        {
+            platform = "Linux-AMD64-";
+            libSearchPattern = "lib*.a";
         }
-        else if(Target.Platform == UnrealTargetPlatform.IOS) {
-            platform = "iOS-xarm64";
-            libPostfix = ".a";
-            libPrefix = "lib";
+        else if (Target.Platform == UnrealTargetPlatform.IOS)
+        {
+            platform = "iOS-ARM64-";
+            libSearchPattern = "lib*.a";
         }
-        else {
-            platform = "Unknown";
-            libPostfix = ".Unknown";
-            libPrefix = "Unknown";
+        else
+        {
+            throw new InvalidOperationException("Cesium for Unreal does not support this platform.");
         }
 
         string libPath = Path.Combine(ModuleDirectory, "../ThirdParty/lib/" + platform);
 
-        string releasePostfix = "";
-        string debugPostfix = "d";
-
-        bool preferDebug = (Target.Configuration == UnrealTargetConfiguration.Debug || Target.Configuration == UnrealTargetConfiguration.DebugGame);
-        string postfix = preferDebug ? debugPostfix : releasePostfix;
-
-        string[] libs = new string[]
+        if (Target.Configuration == UnrealTargetConfiguration.Debug || Target.Configuration == UnrealTargetConfiguration.DebugGame)
         {
-            "CesiumIonClient",
-            "csprng"
-        };
-
-        if (preferDebug)
-        {
-            // We prefer Debug, but might still use Release if that's all that's available.
-            foreach (string lib in libs)
+            string libPathDebug = libPath + "Debug";
+            if (Directory.Exists(libPathDebug))
             {
-                string debugPath = Path.Combine(libPath, libPrefix + lib + debugPostfix + libPostfix);
-                if (!File.Exists(debugPath))
-                {
-                    Console.WriteLine("Using release build of cesium-native because a debug build is not available.");
-                    preferDebug = false;
-                    postfix = releasePostfix;
-                    break;
-                }
+                libPath = libPathDebug;
             }
         }
 
-        PublicAdditionalLibraries.AddRange(libs.Select(lib => Path.Combine(libPath, libPrefix + lib + postfix + libPostfix)));
+        string[] allLibs = Directory.GetFiles(libPath, libSearchPattern);
+
+        PublicAdditionalLibraries.AddRange(allLibs);
 
         PublicDependencyModuleNames.AddRange(
             new string[]

Source/CesiumRuntime/CesiumRuntime.Build.cs

@@ -26,119 +26,52 @@ public CesiumRuntime(ReadOnlyTargetRules Target) : base(Target)
             }
         );
 
-        string libPrefix;
-        string libPostfix;
         string platform;
+        string libSearchPattern;
         if (Target.Platform == UnrealTargetPlatform.Win64)
         {
-            platform = "Windows-x64";
-            libPostfix = ".lib";
-            libPrefix = "";
+            platform = "Windows-AMD64-";
+            libSearchPattern = "*.lib";
         }
         else if (Target.Platform == UnrealTargetPlatform.Mac)
         {
-            platform = "Darwin-x64";
-            libPostfix = ".a";
-            libPrefix = "lib";
+            platform = "Darwin-AMD64-";
+            libSearchPattern = "lib*.a";
         }
         else if (Target.Platform == UnrealTargetPlatform.Android)
         {
-            platform = "Android-xaarch64";
-            libPostfix = ".a";
-            libPrefix = "lib";
+            platform = "Android-ARM64-";
+            libSearchPattern = "lib*.a";
         }
         else if (Target.Platform == UnrealTargetPlatform.Linux)
         {
-            platform = "Linux-x64";
-            libPostfix = ".a";
-            libPrefix = "lib";
+            platform = "Linux-AMD64-";
+            libSearchPattern = "lib*.a";
         }
         else if(Target.Platform == UnrealTargetPlatform.IOS)
         {
-            platform = "iOS-xarm64";
-            libPostfix = ".a";
-            libPrefix = "lib";
-        }
-        else {
-            platform = "Unknown";
-            libPostfix = ".Unknown";
-            libPrefix = "Unknown";
-        }
-
-        string libPath = Path.Combine(ModuleDirectory, "../ThirdParty/lib/" + platform);
-
-        string releasePostfix = "";
-        string debugPostfix = "d";
-
-        bool preferDebug = (Target.Configuration == UnrealTargetConfiguration.Debug || Target.Configuration == UnrealTargetConfiguration.DebugGame);
-        string postfix = preferDebug ? debugPostfix : releasePostfix;
-
-        string[] libs = new string[]
-        {
-            "async++",
-            "Cesium3DTiles",
-            "Cesium3DTilesContent",
-            "Cesium3DTilesReader",
-            "Cesium3DTilesSelection",
-            "CesiumAsync",
-            "CesiumIonClient",
-            "CesiumGeometry",
-            "CesiumGeospatial",
-            "CesiumGltfReader",
-            "CesiumGltfContent",
-            "CesiumGltf",
-            "CesiumJsonReader",
-            "CesiumRasterOverlays",
-            "CesiumQuantizedMeshTerrain",
-            "CesiumUtility",
-            "csprng",
-            "draco",
-            "ktx",
-            //"MikkTSpace",
-            "meshoptimizer",
-            "modp_b64",
-            "s2geometry",
-            "spdlog",
-            "sqlite3",
-            "tinyxml2",
-            "turbojpeg",
-            "uriparser",
-            "webpdecoder",
-        };
-
-        // Use our own copy of MikkTSpace on Android.
-        if (Target.Platform == UnrealTargetPlatform.Android || Target.Platform == UnrealTargetPlatform.IOS)
-        {
-            libs = libs.Concat(new string[] { "MikkTSpace" }).ToArray();
-            PrivateIncludePaths.Add(Path.Combine(ModuleDirectory, "../ThirdParty/include/mikktspace"));
-        }
-
-        if (Target.Platform == UnrealTargetPlatform.Win64)
-        {
-            libs = libs.Concat(new string[] { "tidy_static", "zlibstatic" }).ToArray();
+            platform = "iOS-ARM64-";
+            libSearchPattern = "lib*.a";
         }
         else
         {
-            libs = libs.Concat(new string[] { "tidy", "z" }).ToArray();
+            throw new InvalidOperationException("Cesium for Unreal does not support this platform.");
         }
 
-        if (preferDebug)
+        string libPath = Path.Combine(ModuleDirectory, "../ThirdParty/lib/" + platform);
+
+        if (Target.Configuration == UnrealTargetConfiguration.Debug || Target.Configuration == UnrealTargetConfiguration.DebugGame)
         {
-            // We prefer Debug, but might still use Release if that's all that's available.
-            foreach (string lib in libs)
+            string libPathDebug = libPath + "Debug";
+            if (Directory.Exists(libPathDebug))
             {
-                string debugPath = Path.Combine(libPath, libPrefix + lib + debugPostfix + libPostfix);
-                if (!File.Exists(debugPath))
-                {
-                    Console.WriteLine("Using release build of cesium-native because a debug build is not available.");
-                    preferDebug = false;
-                    postfix = releasePostfix;
-                    break;
-                }
+                libPath = libPathDebug;
             }
         }
 
-        PublicAdditionalLibraries.AddRange(libs.Select(lib => Path.Combine(libPath, libPrefix + lib + postfix + libPostfix)));
+        string[] allLibs = Directory.GetFiles(libPath, libSearchPattern);
+
+        PublicAdditionalLibraries.AddRange(allLibs);
 
         PublicDependencyModuleNames.AddRange(
             new string[]

Source/CesiumRuntime/Private/CesiumEncodedFeaturesMetadata.cpp

@@ -18,7 +18,6 @@
 #include "UnrealMetadataConversions.h"
 #include <CesiumGltf/FeatureIdTextureView.h>
 #include <CesiumUtility/Tracing.h>
-#include <glm/gtx/integer.hpp>
 #include <optional>
 #include <unordered_map>
 

Source/CesiumRuntime/Private/CesiumEncodedMetadataUtility.cpp

@@ -21,7 +21,6 @@
 #include <CesiumGltf/PropertyTexturePropertyView.h>
 #include <CesiumGltf/PropertyTextureView.h>
 #include <CesiumUtility/Tracing.h>
-#include <glm/gtx/integer.hpp>
 #include <unordered_map>
 
 using namespace CesiumTextureUtility;

Source/CesiumRuntime/Private/CesiumFlyToComponent.cpp

@@ -10,7 +10,7 @@
 #include "UObject/ConstructorHelpers.h"
 #include "VecMath.h"
 
-#include <glm/gtx/quaternion.hpp>
+#include <glm/gtc/quaternion.hpp>
 
 UCesiumFlyToComponent::UCesiumFlyToComponent() {
   // Structure to hold one-time initialization

Source/CesiumRuntime/Private/CesiumGlobeAnchorComponent.cpp

@@ -9,7 +9,7 @@
 #include "Components/SceneComponent.h"
 #include "GameFramework/Actor.h"
 #include "VecMath.h"
-#include <glm/gtx/quaternion.hpp>
+#include <glm/gtc/quaternion.hpp>
 
 // These are the "changes" that can happen to this component, how it detects
 // them, and what it does about them:

Source/CesiumRuntime/Private/CesiumGltfComponent.cpp

@@ -1939,7 +1939,7 @@ static void loadInstancingData(
               quatView[i].value[0],
               quatView[i].value[1],
               quatView[i].value[2]);
-          instanceTransforms[i] = instanceTransforms[i] * glm::toMat4(quat);
+          instanceTransforms[i] = instanceTransforms[i] * glm::mat4_cast(quat);
         }
       } else if constexpr (is_int_quat_v<ValueType>) {
         for (int64_t i = 0; i < count; ++i) {
@@ -1948,7 +1948,7 @@ static void loadInstancingData(
             val[j] = GltfNormalized(quatView[i].value[j]);
           }
           glm::dquat quat(val[3], val[0], val[1], val[2]);
-          instanceTransforms[i] = instanceTransforms[i] * glm::toMat4(quat);
+          instanceTransforms[i] = instanceTransforms[i] * glm::mat4_cast(quat);
         }
       }
     });

Source/CesiumRuntime/Private/GeoTransforms.cpp

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

Source/CesiumRuntime/Private/GlobeAwareDefaultPawn.cpp

@@ -21,8 +21,7 @@
 #include <glm/ext/vector_double3.hpp>
 #include <glm/glm.hpp>
 #include <glm/gtc/matrix_inverse.hpp>
-#include <glm/gtx/quaternion.hpp>
-#include <glm/gtx/rotate_vector.hpp>
+#include <glm/gtc/quaternion.hpp>
 
 #if WITH_EDITOR
 #include "Editor.h"

Source/CesiumRuntime/Private/VecMath.cpp

@@ -5,10 +5,7 @@
 #include "CesiumUtility/Math.h"
 #include "Math/Quat.h"
 #include "Math/RotationMatrix.h"
-#include <glm/detail/type_quat.hpp>
 #include <glm/gtc/quaternion.hpp>
-#include <glm/gtx/rotate_vector.hpp>
-#include <glm/gtx/transform.hpp>
 
 glm::dmat4 VecMath::createMatrix4D(const FMatrix& m) noexcept {
   return glm::dmat4(

extern/CMakeLists.txt

@@ -37,26 +37,18 @@ set(PRIVATE_CESIUM_SQLITE ON)
 
 set(CMAKE_MSVC_RUNTIME_LIBRARY MultiThreadedDLL)
 set(CMAKE_INSTALL_PREFIX ${CMAKE_CURRENT_LIST_DIR}/../Source/ThirdParty)
-set(CMAKE_INSTALL_LIBDIR ${CMAKE_INSTALL_PREFIX}/lib/${CMAKE_SYSTEM_NAME}-x${CESIUM_ARCHITECTURE})
+set(CMAKE_INSTALL_LIBDIR ${CMAKE_INSTALL_PREFIX}/lib/${CMAKE_SYSTEM_NAME}-${CMAKE_SYSTEM_PROCESSOR}-$<IF:$<CONFIG:Debug>,Debug,Release>)
 
 # Always define this, since Unreal does in debug anyway
 # We don't want any mismatches, especially with class member ordering
 add_compile_definitions(NDEBUG)
 
-set(CESIUM_DEBUG_POSTFIX "d")
-set(CESIUM_RELEASE_POSTFIX "")
-
-set(CMAKE_DEBUG_POSTFIX ${CESIUM_DEBUG_POSTFIX})
-set(CMAKE_RELEASE_POSTFIX ${CESIUM_RELEASE_POSTFIX})
-set(CMAKE_MINSIZEREL_POSTFIX ${CESIUM_RELEASE_POSTFIX})
-set(CMAKE_RELWITHDEBINFO_POSTFIX ${CESIUM_RELEASE_POSTFIX})
-
 # On Mac and Linux, Unreal uses -fvisibility-ms-compat.
 # On Android, it uses -fvisibility=hidden
 if (${CMAKE_SYSTEM_NAME} STREQUAL "Linux" OR ${CMAKE_SYSTEM_NAME} STREQUAL "Darwin")
   set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fvisibility-ms-compat -fvisibility-inlines-hidden")
 elseif (${CMAKE_SYSTEM_NAME} STREQUAL "Android")
-  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fvisibility=hidden -fvisibility-inlines-hidden")
+  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fvisibility=hidde\n -fvisibility-inlines-hidden")
 elseif (${CMAKE_SYSTEM_NAME} STREQUAL "iOS")
   set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fvisibility=hidden")
 elseif (${CMAKE_SYSTEM_NAME} STREQUAL "Windows")
@@ -93,10 +85,14 @@ if (CESIUM_USE_UNREAL_TRACING)
   list(APPEND CESIUM_EXTRA_INCLUDES "${CMAKE_CURRENT_SOURCE_DIR}/include")
 endif()
 
+if(WIN32)
+    set(VCPKG_TRIPLET "x64-windows-unreal")
+endif()
+
 add_subdirectory(cesium-native)
 
 # cesium-native doesn't require this header to be public, but Cesium for Unreal wants to use it.
-install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/cesium-native/extern/stb/stb_image_resize.h TYPE INCLUDE)
+#install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/cesium-native/extern/stb/stb_image_resize.h TYPE INCLUDE)
 
 # Unreal Engine doesn't include MikkTSpace on Android.
 # So add our own.