Merge remote-tracking branch 'upstream/master'

rdeioris · Mar 6, 2024 · bfddf20 · bfddf20
2 parents fea6512 + c101027
commit bfddf20
Show file tree

Hide file tree

Showing 3 changed files with 42 additions and 1 deletion.
diff --git a/Source/glTFRuntime/Private/glTFRuntimeParserStaticMeshes.cpp b/Source/glTFRuntime/Private/glTFRuntimeParserStaticMeshes.cpp
@@ -12,6 +12,15 @@
 #include "PhysicsEngine/BodySetup.h"
 #include "Runtime/Launch/Resources/Version.h"
 #include "StaticMeshResources.h"
+#if ENGINE_MAJOR_VERSION >= 5
+#if ENGINE_MINOR_VERSION < 2
+#include "MeshCardRepresentation.h"
+#else
+#undef UE_ENABLE_INCLUDE_ORDER_DEPRECATED_IN_5_2
+#define UE_ENABLE_INCLUDE_ORDER_DEPRECATED_IN_5_2 0
+#include "MeshCardBuild.h"
+#endif
+#endif
 
 FglTFRuntimeStaticMeshContext::FglTFRuntimeStaticMeshContext(TSharedRef<FglTFRuntimeParser> InParser, const FglTFRuntimeStaticMeshConfig& InStaticMeshConfig) :
 	Parser(InParser),
@@ -589,6 +598,34 @@ UStaticMesh* FglTFRuntimeParser::LoadStaticMesh_Internal(TSharedRef<FglTFRuntime
 
 		}
 #endif
+
+		if (StaticMeshConfig.bBuildLumenCards)
+		{
+#if ENGINE_MAJOR_VERSION >= 5 
+			if (!LODResources.CardRepresentationData)
+			{
+				LODResources.CardRepresentationData = new FCardRepresentationData();
+			}
+
+			LODResources.CardRepresentationData->MeshCardsBuildData.Bounds = StaticMeshContext->BoundingBoxAndSphere.GetBox().ExpandBy(2);
+
+			for (int32 Index = 0; Index < 6; Index++)
+			{
+				FLumenCardBuildData CardBuildData;
+				CardBuildData.AxisAlignedDirectionIndex = Index;
+				CardBuildData.OBB.AxisZ = FVector3f(0, 0, 0);
+				CardBuildData.OBB.AxisZ[Index / 2] = Index & 1 ? 1.0f : -1.0f;
+				CardBuildData.OBB.AxisZ.FindBestAxisVectors(CardBuildData.OBB.AxisX, CardBuildData.OBB.AxisY);
+				CardBuildData.OBB.AxisX = FVector3f::CrossProduct(CardBuildData.OBB.AxisZ, CardBuildData.OBB.AxisY);
+				CardBuildData.OBB.AxisX.Normalize();
+
+				CardBuildData.OBB.Origin = FVector3f(LODResources.CardRepresentationData->MeshCardsBuildData.Bounds.GetCenter());
+				CardBuildData.OBB.Extent = CardBuildData.OBB.RotateLocalToCard(FVector3f(LODResources.CardRepresentationData->MeshCardsBuildData.Bounds.GetExtent())).GetAbs();
+
+				LODResources.CardRepresentationData->MeshCardsBuildData.CardBuildData.Add(CardBuildData);
+			}
+#endif
+		}
 	}
 
 	OnPostCreatedStaticMesh.Broadcast(StaticMeshContext);

diff --git a/Source/glTFRuntime/Private/glTFRuntimeSkeletalMeshComponent.cpp b/Source/glTFRuntime/Private/glTFRuntimeSkeletalMeshComponent.cpp
@@ -16,7 +16,7 @@ bool UglTFRuntimeSkeletalMeshComponent::ContainsPhysicsTriMeshData(bool InUseAll
 		return false;
 	}
 
-#if (ENGINE_MAJOR_VERSION >= 5 && ENGINE_MINOR_VERSION > 0) || (ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 26)
+#if ENGINE_MAJOR_VERSION >= 5 || (ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 26)
 	return bEnablePerPolyCollision && CurrentSkeletalMeshAsset->GetEnablePerPolyCollision();
 #else
 	return bEnablePerPolyCollision && CurrentSkeletalMeshAsset->bEnablePerPolyCollision;

diff --git a/Source/glTFRuntime/Public/glTFRuntimeParser.h b/Source/glTFRuntime/Public/glTFRuntimeParser.h
@@ -704,6 +704,9 @@ struct FglTFRuntimeStaticMeshConfig
 	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = "glTFRuntime")
 	float LODScreenSizeMultiplier;
 
+	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = "glTFRuntime")
+	bool bBuildLumenCards;
+
 	template<typename T>
 	T* GetCustomConfig() const
 	{
@@ -734,6 +737,7 @@ struct FglTFRuntimeStaticMeshConfig
 		bGenerateStaticMeshDescription = false;
 		bBuildNavCollision = false;
 		LODScreenSizeMultiplier = 2;
+		bBuildLumenCards = false;
 	}
 };