Added vertical weapon animation

Source/Cloud9/Character/Cloud9Character.cpp

@@ -41,6 +41,7 @@
 #include "Cloud9/Character/Components/Cloud9CharacterMovement.h"
 #include "Cloud9/Character/Components/Cloud9Inventory.h"
 #include "Cloud9/Character/Components/Cloud9SpringArmComponent.h"
+#include "Cloud9/Tools/Extensions/FVector.h"
 #include "Cloud9/Tools/Extensions/TContainer.h"
 #include "Cloud9/Weapon/Classes/Cloud9WeaponBase.h"
 
@@ -79,7 +80,6 @@ ACloud9Character::ACloud9Character(const FObjectInitializer& ObjectInitializer)
 
 	Inventory = CreateDefaultSubobject<UCloud9Inventory>(InventoryComponentName);
 
-
 	// Activate ticking in order to update the cursor every frame.
 	PrimaryActorTick.bCanEverTick = true;
 	PrimaryActorTick.bStartWithTickEnabled = true;
@@ -122,7 +122,7 @@ void ACloud9Character::UnSneak() const
 	}
 }
 
-void ACloud9Character::SetViewDirection(const FHitResult& HitResult, bool bIsHitValid) const
+void ACloud9Character::SetViewDirection(const FHitResult& HitResult, bool bIsHitValid)
 {
 	if (IsValid(CursorToWorld))
 	{
@@ -136,11 +136,13 @@ void ACloud9Character::SetViewDirection(const FHitResult& HitResult, bool bIsHit
 
 	let Settings = UCloud9DeveloperSettings::Get();
 
+	let StartLocation = GetMesh()->GetBoneLocation(CameraTargetBoneName, EBoneSpaces::WorldSpace);
+
 	if (Settings->bIsDrawHitCursorLine)
 	{
 		DrawDebugLine(
 			GetWorld(),
-			GetActorLocation(),
+			StartLocation,
 			HitResult.Location,
 			FColor::Green,
 			false,
@@ -162,7 +164,7 @@ void ACloud9Character::SetViewDirection(const FHitResult& HitResult, bool bIsHit
 
 		DrawDebugLine(
 			GetWorld(),
-			GetActorLocation(),
+			StartLocation,
 			WorldLocation,
 			FColor::Red,
 			false,
@@ -171,9 +173,9 @@ void ACloud9Character::SetViewDirection(const FHitResult& HitResult, bool bIsHit
 
 	if (bIsHitValid)
 	{
-		let TargetLocation = FVector{HitResult.Location.X, HitResult.Location.Y, 0.0f};
-		let ActorLocation = GetActorLocation();
-		let LookRotation = UKismetMathLibrary::FindLookAtRotation(ActorLocation, TargetLocation);
+		let TargetLocation = HitResult.Location;
+		let LookRotation = UKismetMathLibrary::FindLookAtRotation(StartLocation, TargetLocation);
+		ViewVerticalRotation = LookRotation.Pitch;
 		GetCloud9CharacterMovement()->Rotate({0.0f, LookRotation.Yaw, 0.0f});
 	}
 }

Source/Cloud9/Character/Cloud9Character.h

@@ -63,7 +63,10 @@ class ACloud9Character : public ACharacter
 
 	void UnSneak() const;
 
-	void SetViewDirection(const FHitResult& HitResult, bool bIsHitValid) const;
+	void SetViewDirection(const FHitResult& HitResult, bool bIsHitValid);
+
+	UFUNCTION(BlueprintCallable)
+	float GetViewVerticalRotation() const { return ViewVerticalRotation; }
 
 	void SetCameraRotationYaw(float Angle) const;
 	void AddCameraRotationYaw(float Angle) const;
@@ -83,28 +86,32 @@ class ACloud9Character : public ACharacter
 	UPROPERTY(BlueprintReadOnly, Category=Character)
 	uint32 bIsSneaking : 1;
 
+protected:
+	UPROPERTY(VisibleAnywhere, BlueprintReadOnly)
+	float ViewVerticalRotation;
+
 private:
 	// TODO: Move to GameInstance
 	UPROPERTY(EditDefaultsOnly)
 	UMaterial* CursorDecal;
 
 	/** A decal that projects to the cursor location. */
-	UPROPERTY(EditDefaultsOnly, Category = Camera, meta=(AllowPrivateAccess))
+	UPROPERTY(EditDefaultsOnly, Category=Camera, meta=(AllowPrivateAccess))
 	FName CameraTargetBoneName;
 
 	/** Top down camera */
-	UPROPERTY(VisibleAnywhere, BlueprintReadOnly, Category = Camera, meta=(AllowPrivateAccess))
+	UPROPERTY(VisibleAnywhere, BlueprintReadOnly, Category=Camera, meta=(AllowPrivateAccess))
 	UCameraComponent* TopDownCameraComponent;
 
 	/** Camera boom positioning the camera above the character */
-	UPROPERTY(VisibleAnywhere, BlueprintReadOnly, Category = Camera, meta=(AllowPrivateAccess))
+	UPROPERTY(VisibleAnywhere, BlueprintReadOnly, Category=Camera, meta=(AllowPrivateAccess))
 	USpringArmComponent* CameraBoom;
 
 	/** A decal that projects to the cursor location. */
-	UPROPERTY(VisibleAnywhere, BlueprintReadOnly, Category = Camera, meta=(AllowPrivateAccess))
+	UPROPERTY(VisibleAnywhere, BlueprintReadOnly, Category=Camera, meta=(AllowPrivateAccess))
 	UDecalComponent* CursorToWorld;
 
 	/** An inventory of the character. */
-	UPROPERTY(VisibleAnywhere, BlueprintReadOnly, Category = Inventory, meta=(AllowPrivateAccess))
+	UPROPERTY(VisibleAnywhere, BlueprintReadOnly, Category=Inventory, meta=(AllowPrivateAccess))
 	UCloud9Inventory* Inventory;
 };

Source/Cloud9/Game/Cloud9DeveloperSettings.cpp

@@ -84,7 +84,7 @@ void UCloud9DeveloperSettings::InitializeCVars()
 		RegisterConsoleVariable(
 			bIsShowMouseCursor,
 			TEXT("r.IsShowMouseCursor"),
-			TEXT("Whether to draw line from character to GetHitUnderCursor point")
+			TEXT("Whether to draw line from character to GetHitResultUnderCursor point")
 		);
 
 		RegisterConsoleVariable(

Source/Cloud9/Weapon/Tables/WeaponCommonData.h

@@ -38,7 +38,7 @@ struct FFirearmCommonData
 	/**
 	 * Alpha coefficient to fixup hit-scan registration.
 	 * 
-	 * GetHitUnderCursor can return value slightly upper then surface.
+	 * GetHitResultUnderCursor can return value slightly upper then surface.
 	 */
 	UPROPERTY(BlueprintReadOnly, EditDefaultsOnly, Category=Settings)
 	float LineTraceAlpha = 5.0f;