Fix camera shake in fist pirson view mode.

I have add new animation. And add camera lag for prevent camera shake.
Deema35 · Sep 8, 2018 · 2311c04 · 2311c04
1 parent 20a8276
commit 2311c04
Show file tree

Hide file tree

Showing 12 changed files with 66 additions and 31 deletions.
diff --git a/.gitignore b/.gitignore
@@ -56,4 +56,9 @@ Saved/*
 Build/*
 
 # Cache files for the editor to use
-DerivedDataCache/*
+DerivedDataCache/*
+
+#Plugin directory
+Plugins/ClimbingPawnMovementComponent/Intermediate/*
+Plugins/ClimbingPawnMovementComponent/Binaries/*
+!Plugins/ClimbingPawnMovementComponent/Binaries/Win64/*.dll
diff --git a/Binaries/Win64/ClimbingSystemEditor.target b/Binaries/Win64/ClimbingSystemEditor.target
@@ -6,8 +6,8 @@
 	{
 		"MajorVersion": 4,
 		"MinorVersion": 20,
-		"PatchVersion": 1,
-		"Changelist": 4233996,
+		"PatchVersion": 2,
+		"Changelist": 4302132,
 		"CompatibleChangelist": 4212847,
 		"IsLicenseeVersion": 0,
 		"IsPromotedBuild": 1,

diff --git a/Binaries/Win64/UE4Editor-ClimbingSystem.dll b/Binaries/Win64/UE4Editor-ClimbingSystem.dll
diff --git a/Content/Animations/Maniqin/IdleRun2D.uasset b/Content/Animations/Maniqin/IdleRun2D.uasset
diff --git a/Content/Animations/Maniqin/RunWithoutShakeCamera2.uasset b/Content/Animations/Maniqin/RunWithoutShakeCamera2.uasset
diff --git a/Content/Blueprints/ClimbinCharBP.uasset b/Content/Blueprints/ClimbinCharBP.uasset
diff --git a/Content/LadderSkelton_Skeleton.uasset b/Content/LadderSkelton_Skeleton.uasset
diff --git a/Content/Mannequin/Mesh/UE4_Mannequin_Skeleton.uasset b/Content/Mannequin/Mesh/UE4_Mannequin_Skeleton.uasset
diff --git a/Content/Skel_Skeleton.uasset b/Content/Skel_Skeleton.uasset
diff --git a/Content/ThirdPersonBP/Maps/ThirdPersonExampleMap.umap b/Content/ThirdPersonBP/Maps/ThirdPersonExampleMap.umap
diff --git a/...ngPawnMovementComponent/Source/ClimbingPawnMovementComponentRuntime/ClimbingCharacter.cpp b/...ngPawnMovementComponent/Source/ClimbingPawnMovementComponentRuntime/ClimbingCharacter.cpp
@@ -21,25 +21,54 @@ AClimbingCharacter::AClimbingCharacter(const FObjectInitializer& ObjectInitializ
 
 	TArray<USkeletalMeshComponent*> Components;
 	GetComponents<USkeletalMeshComponent>(Components);
-	ClimbMesh = Components[0];
-
-	TArray<UCapsuleComponent*> ComponentsCaps;
-	GetComponents<UCapsuleComponent>(ComponentsCaps);
-	ClimbCapsule = ComponentsCaps[0];
+	USkeletalMeshComponent* ClimbMesh = Components[0];
 
 
-	//Add Camera
-	CameraSpringArm = CreateDefaultSubobject<USpringArmComponent>(TEXT("CameraSpringArm"));
-	CameraSpringArm->AttachToComponent(RootComponent, FAttachmentTransformRules::KeepRelativeTransform);
-	CameraSpringArm->SetRelativeLocationAndRotation(FVector(0.0f, 0.0f, 8.0f), FRotator(0.0f, 0.0f, 0.0f));
-	CameraSpringArm->TargetArmLength = 300.f;
-	CameraSpringArm->bUsePawnControlRotation = true;
+	//Add Thrid pirson Camera arm
+	ThridCameraSpringArm = CreateDefaultSubobject<USpringArmComponent>(TEXT("ThridCameraSpringArm"));
+	ThridCameraSpringArm->AttachToComponent(RootComponent, FAttachmentTransformRules::KeepRelativeTransform);
+	ThridCameraSpringArm->SetRelativeLocationAndRotation(FVector(0.0f, 0.0f, 8.0f), FRotator(0.0f, 0.0f, 0.0f));
+	ThridCameraSpringArm->TargetArmLength = 300.f;
+	ThridCameraSpringArm->bUsePawnControlRotation = true;
+
+	//Add Fist pirson Camera arm
+	FistCameraSpringArm = CreateDefaultSubobject<USpringArmComponent>(TEXT("FistCameraSpringArm"));
+	FistCameraSpringArm->AttachToComponent(ClimbMesh, FAttachmentTransformRules::KeepRelativeTransform, FName("head"));
+	FistCameraSpringArm->SetRelativeLocationAndRotation(FVector(0.0f, 12.0f, 0.0f), FRotator(0.0f, 90.0f, 270.0f));
+	FistCameraSpringArm->TargetArmLength = 0;
+	FistCameraSpringArm->bUsePawnControlRotation = true;
+	FistCameraSpringArm->bEnableCameraLag = true;
+
+	FistCameraSpringArm->CameraLagSpeed = 65;
+	FistCameraSpringArm->CameraLagMaxTimeStep = 0.5;
+
+	if (ClimbingMovement->GetCurrentClimbingMode() != EClimbingPawnModeType::Climb)
+	{
+		bUseControllerRotationYaw = true;
+		ClimbingMovement->bOrientRotationToMovement = false;
+
+	}
 
+	//AddCamera
 	Camera = CreateDefaultSubobject<UCameraComponent>(TEXT("ClimbCamera"));
-	Camera->AttachToComponent(CameraSpringArm, FAttachmentTransformRules::KeepRelativeTransform, USpringArmComponent::SocketName);
-	Camera->bUsePawnControlRotation = true;
-	bUseControllerRotationYaw = false;
 
+	Camera->bUsePawnControlRotation = true;
+
+	if (bFistPirsonView)
+	{
+		Camera->AttachToComponent(FistCameraSpringArm, FAttachmentTransformRules::KeepRelativeTransform, USpringArmComponent::SocketName);
+
+		bUseControllerRotationYaw = true;
+		ClimbingMovement->bOrientRotationToMovement = false;
+
+	}
+	else
+	{
+		Camera->AttachToComponent(ThridCameraSpringArm, FAttachmentTransformRules::KeepRelativeTransform, USpringArmComponent::SocketName);
+
+		bUseControllerRotationYaw = false;
+		ClimbingMovement->bOrientRotationToMovement = true;
+	}
 
 
 }
@@ -261,12 +290,12 @@ void AClimbingCharacter::ChangeView(bool FistPirson)
 {
 	if (FistPirson == bFistPirsonView) return;
 
+	Camera->DetachFromComponent(FDetachmentTransformRules::KeepWorldTransform);
+
 	if (FistPirson)
 	{
-		Camera->DetachFromComponent(FDetachmentTransformRules::KeepWorldTransform);
-		Camera->AttachToComponent(ClimbMesh, FAttachmentTransformRules::KeepRelativeTransform, FName("head"));
-		GetWorld()->GetFirstPlayerController()->SetControlRotation(GetActorRotation());
-		Camera->SetRelativeLocation(FVector(0, 10, 0));
+		Camera->AttachToComponent(FistCameraSpringArm, FAttachmentTransformRules::SnapToTargetNotIncludingScale, FName("SpringEndpoint"));
+
 		bFistPirsonView = true;
 
 		if (ClimbingMovement->GetCurrentClimbingMode() != EClimbingPawnModeType::Climb)
@@ -278,9 +307,10 @@ void AClimbingCharacter::ChangeView(bool FistPirson)
 	}
 	else
 	{
-		Camera->DetachFromComponent(FDetachmentTransformRules::KeepWorldTransform);
-		Camera->AttachToComponent(CameraSpringArm, FAttachmentTransformRules::SnapToTargetNotIncludingScale, FName("SpringEndpoint"));
+		Camera->AttachToComponent(ThridCameraSpringArm, FAttachmentTransformRules::SnapToTargetNotIncludingScale, FName("SpringEndpoint"));
+
 		bFistPirsonView = false;
+
 		if (ClimbingMovement->GetCurrentClimbingMode() != EClimbingPawnModeType::Climb)
 		{
 			bUseControllerRotationYaw = false;

diff --git a/...bingPawnMovementComponent/Source/ClimbingPawnMovementComponentRuntime/ClimbingCharacter.h b/...bingPawnMovementComponent/Source/ClimbingPawnMovementComponentRuntime/ClimbingCharacter.h
@@ -17,11 +17,17 @@ enum class EPointLocation : uint8
 UCLASS()
 class CLIMBINGPAWNMOVEMENTCOMPONENTRUNTIME_API AClimbingCharacter : public ACharacter
 {
+	friend class UClimbingPawnMovementComponent;
+
 	GENERATED_BODY()
 public:
 
 	UPROPERTY(Category = Character, VisibleAnywhere, BlueprintReadOnly)
-		class USpringArmComponent* CameraSpringArm;
+		class USpringArmComponent* ThridCameraSpringArm;
+
+	UPROPERTY(Category = Character, VisibleAnywhere, BlueprintReadOnly)
+		class USpringArmComponent* FistCameraSpringArm;
+
 	UPROPERTY(Category = Character, VisibleAnywhere, BlueprintReadOnly)
 		class UCameraComponent* Camera;
 
@@ -83,7 +89,7 @@ class CLIMBINGPAWNMOVEMENTCOMPONENTRUNTIME_API AClimbingCharacter : public AChar
 
 public:
 
-	bool bFistPirsonView;
+	bool bFistPirsonView = true;
 
 	class AOverlapObject* OverlopObject;
 
@@ -92,12 +98,6 @@ class CLIMBINGPAWNMOVEMENTCOMPONENTRUNTIME_API AClimbingCharacter : public AChar
 	UPROPERTY(Category = Character, VisibleAnywhere, BlueprintReadOnly, meta = (AllowPrivateAccess = "true"))
 		class  UClimbingPawnMovementComponent* ClimbingMovement;
 
-		USkeletalMeshComponent* ClimbMesh;
-
-		UCapsuleComponent* ClimbCapsule;
-
-		friend class UClimbingPawnMovementComponent;
-
 		float LeftYawRange;
 
 		float RightYawRange;