From 7a52e7f155a3272383a08e1708366d7fb3b4b6fa Mon Sep 17 00:00:00 2001 From: GageM Date: Mon, 12 Feb 2024 17:26:29 -0500 Subject: [PATCH 1/3] - Fixed player animation blendspace - Reimported Loaf and Donut as well as added new animations --- Content/Unbread/Art/Characters/Donut/Donut.uasset | 4 ++-- Content/Unbread/Art/Characters/Donut/Donut_Attack.uasset | 3 +++ Content/Unbread/Art/Characters/Donut/Donut_Skeleton.uasset | 4 ++-- Content/Unbread/Art/Characters/Donut/Donut_Walk.uasset | 3 +++ .../Art/Characters/GingerbreadMan/ABP_GingerbreadMan.uasset | 4 ++-- .../GingerbreadMan/BS_GingerbreadMovement_2D.uasset | 4 ++-- .../Unbread/Art/Characters/GingerbreadMan/GBM_Strafe_L.uasset | 3 +++ .../Unbread/Art/Characters/GingerbreadMan/GBM_Strafe_R.uasset | 3 +++ .../Art/Characters/GingerbreadMan/GBM_WalkBackward.uasset | 3 +++ Content/Unbread/Art/Characters/Loaf/Loaf.uasset | 4 ++-- Content/Unbread/Art/Characters/Loaf/Loaf_Attack.uasset | 3 +++ Content/Unbread/Art/Characters/Loaf/Loaf_Skeleton.uasset | 4 ++-- Content/Unbread/Art/Characters/Loaf/Loaf_Walk.uasset | 3 +++ Content/Unbread/Core/Character/BP_Character.uasset | 4 ++-- Content/Unbread/Core/Character/BP_CharacterRotation.uasset | 4 ++-- 15 files changed, 37 insertions(+), 16 deletions(-) create mode 100644 Content/Unbread/Art/Characters/Donut/Donut_Attack.uasset create mode 100644 Content/Unbread/Art/Characters/Donut/Donut_Walk.uasset create mode 100644 Content/Unbread/Art/Characters/GingerbreadMan/GBM_Strafe_L.uasset create mode 100644 Content/Unbread/Art/Characters/GingerbreadMan/GBM_Strafe_R.uasset create mode 100644 Content/Unbread/Art/Characters/GingerbreadMan/GBM_WalkBackward.uasset create mode 100644 Content/Unbread/Art/Characters/Loaf/Loaf_Attack.uasset create mode 100644 Content/Unbread/Art/Characters/Loaf/Loaf_Walk.uasset diff --git a/Content/Unbread/Art/Characters/Donut/Donut.uasset b/Content/Unbread/Art/Characters/Donut/Donut.uasset index 3ad190ae..77b16030 100644 --- a/Content/Unbread/Art/Characters/Donut/Donut.uasset +++ b/Content/Unbread/Art/Characters/Donut/Donut.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a211486496461f5369cfa507578894d8ade488913a8c5058af030ce2af86851f -size 23198624 +oid sha256:169b116dd21cc8b617f51ae301097684592139a91e6d599275b3d1c4ad2b1a4d +size 9948145 diff --git a/Content/Unbread/Art/Characters/Donut/Donut_Attack.uasset b/Content/Unbread/Art/Characters/Donut/Donut_Attack.uasset new file mode 100644 index 00000000..2eac4018 --- /dev/null +++ b/Content/Unbread/Art/Characters/Donut/Donut_Attack.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:95e19eeca49a918fd71b62aaf659b4710e7778c790006670ffb00cc9be9f7e4c +size 68689 diff --git a/Content/Unbread/Art/Characters/Donut/Donut_Skeleton.uasset b/Content/Unbread/Art/Characters/Donut/Donut_Skeleton.uasset index 9db07d58..b7bdbb93 100644 --- a/Content/Unbread/Art/Characters/Donut/Donut_Skeleton.uasset +++ b/Content/Unbread/Art/Characters/Donut/Donut_Skeleton.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c2f794915d897b3f10ec7cb3eb449073ec8bb4b3c9f16ae21f8cfcd0981ee3a3 -size 10784 +oid sha256:b3661a7f6eb3cee145a7ad77e25226d984c47679faee3209dd733b276bef14aa +size 12138 diff --git a/Content/Unbread/Art/Characters/Donut/Donut_Walk.uasset b/Content/Unbread/Art/Characters/Donut/Donut_Walk.uasset new file mode 100644 index 00000000..83e98920 --- /dev/null +++ b/Content/Unbread/Art/Characters/Donut/Donut_Walk.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e07f5ecc867c6265551cbaf71cc1e1bc8faac38ac3867b5a8494f3e3befc8e3e +size 73242 diff --git a/Content/Unbread/Art/Characters/GingerbreadMan/ABP_GingerbreadMan.uasset b/Content/Unbread/Art/Characters/GingerbreadMan/ABP_GingerbreadMan.uasset index c2547a3d..9bad8a64 100644 --- a/Content/Unbread/Art/Characters/GingerbreadMan/ABP_GingerbreadMan.uasset +++ b/Content/Unbread/Art/Characters/GingerbreadMan/ABP_GingerbreadMan.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:1a8033b2e16ddd90cc547ab02208651ba17b1f2074221d5f89ad7e425f2ad50e -size 213768 +oid sha256:5ce649822db295be8faef21176204d5bcfeb6fcea06ff9c78e7c92a7880e54ab +size 224426 diff --git a/Content/Unbread/Art/Characters/GingerbreadMan/BS_GingerbreadMovement_2D.uasset b/Content/Unbread/Art/Characters/GingerbreadMan/BS_GingerbreadMovement_2D.uasset index ebcf9d16..91555a30 100644 --- a/Content/Unbread/Art/Characters/GingerbreadMan/BS_GingerbreadMovement_2D.uasset +++ b/Content/Unbread/Art/Characters/GingerbreadMan/BS_GingerbreadMovement_2D.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d04b02544352133c25f0f27483221d15f2016c97af691bc945873d61f9da6c4f -size 9830 +oid sha256:3f90dac08a59fdbcf87103aeb2297b25b4461a02a156cf34199a68cb90491958 +size 17278 diff --git a/Content/Unbread/Art/Characters/GingerbreadMan/GBM_Strafe_L.uasset b/Content/Unbread/Art/Characters/GingerbreadMan/GBM_Strafe_L.uasset new file mode 100644 index 00000000..6daa9de1 --- /dev/null +++ b/Content/Unbread/Art/Characters/GingerbreadMan/GBM_Strafe_L.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:5302a98d21f231bd7350d37a2d26eac925074809bb99673ebafe8bfd163be078 +size 64321 diff --git a/Content/Unbread/Art/Characters/GingerbreadMan/GBM_Strafe_R.uasset b/Content/Unbread/Art/Characters/GingerbreadMan/GBM_Strafe_R.uasset new file mode 100644 index 00000000..4d82fd49 --- /dev/null +++ b/Content/Unbread/Art/Characters/GingerbreadMan/GBM_Strafe_R.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ab2be971aa755167fe79443fef2aba4a28688a365072fd981a1ded9eaee8d773 +size 64022 diff --git a/Content/Unbread/Art/Characters/GingerbreadMan/GBM_WalkBackward.uasset b/Content/Unbread/Art/Characters/GingerbreadMan/GBM_WalkBackward.uasset new file mode 100644 index 00000000..08a008a3 --- /dev/null +++ b/Content/Unbread/Art/Characters/GingerbreadMan/GBM_WalkBackward.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:1a0819e99196b8ff52efe23a5cbd72ee91f36fbeb22bc9435c6608c0f1623b19 +size 70276 diff --git a/Content/Unbread/Art/Characters/Loaf/Loaf.uasset b/Content/Unbread/Art/Characters/Loaf/Loaf.uasset index 937e2c6d..d00d3b44 100644 --- a/Content/Unbread/Art/Characters/Loaf/Loaf.uasset +++ b/Content/Unbread/Art/Characters/Loaf/Loaf.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e607267662862da728016de0736ef4d02b482d8d0a258008a70715323e97eacc -size 2040574 +oid sha256:75b06f049017c5cddf5a8284652833a34d9d8655e438daee23d18d4b546e352c +size 2378445 diff --git a/Content/Unbread/Art/Characters/Loaf/Loaf_Attack.uasset b/Content/Unbread/Art/Characters/Loaf/Loaf_Attack.uasset new file mode 100644 index 00000000..512ceffa --- /dev/null +++ b/Content/Unbread/Art/Characters/Loaf/Loaf_Attack.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:35083c0852d41d12ec3a75a9af0d17914adca0815ed2128515f943986c9b6c31 +size 63768 diff --git a/Content/Unbread/Art/Characters/Loaf/Loaf_Skeleton.uasset b/Content/Unbread/Art/Characters/Loaf/Loaf_Skeleton.uasset index d6db669c..3a8f04f0 100644 --- a/Content/Unbread/Art/Characters/Loaf/Loaf_Skeleton.uasset +++ b/Content/Unbread/Art/Characters/Loaf/Loaf_Skeleton.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:9e2416960f3395f0378b0596dd534ffb6d8f58b2d638f779085c5dfda6aacbad -size 9312 +oid sha256:d9e0c2eafabda6b0bf7c62168dd992ec98d2ef95dd193c72c996c6047f97fa35 +size 11147 diff --git a/Content/Unbread/Art/Characters/Loaf/Loaf_Walk.uasset b/Content/Unbread/Art/Characters/Loaf/Loaf_Walk.uasset new file mode 100644 index 00000000..64a1e55b --- /dev/null +++ b/Content/Unbread/Art/Characters/Loaf/Loaf_Walk.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:8a976c087643d6a7e7c713bdfaec5034eed0fdaa6742b954c26efc80a10b96c7 +size 72504 diff --git a/Content/Unbread/Core/Character/BP_Character.uasset b/Content/Unbread/Core/Character/BP_Character.uasset index 417071b4..58ad1bb5 100644 --- a/Content/Unbread/Core/Character/BP_Character.uasset +++ b/Content/Unbread/Core/Character/BP_Character.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:0870bb87fb0872f3f81ce56493d9c875afc69692c1d96874509aec7b271e78eb -size 445543 +oid sha256:bb3a6baafea6117049867e973a0777054aff0a82bda473f5c1ed04c4c7109226 +size 445465 diff --git a/Content/Unbread/Core/Character/BP_CharacterRotation.uasset b/Content/Unbread/Core/Character/BP_CharacterRotation.uasset index ae77d7b4..1a464887 100644 --- a/Content/Unbread/Core/Character/BP_CharacterRotation.uasset +++ b/Content/Unbread/Core/Character/BP_CharacterRotation.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:509e4464ac60da0ddad072fbaabbb1a7ee183c6847f1191c770d72277b09e350 -size 373896 +oid sha256:1187cbbc2ef49fa5ca2ab198a3d2098eac4c8ca78cf2f1045fba7e74e926bec7 +size 374116 From fd0e8df98262aaa02281fdbcbe27fdf4e5e1dbea Mon Sep 17 00:00:00 2001 From: GageM Date: Wed, 14 Feb 2024 12:07:36 -0500 Subject: [PATCH 2/3] - Added a camera register volume that follows a spline - Fixed a bug in the CameraRegisterVolume.cpp Tick function - Updated SCharacter.cpp to make character rotation relative to the current camera --- .../Release/BP_CameraRegisterLookAtTarget.uasset | 4 ++-- .../Release/BP_CameraSplineVolume.uasset | 3 +++ Content/Unbread/Maps/DynamicCameraTest01.umap | 4 ++-- Source/unbread/Private/SCharacter.cpp | 11 +++++++++-- Source/unbread/Public/CameraRegisterVolume.cpp | 3 ++- 5 files changed, 18 insertions(+), 7 deletions(-) create mode 100644 Content/Unbread/Core/DynamicCamera/Release/BP_CameraSplineVolume.uasset diff --git a/Content/Unbread/Core/DynamicCamera/Release/BP_CameraRegisterLookAtTarget.uasset b/Content/Unbread/Core/DynamicCamera/Release/BP_CameraRegisterLookAtTarget.uasset index 629a56dd..5f166c00 100644 --- a/Content/Unbread/Core/DynamicCamera/Release/BP_CameraRegisterLookAtTarget.uasset +++ b/Content/Unbread/Core/DynamicCamera/Release/BP_CameraRegisterLookAtTarget.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:7cadc7fc4d445ce91dba178fb4fb7ec88a5e3442092c90a66dcea75235b1bbfb -size 113130 +oid sha256:08b9bd3b0dd8ac9ede6f75d2fad60f22dedeed7450eef54ca5c66ef693a29301 +size 110125 diff --git a/Content/Unbread/Core/DynamicCamera/Release/BP_CameraSplineVolume.uasset b/Content/Unbread/Core/DynamicCamera/Release/BP_CameraSplineVolume.uasset new file mode 100644 index 00000000..25a30982 --- /dev/null +++ b/Content/Unbread/Core/DynamicCamera/Release/BP_CameraSplineVolume.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:0cc88b02377b0949e885151b7621b3697f75ae705c90bfd6a45cd91c4bb8b074 +size 122124 diff --git a/Content/Unbread/Maps/DynamicCameraTest01.umap b/Content/Unbread/Maps/DynamicCameraTest01.umap index b7fc84f0..9c475eda 100644 --- a/Content/Unbread/Maps/DynamicCameraTest01.umap +++ b/Content/Unbread/Maps/DynamicCameraTest01.umap @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ec26b1278087b08edb9461898ce0a8088942880b6ef8be6e5b75ae77cec6a589 -size 43222 +oid sha256:e26223b8e5583d03917bc72cf97dd5056c8ed8be57015b21a4c781fbe7aad84b +size 51582 diff --git a/Source/unbread/Private/SCharacter.cpp b/Source/unbread/Private/SCharacter.cpp index a66b4f64..8745302c 100644 --- 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(); 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()->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 index e8d6c73f..c6ff0dbc 100644 --- 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(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, From cc599e52de5351ba1e4d5d3fe8dbdd093017f021 Mon Sep 17 00:00:00 2001 From: GageM Date: Wed, 14 Feb 2024 12:15:42 -0500 Subject: [PATCH 3/3] - Removed debug text from spline camera volume --- .../Core/DynamicCamera/Release/BP_CameraSplineVolume.uasset | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Content/Unbread/Core/DynamicCamera/Release/BP_CameraSplineVolume.uasset b/Content/Unbread/Core/DynamicCamera/Release/BP_CameraSplineVolume.uasset index 25a30982..8187d8ec 100644 --- a/Content/Unbread/Core/DynamicCamera/Release/BP_CameraSplineVolume.uasset +++ b/Content/Unbread/Core/DynamicCamera/Release/BP_CameraSplineVolume.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:0cc88b02377b0949e885151b7621b3697f75ae705c90bfd6a45cd91c4bb8b074 -size 122124 +oid sha256:3c75941c174f9736ab3978553d291cb6e30b1150623b1de2db5a8e2f3f0dd33a +size 112326