Skip to content

Commit db5aa0b

Browse files
dyanikogludyanikoglu
authored
Merge pull request #309 from dyanikoglu/dev
Hotfix v4.21.2
2 parents 494911c + 281cc15 commit db5aa0b

File tree

10 files changed

+46
-52
lines changed

10 files changed

+46
-52
lines changed

‎ALSV4_CPP.uplugin‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"FileVersion": 3,
33
"Version": 1,
4-
"VersionName": "4.21",
4+
"VersionName": "4.21.2",
55
"FriendlyName": "Advanced Locomotion System Community",
66
"Description": "Performance optimized community version of LongmireLocomotion's Advanced Locomotion System V4",
77
"Category": "Animation",

‎Content/AdvancedLocomotionV4/Blueprints/UI/ALS_HUD.uasset‎

4 Bytes
Binary file not shown.

‎Source/ALSV4_CPP/Private/Character/ALSBaseCharacter.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -156,7 +156,7 @@ void AALSBaseCharacter::BeginPlay()
156156

157157
MyCharacterMovementComponent->SetMovementSettings(GetTargetMovementSettings());
158158

159-
DebugComponent = FindComponentByClass<UALSDebugComponent>();
159+
ALSDebugComponent = FindComponentByClass<UALSDebugComponent>();
160160
}
161161

162162
void AALSBaseCharacter::PreInitializeComponents()
@@ -773,7 +773,7 @@ void AALSBaseCharacter::SetActorLocationDuringRagdoll(float DeltaTime)
773773
const bool bHit = World->LineTraceSingleByChannel(HitResult, TargetRagdollLocation, TraceVect,
774774
ECC_Visibility, Params);
775775

