From 8e82238395278952393045c2b4c4662b06443277 Mon Sep 17 00:00:00 2001 From: Simon Date: Sat, 25 Jul 2020 15:54:44 +0100 Subject: [PATCH] Fix scope lerp issue - Also disabled snap turn while in scope - Made sure VR menu options show when menu is shown --- Projects/Android/jni/RTCWVR/VrInputCommon.c | 4 +++- Projects/Android/jni/RTCWVR/VrInputDefault.c | 10 +++++----- .../z_rtcwquest_vrmenu/ui/controls.menu | 2 +- .../z_rtcwquest_vrmenu/z_rtcwquest_vrmenu.pk3 | Bin 6404 -> 6401 bytes assets/z_rtcwquest_vrmenu.pk3 | Bin 6404 -> 6401 bytes 5 files changed, 9 insertions(+), 7 deletions(-) diff --git a/Projects/Android/jni/RTCWVR/VrInputCommon.c b/Projects/Android/jni/RTCWVR/VrInputCommon.c index 6ec93c5..7335a36 100644 --- a/Projects/Android/jni/RTCWVR/VrInputCommon.c +++ b/Projects/Android/jni/RTCWVR/VrInputCommon.c @@ -139,7 +139,9 @@ void updateScopeAngles() vec3_t angles; VectorSet(angles, vr.weaponangles[PITCH], vr.weaponangles[YAW], vr.hmdorientation[ROLL]); - VectorLerp(currentScopeAngles, 0.125, angles, currentScopeAngles); + //Can't use lerp as the change from +180 to -180 causes a rapid spin! + //VectorLerp(currentScopeAngles, 0.125, angles, currentScopeAngles); + VectorCopy(angles, currentScopeAngles); //Set "view" Angles VectorCopy(currentScopeAngles, vr.hmdorientation); diff --git a/Projects/Android/jni/RTCWVR/VrInputDefault.c b/Projects/Android/jni/RTCWVR/VrInputDefault.c index 1ab921b..4c89fa5 100644 --- a/Projects/Android/jni/RTCWVR/VrInputDefault.c +++ b/Projects/Android/jni/RTCWVR/VrInputDefault.c @@ -535,8 +535,8 @@ void HandleInput_Default( ovrInputStateTrackedRemote *pDominantTrackedRemoteNew, //No snap turn when using mounted gun static int increaseSnap = true; - if (!vr.mountedgun) { - if (pDominantTrackedRemoteNew->Joystick.x > 0.6f) { + if (!vr.mountedgun && !vr.scopeengaged) { + if (pDominantTrackedRemoteNew->Joystick.x > 0.7f) { if (increaseSnap) { snapTurn -= vr_snapturn_angle->value; if (vr_snapturn_angle->value > 10.0f) { @@ -549,12 +549,12 @@ void HandleInput_Default( ovrInputStateTrackedRemote *pDominantTrackedRemoteNew, RTCWVR_ResyncClientYawWithGameYaw(); } - } else if (pDominantTrackedRemoteNew->Joystick.x < 0.4f) { + } else if (pDominantTrackedRemoteNew->Joystick.x < 0.3f) { increaseSnap = true; } static int decreaseSnap = true; - if (pDominantTrackedRemoteNew->Joystick.x < -0.6f) { + if (pDominantTrackedRemoteNew->Joystick.x < -0.7f) { if (decreaseSnap) { snapTurn += vr_snapturn_angle->value; @@ -569,7 +569,7 @@ void HandleInput_Default( ovrInputStateTrackedRemote *pDominantTrackedRemoteNew, RTCWVR_ResyncClientYawWithGameYaw(); } - } else if (pDominantTrackedRemoteNew->Joystick.x > -0.4f) { + } else if (pDominantTrackedRemoteNew->Joystick.x > -0.3f) { decreaseSnap = true; } } diff --git a/Projects/Android/z_rtcwquest_vrmenu/ui/controls.menu b/Projects/Android/z_rtcwquest_vrmenu/ui/controls.menu index ac23162..59c4b77 100644 --- a/Projects/Android/z_rtcwquest_vrmenu/ui/controls.menu +++ b/Projects/Android/z_rtcwquest_vrmenu/ui/controls.menu @@ -17,7 +17,7 @@ menuDef setitemcolor fadebox backcolor 0 0 0 1; fadeout fadebox; hide grpControls; - show look; + show vr; uiScript loadControls } diff --git a/Projects/Android/z_rtcwquest_vrmenu/z_rtcwquest_vrmenu.pk3 b/Projects/Android/z_rtcwquest_vrmenu/z_rtcwquest_vrmenu.pk3 index cac41fdbe1d54bef69a983886934c55cd138d487..ff0b76bce61b486fbfb32082b179fbd527a3e3e1 100644 GIT binary patch delta 1303 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 diff --git a/assets/z_rtcwquest_vrmenu.pk3 b/assets/z_rtcwquest_vrmenu.pk3 index cac41fdbe1d54bef69a983886934c55cd138d487..ff0b76bce61b486fbfb32082b179fbd527a3e3e1 100644 GIT binary patch delta 1303 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