Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@
#include "PhysicsEngine/BodySetup.h"
#include "PhysicsEngine/PhysicsSettings.h"


bool URealtimeMeshCollisionTools::FindCollisionUVRealtimeMesh(const FHitResult& Hit, int32 UVChannel, FVector2D& UV)
{
bool bSuccess = false;
Expand Down Expand Up @@ -73,7 +72,8 @@ void URealtimeMeshCollisionTools::CookConvexHull(FRealtimeMeshCollisionConvex& C
#if RMC_ENGINE_ABOVE_5_4
return Chaos::FConvexPtr(new FConvex(ConvexVertices, 0.0f));
#else
return MakeShared<FConvex>(ConvexVertices, 0.0f).ToSharedPtr();
TSharedPtr<FConvex> convexPtr = MakeShared<FConvex>(ConvexVertices, 0.0f);
return convexPtr;
#endif
};

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,9 @@
#include "RealtimeMeshComponent.h"

#include "GameDelegates.h"
#if RMC_ENGINE_ABOVE_5_2
#include "MaterialDomain.h"
#endif
#include "NaniteVertexFactory.h"
#include "RealtimeMeshComponentModule.h"
#include "RenderProxy/RealtimeMeshComponentProxy.h"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,8 @@ namespace RealtimeMesh

Proxy->EnqueueCommandBatch(MoveTemp(Tasks), ThreadState);

DoOnGameThread([ThreadState, MeshWeak = Mesh.ToWeakPtr(), bRecreateProxies = static_cast<bool>(bRequiresProxyRecreate)]()
TWeakPtr<const RealtimeMesh::FRealtimeMesh> meshWeak = Mesh;
DoOnGameThread([ThreadState, MeshWeak = meshWeak, bRecreateProxies = static_cast<bool>(bRequiresProxyRecreate)]()
{
if (bRecreateProxies)
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@

#include "RenderProxy/RealtimeMeshSectionGroupProxy.h"

//#include "MaterialDomain.h"
#include "RealtimeMeshComponentModule.h"
#include "Data/RealtimeMeshShared.h"
#include "RenderProxy/RealtimeMeshLODProxy.h"
Expand Down Expand Up @@ -321,7 +320,9 @@ namespace RealtimeMesh

FRayTracingGeometryInitializer Initializer;
Initializer.DebugName = *(SharedResources->GetMeshName().ToString() + TEXT("_") + Key.ToString() + " RTGeometry");
#if RMC_ENGINE_ABOVE_5_4
Initializer.OwnerName = SharedResources->GetMeshName();
#endif

Initializer.IndexBuffer = IndexStream->IndexBufferRHI;
Initializer.IndexBufferOffset = IndexStream->IndexBufferRHI->GetStride() * MinIndex;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
#include "CoreFwd.h"
#include "UObject/NameTypes.h"
#include "Math/Range.h"
#include "RealtimeMeshInterfaceFwd.h"

enum class ERealtimeMeshStreamType : uint8
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,9 @@

#include "FunctionalTests/RealtimeMeshStressTestActor.h"

#if RMC_ENGINE_ABOVE_5_2
#include "MaterialDomain.h"
#endif
#include "RealtimeMeshLibrary.h"
#include "RealtimeMeshSimple.h"
#include "Mesh/RealtimeMeshBasicShapeTools.h"
Expand Down