Merge pull request #213 from eddieataberk/patch-1

Restores velocities after recreating physics state
TriAxis-Games · May 16, 2021 · 81768be · 81768be
2 parents 1fe401f + c4ffa62
commit 81768be
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 3 deletions.
diff --git a/Source/RuntimeMeshComponent/Private/RuntimeMeshComponent.cpp b/Source/RuntimeMeshComponent/Private/RuntimeMeshComponent.cpp
@@ -71,9 +71,25 @@ FRuntimeMeshCollisionHitInfo URuntimeMeshComponent::GetHitSource(int32 FaceIndex
 void URuntimeMeshComponent::NewCollisionMeshReceived()
 {
 	SCOPE_CYCLE_COUNTER(STAT_RuntimeMeshComponent_NewCollisionMeshReceived);
+
+	if (KeepMomentumOnCollisionUpdate)
+	{
+		// First Store Velocities
+		FVector PrevLinearVelocity = GetPhysicsLinearVelocity();
+		FVector PrevAngularVelocity = GetPhysicsAngularVelocityInDegrees();
 
-	// First recreate the physics state
-	RecreatePhysicsState();
+		// Recreate the physics state
+		RecreatePhysicsState();
+
+		// Apply Velocities
+		SetPhysicsLinearVelocity(PrevLinearVelocity, false);
+		SetPhysicsAngularVelocityInDegrees(PrevAngularVelocity, false);
+	}
+	else
+	{
+		//First recreate the physics state
+		RecreatePhysicsState();
+	}
 
  	// Now update the navigation.
 	FNavigationSystem::UpdateComponentData(*this);
@@ -240,4 +256,4 @@ void URuntimeMeshComponent::OnUnregister()
 	}
 
 	Super::OnUnregister();
-}
+}
diff --git a/Source/RuntimeMeshComponent/Public/RuntimeMeshComponent.h b/Source/RuntimeMeshComponent/Public/RuntimeMeshComponent.h
@@ -29,6 +29,9 @@ class RUNTIMEMESHCOMPONENT_API URuntimeMeshComponent : public UMeshComponent, pu
 
 public:
 	URuntimeMeshComponent();
+
+	UPROPERTY(BlueprintReadWrite, EditAnywhere, Category = "RuntimeMesh")
+	bool KeepMomentumOnCollisionUpdate = false;
 
 	uint32 GetRuntimeMeshId() const { return RuntimeMeshReference? RuntimeMeshReference->GetMeshId() : -1; }