teambeef/ioq3quest
0
0
Fork 0
mirror of https://github.com/DrBeef/ioq3quest.git synced 2024-11-10 14:52:00 +00:00
Code Issues Projects Releases Packages Wiki Activity

Small extra tweaks

Browse source 
- Show scoreboard with off-hand thumbstick
- Add jumping to off-hand trigger
This commit is contained in:
Simon 2022-02-13 15:25:33 +00:00
parent efe1e29eee
commit 02e2957e39
2 changed files with 46 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
android/app/src/main/AndroidManifest.xml
View file

@ -2,8 +2,8 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.drbeef.ioq3quest"
android:installLocation="preferExternal"
android:versionCode="14"
android:versionName="0.10.0">
android:versionCode="15"
android:versionName="0.10.1">
<uses-feature android:name="android.hardware.vr.headtracking" android:version="1" android:required="true" />
<uses-feature android:glEsVersion="0x00030001" />

57
code/vr/vr_input.c
View file

@ -362,7 +362,7 @@ static void IN_VRJoystick( qboolean isRightController, float joystickX, float jo
static void IN_VRTriggers( qboolean isRightController, float index ) {
vrController_t* controller = isRightController == qtrue ? &rightController : &leftController;
if (isRightController == qtrue) {
if (isRightController == (vr_righthanded->integer != 0)) {
if (!(controller->axisButtons & VR_TOUCH_AXIS_TRIGGER_INDEX) && index > pressedThreshold) {
controller->axisButtons |= VR_TOUCH_AXIS_TRIGGER_INDEX;
Com_QueueEvent(in_vrEventTime, SE_KEY, K_MOUSE1, qtrue, 0, NULL);
@ -371,6 +371,17 @@ static void IN_VRTriggers( qboolean isRightController, float index ) {
Com_QueueEvent(in_vrEventTime, SE_KEY, K_MOUSE1, qfalse, 0, NULL);
}
}
//off hand trigger Jump as well
if (isRightController != (vr_righthanded->integer != 0)) {
if (!(controller->axisButtons & VR_TOUCH_AXIS_TRIGGER_INDEX) && index > pressedThreshold) {
controller->axisButtons |= VR_TOUCH_AXIS_TRIGGER_INDEX;
Com_QueueEvent(in_vrEventTime, SE_KEY, K_SPACE, qtrue, 0, NULL);
} else if ((controller->axisButtons & VR_TOUCH_AXIS_TRIGGER_INDEX) && index < releasedThreshold) {
controller->axisButtons &= ~VR_TOUCH_AXIS_TRIGGER_INDEX;
Com_QueueEvent(in_vrEventTime, SE_KEY, K_SPACE, qfalse, 0, NULL);
}
}
}
static void IN_VRButtonsChanged( qboolean isRightController, uint32_t buttons )
@ -393,7 +404,8 @@ static void IN_VRButtonsChanged( qboolean isRightController, uint32_t buttons )
vr.weapon_stabilised = qfalse;
}
}
//Jump
if ((buttons & ovrButton_A) && !(controller->buttons & ovrButton_A)) {
Com_QueueEvent(in_vrEventTime, SE_KEY, K_SPACE, qtrue, 0, NULL);
} else if (!(buttons & ovrButton_A) && (controller->buttons & ovrButton_A)) {
@ -415,19 +427,38 @@ static void IN_VRButtonsChanged( qboolean isRightController, uint32_t buttons )
}
}
if (isRightController == (vr_righthanded->integer != 0)) {
//thumbstick is "use item"
if ((buttons & ovrButton_RThumb) && !(controller->buttons & ovrButton_RThumb)) {
Com_QueueEvent(in_vrEventTime, SE_KEY, K_ENTER, qtrue, 0, NULL);
} else if (!(buttons & ovrButton_RThumb) && (controller->buttons & ovrButton_RThumb)) {
Com_QueueEvent(in_vrEventTime, SE_KEY, K_ENTER, qfalse, 0, NULL);
if (isRightController) {
if (vr_righthanded->integer) {
//Right thumbstick is "use item"
if ((buttons & ovrButton_RThumb) && !(controller->buttons & ovrButton_RThumb)) {
Com_QueueEvent(in_vrEventTime, SE_KEY, K_ENTER, qtrue, 0, NULL);
} else if (!(buttons & ovrButton_RThumb) && (controller->buttons & ovrButton_RThumb)) {
Com_QueueEvent(in_vrEventTime, SE_KEY, K_ENTER, qfalse, 0, NULL);
}
}
else {
//right thumbstick is scoreboard
if ((buttons & ovrButton_RThumb) && !(controller->buttons & ovrButton_RThumb)) {
sendButtonActionSimple("+scores");
} else if (!(buttons & ovrButton_RThumb) && (controller->buttons & ovrButton_RThumb)) {
sendButtonActionSimple("-scores");
}
}
} else {
//thumbstick is "use item"
if ((buttons & ovrButton_LThumb) && !(controller->buttons & ovrButton_LThumb)) {
Com_QueueEvent(in_vrEventTime, SE_KEY, K_ENTER, qtrue, 0, NULL);
} else if (!(buttons & ovrButton_LThumb) && (controller->buttons & ovrButton_LThumb)) {
Com_QueueEvent(in_vrEventTime, SE_KEY, K_ENTER, qfalse, 0, NULL);
if (vr_righthanded->integer) {
//left thumbstick is scoreboard
if ((buttons & ovrButton_LThumb) && !(controller->buttons & ovrButton_LThumb)) {
sendButtonActionSimple("+scores");
} else if (!(buttons & ovrButton_LThumb) && (controller->buttons & ovrButton_LThumb)) {
sendButtonActionSimple("-scores");
}
} else {
//left thumbstick is "use item"
if ((buttons & ovrButton_LThumb) && !(controller->buttons & ovrButton_LThumb)) {
Com_QueueEvent(in_vrEventTime, SE_KEY, K_ENTER, qtrue, 0, NULL);
} else if (!(buttons & ovrButton_LThumb) && (controller->buttons & ovrButton_LThumb)) {
Com_QueueEvent(in_vrEventTime, SE_KEY, K_ENTER, qfalse, 0, NULL);
}
}
}