Fixed DX12 crash when creating empty sections

Fixed automation warning of uninitialized FRuntimeMeshCollisionConvexMesh Fixed bug in clearing sections.
TriAxis-Games · Aug 24, 2020 · b16613a · b16613a
1 parent d307bbd
commit b16613a
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 5 deletions.
diff --git a/Source/RuntimeMeshComponent/Private/RuntimeMesh.cpp b/Source/RuntimeMeshComponent/Private/RuntimeMesh.cpp
@@ -874,7 +874,7 @@ void URuntimeMesh::HandleSingleSectionUpdate(const FRuntimeMeshProxyPtr& RenderP
 		Properties.bWants32BitIndices);
 	bool bResult = MeshProviderPtr->GetSectionMeshForLOD(LODId, SectionId, MeshData);
 
-	if (bResult)
+	if (bResult && MeshData.HasValidMeshData())
 	{
 		// Update section
 		TSharedPtr<FRuntimeMeshSectionUpdateData> UpdateData = MakeShared<FRuntimeMeshSectionUpdateData>(MoveTemp(MeshData));

diff --git a/Source/RuntimeMeshComponent/Private/RuntimeMeshProxy.cpp b/Source/RuntimeMeshComponent/Private/RuntimeMeshProxy.cpp
@@ -224,6 +224,19 @@ void FRuntimeMeshProxy::ClearAllSectionsForLOD_RenderThread(int32 LODIndex)
 	RMC_LOG_VERBOSE("ClearAllSectionsForLOD_RenderThread: LOD:%d", LODIndex);
 	check(IsInRenderingThread());
 
+	if (LODs.IsValidIndex(LODIndex))
+	{
+		auto& LOD = LODs[LODIndex];
+		for (auto& SectionEntry : LOD.Sections)
+		{
+			ClearSection(SectionEntry.Value);			
+		}
+		UpdateRenderState();
+	}
+	else
+	{
+		// Invalid LOD
+	}
 }
 
 void FRuntimeMeshProxy::RemoveAllSectionsForLOD_RenderThread(int32 LODIndex)

diff --git a/Source/RuntimeMeshComponent/Private/RuntimeMeshRendering.h b/Source/RuntimeMeshComponent/Private/RuntimeMeshRendering.h
@@ -245,7 +245,7 @@ class FRuntimeMeshVertexBuffer : public FVertexBuffer
 		check(InVertexBufferRHI);
 
 		VertexBufferRHI = InVertexBufferRHI;
-		if (RHISupportsManualVertexFetch(GMaxRHIShaderPlatform))
+		if (VertexBufferRHI.IsValid() && RHISupportsManualVertexFetch(GMaxRHIShaderPlatform))
 		{
 		 	ShaderResourceView = RHICreateShaderResourceView(VertexBufferRHI, GetElementDatumSize(), GetElementFormat());
 		}

diff --git a/Source/RuntimeMeshComponent/Public/RuntimeMeshCollision.h b/Source/RuntimeMeshComponent/Public/RuntimeMeshCollision.h
@@ -18,16 +18,16 @@ struct RUNTIMEMESHCOMPONENT_API FRuntimeMeshCollisionConvexMesh
 	GENERATED_BODY()
 
 public:
-	FRuntimeMeshCollisionConvexMesh() { }
+	FRuntimeMeshCollisionConvexMesh() : BoundingBox(ForceInit) { }
 	FRuntimeMeshCollisionConvexMesh(const TArray<FVector>& InVertexBuffer)
 		: VertexBuffer(InVertexBuffer)
 		, BoundingBox(InVertexBuffer)
 	{
 	}
 	FRuntimeMeshCollisionConvexMesh(TArray<FVector>&& InVertexBuffer)
 		: VertexBuffer(InVertexBuffer)
+		, BoundingBox(VertexBuffer)
 	{
-		BoundingBox = FBox(VertexBuffer);
 	}
 	FRuntimeMeshCollisionConvexMesh(const TArray<FVector>& InVertexBuffer, const FBox& InBoundingBox)
 		: VertexBuffer(InVertexBuffer)
@@ -36,8 +36,8 @@ struct RUNTIMEMESHCOMPONENT_API FRuntimeMeshCollisionConvexMesh
 	}
 	FRuntimeMeshCollisionConvexMesh(TArray<FVector>&& InVertexBuffer, const FBox& InBoundingBox)
 		: VertexBuffer(InVertexBuffer)
+		, BoundingBox(VertexBuffer)
 	{
-		BoundingBox = FBox(VertexBuffer);
 	}
 
 	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = "RuntimeMesh|Collision|Convex")