Skip to content
Snippets Groups Projects
Commit ca70e3ba authored by Kris Tabea Helwig's avatar Kris Tabea Helwig
Browse files

fix(movement): Splits mouse rotation from IA_Turn to avoid snap turn on CAVE

parent 30893e87
Branches
Tags
2 merge requests!107UE5.4-2024.1-rc1,!100Splits mouse rotation from IA_Turn to avoid snap turn on CAVE
Pipeline #450193 failed
...@@ -18,4 +18,5 @@ ...@@ -18,4 +18,5 @@
+FunctionRedirects = (OldName="/Script/RWTHVRToolkit.DirectInteractionComponent.OnBeginGrab",NewName="/Script/RWTHVRToolkit.DirectInteractionComponent.OnBeginInteraction") +FunctionRedirects = (OldName="/Script/RWTHVRToolkit.DirectInteractionComponent.OnBeginGrab",NewName="/Script/RWTHVRToolkit.DirectInteractionComponent.OnBeginInteraction")
+FunctionRedirects = (OldName="/Script/RWTHVRToolkit.DirectInteractionComponent.OnEndGrab",NewName="/Script/RWTHVRToolkit.DirectInteractionComponent.OnEndInteraction") +FunctionRedirects = (OldName="/Script/RWTHVRToolkit.DirectInteractionComponent.OnEndGrab",NewName="/Script/RWTHVRToolkit.DirectInteractionComponent.OnEndInteraction")
+PropertyRedirects = (OldName="/Script/RWTHVRToolkit.DirectInteractionComponent.PreviousGrabBehavioursInRange",NewName="/Script/RWTHVRToolkit.DirectInteractionComponent.PreviousInteractableComponentsInRange") +PropertyRedirects = (OldName="/Script/RWTHVRToolkit.DirectInteractionComponent.PreviousGrabBehavioursInRange",NewName="/Script/RWTHVRToolkit.DirectInteractionComponent.PreviousInteractableComponentsInRange")
+PropertyRedirects = (OldName="/Script/RWTHVRToolkit.DirectInteractionComponent.CurrentGrabBehavioursInRange",NewName="/Script/RWTHVRToolkit.DirectInteractionComponent.CurrentInteractableComponentsInRange") +PropertyRedirects = (OldName="/Script/RWTHVRToolkit.DirectInteractionComponent.CurrentGrabBehavioursInRange",NewName="/Script/RWTHVRToolkit.DirectInteractionComponent.CurrentInteractableComponentsInRange")
\ No newline at end of file +PropertyRedirects=(OldName="/Script/RWTHVRToolkit.TurnComponent.DesktopRotation",NewName="/Script/RWTHVRToolkit.TurnComponent.DesktopTurnCondition")
\ No newline at end of file
No preview for this file type
File deleted
File added
File added
No preview for this file type
No preview for this file type
No preview for this file type
...@@ -44,15 +44,15 @@ void UTurnComponent::SetupPlayerInput(UInputComponent* PlayerInputComponent) ...@@ -44,15 +44,15 @@ void UTurnComponent::SetupPlayerInput(UInputComponent* PlayerInputComponent)
} }
else else
{ {
EI->BindAction(Turn, ETriggerEvent::Triggered, this, &UTurnComponent::OnBeginTurn); EI->BindAction(DesktopTurn, ETriggerEvent::Triggered, this, &UTurnComponent::OnBeginTurn);
} }
} }
// bind additional functions for desktop rotations // bind additional functions for desktop rotations
if (URWTHVRUtilities::IsDesktopMode()) if (URWTHVRUtilities::IsDesktopMode())
{ {
EI->BindAction(DesktopRotation, ETriggerEvent::Started, this, &UTurnComponent::StartDesktopRotation); EI->BindAction(DesktopTurnCondition, ETriggerEvent::Started, this, &UTurnComponent::StartDesktopRotation);
EI->BindAction(DesktopRotation, ETriggerEvent::Completed, this, &UTurnComponent::EndDesktopRotation); EI->BindAction(DesktopTurnCondition, ETriggerEvent::Completed, this, &UTurnComponent::EndDesktopRotation);
} }
} }
......
...@@ -36,9 +36,12 @@ public: ...@@ -36,9 +36,12 @@ public:
UPROPERTY(EditDefaultsOnly, BlueprintReadOnly, Category = "VR Movement|Input|Actions") UPROPERTY(EditDefaultsOnly, BlueprintReadOnly, Category = "VR Movement|Input|Actions")
class UInputAction* Turn; class UInputAction* Turn;
UPROPERTY(EditDefaultsOnly, BlueprintReadOnly, Category = "VR Movement|Input|Actions")
class UInputAction* DesktopTurn;
UPROPERTY(EditDefaultsOnly, BlueprintReadOnly, Category = "VR Movement|Input|Actions") UPROPERTY(EditDefaultsOnly, BlueprintReadOnly, Category = "VR Movement|Input|Actions")
class UInputAction* DesktopRotation; class UInputAction* DesktopTurnCondition;
/** /**
* Called every tick as long as stick input is received to allow for continuous turning * Called every tick as long as stick input is received to allow for continuous turning
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment