diff --git a/Config/DefaultRWTHVRToolkit.ini b/Config/DefaultRWTHVRToolkit.ini index d889fa8e739260f399c2a767ec67869d0058b00a..29ee91a7aaabc28feebf6357b1672bdd652ff613 100644 --- a/Config/DefaultRWTHVRToolkit.ini +++ b/Config/DefaultRWTHVRToolkit.ini @@ -1,5 +1,7 @@ [CoreRedirects] -+ClassRedirects=(OldName="/Script/RWTHVRToolkit.VirtualRealityPawn",NewName="/Script/RWTHVRToolkit.RWTHVRPawn") -+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") \ No newline at end of file ++ClassRedirects = (OldName="/Script/RWTHVRToolkit.VirtualRealityPawn",NewName="/Script/RWTHVRToolkit.RWTHVRPawn") ++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 diff --git a/Source/RWTHVRToolkit/Private/Pawn/RWTHVRPawn.cpp b/Source/RWTHVRToolkit/Private/Pawn/RWTHVRPawn.cpp index c6653b378862670fb6aa61a31dc4ce2d43d1089a..eee711326be2929cae7f232537c7dc74c37d42c6 100644 --- a/Source/RWTHVRToolkit/Private/Pawn/RWTHVRPawn.cpp +++ b/Source/RWTHVRToolkit/Private/Pawn/RWTHVRPawn.cpp @@ -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); diff --git a/Source/RWTHVRToolkit/Public/Pawn/RWTHVRPawn.h b/Source/RWTHVRToolkit/Public/Pawn/RWTHVRPawn.h index 9cf9340a485a84d59431eacd5170db0595cb3208..50b98e0e84c1cfb5461c2d5764147fe6de77ca32 100644 --- a/Source/RWTHVRToolkit/Public/Pawn/RWTHVRPawn.h +++ b/Source/RWTHVRToolkit/Public/Pawn/RWTHVRPawn.h @@ -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. */