Fixed Head Based Forward Movement

This commit is contained in:
Grant Bagwell 2021-01-11 17:37:12 +01:00
parent 39465c09c4
commit 522fa3e5ad
5 changed files with 2 additions and 8 deletions

View file

@ -1180,7 +1180,7 @@ void idGameLocal::EvaluateVRMoveMode(idVec3 &viewangles, usercmd_t &cmd, int but
return; return;
} }
if (commonVr->VR_USE_MOTION_CONTROLS && !commonVr->thirdPersonMovement && (vr_movePoint.GetInteger() == 1 || vr_movePoint.GetInteger() > 2) && if (!commonVr->thirdPersonMovement && (vr_movePoint.GetInteger() == 1 || vr_movePoint.GetInteger() > 2) &&
(abs(cmd.forwardmove) >= .1 || abs(cmd.rightmove) >= .1) || vr_teleportMode.GetInteger() == 2) // body will follow motion from move vector (abs(cmd.forwardmove) >= .1 || abs(cmd.rightmove) >= .1) || vr_teleportMode.GetInteger() == 2) // body will follow motion from move vector
{ {
static idAngles controllerAng; static idAngles controllerAng;
@ -1207,7 +1207,7 @@ void idGameLocal::EvaluateVRMoveMode(idVec3 &viewangles, usercmd_t &cmd, int but
} }
else if ( !commonVr->VR_USE_MOTION_CONTROLS || vr_movePoint.GetInteger() == 2 ) // body will follow view else if ( !commonVr->VR_USE_MOTION_CONTROLS || vr_movePoint.GetInteger() == 2 ) // body will follow view
{ {
viewangles[YAW] += commonVr->poseHmdAngles.yaw - commonVr->bodyMoveAng; viewangles[YAW] += commonVr->poseHmdAngles.yaw - commonVr->bodyYawOffset;
commonVr->bodyMoveAng = commonVr->poseHmdAngles.yaw; commonVr->bodyMoveAng = commonVr->poseHmdAngles.yaw;
commonVr->bodyYawOffset = commonVr->poseHmdAngles.yaw; commonVr->bodyYawOffset = commonVr->poseHmdAngles.yaw;
} }

View file

@ -152,9 +152,6 @@ idCVar vr_moveClick( "vr_moveClick", "0", CVAR_INTEGER | CVAR_ARCHIVE, " 0 = Nor
//In Menu - working //In Menu - working
idCVar vr_playerBodyMode( "vr_playerBodyMode", "0", CVAR_INTEGER | CVAR_GAME | CVAR_ARCHIVE, "Player body mode:\n0 = Display full body\n1 = Just Hands \n2 = Weapons only\n" ); idCVar vr_playerBodyMode( "vr_playerBodyMode", "0", CVAR_INTEGER | CVAR_GAME | CVAR_ARCHIVE, "Player body mode:\n0 = Display full body\n1 = Just Hands \n2 = Weapons only\n" );
//GB This is active in FP, and seems to only move body when pushing forward!
idCVar vr_bodyToMove( "vr_bodyToMove", "1", CVAR_BOOL | CVAR_GAME | CVAR_ARCHIVE, "Lock body orientaion to movement direction." );
idCVar vr_moveThirdPerson( "vr_moveThirdPerson", "1", CVAR_BOOL | CVAR_GAME | CVAR_ARCHIVE, "Artifical movement will user 3rd person perspective." ); idCVar vr_moveThirdPerson( "vr_moveThirdPerson", "1", CVAR_BOOL | CVAR_GAME | CVAR_ARCHIVE, "Artifical movement will user 3rd person perspective." );
//needs to be added to menu - cant be bothered now //needs to be added to menu - cant be bothered now
idCVar vr_crouchMode( "vr_crouchMode", "0", CVAR_INTEGER | CVAR_GAME | CVAR_ARCHIVE, "Crouch Mode:\n 0 = Full motion crouch (In game matches real life)\n 1 = Crouch anim triggered by smaller movement." ); idCVar vr_crouchMode( "vr_crouchMode", "0", CVAR_INTEGER | CVAR_GAME | CVAR_ARCHIVE, "Crouch Mode:\n 0 = Full motion crouch (In game matches real life)\n 1 = Crouch anim triggered by smaller movement." );

View file

@ -500,7 +500,6 @@ extern idCVar vr_pdaPitch;
extern idCVar vr_movePoint; extern idCVar vr_movePoint;
extern idCVar vr_moveClick; extern idCVar vr_moveClick;
extern idCVar vr_playerBodyMode; extern idCVar vr_playerBodyMode;
extern idCVar vr_bodyToMove;
extern idCVar vr_moveThirdPerson; extern idCVar vr_moveThirdPerson;
extern idCVar vr_teleportSkipHandrails; extern idCVar vr_teleportSkipHandrails;

View file

@ -227,7 +227,6 @@ seta vr_crouchHideBody "0"
seta vr_crouchTriggerDist "7" seta vr_crouchTriggerDist "7"
seta vr_crouchMode "0" seta vr_crouchMode "0"
seta vr_moveThirdPerson "1" seta vr_moveThirdPerson "1"
seta vr_bodyToMove "1"
seta vr_playerBodyMode "0" seta vr_playerBodyMode "0"
seta vr_moveClick "0" seta vr_moveClick "0"
seta vr_movePoint "1" seta vr_movePoint "1"

View file

@ -227,7 +227,6 @@ seta vr_crouchHideBody "0"
seta vr_crouchTriggerDist "7" seta vr_crouchTriggerDist "7"
seta vr_crouchMode "0" seta vr_crouchMode "0"
seta vr_moveThirdPerson "1" seta vr_moveThirdPerson "1"
seta vr_bodyToMove "1"
seta vr_playerBodyMode "0" seta vr_playerBodyMode "0"
seta vr_moveClick "0" seta vr_moveClick "0"
seta vr_movePoint "1" seta vr_movePoint "1"