776-
if (DebugComponent && DebugComponent->GetShowTraces())
776+
if (ALSDebugComponent && ALSDebugComponent->GetShowTraces())
777777
{
778778
UALSDebugComponent::DrawDebugLineTraceSingle(World,
779779
TargetRagdollLocation,

‎Source/ALSV4_CPP/Private/Character/ALSPlayerCameraManager.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ void AALSPlayerCameraManager::OnPossess(AALSBaseCharacter* NewCharacter)
6464
SetActorLocation(TPSLoc);
6565
SmoothedPivotTarget.SetLocation(TPSLoc);
6666

67-
DebugComponent = ControlledCharacter->FindComponentByClass<UALSDebugComponent>();
67+
ALSDebugComponent = ControlledCharacter->FindComponentByClass<UALSDebugComponent>();
6868
}
6969

7070
float AALSPlayerCameraManager::GetCameraBehaviorParam(FName CurveName) const
@@ -202,7 +202,7 @@ bool AALSPlayerCameraManager::CustomCameraBehavior(float DeltaTime, FVector& Loc
202202
const bool bHit = World->SweepSingleByChannel(HitResult, TraceOrigin, TargetCameraLocation, FQuat::Identity,
203203
TraceChannel, SphereCollisionShape, Params);
204204

205-
if (DebugComponent && DebugComponent->GetShowTraces())
205+
if (ALSDebugComponent && ALSDebugComponent->GetShowTraces())
206206
{
207207
UALSDebugComponent::DrawDebugSphereTraceSingle(World,
208208
TraceOrigin,

‎Source/ALSV4_CPP/Private/Character/Animation/ALSCharacterAnimInstance.cpp‎

Lines changed: 30 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -16,37 +16,33 @@
1616
#include "GameFramework/CharacterMovementComponent.h"
1717

1818

19-
const FName NAME_BasePose_CLF(TEXT("BasePose_CLF"));
20-
const FName NAME_BasePose_N(TEXT("BasePose_N"));
21-
const FName NAME_Enable_FootIK_R(TEXT("Enable_FootIK_R"));
22-
const FName NAME_Enable_FootIK_L(TEXT("Enable_FootIK_L"));
23-
const FName NAME_Enable_HandIK_L(TEXT("Enable_HandIK_L"));
24-
const FName NAME_Enable_HandIK_R(TEXT("Enable_HandIK_R"));
25-
const FName NAME_Enable_Transition(TEXT("Enable_Transition"));
26-
const FName NAME_FootLock_L(TEXT("FootLock_L"));
27-
const FName NAME_FootLock_R(TEXT("FootLock_R"));
28-
const FName NAME_Grounded___Slot(TEXT("Grounded Slot"));
29-
const FName NAME_Layering_Arm_L(TEXT("Layering_Arm_L"));
30-
const FName NAME_Layering_Arm_L_Add(TEXT("Layering_Arm_L_Add"));
31-
const FName NAME_Layering_Arm_L_LS(TEXT("Layering_Arm_L_LS"));
32-
const FName NAME_Layering_Arm_R(TEXT("Layering_Arm_R"));
33-
const FName NAME_Layering_Arm_R_Add(TEXT("Layering_Arm_R_Add"));
34-
const FName NAME_Layering_Arm_R_LS(TEXT("Layering_Arm_R_LS"));
35-
const FName NAME_Layering_Hand_L(TEXT("Layering_Hand_L"));
36-
const FName NAME_Layering_Hand_R(TEXT("Layering_Hand_R"));
37-
const FName NAME_Layering_Head_Add(TEXT("Layering_Head_Add"));
38-
const FName NAME_Layering_Spine_Add(TEXT("Layering_Spine_Add"));
39-
const FName NAME_Mask_AimOffset(TEXT("Mask_AimOffset"));
40-
const FName NAME_Mask_LandPrediction(TEXT("Mask_LandPrediction"));
41-
const FName NAME__ALSCharacterAnimInstance__RotationAmount(TEXT("RotationAmount"));
42-
const FName NAME_VB___foot_target_l(TEXT("VB foot_target_l"));
43-
const FName NAME_VB___foot_target_r(TEXT("VB foot_target_r"));
44-
const FName NAME_W_Gait(TEXT("W_Gait"));
45-
const FName NAME__ALSCharacterAnimInstance__root(TEXT("root"));
46-
47-
48-
FName UALSCharacterAnimInstance::NAME_ik_foot_l(TEXT("ik_foot_l"));
49-
FName UALSCharacterAnimInstance::NAME_ik_foot_r(TEXT("ik_foot_r"));
19+
static const FName NAME_BasePose_CLF(TEXT("BasePose_CLF"));
20+
static const FName NAME_BasePose_N(TEXT("BasePose_N"));
21+
static const FName NAME_Enable_FootIK_R(TEXT("Enable_FootIK_R"));
22+
static const FName NAME_Enable_FootIK_L(TEXT("Enable_FootIK_L"));
23+
static const FName NAME_Enable_HandIK_L(TEXT("Enable_HandIK_L"));
24+
static const FName NAME_Enable_HandIK_R(TEXT("Enable_HandIK_R"));
25+
static const FName NAME_Enable_Transition(TEXT("Enable_Transition"));
26+
static const FName NAME_FootLock_L(TEXT("FootLock_L"));
27+
static const FName NAME_FootLock_R(TEXT("FootLock_R"));
28+
static const FName NAME_Grounded___Slot(TEXT("Grounded Slot"));
29+
static const FName NAME_Layering_Arm_L(TEXT("Layering_Arm_L"));
30+
static const FName NAME_Layering_Arm_L_Add(TEXT("Layering_Arm_L_Add"));
31+
static const FName NAME_Layering_Arm_L_LS(TEXT("Layering_Arm_L_LS"));
32+
static const FName NAME_Layering_Arm_R(TEXT("Layering_Arm_R"));
33+
static const FName NAME_Layering_Arm_R_Add(TEXT("Layering_Arm_R_Add"));
34+
static const FName NAME_Layering_Arm_R_LS(TEXT("Layering_Arm_R_LS"));
35+
static const FName NAME_Layering_Hand_L(TEXT("Layering_Hand_L"));
36+
static const FName NAME_Layering_Hand_R(TEXT("Layering_Hand_R"));
37+
static const FName NAME_Layering_Head_Add(TEXT("Layering_Head_Add"));
38+
static const FName NAME_Layering_Spine_Add(TEXT("Layering_Spine_Add"));
39+
static const FName NAME_Mask_AimOffset(TEXT("Mask_AimOffset"));
40+
static const FName NAME_Mask_LandPrediction(TEXT("Mask_LandPrediction"));
41+
static const FName NAME__ALSCharacterAnimInstance__RotationAmount(TEXT("RotationAmount"));
42+
static const FName NAME_VB___foot_target_l(TEXT("VB foot_target_l"));
43+
static const FName NAME_VB___foot_target_r(TEXT("VB foot_target_r"));
44+
static const FName NAME_W_Gait(TEXT("W_Gait"));
45+
static const FName NAME__ALSCharacterAnimInstance__root(TEXT("root"));
5046

5147

5248
void UALSCharacterAnimInstance::NativeInitializeAnimation()
@@ -62,7 +58,7 @@ void UALSCharacterAnimInstance::NativeBeginPlay()
6258
// This is the reason why it is tried here to get the ALS debug component.
6359
if (APawn* Owner = TryGetPawnOwner())
6460
{
65-
DebugComponent = Owner->FindComponentByClass<UALSDebugComponent>();
61+
ALSDebugComponent = Owner->FindComponentByClass<UALSDebugComponent>();
6662
}
6763
}
6864

@@ -486,7 +482,7 @@ void UALSCharacterAnimInstance::SetFootOffsets(float DeltaSeconds, FName EnableF
486482
TraceEnd,
487483
ECC_Visibility, Params);
488484

489-
if (DebugComponent && DebugComponent->GetShowTraces())
485+
if (ALSDebugComponent && ALSDebugComponent->GetShowTraces())
490486
{
491487
UALSDebugComponent::DrawDebugLineTraceSingle(
492488
World,
@@ -811,7 +807,7 @@ float UALSCharacterAnimInstance::CalculateLandPrediction() const
811807
const bool bHit = World->SweepSingleByChannel(HitResult, CapsuleWorldLoc, CapsuleWorldLoc + TraceLength, FQuat::Identity,
812808
ECC_Visibility, CapsuleCollisionShape, Params);
813809

814-
if (DebugComponent && DebugComponent->GetShowTraces())
810+
if (ALSDebugComponent && ALSDebugComponent->GetShowTraces())
815811
{
816812
UALSDebugComponent::DrawDebugCapsuleTraceSingle(World,
817813
CapsuleWorldLoc,

‎Source/ALSV4_CPP/Private/Components/ALSMantleComponent.cpp‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,8 @@ void UALSMantleComponent::BeginPlay()
4141
OwnerCharacter = Cast<AALSBaseCharacter>(GetOwner());
4242
if (OwnerCharacter)
4343
{
44+
ALSDebugComponent = OwnerCharacter->FindComponentByClass<UALSDebugComponent>();
45+
4446
AddTickPrerequisiteActor(OwnerCharacter); // Always tick after owner, so we'll use updated values
4547

4648
// Bindings
@@ -56,8 +58,6 @@ void UALSMantleComponent::BeginPlay()
5658
OwnerCharacter->JumpPressedDelegate.AddUniqueDynamic(this, &UALSMantleComponent::OnOwnerJumpInput);
5759
OwnerCharacter->RagdollStateChangedDelegate.AddUniqueDynamic(
5860
this, &UALSMantleComponent::OnOwnerRagdollStateChanged);
59-
60-
DebugComponent = OwnerCharacter->FindComponentByClass<UALSDebugComponent>();
6161
}
6262
}
6363
}
@@ -181,7 +181,7 @@ bool UALSMantleComponent::MantleCheck(const FALSMantleTraceSettings& TraceSettin
181181
const bool bHit = World->SweepSingleByProfile(HitResult, TraceStart, TraceEnd, FQuat::Identity, MantleObjectDetectionProfile,
182182
CapsuleCollisionShape, Params);
183183

184-
if (DebugComponent && DebugComponent->GetShowTraces())
184+
if (ALSDebugComponent && ALSDebugComponent->GetShowTraces())
185185
{
186186
UALSDebugComponent::DrawDebugCapsuleTraceSingle(World,
187187
TraceStart,
@@ -228,7 +228,7 @@ bool UALSMantleComponent::MantleCheck(const FALSMantleTraceSettings& TraceSettin
228228
WalkableSurfaceDetectionChannel, SphereCollisionShape,
229229
Params);
230230

231-
if (DebugComponent && DebugComponent->GetShowTraces())
231+
if (ALSDebugComponent && ALSDebugComponent->GetShowTraces())
232232
{
233233
UALSDebugComponent::DrawDebugSphereTraceSingle(World,
234234
TraceStart,
@@ -259,7 +259,7 @@ bool UALSMantleComponent::MantleCheck(const FALSMantleTraceSettings& TraceSettin
259259
DownTraceLocation, 2.0f, OwnerCharacter->GetCapsuleComponent());
260260
const bool bCapsuleHasRoom = UALSMathLibrary::CapsuleHasRoomCheck(OwnerCharacter->GetCapsuleComponent(),
261261
CapsuleLocationFBase, 0.0f,
262-
0.0f, DebugType, DebugComponent && DebugComponent->GetShowTraces());
262+
0.0f, DebugType, ALSDebugComponent && ALSDebugComponent->GetShowTraces());
263263

264264
if (!bCapsuleHasRoom)
265265
{

‎Source/ALSV4_CPP/Public/Character/ALSBaseCharacter.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -646,5 +646,5 @@ class ALSV4_CPP_API AALSBaseCharacter : public ACharacter
646646

647647
private:
648648
UPROPERTY()
649-
UALSDebugComponent* DebugComponent = nullptr;
649+
UALSDebugComponent* ALSDebugComponent = nullptr;
650650
};

‎Source/ALSV4_CPP/Public/Character/ALSPlayerCameraManager.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,5 +78,5 @@ class ALSV4_CPP_API AALSPlayerCameraManager : public APlayerCameraManager
7878

7979
private:
8080
UPROPERTY()
81-
UALSDebugComponent* DebugComponent = nullptr;
81+
UALSDebugComponent* ALSDebugComponent = nullptr;
8282
};

‎Source/ALSV4_CPP/Public/Character/Animation/ALSCharacterAnimInstance.h‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -302,14 +302,12 @@ class ALSV4_CPP_API UALSCharacterAnimInstance : public UAnimInstance
302302
UPROPERTY(EditDefaultsOnly, BlueprintReadOnly, Category = "Configuration|Dynamic Transition")
303303
UAnimSequenceBase* TransitionAnim_L = nullptr;
304304

305-
static FName NAME_ik_foot_l;
306-
static FName NAME_ik_foot_r;
307305
/** IK Bone Names */
308306
UPROPERTY(EditDefaultsOnly, BlueprintReadOnly, Category = "Configuration|Anim Graph - Foot IK")
309-
FName IkFootL_BoneName = NAME_ik_foot_l;
307+
FName IkFootL_BoneName = FName(TEXT("ik_foot_l"));
310308

311309
UPROPERTY(EditDefaultsOnly, BlueprintReadOnly, Category = "Configuration|Anim Graph - Foot IK")
312-
FName IkFootR_BoneName = NAME_ik_foot_r;
310+
FName IkFootR_BoneName = FName(TEXT("ik_foot_r"));
313311

314312
private:
315313
FTimerHandle OnPivotTimer;
@@ -321,5 +319,5 @@ class ALSV4_CPP_API UALSCharacterAnimInstance : public UAnimInstance
321319
bool bCanPlayDynamicTransition = true;
322320

323321
UPROPERTY()
324-
UALSDebugComponent* DebugComponent = nullptr;
322+
UALSDebugComponent* ALSDebugComponent = nullptr;
325323
};

‎Source/ALSV4_CPP/Public/Components/ALSMantleComponent.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -114,5 +114,5 @@ class ALSV4_CPP_API UALSMantleComponent : public UActorComponent
114114
AALSBaseCharacter* OwnerCharacter;
115115

116116
UPROPERTY()
117-
UALSDebugComponent* DebugComponent = nullptr;
117+
UALSDebugComponent* ALSDebugComponent = nullptr;
118118
};

0 commit comments

Comments
 (0)