ml
d8324d409e
build / build (push) Successful in 3m24s
- Free view: hold a mapped input (default: left grip) and that thumbstick drives the engine's mouse look, with the stick's normal bindings suspended while held. Also available for the right stick, unbound by default. - Cyberspace actions: eleven thrust/climb/dive/bank/roll actions with their own bindings, active only in cyberspace. The normal movement actions are inactive there, and capture exclusivity only compares actions that can be active together, so one input can be bound in both sets. - Cyberspace pitch and bank scale with thumbstick deflection instead of running at full strength. - Remove the toggle_freelook action; bind the automap view to the right stick click by default. - Engine patches: 24 exposes whether the player is in cyberspace, 25 lets the controller code scale cyberspace pitch and bank.
111 lines
3.0 KiB
Diff
111 lines
3.0 KiB
Diff
--- a/src/GameSrc/movekeys.c
|
|
+++ b/src/GameSrc/movekeys.c
|
|
@@ -44,6 +44,12 @@
|
|
extern bool gKeypadOverride;
|
|
|
|
uchar parse_motion_key(ushort code, short *cnum, short *cval);
|
|
+#ifdef __ANDROID__
|
|
+// Set every frame by android/app/src/main/cpp/xr_input.c.
|
|
+float qs_cyber_pitch_scale = 1.0f;
|
|
+float qs_cyber_bank_scale = 1.0f;
|
|
+#endif
|
|
+
|
|
uchar parse_motion_key_cyber(ushort code, short *cnum, short *cval);
|
|
void init_motion_polling(void);
|
|
|
|
@@ -173,6 +179,20 @@
|
|
*cnum = -1;
|
|
*cval = 0;
|
|
|
|
+#ifdef __ANDROID__
|
|
+ // Pitch and bank strength, scaled by the controller thumbstick's
|
|
+ // deflection (see android/app/src/main/cpp/xr_input.c); 1.0 for a key.
|
|
+ short pitchMax = (short)(CONTROL_MAX_VAL * qs_cyber_pitch_scale + 0.5f);
|
|
+ short bankMax = (short)(CONTROL_MAX_VAL * qs_cyber_bank_scale + 0.5f);
|
|
+ if (pitchMax < 1)
|
|
+ pitchMax = 1;
|
|
+ if (bankMax < 1)
|
|
+ bankMax = 1;
|
|
+#else
|
|
+ short pitchMax = CONTROL_MAX_VAL;
|
|
+ short bankMax = CONTROL_MAX_VAL;
|
|
+#endif
|
|
+
|
|
while (MoveCyberKeybinds[i].code != 255) {
|
|
if (code == MoveCyberKeybinds[i].code) {
|
|
move = MoveCyberKeybinds[i].move;
|
|
@@ -189,22 +209,22 @@
|
|
|
|
case M_CLIMB:
|
|
*cnum = CONTROL_YVEL;
|
|
- *cval = -CONTROL_MAX_VAL;
|
|
+ *cval = -pitchMax;
|
|
break;
|
|
|
|
case M_BANKLEFT:
|
|
*cnum = CONTROL_XYROT;
|
|
- *cval = -CONTROL_MAX_VAL;
|
|
+ *cval = -bankMax;
|
|
break;
|
|
|
|
case M_BANKRIGHT:
|
|
*cnum = CONTROL_XYROT;
|
|
- *cval = CONTROL_MAX_VAL;
|
|
+ *cval = bankMax;
|
|
break;
|
|
|
|
case M_DIVE:
|
|
*cnum = CONTROL_YVEL;
|
|
- *cval = CONTROL_MAX_VAL;
|
|
+ *cval = pitchMax;
|
|
break;
|
|
|
|
case M_ROLLRIGHT:
|
|
@@ -219,38 +239,38 @@
|
|
|
|
case M_CLIMBLEFT:
|
|
*cnum = CONTROL_YVEL;
|
|
- *cval = -CONTROL_MAX_VAL;
|
|
+ *cval = -pitchMax;
|
|
if (abs(poll_controls[*cnum]) < abs(*cval))
|
|
poll_controls[*cnum] = *cval;
|
|
*cnum = CONTROL_XYROT;
|
|
- *cval = -CONTROL_MAX_VAL;
|
|
+ *cval = -bankMax;
|
|
break;
|
|
|
|
case M_CLIMBRIGHT:
|
|
*cnum = CONTROL_YVEL;
|
|
- *cval = -CONTROL_MAX_VAL;
|
|
+ *cval = -pitchMax;
|
|
if (abs(poll_controls[*cnum]) < abs(*cval))
|
|
poll_controls[*cnum] = *cval;
|
|
*cnum = CONTROL_XYROT;
|
|
- *cval = CONTROL_MAX_VAL;
|
|
+ *cval = bankMax;
|
|
break;
|
|
|
|
case M_DIVERIGHT:
|
|
*cnum = CONTROL_YVEL;
|
|
- *cval = CONTROL_MAX_VAL;
|
|
+ *cval = pitchMax;
|
|
if (abs(poll_controls[*cnum]) < abs(*cval))
|
|
poll_controls[*cnum] = *cval;
|
|
*cnum = CONTROL_XYROT;
|
|
- *cval = CONTROL_MAX_VAL;
|
|
+ *cval = bankMax;
|
|
break;
|
|
|
|
case M_DIVELEFT:
|
|
*cnum = CONTROL_YVEL;
|
|
- *cval = CONTROL_MAX_VAL;
|
|
+ *cval = pitchMax;
|
|
if (abs(poll_controls[*cnum]) < abs(*cval))
|
|
poll_controls[*cnum] = *cval;
|
|
*cnum = CONTROL_XYROT;
|
|
- *cval = -CONTROL_MAX_VAL;
|
|
+ *cval = -bankMax;
|
|
break;
|
|
default:
|
|
// Unhandled movement. What I gonna do?
|