teambeef/jkxr
0
0
Fork 0
mirror of https://github.com/DrBeef/JKXR.git synced 2025-02-17 17:31:09 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fixes for scope on android

Browse source
This commit is contained in:
Simon 2023-11-24 19:57:02 +00:00
parent 2820b99e6b
commit d10b4d9c2c
3 changed files with 8 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Projects/Android/AndroidManifest.xml
View file

@ -2,7 +2,7 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android" <manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.drbeef.jkxr" package="com.drbeef.jkxr"
android:versionCode="64" android:versionCode="64"
android:versionName="1.1.19" android:installLocation="auto" > android:versionName="1.1.20" android:installLocation="auto" >
<!-- Tell the system this app requires OpenGL ES 3.1. --> <!-- Tell the system this app requires OpenGL ES 3.1. -->
<uses-feature android:glEsVersion="0x00030002" android:required="true"/> <uses-feature android:glEsVersion="0x00030002" android:required="true"/>

11
Projects/Android/jni/OpenJK/JKXR/android/JKXR_SurfaceView.cpp
View file

@ -59,7 +59,7 @@ bool VR_UseScreenLayer()
(bool)((vr.cin_camera && !vr.immersive_cinematics) || (bool)((vr.cin_camera && !vr.immersive_cinematics) ||
vr.misc_camera || vr.misc_camera ||
(CL_IsRunningInGameCinematic() || CL_InGameCinematicOnStandBy()) || (CL_IsRunningInGameCinematic() || CL_InGameCinematicOnStandBy()) ||
(cls.state == CA_DISCONNECTED) || // (cls.state == CA_DISCONNECTED) ||
(cls.state == CA_CINEMATIC) || (cls.state == CA_CINEMATIC) ||
(cls.state == CA_LOADING) || (cls.state == CA_LOADING) ||
( Key_GetCatcher( ) & KEYCATCH_UI ) || ( Key_GetCatcher( ) & KEYCATCH_UI ) ||
@ -152,7 +152,7 @@ void VR_SetHMDOrientation(float pitch, float yaw, float roll)
//Keep this for our records //Keep this for our records
VectorCopy(vr.hmdorientation, vr.hmdorientation_last); VectorCopy(vr.hmdorientation, vr.hmdorientation_last);
if (!vr.third_person && !vr.remote_npc && !vr.remote_turret if (!vr.third_person && !vr.remote_npc && !vr.remote_turret && !vr.cgzoommode
#ifndef JK2_MODE #ifndef JK2_MODE
&& !vr.in_vehicle && !vr.in_vehicle
#endif #endif
@ -161,7 +161,7 @@ void VR_SetHMDOrientation(float pitch, float yaw, float roll)
VectorCopy(vr.hmdorientation, vr.hmdorientation_first); VectorCopy(vr.hmdorientation, vr.hmdorientation_first);
} }
if (!vr.remote_turret) if (!vr.remote_turret && !vr.cgzoommode)
{ {
VectorCopy(vr.weaponangles[ANGLES_ADJUSTED], vr.weaponangles_first[ANGLES_ADJUSTED]); VectorCopy(vr.weaponangles[ANGLES_ADJUSTED], vr.weaponangles_first[ANGLES_ADJUSTED]);
} }
@ -239,7 +239,8 @@ void VR_GetMove(float *forward, float *side, float *pos_forward, float *pos_side
*up = 0.0f; *up = 0.0f;
*side = remote_movementSideways / 3.0f; *side = remote_movementSideways / 3.0f;
*pos_side = 0.0f; *pos_side = 0.0f;
*yaw = vr.snapTurn; *yaw = vr.snapTurn + vr.hmdorientation_first[YAW] +
vr.weaponangles[ANGLES_ADJUSTED][YAW] - vr.weaponangles_first[ANGLES_ADJUSTED][YAW];
*pitch = vr.weaponangles[ANGLES_ADJUSTED][PITCH]; *pitch = vr.weaponangles[ANGLES_ADJUSTED][PITCH];
*roll = 0.0f;//vr.hmdorientation[ROLL]; *roll = 0.0f;//vr.hmdorientation[ROLL];
} }
@ -330,7 +331,7 @@ void VR_Init()
vr_positional_factor = Cvar_Get( "vr_positional_factor", "12", CVAR_ARCHIVE); vr_positional_factor = Cvar_Get( "vr_positional_factor", "12", CVAR_ARCHIVE);
vr_walkdirection = Cvar_Get( "vr_walkdirection", "1", CVAR_ARCHIVE); vr_walkdirection = Cvar_Get( "vr_walkdirection", "1", CVAR_ARCHIVE);
vr_weapon_pitchadjust = Cvar_Get( "vr_weapon_pitchadjust", "-20.0", CVAR_ARCHIVE); vr_weapon_pitchadjust = Cvar_Get( "vr_weapon_pitchadjust", "-20.0", CVAR_ARCHIVE);
vr_saber_pitchadjust = Cvar_Get( "vr_saber_pitchadjust", "-25.0", CVAR_ARCHIVE); vr_saber_pitchadjust = Cvar_Get( "vr_saber_pitchadjust", "-13.36", CVAR_ARCHIVE);
vr_virtual_stock = Cvar_Get( "vr_virtual_stock", "0", CVAR_ARCHIVE); vr_virtual_stock = Cvar_Get( "vr_virtual_stock", "0", CVAR_ARCHIVE);
//Defaults //Defaults

2
Projects/Android/jni/OpenJK/code/qcommon/stv_version.h
View file

@ -23,7 +23,7 @@ along with this program; if not, see <http://www.gnu.org/licenses/>.
// Current version of the single player game // Current version of the single player game
#include "../win32/AutoVersion.h" #include "../win32/AutoVersion.h"
#define JKXR_VERSION "1.1.19-ea" #define JKXR_VERSION "1.1.20-ea"
#ifdef _DEBUG #ifdef _DEBUG
#define Q3_VERSION "(debug)OpenJK: v" VERSION_STRING_DOTTED " JKXR: " JKXR_VERSION #define Q3_VERSION "(debug)OpenJK: v" VERSION_STRING_DOTTED " JKXR: " JKXR_VERSION