Merge pull request #8 from ShinuziKyura/feature/MMN-002_paper_actor

Feature/mmn 002 paper actor
ShinuziKyura · Mar 19, 2019 · d66e0a1 · d66e0a1
2 parents 8ca4fcb + a0020d8
commit d66e0a1
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/Source/MirrorMeNot/Private/Actors/PaperPawn.cpp b/Source/MirrorMeNot/Private/Actors/PaperPawn.cpp
@@ -44,7 +44,7 @@ void APaperPawn::BeginPlay()
 	Super::BeginPlay();
 
 	LevelCollisionObjectParams.AddObjectTypesToQuery(ECC_Level);
-	LevelCollisionShape.SetSphere(CollisionComponent->GetUnscaledCapsuleRadius() - .1f); // Small offset so collisions against walls aren't detected
+	LevelCollisionShape.SetSphere(CollisionComponent->GetUnscaledCapsuleRadius() / 2.f); // Offset so collisions against walls aren't detected
 	LevelCollisionParams.AddIgnoredActor(this);
 	LevelCollisionDelegate.BindUObject(this, &APaperPawn::LevelCollisionHandler);
 }
@@ -131,8 +131,8 @@ void APaperPawn::SetOrientation(float const InOrientation)
 
 void APaperPawn::QueryLevelCollision()
 {
-	auto const Point = CollisionComponent->GetComponentLocation() - FVector::UpVector * (CollisionComponent->GetUnscaledCapsuleHalfHeight() - CollisionComponent->GetUnscaledCapsuleRadius());
-	auto const Direction = Point - FVector::UpVector;
+	auto const Point = CollisionComponent->GetComponentLocation() - FVector::UpVector * CollisionComponent->GetUnscaledCapsuleHalfHeight_WithoutHemisphere();
+	auto const Direction = Point - FVector::UpVector * CollisionComponent->GetUnscaledCapsuleRadius();
 
 	GetWorld()->AsyncSweepByObjectType(
 		EAsyncTraceType::Single,