From 3e4310da8c30a49ddd9c5cf49fb5bb52256ffce9 Mon Sep 17 00:00:00 2001 From: Grant Bagwell Date: Thu, 18 Jul 2019 22:35:21 +0200 Subject: [PATCH 1/4] Fixing rebroken leftstick --- Projects/Android/jni/src/Lambda1VR/L1VR_SurfaceView.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Projects/Android/jni/src/Lambda1VR/L1VR_SurfaceView.c b/Projects/Android/jni/src/Lambda1VR/L1VR_SurfaceView.c index 6d893b1..d663ae6 100644 --- a/Projects/Android/jni/src/Lambda1VR/L1VR_SurfaceView.c +++ b/Projects/Android/jni/src/Lambda1VR/L1VR_SurfaceView.c @@ -1232,9 +1232,9 @@ static void ovrApp_HandleInput( ovrApp * app ) flashlightoffset[2] = offHandRemoteTracking->HeadPose.Pose.Position.z - hmdPosition[2]; QuatToYawPitchRoll(offHandRemoteTracking->HeadPose.Pose.Orientation, flashlightangles); - flashlightangles[YAW] += (cl.refdef.cl_viewangles[YAW] - hmdorientation[YAW]); - controllerYawHeading = -cl.refdef.cl_viewangles[YAW] + flashlightangles[YAW] - hmdorientation[YAW]; + flashlightangles[YAW] += (cl.refdef.cl_viewangles[YAW] - hmdorientation[YAW]); + controllerYawHeading = -cl.refdef.cl_viewangles[YAW] + flashlightangles[YAW]; //Run handleTrackedControllerButton(offHandTrackedRemoteState, From 9b6cb36ea659a24c4385ab27dbac50dfecbbca20 Mon Sep 17 00:00:00 2001 From: Grant Bagwell Date: Thu, 18 Jul 2019 23:24:01 +0200 Subject: [PATCH 2/4] Remove crosshair --- Projects/Android/jni/src/Xash3D/xash3d/engine/common/common.h | 2 +- Projects/Android/jni/src/hlsdk-xash3d/cl_dll/vr_renderer.cpp | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/Projects/Android/jni/src/Xash3D/xash3d/engine/common/common.h b/Projects/Android/jni/src/Xash3D/xash3d/engine/common/common.h index 636ddf4..49c6ec9 100644 --- a/Projects/Android/jni/src/Xash3D/xash3d/engine/common/common.h +++ b/Projects/Android/jni/src/Xash3D/xash3d/engine/common/common.h @@ -177,7 +177,7 @@ typedef enum // PERFORMANCE INFO #define MIN_FPS 15.0 // host minimum fps value for maxfps. -#define MAX_FPS 500.0 // upper limit for maxfps. +#define MAX_FPS 72.0 // upper limit for maxfps. #ifdef VR #define VR_EYE_MONO -1 diff --git a/Projects/Android/jni/src/hlsdk-xash3d/cl_dll/vr_renderer.cpp b/Projects/Android/jni/src/hlsdk-xash3d/cl_dll/vr_renderer.cpp index c37112a..1d41f38 100644 --- a/Projects/Android/jni/src/hlsdk-xash3d/cl_dll/vr_renderer.cpp +++ b/Projects/Android/jni/src/hlsdk-xash3d/cl_dll/vr_renderer.cpp @@ -55,6 +55,7 @@ void VRRenderer::Frame(double time) gEngfuncs.pfnClientCmd("fps_max 150"); //gEngfuncs.pfnClientCmd("fps_override 1"); gEngfuncs.pfnClientCmd("gl_vsync 0"); + gEngfuncs.pfnClientCmd("crosshair 0"); gEngfuncs.pfnClientCmd("default_fov 110"); //gEngfuncs.pfnClientCmd("firstperson"); From 11918aed4b134c3839fb1c0695ff7c238808dde4 Mon Sep 17 00:00:00 2001 From: Grant Bagwell Date: Thu, 18 Jul 2019 23:24:11 +0200 Subject: [PATCH 3/4] Revert "Remove crosshair" This reverts commit 9b6cb36ea659a24c4385ab27dbac50dfecbbca20. --- Projects/Android/jni/src/Xash3D/xash3d/engine/common/common.h | 2 +- Projects/Android/jni/src/hlsdk-xash3d/cl_dll/vr_renderer.cpp | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/Projects/Android/jni/src/Xash3D/xash3d/engine/common/common.h b/Projects/Android/jni/src/Xash3D/xash3d/engine/common/common.h index 49c6ec9..636ddf4 100644 --- a/Projects/Android/jni/src/Xash3D/xash3d/engine/common/common.h +++ b/Projects/Android/jni/src/Xash3D/xash3d/engine/common/common.h @@ -177,7 +177,7 @@ typedef enum // PERFORMANCE INFO #define MIN_FPS 15.0 // host minimum fps value for maxfps. -#define MAX_FPS 72.0 // upper limit for maxfps. +#define MAX_FPS 500.0 // upper limit for maxfps. #ifdef VR #define VR_EYE_MONO -1 diff --git a/Projects/Android/jni/src/hlsdk-xash3d/cl_dll/vr_renderer.cpp b/Projects/Android/jni/src/hlsdk-xash3d/cl_dll/vr_renderer.cpp index 1d41f38..c37112a 100644 --- a/Projects/Android/jni/src/hlsdk-xash3d/cl_dll/vr_renderer.cpp +++ b/Projects/Android/jni/src/hlsdk-xash3d/cl_dll/vr_renderer.cpp @@ -55,7 +55,6 @@ void VRRenderer::Frame(double time) gEngfuncs.pfnClientCmd("fps_max 150"); //gEngfuncs.pfnClientCmd("fps_override 1"); gEngfuncs.pfnClientCmd("gl_vsync 0"); - gEngfuncs.pfnClientCmd("crosshair 0"); gEngfuncs.pfnClientCmd("default_fov 110"); //gEngfuncs.pfnClientCmd("firstperson"); From 15e9f714836efc4548dbc42b4a513c86f1b34392 Mon Sep 17 00:00:00 2001 From: Grant Bagwell Date: Thu, 18 Jul 2019 23:24:49 +0200 Subject: [PATCH 4/4] Remove crosshair --- Projects/Android/jni/src/hlsdk-xash3d/cl_dll/vr_renderer.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/Projects/Android/jni/src/hlsdk-xash3d/cl_dll/vr_renderer.cpp b/Projects/Android/jni/src/hlsdk-xash3d/cl_dll/vr_renderer.cpp index c37112a..1d41f38 100644 --- a/Projects/Android/jni/src/hlsdk-xash3d/cl_dll/vr_renderer.cpp +++ b/Projects/Android/jni/src/hlsdk-xash3d/cl_dll/vr_renderer.cpp @@ -55,6 +55,7 @@ void VRRenderer::Frame(double time) gEngfuncs.pfnClientCmd("fps_max 150"); //gEngfuncs.pfnClientCmd("fps_override 1"); gEngfuncs.pfnClientCmd("gl_vsync 0"); + gEngfuncs.pfnClientCmd("crosshair 0"); gEngfuncs.pfnClientCmd("default_fov 110"); //gEngfuncs.pfnClientCmd("firstperson");