Merge pull request #76 from MashdorDev/AnimationFixes

Animation fixes and Spline Camera
MashdorDev · Feb 15, 2024 · 7484a59 · 7484a59
2 parents 6b2869f + 43a388c
commit 7484a59
Show file tree

Hide file tree

Showing 20 changed files with 55 additions and 23 deletions.
diff --git a/Content/Unbread/Art/Characters/Donut/Donut.uasset b/Content/Unbread/Art/Characters/Donut/Donut.uasset
diff --git a/Content/Unbread/Art/Characters/Donut/Donut_Attack.uasset b/Content/Unbread/Art/Characters/Donut/Donut_Attack.uasset
diff --git a/Content/Unbread/Art/Characters/Donut/Donut_Skeleton.uasset b/Content/Unbread/Art/Characters/Donut/Donut_Skeleton.uasset
diff --git a/Content/Unbread/Art/Characters/Donut/Donut_Walk.uasset b/Content/Unbread/Art/Characters/Donut/Donut_Walk.uasset
diff --git a/Content/Unbread/Art/Characters/GingerbreadMan/ABP_GingerbreadMan.uasset b/Content/Unbread/Art/Characters/GingerbreadMan/ABP_GingerbreadMan.uasset
diff --git a/Content/Unbread/Art/Characters/GingerbreadMan/BS_GingerbreadMovement_2D.uasset b/Content/Unbread/Art/Characters/GingerbreadMan/BS_GingerbreadMovement_2D.uasset
diff --git a/Content/Unbread/Art/Characters/GingerbreadMan/GBM_Strafe_L.uasset b/Content/Unbread/Art/Characters/GingerbreadMan/GBM_Strafe_L.uasset
diff --git a/Content/Unbread/Art/Characters/GingerbreadMan/GBM_Strafe_R.uasset b/Content/Unbread/Art/Characters/GingerbreadMan/GBM_Strafe_R.uasset
diff --git a/Content/Unbread/Art/Characters/GingerbreadMan/GBM_WalkBackward.uasset b/Content/Unbread/Art/Characters/GingerbreadMan/GBM_WalkBackward.uasset
diff --git a/Content/Unbread/Art/Characters/Loaf/Loaf.uasset b/Content/Unbread/Art/Characters/Loaf/Loaf.uasset
diff --git a/Content/Unbread/Art/Characters/Loaf/Loaf_Attack.uasset b/Content/Unbread/Art/Characters/Loaf/Loaf_Attack.uasset
diff --git a/Content/Unbread/Art/Characters/Loaf/Loaf_Skeleton.uasset b/Content/Unbread/Art/Characters/Loaf/Loaf_Skeleton.uasset
diff --git a/Content/Unbread/Art/Characters/Loaf/Loaf_Walk.uasset b/Content/Unbread/Art/Characters/Loaf/Loaf_Walk.uasset
diff --git a/Content/Unbread/Core/Character/BP_Character.uasset b/Content/Unbread/Core/Character/BP_Character.uasset
diff --git a/Content/Unbread/Core/Character/BP_CharacterRotation.uasset b/Content/Unbread/Core/Character/BP_CharacterRotation.uasset
diff --git a/Content/Unbread/Core/DynamicCamera/Release/BP_CameraRegisterLookAtTarget.uasset b/Content/Unbread/Core/DynamicCamera/Release/BP_CameraRegisterLookAtTarget.uasset
diff --git a/Content/Unbread/Core/DynamicCamera/Release/BP_CameraSplineVolume.uasset b/Content/Unbread/Core/DynamicCamera/Release/BP_CameraSplineVolume.uasset
diff --git a/Content/Unbread/Maps/DynamicCameraTest01.umap b/Content/Unbread/Maps/DynamicCameraTest01.umap
diff --git a/Source/unbread/Private/SCharacter.cpp b/Source/unbread/Private/SCharacter.cpp
@@ -120,8 +120,15 @@ void ASCharacter::Rotate(const FInputActionValue& Value)
 {
 	const FVector2D RotVector = Value.Get<FVector2D>();
 	const float Angle = FMath::Atan2(RotVector.Y, RotVector.X) * (180.0f / PI);
-	const FRotator NewRotation = FRotator(0.0f, -1* Angle, 0.0f);
-	GetMesh()->SetRelativeRotationExact(NewRotation);
+
+	// !!Safak please check if this change is okay with you!!
+
+	// Rotate the character relative to the current camera
+	FRotator CameraWorldRotation = DynamicCamera->CurrentCameraActor->GetComponentByClass<UCameraComponent>()->GetRelativeRotation() + DynamicCamera->CurrentCameraActor->GetActorRotation();
+	CameraWorldRotation.Roll = 0.f;
+	CameraWorldRotation.Pitch = 0.f;	
+	const FRotator NewRotation = FRotator(0.0f, -1* Angle, 0.0f) + CameraWorldRotation;
+	GetMesh()->SetWorldRotation(NewRotation);
 }
 
 void ASCharacter::RotateToTarget(const FVector LookAtTarget)

diff --git a/Source/unbread/Public/CameraRegisterVolume.cpp b/Source/unbread/Public/CameraRegisterVolume.cpp
@@ -12,6 +12,7 @@ ACameraRegisterVolume::ACameraRegisterVolume()
 {
  	// Set this actor to call Tick() every frame.  You can turn this off to improve performance if you don't need it.
 	PrimaryActorTick.bCanEverTick = true;
+	PrimaryActorTick.bStartWithTickEnabled = true;
 
 	// Create and set the Root component
 	Root = CreateDefaultSubobject<USceneComponent>(TEXT("Root"));
@@ -39,7 +40,7 @@ void ACameraRegisterVolume::BeginPlay()
 // Called every frame
 void ACameraRegisterVolume::Tick(float DeltaTime)
 {
-	Super::BeginPlay();
+	Super::Tick(DeltaTime);
 }
 
 void ACameraRegisterVolume::OnEnterVolume(UPrimitiveComponent* OverlappedComp, AActor* OtherActor,