Skip to content
Snippets Groups Projects
Commit 84c7c8a9 authored by Peter Gschladt's avatar Peter Gschladt
Browse files

Merge branch 'fix/snapturn' into 'dev/5.5'

Fix/snapturn

See merge request !117
parents d61f7bc5 ed152f12
Branches
No related tags found
1 merge request!117Fix/snapturn
File added
File added
No preview for this file type
No preview for this file type
No preview for this file type
...@@ -42,7 +42,7 @@ void UTurnComponent::SetupPlayerInput(UInputComponent* PlayerInputComponent) ...@@ -42,7 +42,7 @@ void UTurnComponent::SetupPlayerInput(UInputComponent* PlayerInputComponent)
// no snap turning for desktop mode // no snap turning for desktop mode
if (!URWTHVRUtilities::IsDesktopMode()) if (!URWTHVRUtilities::IsDesktopMode())
{ {
EI->BindAction(XRTurn, ETriggerEvent::Triggered, this, &UTurnComponent::OnBeginSnapTurn); EI->BindAction(XRTurnSnap, ETriggerEvent::Triggered, this, &UTurnComponent::OnBeginSnapTurn);
} }
else else
{ {
...@@ -53,7 +53,7 @@ void UTurnComponent::SetupPlayerInput(UInputComponent* PlayerInputComponent) ...@@ -53,7 +53,7 @@ void UTurnComponent::SetupPlayerInput(UInputComponent* PlayerInputComponent)
{ {
if (!URWTHVRUtilities::IsDesktopMode()) if (!URWTHVRUtilities::IsDesktopMode())
{ {
EI->BindAction(XRTurn, ETriggerEvent::Triggered, this, &UTurnComponent::OnBeginTurn); EI->BindAction(XRTurnContinuous, ETriggerEvent::Triggered, this, &UTurnComponent::OnBeginTurn);
} }
else else
{ {
......
...@@ -35,7 +35,10 @@ public: ...@@ -35,7 +35,10 @@ public:
float SnapTurnAngle = 22.5; float SnapTurnAngle = 22.5;
UPROPERTY(EditDefaultsOnly, BlueprintReadOnly, Category = "VR Movement|Input|Actions") UPROPERTY(EditDefaultsOnly, BlueprintReadOnly, Category = "VR Movement|Input|Actions")
class UInputAction* XRTurn; class UInputAction* XRTurnContinuous;
UPROPERTY(EditDefaultsOnly, BlueprintReadOnly, Category = "VR Movement|Input|Actions")
class UInputAction* XRTurnSnap;
UPROPERTY(EditDefaultsOnly, BlueprintReadOnly, Category = "VR Movement|Input|Actions") UPROPERTY(EditDefaultsOnly, BlueprintReadOnly, Category = "VR Movement|Input|Actions")
class UInputAction* DesktopTurn; class UInputAction* DesktopTurn;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment