diff --git a/Projects/Android/jni/src/Lambda1VR/VrInputAlt.c b/Projects/Android/jni/src/Lambda1VR/VrInputAlt.c index e955540..0cc072f 100644 --- a/Projects/Android/jni/src/Lambda1VR/VrInputAlt.c +++ b/Projects/Android/jni/src/Lambda1VR/VrInputAlt.c @@ -198,8 +198,8 @@ void HandleInput_Alt( ovrInputStateTrackedRemote *pDominantTrackedRemoteNew, ovr if (vr_gesture_triggered_use->integer) { bool gestureUseAllowed = !vr_weapon_stabilised->value; // Off-hand gesture - float xOffset = hmdPosition[0] - pOffTracking->HeadPose.Pose.Position.x; - float zOffset = hmdPosition[2] - pOffTracking->HeadPose.Pose.Position.z; + float xOffset = hmdPosition[0] - pOffTracking->Pose.position.x; + float zOffset = hmdPosition[2] - pOffTracking->Pose.position.z; float distanceToBody = sqrtf((xOffset * xOffset) + (zOffset * zOffset)); if (gestureUseAllowed && (distanceToBody > vr_use_gesture_boundary->value)) { if (!(use_gesture_state & VR_USE_GESTURE_OFF_HAND)) { @@ -213,8 +213,8 @@ void HandleInput_Alt( ovrInputStateTrackedRemote *pDominantTrackedRemoteNew, ovr use_gesture_state &= ~VR_USE_GESTURE_OFF_HAND; } // Weapon-hand gesture - xOffset = hmdPosition[0] - pDominantTracking->HeadPose.Pose.Position.x; - zOffset = hmdPosition[2] - pDominantTracking->HeadPose.Pose.Position.z; + xOffset = hmdPosition[0] - pDominantTracking->Pose.position.x; + zOffset = hmdPosition[2] - pDominantTracking->Pose.position.z; distanceToBody = sqrtf((xOffset * xOffset) + (zOffset * zOffset)); if (gestureUseAllowed && (distanceToBody > vr_use_gesture_boundary->value)) { if (!(use_gesture_state & VR_USE_GESTURE_WEAPON_HAND)) { diff --git a/Projects/Android/jni/src/Lambda1VR/VrInputAlt2.c b/Projects/Android/jni/src/Lambda1VR/VrInputAlt2.c index 8bd5439..20de705 100644 --- a/Projects/Android/jni/src/Lambda1VR/VrInputAlt2.c +++ b/Projects/Android/jni/src/Lambda1VR/VrInputAlt2.c @@ -210,8 +210,8 @@ void HandleInput_Alt2( ovrInputStateTrackedRemote *pDominantTrackedRemoteNew, ov if (vr_gesture_triggered_use->integer) { bool gestureUseAllowed = !vr_weapon_stabilised->value; // Off-hand gesture - float xOffset = hmdPosition[0] - pOffTracking->HeadPose.Pose.Position.x; - float zOffset = hmdPosition[2] - pOffTracking->HeadPose.Pose.Position.z; + float xOffset = hmdPosition[0] - pOffTracking->Pose.position.x; + float zOffset = hmdPosition[2] - pOffTracking->Pose.position.z; float distanceToBody = sqrtf((xOffset * xOffset) + (zOffset * zOffset)); if (gestureUseAllowed && (distanceToBody > vr_use_gesture_boundary->value)) { if (!(use_gesture_state & VR_USE_GESTURE_OFF_HAND)) { @@ -225,8 +225,8 @@ void HandleInput_Alt2( ovrInputStateTrackedRemote *pDominantTrackedRemoteNew, ov use_gesture_state &= ~VR_USE_GESTURE_OFF_HAND; } // Weapon-hand gesture - xOffset = hmdPosition[0] - pDominantTracking->HeadPose.Pose.Position.x; - zOffset = hmdPosition[2] - pDominantTracking->HeadPose.Pose.Position.z; + xOffset = hmdPosition[0] - pDominantTracking->Pose.position.x; + zOffset = hmdPosition[2] - pDominantTracking->Pose.position.z; distanceToBody = sqrtf((xOffset * xOffset) + (zOffset * zOffset)); if (gestureUseAllowed && (distanceToBody > vr_use_gesture_boundary->value)) { if (!(use_gesture_state & VR_USE_GESTURE_WEAPON_HAND)) { diff --git a/Projects/Android/jni/src/Lambda1VR/VrInputDefault.c b/Projects/Android/jni/src/Lambda1VR/VrInputDefault.c index 37a2dce..2962eff 100644 --- a/Projects/Android/jni/src/Lambda1VR/VrInputDefault.c +++ b/Projects/Android/jni/src/Lambda1VR/VrInputDefault.c @@ -211,8 +211,8 @@ void HandleInput_Default( ovrInputStateTrackedRemote *pDominantTrackedRemoteNew, if (vr_gesture_triggered_use->integer) { bool gestureUseAllowed = !vr_weapon_stabilised->value; // Off-hand gesture - float xOffset = hmdPosition[0] - pOffTracking->HeadPose.Pose.Position.x; - float zOffset = hmdPosition[2] - pOffTracking->HeadPose.Pose.Position.z; + float xOffset = hmdPosition[0] - pOffTracking->Pose.position.x; + float zOffset = hmdPosition[2] - pOffTracking->Pose.position.z; float distanceToBody = sqrtf((xOffset * xOffset) + (zOffset * zOffset)); if (gestureUseAllowed && (distanceToBody > vr_use_gesture_boundary->value)) { if (!(use_gesture_state & VR_USE_GESTURE_OFF_HAND)) { @@ -226,8 +226,8 @@ void HandleInput_Default( ovrInputStateTrackedRemote *pDominantTrackedRemoteNew, use_gesture_state &= ~VR_USE_GESTURE_OFF_HAND; } // Weapon-hand gesture - xOffset = hmdPosition[0] - pDominantTracking->HeadPose.Pose.Position.x; - zOffset = hmdPosition[2] - pDominantTracking->HeadPose.Pose.Position.z; + xOffset = hmdPosition[0] - pDominantTracking->Pose.position.x; + zOffset = hmdPosition[2] - pDominantTracking->Pose.position.z; distanceToBody = sqrtf((xOffset * xOffset) + (zOffset * zOffset)); if (gestureUseAllowed && (distanceToBody > vr_use_gesture_boundary->value)) { if (!(use_gesture_state & VR_USE_GESTURE_WEAPON_HAND)) { diff --git a/Projects/Android/jni/src/Lambda1VR/VrInputOne.c b/Projects/Android/jni/src/Lambda1VR/VrInputOne.c index daa7984..3e1844b 100644 --- a/Projects/Android/jni/src/Lambda1VR/VrInputOne.c +++ b/Projects/Android/jni/src/Lambda1VR/VrInputOne.c @@ -429,8 +429,8 @@ void HandleInput_OneController( ovrInputStateTrackedRemote *pDominantTrackedRemo if (vr_gesture_triggered_use->integer) { bool gestureUseAllowed = !vr_weapon_stabilised->value; // Off-hand gesture - float xOffset = hmdPosition[0] - pOffTracking->HeadPose.Pose.Position.x; - float zOffset = hmdPosition[2] - pOffTracking->HeadPose.Pose.Position.z; + float xOffset = hmdPosition[0] - pOffTracking->Pose.position.x; + float zOffset = hmdPosition[2] - pOffTracking->Pose.position.z; float distanceToBody = sqrtf((xOffset * xOffset) + (zOffset * zOffset)); if (gestureUseAllowed && (distanceToBody > vr_use_gesture_boundary->value)) { if (!(use_gesture_state & VR_USE_GESTURE_OFF_HAND)) { @@ -444,8 +444,8 @@ void HandleInput_OneController( ovrInputStateTrackedRemote *pDominantTrackedRemo use_gesture_state &= ~VR_USE_GESTURE_OFF_HAND; } // Weapon-hand gesture - xOffset = hmdPosition[0] - pDominantTracking->HeadPose.Pose.Position.x; - zOffset = hmdPosition[2] - pDominantTracking->HeadPose.Pose.Position.z; + xOffset = hmdPosition[0] - pDominantTracking->Pose.position.x; + zOffset = hmdPosition[2] - pDominantTracking->Pose.position.z; distanceToBody = sqrtf((xOffset * xOffset) + (zOffset * zOffset)); if (gestureUseAllowed && (distanceToBody > vr_use_gesture_boundary->value)) { if (!(use_gesture_state & VR_USE_GESTURE_WEAPON_HAND)) {