BT83 Improving Tank Aiming.cmproj

davidAlittle · Jul 23, 2016 · d06b8d1 · d06b8d1
1 parent fa5baeb
commit d06b8d1
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 5 deletions.
diff --git a/BattleTank/Content/Tank/Tank_BP.uasset b/BattleTank/Content/Tank/Tank_BP.uasset
diff --git a/BattleTank/Content/_Levels/BattleGround.umap b/BattleTank/Content/_Levels/BattleGround.umap
diff --git a/BattleTank/Source/BattleTank/Private/TankAimingComponent.cpp b/BattleTank/Source/BattleTank/Private/TankAimingComponent.cpp
@@ -87,8 +87,16 @@ void UTankAimingComponent::MoveBarrelTowards(FVector AimDirection)
 	auto AimAsRotator = AimDirection.Rotation();
 	auto DeltaRotator = AimAsRotator - BarrelRotator;
 
+	// Always yaw the shortest way
 	Barrel->Elevate(DeltaRotator.Pitch);
-	Turret->Rotate(DeltaRotator.Yaw);
+	if (DeltaRotator.Yaw < 180)
+	{
+		Turret->Rotate(DeltaRotator.Yaw);
+	}
+	else
+	{
+		Turret->Rotate(-DeltaRotator.Yaw);
+	}
 }
 
 void UTankAimingComponent::Fire()

diff --git a/BattleTank/Source/BattleTank/Private/TankPlayerController.cpp b/BattleTank/Source/BattleTank/Private/TankPlayerController.cpp
@@ -26,7 +26,8 @@ void ATankPlayerController::AimTowardsCrosshair()
 	if (!ensure(AimingComponent)) { return; }
 
 	FVector HitLocation; // Out parameter
-	if (GetSightRayHitLocation(HitLocation)) // Has "side-effect", is going to line trace
+	bool bGotHitLocation = GetSightRayHitLocation(HitLocation);
+	if (bGotHitLocation) // Has "side-effect", is going to line trace
 	{
 		AimingComponent->AimAt(HitLocation);
 	}
@@ -45,10 +46,9 @@ bool ATankPlayerController::GetSightRayHitLocation(FVector& HitLocation) const
 	if (GetLookDirection(ScreenLocation, LookDirection))
 	{
 		// Line-trace along that LookDirection, and see what we hit (up to max range)
-		GetLookVectorHitLocation(LookDirection, HitLocation);
+		return GetLookVectorHitLocation(LookDirection, HitLocation);
 	}
-
-	return true;
+	return false;
 }
 
 bool ATankPlayerController::GetLookVectorHitLocation(FVector LookDirection, FVector& HitLocation) const