teambeef/ioq3quest
0
0
Fork 0
mirror of https://github.com/DrBeef/ioq3quest.git synced 2025-02-17 01:21:47 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #7 from petr666/feature/apply-vignette-to-smooth-turn

Browse source 
Apply vignette to smooth turn
This commit is contained in:
Simon 2022-03-10 20:44:10 +00:00 committed by GitHub
commit e86582ebd3
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 16 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
android/app/src/main/cpp/code/cgame/cg_draw.c
View file

@ -2601,7 +2601,7 @@ static void CG_DrawVignette( void )
return;
}
if (VectorLength(cg.predictedPlayerState.velocity) > 30.0)
if (VectorLength(cg.predictedPlayerState.velocity) > 30.0 || vr->smooth_turning)
{
if (currentComfortVignetteValue < comfortVignetteValue)
{

1
android/app/src/main/cpp/code/vr/vr_clientinfo.h
View file

@ -20,6 +20,7 @@ typedef struct {
qboolean local_server; // used in bg_pmove.c
followMode_t follow_mode;
qboolean weapon_select;
qboolean smooth_turning;
int realign; // used to realign the fake 6DoF playspace in a multiplayer game

14
android/app/src/main/cpp/code/vr/vr_input.c
View file

@ -516,6 +516,7 @@ static void IN_VRJoystick( qboolean isRightController, float joystickX, float jo
if (joystickY > releasedThreshold) {
// stop left & right
vr.smooth_turning = false;
if ((controller->axisButtons & VR_TOUCH_AXIS_LEFT) && IN_GetButtonAction("RTHUMBLEFT", action)) {
IN_SendButtonAction(action, qfalse);
}
@ -590,6 +591,7 @@ static void IN_VRJoystick( qboolean isRightController, float joystickX, float jo
} else if (joystickY < -releasedThreshold) {
// stop left & right
vr.smooth_turning = false;
if ((controller->axisButtons & VR_TOUCH_AXIS_LEFT) && IN_GetButtonAction("RTHUMBLEFT", action)) {
IN_SendButtonAction(action, qfalse);
}
@ -699,6 +701,7 @@ static void IN_VRJoystick( qboolean isRightController, float joystickX, float jo
// left action
if (IN_GetButtonAction("RTHUMBLEFT", action)) {
vr.smooth_turning = false;
if (!(controller->axisButtons & VR_TOUCH_AXIS_LEFT)) {
IN_SendButtonAction(action, qtrue);
}
@ -706,6 +709,7 @@ static void IN_VRJoystick( qboolean isRightController, float joystickX, float jo
// yaw (snap turn)
} else if (vr_snapturn->integer > 0) {
vr.smooth_turning = false;
int snap = 45;
if (vr_snapturn->integer > 1) {
snap = vr_snapturn->integer;
@ -716,6 +720,7 @@ static void IN_VRJoystick( qboolean isRightController, float joystickX, float jo
// yaw (smooth turn)
} else {
vr.smooth_turning = true;
const float x = joystickX * cl_sensitivity->value * m_yaw->value;
Com_QueueEvent(in_vrEventTime, SE_MOUSE, x, 0, 0, NULL);
}
@ -723,6 +728,9 @@ static void IN_VRJoystick( qboolean isRightController, float joystickX, float jo
controller->axisButtons |= VR_TOUCH_AXIS_LEFT;
} else if (joystickX > -releasedThreshold) {
if (joystickX < releasedThreshold) {
vr.smooth_turning = false;
}
if ((controller->axisButtons & VR_TOUCH_AXIS_LEFT) && IN_GetButtonAction("RTHUMBLEFT", action)) {
IN_SendButtonAction(action, qfalse);
}
@ -734,6 +742,7 @@ static void IN_VRJoystick( qboolean isRightController, float joystickX, float jo
// right action
if (IN_GetButtonAction("RTHUMBRIGHT", action)) {
vr.smooth_turning = false;
if (!(controller->axisButtons & VR_TOUCH_AXIS_RIGHT)) {
IN_SendButtonAction(action, qtrue);
}
@ -741,6 +750,7 @@ static void IN_VRJoystick( qboolean isRightController, float joystickX, float jo
// yaw (snap turn)
} else if (vr_snapturn->integer > 0) {
vr.smooth_turning = false;
int snap = 45;
if (vr_snapturn->integer > 1) {
snap = vr_snapturn->integer;
@ -751,6 +761,7 @@ static void IN_VRJoystick( qboolean isRightController, float joystickX, float jo
// yaw (smooth turn)
} else {
vr.smooth_turning = true;
const float x = joystickX * cl_sensitivity->value * m_yaw->value;
Com_QueueEvent(in_vrEventTime, SE_MOUSE, x, 0, 0, NULL);
}
@ -758,6 +769,9 @@ static void IN_VRJoystick( qboolean isRightController, float joystickX, float jo
controller->axisButtons |= VR_TOUCH_AXIS_RIGHT;
} else if (joystickX < releasedThreshold) {
if (joystickX > -releasedThreshold) {
vr.smooth_turning = false;
}
if ((controller->axisButtons & VR_TOUCH_AXIS_RIGHT) && IN_GetButtonAction("RTHUMBRIGHT", action)) {
IN_SendButtonAction(action, qfalse);
}