Merge branch 'test-pr-1453'

CesiumGS · Jun 28, 2024 · 3663041 · 3663041
2 parents 9588abd + 0ef9b08
commit 3663041
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 2 deletions.
diff --git a/CHANGES.md b/CHANGES.md
@@ -6,6 +6,7 @@
 
 - Removed unnecessary alpha check when selecting translucent base materials.
 - Fixed a crash caused by `CesiumSunSky` when no viewport is activated in the Editor.
+- Fixed build issues in Unreal 5.4.2 relating to `UStaticMesh` and `glm::toMat4`. 
 
 ### v2.6.0 - 2024-06-03
 

diff --git a/Source/CesiumRuntime/Private/CesiumGltfComponent.cpp b/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);
         }
       }
     });

diff --git a/Source/CesiumRuntime/Private/CesiumGltfPrimitiveComponent.h b/Source/CesiumRuntime/Private/CesiumGltfPrimitiveComponent.h
@@ -7,6 +7,7 @@
 #include "Components/InstancedStaticMeshComponent.h"
 #include "Components/StaticMeshComponent.h"
 #include "CoreMinimal.h"
+#include "Engine/StaticMesh.h"
 #include "Materials/MaterialInstanceDynamic.h"
 #include "PhysicsEngine/BodySetup.h"
 #include "VecMath.h"