teambeef/jkxr
0
0
Fork 0
mirror of https://github.com/DrBeef/JKXR.git synced 2024-11-24 21:11:03 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fixed crash

Browse source 
and head tacking seems to work
This commit is contained in:
Simon 2022-09-24 17:50:21 +01:00
parent b1d847e0d8
commit 62556d9b6b
2 changed files with 56 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

54
Projects/Android/jni/OpenJK/code/client/cl_input.cpp
View file

@ -70,6 +70,27 @@ qboolean in_mlooking;
extern cvar_t *in_joystick; extern cvar_t *in_joystick;
#ifdef __ANDROID__
void JKVR_GetMove(float *forward, float *side, float *pos_forward, float *pos_side, float *up,
float *yaw, float *pitch, float *roll);
typedef struct {
float forward;
float pos_forward;
float side;
float pos_side;
float up;
float yaw;
float pitch;
float roll;
} vr_move;
vr_move new_move;
vr_move old_move;
#endif
static void IN_UseGivenForce(void) static void IN_UseGivenForce(void)
{ {
const char *c = Cmd_Argv(1); const char *c = Cmd_Argv(1);
@ -358,7 +379,7 @@ Moves the local angle positions
================ ================
*/ */
void CL_AdjustAngles( void ) { void CL_AdjustAngles( void ) {
float speed; /* float speed;
if ( in_speed.active ) { if ( in_speed.active ) {
speed = 0.001 * cls.frametime * cl_anglespeedkey->value; speed = 0.001 * cls.frametime * cl_anglespeedkey->value;
@ -389,6 +410,20 @@ void CL_AdjustAngles( void ) {
cl.viewangles[PITCH] -= speed*cl_pitchspeed->value * CL_KeyState (&in_lookup); cl.viewangles[PITCH] -= speed*cl_pitchspeed->value * CL_KeyState (&in_lookup);
cl.viewangles[PITCH] += speed*cl_pitchspeed->value * CL_KeyState (&in_lookdown); cl.viewangles[PITCH] += speed*cl_pitchspeed->value * CL_KeyState (&in_lookdown);
} }
*/
cl.viewangles[YAW] -= old_move.yaw;
cl.viewangles[YAW] += new_move.yaw;
//Make angles good
while (cl.viewangles[YAW] > 180.0f)
cl.viewangles[YAW] -= 360.0f;
while (cl.viewangles[YAW] < -180.0f)
cl.viewangles[YAW] += 360.0f;
cl.viewangles[PITCH] = new_move.pitch;
cl.viewangles[ROLL] = new_move.roll;
} }
/* /*
@ -488,7 +523,7 @@ void CL_JoystickMove( usercmd_t *cmd ) {
return; return;
}*/ }*/
if ( !(in_speed.active ^ cl_run->integer) ) { /* if ( !(in_speed.active ^ cl_run->integer) ) {
cmd->buttons |= BUTTON_WALKING; cmd->buttons |= BUTTON_WALKING;
} }
@ -527,6 +562,10 @@ void CL_JoystickMove( usercmd_t *cmd ) {
} }
cmd->upmove = ClampChar( cmd->upmove + cl.joystickAxis[AXIS_UP] ); cmd->upmove = ClampChar( cmd->upmove + cl.joystickAxis[AXIS_UP] );
*/
cmd->forwardmove = ClampChar( cmd->forwardmove + (new_move.forward * 127) + (new_move.pos_forward * 127));
cmd->rightmove = ClampChar( cmd->rightmove + (new_move.side * 127) + (new_move.pos_side * 127));
} }
/* /*
@ -671,6 +710,9 @@ void CL_FinishMove( usercmd_t *cmd ) {
for (i=0 ; i<3 ; i++) { for (i=0 ; i<3 ; i++) {
cmd->angles[i] = ANGLE2SHORT(cl.viewangles[i]); cmd->angles[i] = ANGLE2SHORT(cl.viewangles[i]);
} }
//retain the move from this
old_move = new_move;
} }
/* /*
@ -686,6 +728,14 @@ usercmd_t CL_CreateCmd( void ) {
VectorCopy( cl.viewangles, oldAngles ); VectorCopy( cl.viewangles, oldAngles );
#ifdef __ANDROID__
JKVR_GetMove(&new_move.forward, &new_move.side, &new_move.pos_forward, &new_move.pos_side,
&new_move.up, &new_move.yaw, &new_move.pitch, &new_move.roll);
#endif
// keyboard angle adjustment // keyboard angle adjustment
CL_AdjustAngles (); CL_AdjustAngles ();

4
Projects/Android/jni/OpenJK/code/rd-vanilla/tr_cmds.cpp
View file

@ -494,6 +494,10 @@ void RE_EndFrame( int *frontEndMsec, int *backEndMsec ) {
R_IssueRenderCommands( qfalse ); R_IssueRenderCommands( qfalse );
// use the other buffers next frame, because another CPU
// may still be rendering into the current ones
R_InitNextFrame();
if (frontEndMsec) { if (frontEndMsec) {
*frontEndMsec = tr.frontEndMsec; *frontEndMsec = tr.frontEndMsec;
} }