Fix for View Warping on Quest 2

This commit is contained in:
Simon 2020-10-13 21:52:18 +01:00
parent aea9b72511
commit 2aecd83db1
5 changed files with 9 additions and 9 deletions

View file

@ -1,8 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.drbeef.rtcwquest"
android:versionCode="41"
android:versionName="1.1.3" android:installLocation="auto" >
android:versionCode="42"
android:versionName="1.1.4" android:installLocation="auto" >
<!-- Tell the system this app requires OpenGL ES 3.1. -->
<uses-feature android:glEsVersion="0x00030001" android:required="true"/>

View file

@ -1693,7 +1693,6 @@ extern vmCvar_t cg_tracerSpeed;
extern vmCvar_t cg_autoswitch;
extern vmCvar_t cg_ignore;
extern vmCvar_t cg_simpleItems;
extern vmCvar_t cg_fov;
extern vmCvar_t cg_zoomDefaultBinoc;
extern vmCvar_t cg_zoomDefaultSniper;
extern vmCvar_t cg_zoomDefaultFG;

View file

@ -174,7 +174,6 @@ vmCvar_t cg_tracerSpeed;
vmCvar_t cg_autoswitch;
vmCvar_t cg_ignore;
vmCvar_t cg_simpleItems;
vmCvar_t cg_fov;
vmCvar_t cg_zoomStepSniper;
vmCvar_t cg_zoomStepSnooper;
vmCvar_t cg_zoomStepFG; //----(SA) added
@ -323,7 +322,6 @@ cvarTable_t cvarTable[] = {
{ &cg_zoomStepSniper, "cg_zoomStepSniper", "2", CVAR_ARCHIVE },
{ &cg_zoomStepSnooper, "cg_zoomStepSnooper", "5", CVAR_ARCHIVE },
{ &cg_zoomStepFG, "cg_zoomStepFG", "10", CVAR_ARCHIVE }, //----(SA) added
{ &cg_fov, "cg_fov", "104", CVAR_ARCHIVE }, // JPW NERVE added cheat protect NOTE: there is already a dmflag (DF_FIXED_FOV) to allow server control of this cheat
{ &cg_viewsize, "cg_viewsize", "100", CVAR_ARCHIVE },
{ &cg_letterbox, "cg_letterbox", "0", CVAR_TEMP }, //----(SA) added
{ &cg_stereoSeparation, "cg_stereoSeparation", "0.065", CVAR_ARCHIVE },

View file

@ -29,6 +29,9 @@ If you have questions concerning this license or the applicable additional terms
// cg_view.c -- setup all the parameters (position, angle, etc)
// for a 3D rendering
#include "cg_local.h"
#include "../../../RTCWVR/VrClientInfo.h"
extern vr_client_info_t *cgVR;
//========================
extern int notebookModel;
@ -831,10 +834,10 @@ static int CG_CalcFov( void ) {
} else {
// user selectable
if ( cgs.dmflags & DF_FIXED_FOV ) {
// dmflag to prevent wide fov for all clients
// dmflag to prevent wide fov for all clientscg_
fov_x = 90;
} else {
fov_x = cg_fov.value;
fov_x = cgVR ? cgVR->fov : 90.0f;
if ( fov_x < 1 ) {
fov_x = 1;
} else if ( fov_x > 160 ) {
@ -1347,7 +1350,7 @@ void CG_DrawSkyBoxPortal( void ) {
// dmflag to prevent wide fov for all clients
fov_x = 90;
} else {
fov_x = cg_fov.value;
fov_x = cgVR ? cgVR->fov : 90.0f;
if ( fov_x < 1 ) {
fov_x = 1;
} else if ( fov_x > 160 ) {

View file

@ -42,7 +42,7 @@ If you have questions concerning this license or the applicable additional terms
// q_shared.h -- included first by ALL program modules.
// A user mod should never modify this file
#define Q3_VERSION "RTCWQuest 1.1.3 (Wolf 1.41)"
#define Q3_VERSION "RTCWQuest 1.1.4 (Wolf 1.41)"
// ver 1.0.0 - release
// ver 1.0.1 - post-release work
// ver 1.1.0 - patch 1 (12/12/01)