diff --git a/Projects/Android/Android.iml b/Projects/Android/Android.iml
index a22ed08..247bdfc 100644
--- a/Projects/Android/Android.iml
+++ b/Projects/Android/Android.iml
@@ -47,32 +47,32 @@
-
-
-
-
-
-
+
+
+
+
-
-
-
-
+
+
+
+
+
+
-
-
-
+
+
+
diff --git a/Projects/Android/AndroidManifest.xml b/Projects/Android/AndroidManifest.xml
index 613f8c1..1b5e595 100644
--- a/Projects/Android/AndroidManifest.xml
+++ b/Projects/Android/AndroidManifest.xml
@@ -1,8 +1,8 @@
+ android:versionCode="25"
+ android:versionName="1.4.7" android:installLocation="auto" >
diff --git a/Projects/Android/jni/src/Lambda1VR/L1VR_SurfaceView.c b/Projects/Android/jni/src/Lambda1VR/L1VR_SurfaceView.c
index 3cbc621..89add09 100644
--- a/Projects/Android/jni/src/Lambda1VR/L1VR_SurfaceView.c
+++ b/Projects/Android/jni/src/Lambda1VR/L1VR_SurfaceView.c
@@ -84,8 +84,6 @@ int GPU_LEVEL = 3;
int NUM_MULTI_SAMPLES = 4;
float SS_MULTIPLIER = 1.25f;
-vec2_t cylinderSize = {1280, 720};
-
float radians(float deg) {
return (deg * M_PI) / 180.0;
}
@@ -718,7 +716,7 @@ void ovrRenderer_Create( int width, int height, ovrRenderer * renderer, const ov
renderer->NumBuffers = VRAPI_FRAME_LAYER_EYE_MAX;
//Now using a symmetrical render target, based on the horizontal FOV
- vrFOV = vrapi_GetSystemPropertyInt( java, VRAPI_SYS_PROP_SUGGESTED_EYE_FOV_DEGREES_X);
+ vrFOV = vrapi_GetSystemPropertyInt( java, VRAPI_SYS_PROP_SUGGESTED_EYE_FOV_DEGREES_Y);
// Create the render Textures.
for ( int eye = 0; eye < VRAPI_FRAME_LAYER_EYE_MAX; eye++ )
@@ -1351,14 +1349,8 @@ void R_ChangeDisplaySettings( int width, int height, qboolean fullscreen );
void Android_GetScreenRes(int *width, int *height)
{
- if (useScreenLayer())
- {
- *width = cylinderSize[0];
- *height = cylinderSize[1];
- } else {
- *width = m_width;
- *height = m_height;
- }
+ *width = m_width;
+ *height = m_height;
}
void Android_MessageBox(const char *title, const char *text)
@@ -1423,8 +1415,8 @@ void VR_Init()
vr_lasersight = Cvar_Get( "vr_lasersight", "0", CVAR_ARCHIVE, "Enables laser-sight" );
char buffer[32];
- sprintf(buffer, "%i", (int)vrFOV);
- vr_fixed_fov = Cvar_Get( "vr_fixed_fov", buffer, CVAR_ARCHIVE, "FOV for Lambda1VR" );
+ sprintf(buffer, "%d", (int)vrFOV);
+ vr_quest_fov = Cvar_Get("vr_quest_fov", buffer, CVAR_LATCH, "FOV for Lambda1VR" );
vr_control_scheme = Cvar_Get( "vr_control_scheme", "0", CVAR_ARCHIVE, "Controller Layout scheme" );
vr_enable_crouching = Cvar_Get( "vr_enable_crouching", "0.85", CVAR_ARCHIVE, "To enable real-world crouching trigger, set this to a value that multiplied by the user's height will trigger crouch mechanic" );
@@ -1580,7 +1572,7 @@ void * AppThreadFunction( void * parm )
// The scene is created here to be able to show a loading icon.
if ( !ovrScene_IsCreated( &appState.Scene ) )
{
- ovrScene_Create( cylinderSize[0], cylinderSize[1], &appState.Scene, &java );
+ ovrScene_Create( m_width, m_height, &appState.Scene, &java );
}
// This is the only place the frame index is incremented, right before
@@ -1728,14 +1720,7 @@ void * AppThreadFunction( void * parm )
if (usingScreenLayer != useScreenLayer())
{
usingScreenLayer = useScreenLayer();
- if (usingScreenLayer)
- {
- R_ChangeDisplaySettings(cylinderSize[0], cylinderSize[1], true);
- }
- else
- {
- R_ChangeDisplaySettings(m_width, m_height, false);
- }
+ R_ChangeDisplaySettings(m_width, m_height, false);
}
ovrSubmitFrameDescription2 frameDesc = { 0 };
diff --git a/Projects/Android/jni/src/Lambda1VR/VrCompositor.c b/Projects/Android/jni/src/Lambda1VR/VrCompositor.c
index 7ac3623..c474168 100644
--- a/Projects/Android/jni/src/Lambda1VR/VrCompositor.c
+++ b/Projects/Android/jni/src/Lambda1VR/VrCompositor.c
@@ -604,7 +604,7 @@ ovrLayerCylinder2 BuildCylinderLayer( ovrRenderer * cylinderRenderer,
const float density = 4500.0f;
const float rotateYaw = 0.0f;
const float radius = 2.0f;
- const ovrVector3f translation = { 0.0f, playerHeight, -0.5f };
+ const ovrVector3f translation = { 0.0f, playerHeight, -3.5f };
ovrMatrix4f cylinderTransform =
CylinderModelMatrix( textureWidth, textureHeight, translation,
diff --git a/Projects/Android/jni/src/Lambda1VR/VrCvars.h b/Projects/Android/jni/src/Lambda1VR/VrCvars.h
index 4776412..2ca8411 100644
--- a/Projects/Android/jni/src/Lambda1VR/VrCvars.h
+++ b/Projects/Android/jni/src/Lambda1VR/VrCvars.h
@@ -11,7 +11,7 @@ convar_t *vr_crowbar_pitchadjust;
convar_t *vr_weapon_recoil;
convar_t *vr_weapon_stabilised;
convar_t *vr_lasersight;
-convar_t *vr_fixed_fov;
+convar_t *vr_quest_fov;
convar_t *vr_control_scheme;
convar_t *vr_enable_crouching;
convar_t *vr_height_adjust;
diff --git a/Projects/Android/jni/src/Xash3D/xash3d/engine/common/build.c b/Projects/Android/jni/src/Xash3D/xash3d/engine/common/build.c
index 17b5c11..df51bb6 100644
--- a/Projects/Android/jni/src/Xash3D/xash3d/engine/common/build.c
+++ b/Projects/Android/jni/src/Xash3D/xash3d/engine/common/build.c
@@ -139,7 +139,7 @@ Q_buildcommit will identify this build as release or "notset"
*/
const char *Q_buildcommit( void )
{
- return "Lambda1VR-v1.4.5";
+ return "Lambda1VR-v1.4.7";
}
/*
diff --git a/Projects/Android/jni/src/hlsdk-xash3d b/Projects/Android/jni/src/hlsdk-xash3d
index c85b094..e0eaec2 160000
--- a/Projects/Android/jni/src/hlsdk-xash3d
+++ b/Projects/Android/jni/src/hlsdk-xash3d
@@ -1 +1 @@
-Subproject commit c85b09485310736003b0994002c370f8d7f884fd
+Subproject commit e0eaec22f18f07e5ededd148fa02fc063daccfa1
diff --git a/Projects/Android/jni/src/hlsdk-xash3d-opfor b/Projects/Android/jni/src/hlsdk-xash3d-opfor
index 8bc8ad1..ef32f0c 160000
--- a/Projects/Android/jni/src/hlsdk-xash3d-opfor
+++ b/Projects/Android/jni/src/hlsdk-xash3d-opfor
@@ -1 +1 @@
-Subproject commit 8bc8ad119394d46928ec0b5cb5105d84bafd7dbd
+Subproject commit ef32f0c1021ced261356648c14c46087a1ecf355