Merge remote-tracking branch 'origin/ue4-main' into ue5-main

CHANGES.md

@@ -10,6 +10,7 @@
 
 - Fixed bug that caused a crash when changing the project default token with tilesets active in the level.
 - Vertex buffers created for 3D Tiles are now set to use full-precision UV coordinates, avoiding problems in particular with feature IDs.
+- Added some missing headers, to avoid compiler errors in non-unity builds.
 
 In addition to the above, this release updates [cesium-native](https://github.com/CesiumGS/cesium-native) from v0.21.3 to v0.22.0. See the [changelog](https://github.com/CesiumGS/cesium-native/blob/main/CHANGES.md) for a complete list of changes in cesium-native.
 

Source/CesiumRuntime/Private/Cesium3DTileset.cpp

@@ -20,7 +20,6 @@
 #include "CesiumCustomVersion.h"
 #include "CesiumGeospatial/Cartographic.h"
 #include "CesiumGeospatial/Ellipsoid.h"
-#include "CesiumGeospatial/Transforms.h"
 #include "CesiumGltf/ImageCesium.h"
 #include "CesiumGltf/Ktx2TranscodeTargets.h"
 #include "CesiumGltfComponent.h"

Source/CesiumRuntime/Private/CesiumGeoreference.cpp

@@ -4,7 +4,6 @@
 #include "Camera/PlayerCameraManager.h"
 #include "CesiumActors.h"
 #include "CesiumCommon.h"
-#include "CesiumGeospatial/Transforms.h"
 #include "CesiumRuntime.h"
 #include "CesiumTransforms.h"
 #include "CesiumUtility/Math.h"

Source/CesiumRuntime/Private/CesiumGltfComponent.cpp

@@ -13,8 +13,8 @@
 #include "CesiumFeatureTexture.h"
 #include "CesiumFeatureTextureProperty.h"
 #include "CesiumGeometry/Axis.h"
-#include "CesiumGeometry/AxisTransforms.h"
 #include "CesiumGeometry/Rectangle.h"
+#include "CesiumGeometry/Transforms.h"
 #include "CesiumGltf/AccessorView.h"
 #include "CesiumGltf/ExtensionKhrMaterialsUnlit.h"
 #include "CesiumGltf/ExtensionMeshPrimitiveExtFeatureMetadata.h"
@@ -49,9 +49,11 @@
 #include "StaticMeshOperations.h"
 #include "StaticMeshResources.h"
 #include "UObject/ConstructorHelpers.h"
+#include "VecMath.h"
 #include "mikktspace.h"
 #include <cstddef>
 #include <glm/ext/matrix_transform.hpp>
+#include <glm/gtc/matrix_inverse.hpp>
 #include <glm/gtc/quaternion.hpp>
 #include <glm/mat3x3.hpp>
 #include <iostream>
@@ -1479,15 +1481,15 @@ void applyGltfUpAxisTransform(const Model& model, glm::dmat4x4& rootTransform) {
     // The default up-axis of glTF is the Y-axis, and no other
     // up-axis was specified. Transform the Y-axis to the Z-axis,
     // to match the 3D Tiles specification
-    rootTransform *= CesiumGeometry::AxisTransforms::Y_UP_TO_Z_UP;
+    rootTransform *= CesiumGeometry::Transforms::Y_UP_TO_Z_UP;
     return;
   }
   const CesiumUtility::JsonValue& gltfUpAxis = gltfUpAxisIt->second;
   int gltfUpAxisValue = static_cast<int>(gltfUpAxis.getSafeNumberOrDefault(1));
   if (gltfUpAxisValue == static_cast<int>(CesiumGeometry::Axis::X)) {
-    rootTransform *= CesiumGeometry::AxisTransforms::X_UP_TO_Z_UP;
+    rootTransform *= CesiumGeometry::Transforms::X_UP_TO_Z_UP;
   } else if (gltfUpAxisValue == static_cast<int>(CesiumGeometry::Axis::Y)) {
-    rootTransform *= CesiumGeometry::AxisTransforms::Y_UP_TO_Z_UP;
+    rootTransform *= CesiumGeometry::Transforms::Y_UP_TO_Z_UP;
   } else if (gltfUpAxisValue == static_cast<int>(CesiumGeometry::Axis::Z)) {
     // No transform required
   } else {

Source/CesiumRuntime/Private/CesiumLifetime.cpp

@@ -1,6 +1,7 @@
 // Copyright 2020-2021 CesiumGS, Inc. and Contributors
 
 #include "CesiumLifetime.h"
+#include "CesiumRuntime.h"
 #include "Engine/StaticMesh.h"
 #include "Engine/Texture2D.h"
 #include "PhysicsEngine/BodySetup.h"

Source/CesiumRuntime/Private/CesiumRasterOverlay.cpp

@@ -6,6 +6,7 @@
 #include "Cesium3DTilesSelection/Tileset.h"
 #include "Cesium3DTileset.h"
 #include "CesiumAsync/IAssetResponse.h"
+#include "CesiumRuntime.h"
 
 FCesiumRasterOverlayLoadFailure OnCesiumRasterOverlayLoadFailure{};
 

Source/CesiumRuntime/Private/GeoTransforms.cpp

@@ -2,7 +2,7 @@
 
 #include "GeoTransforms.h"
 
-#include "CesiumGeospatial/Transforms.h"
+#include "CesiumGeospatial/GlobeTransforms.h"
 #include "CesiumTransforms.h"
 #include "VecMath.h"
 
@@ -52,7 +52,7 @@ glm::dquat GeoTransforms::ComputeSurfaceNormalRotationUnreal(
 
 void GeoTransforms::updateTransforms() noexcept {
   this->_georeferencedToEcef =
-      CesiumGeospatial::Transforms::eastNorthUpToFixedFrame(
+      CesiumGeospatial::GlobeTransforms::eastNorthUpToFixedFrame(
           _center,
           _ellipsoid);
   this->_ecefToGeoreferenced = glm::affineInverse(this->_georeferencedToEcef);
@@ -166,6 +166,7 @@ glm::dmat3 GeoTransforms::ComputeEastSouthUpToUnreal(
 
 glm::dmat3
 GeoTransforms::ComputeEastNorthUpToEcef(const glm::dvec3& ecef) const noexcept {
-  return glm::dmat3(
-      CesiumGeospatial::Transforms::eastNorthUpToFixedFrame(ecef, _ellipsoid));
+  return glm::dmat3(CesiumGeospatial::GlobeTransforms::eastNorthUpToFixedFrame(
+      ecef,
+      _ellipsoid));
 }

Source/CesiumRuntime/Private/GlobeAwareDefaultPawn.cpp

@@ -6,7 +6,6 @@
 #include "CesiumCustomVersion.h"
 #include "CesiumGeoreference.h"
 #include "CesiumGeospatial/Ellipsoid.h"
-#include "CesiumGeospatial/Transforms.h"
 #include "CesiumGlobeAnchorComponent.h"
 #include "CesiumRuntime.h"
 #include "CesiumTransforms.h"

Source/CesiumRuntime/Private/VecMath.cpp

@@ -5,7 +5,6 @@
 #include "CesiumUtility/Math.h"
 #include "Math/Quat.h"
 #include "Math/RotationMatrix.h"
-#include <CesiumGeometry/AxisTransforms.h>
 #include <glm/detail/type_quat.hpp>
 #include <glm/gtc/quaternion.hpp>
 #include <glm/gtx/rotate_vector.hpp>

Source/CesiumRuntime/Public/CesiumRuntime.h

@@ -4,6 +4,7 @@
 
 #include "CoreMinimal.h"
 #include "Modules/ModuleManager.h"
+#include <memory>
 
 class ACesium3DTileset;
 class UCesiumRasterOverlay;