diff --git a/Projects/Android/Android.iml b/Projects/Android/Android.iml
index a89a7ec..63dc891 100644
--- a/Projects/Android/Android.iml
+++ b/Projects/Android/Android.iml
@@ -122,15 +122,15 @@
-
+
-
+
-
+
diff --git a/Projects/Android/AndroidManifest.xml b/Projects/Android/AndroidManifest.xml
index feade11..92621c1 100644
--- a/Projects/Android/AndroidManifest.xml
+++ b/Projects/Android/AndroidManifest.xml
@@ -1,8 +1,8 @@
+ android:versionCode="16"
+ android:versionName="1.0.5" android:installLocation="auto" >
diff --git a/Projects/Android/jni/Quake2VR/Q2VR_SurfaceView.c b/Projects/Android/jni/Quake2VR/Q2VR_SurfaceView.c
index 1908017..2463805 100644
--- a/Projects/Android/jni/Quake2VR/Q2VR_SurfaceView.c
+++ b/Projects/Android/jni/Quake2VR/Q2VR_SurfaceView.c
@@ -667,7 +667,7 @@ void ovrRenderer_Clear( ovrRenderer * renderer )
{
ovrFramebuffer_Clear( &renderer->FrameBuffer[eye] );
}
- renderer->ProjectionMatrix = ovrMatrix4f_CreateIdentity();
+
renderer->NumBuffers = VRAPI_FRAME_LAYER_EYE_MAX;
}
@@ -676,9 +676,6 @@ 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);
-
// Create the render Textures.
for ( int eye = 0; eye < VRAPI_FRAME_LAYER_EYE_MAX; eye++ )
{
@@ -688,11 +685,6 @@ void ovrRenderer_Create( int width, int height, ovrRenderer * renderer, const ov
height,
NUM_MULTI_SAMPLES );
}
-
- // Setup the projection matrix.
- renderer->ProjectionMatrix = ovrMatrix4f_CreateProjectionFov(
- vrFOV, vrFOV, 0.0f, 0.0f, 1.0f, 0.0f );
-
}
void ovrRenderer_Destroy( ovrRenderer * renderer )
@@ -701,7 +693,6 @@ void ovrRenderer_Destroy( ovrRenderer * renderer )
{
ovrFramebuffer_Destroy( &renderer->FrameBuffer[eye] );
}
- renderer->ProjectionMatrix = ovrMatrix4f_CreateIdentity();
}
@@ -1674,7 +1665,8 @@ void * AppThreadFunction( void * parm )
layer.Textures[eye].SwapChainIndex = frameBuffer->TextureSwapChainIndex;
ovrMatrix4f projectionMatrix;
- projectionMatrix = ovrMatrix4f_CreateProjectionFov(vrFOV, vrFOV,
+ float fov = getFOV();
+ projectionMatrix = ovrMatrix4f_CreateProjectionFov(fov, fov,
0.0f, 0.0f, 0.1f, 0.0f);
layer.Textures[eye].TexCoordsFromTanAngles = ovrMatrix4f_TanAngleMatrixFromProjection(&projectionMatrix);
diff --git a/Projects/Android/jni/Quake2VR/VrCommon.h b/Projects/Android/jni/Quake2VR/VrCommon.h
index 58d09d9..2cf98ba 100644
--- a/Projects/Android/jni/Quake2VR/VrCommon.h
+++ b/Projects/Android/jni/Quake2VR/VrCommon.h
@@ -30,7 +30,6 @@ float playerHeight;
float playerYaw;
bool showingScreenLayer;
-float vrFOV;
vec3_t worldPosition;
diff --git a/Projects/Android/jni/Quake2VR/VrCompositor.h b/Projects/Android/jni/Quake2VR/VrCompositor.h
index 9c02f4d..35d402a 100644
--- a/Projects/Android/jni/Quake2VR/VrCompositor.h
+++ b/Projects/Android/jni/Quake2VR/VrCompositor.h
@@ -83,7 +83,6 @@ ovrRenderer
typedef struct
{
ovrFramebuffer FrameBuffer[VRAPI_FRAME_LAYER_EYE_MAX];
- ovrMatrix4f ProjectionMatrix;
int NumBuffers;
} ovrRenderer;
diff --git a/Projects/Android/jni/quake2/src/common/header/common.h b/Projects/Android/jni/quake2/src/common/header/common.h
index 7bea1fa..764a298 100644
--- a/Projects/Android/jni/quake2/src/common/header/common.h
+++ b/Projects/Android/jni/quake2/src/common/header/common.h
@@ -32,7 +32,7 @@
#include "shared.h"
#include "crc.h"
-#define Q2QVERSION "1.0.4"
+#define Q2QVERSION "1.0.5"
#define YQ2VERSION "7.41"
#define BASEDIRNAME "Quake2Quest"