Skip to content
Snippets Groups Projects
Commit e692d9c3 authored by David Gilbert's avatar David Gilbert :bug:
Browse files

Merge branch 'refactor/pawn_movement_var' into 'dev/5.3'

refactor(pawn): Rename PawnMovement variable to CollisionHandlingMovement

See merge request !63
parents a44b940d 49b2e936
No related branches found
No related tags found
2 merge requests!80UE5.3-2023.1-rc2,!63refactor(pawn): Rename PawnMovement variable to CollisionHandlingMovement
......@@ -3,3 +3,5 @@
+ClassRedirects = (OldName="/Script/RWTHVRToolkit.VRPawnMovement",NewName="/Script/RWTHVRToolkit.CollisionHandlingMovement")
+StructRedirects = (OldName="/Script/RWTHVRToolkit.VRTransformRep",NewName="/Script/RWTHVRToolkit.ReplicatedTransform")
+ClassRedirects = (OldName="/Script/RWTHVRToolkit.VRWidgetInteractionComponent",NewName="/Script/RWTHVRToolkit.RWTHVRWidgetInteractionComponent")
+PropertyRedirects = (OldName="/Script/RWTHVRToolkit.RWTHVRPawn.PawnMovement",NewName="/Script/RWTHVRToolkit.RWTHVRPawn.CollisionHandlingMovement")
+PropertyRedirects = (OldName="/Script/RWTHVRToolkit.RWTHVRPawn.PawnMovement",NewName="/Script/RWTHVRToolkit.RWTHVRPawn.CollisionHandlingMovement")
\ No newline at end of file
......@@ -26,9 +26,9 @@ ARWTHVRPawn::ARWTHVRPawn(const FObjectInitializer& ObjectInitializer) : Super(Ob
HeadCameraComponent->SetRelativeLocation(FVector(0.0f, 0.0f, BaseEyeHeight));
// so it is rendered correctly in editor
PawnMovement = CreateDefaultSubobject<UCollisionHandlingMovement>(TEXT("Pawn Movement"));
PawnMovement->SetUpdatedComponent(RootComponent);
PawnMovement->SetHeadComponent(HeadCameraComponent);
CollisionHandlingMovement = CreateDefaultSubobject<UCollisionHandlingMovement>(TEXT("Collision Handling Movement"));
CollisionHandlingMovement->SetUpdatedComponent(RootComponent);
CollisionHandlingMovement->SetHeadComponent(HeadCameraComponent);
RightHand = CreateDefaultSubobject<UReplicatedMotionControllerComponent>(TEXT("Right Hand MCC"));
RightHand->SetupAttachment(RootComponent);
......
......@@ -39,7 +39,7 @@ public:
/* Movement */
UPROPERTY(VisibleAnywhere, BlueprintReadOnly, Category = "Pawn|Movement")
UCollisionHandlingMovement* PawnMovement;
UCollisionHandlingMovement* CollisionHandlingMovement;
UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = "Pawn|Desktop Movement")
bool bMoveRightHandWithMouse = true;
......@@ -86,7 +86,8 @@ protected:
/* LiveLink helper function called on tick */
void EvaluateLivelink() const;
/* Helper function that applies the LiveLink data to this component. Taken from the LiveLink Transform Controller. */
/* Helper function that applies the LiveLink data to this component. Taken from the LiveLink Transform Controller.
*/
void ApplyLiveLinkTransform(const FTransform& Transform, const FLiveLinkTransformStaticData& StaticData) const;
/* Fixes camera rotation in desktop mode. */
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment