hermes-agent/VoidLink
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

multi gamepad input fixes

Browse Source
This commit is contained in:
True Zhuanjia committed 2026-04-14 10:45:50 +08:00
1 parent a4f805db26
commit 3e1423ff46
1 file changed
+13 -5
Download Patch File Download Diff File Expand all files Collapse all files
VoidLink/Input/ControllerSupport.m
+13 -5
View File
@@ -631,7 +631,7 @@ static const double MOUSE_SPEED_DIVISOR = 1.25;
//NSLog(@"gamepadMask: %@", [self binaryRepresentationOfInteger:buttonFlags]); // we got the pressed OSC buttons here. //NSLog(@"gamepadMask: %@", [self binaryRepresentationOfInteger:buttonFlags]); // we got the pressed OSC buttons here.
// Player 1 is always present for OSC // Player 0 is always present for OSC
LiSendMultiControllerEvent(_multiController ? controller.playerIndex : 0, [self getActiveGamepadMask], LiSendMultiControllerEvent(_multiController ? controller.playerIndex : 0, [self getActiveGamepadMask],
buttonFlags, leftTrigger, rightTrigger, buttonFlags, leftTrigger, rightTrigger,
leftStickX, leftStickY, rightStickX, rightStickY); leftStickX, leftStickY, rightStickX, rightStickY);
@@ -1149,7 +1149,7 @@ double rc_expo(double x, double expo) {
for(NSNumber* buttonFlagId in buttonDict){ for(NSNumber* buttonFlagId in buttonDict){
GCControllerButtonInput * button = (GCControllerButtonInput *)buttonDict[buttonFlagId]; GCControllerButtonInput * button = (GCControllerButtonInput *)buttonDict[buttonFlagId];
if(self->_mapControllerToMouse){ if(self->_mapControllerToMouse && voidController.playerIndex==0){
if(button.pressed){ if(button.pressed){
if(buttonFlagId.intValue == self->_controllerMouseSwitch){ if(buttonFlagId.intValue == self->_controllerMouseSwitch){
self->_mouseSwitchButtonPressed = true; self->_mouseSwitchButtonPressed = true;
@@ -1577,9 +1577,17 @@ double rc_expo(double x, double expo) {
} }
} }
// If this is player 0, it shares state with the OSC // Only player 0 shares state with the OSC.
voidController.mergedWithController = _oscController; if (voidController.playerIndex == 0) {
_oscController.mergedWithController = voidController; voidController.mergedWithController = _oscController;
_oscController.mergedWithController = voidController;
}
else {
voidController.mergedWithController = nil;
if (_oscController.mergedWithController == voidController) {
_oscController.mergedWithController = nil;
}
}
if (@available(iOS 13.0, tvOS 13.0, *)) { if (@available(iOS 13.0, tvOS 13.0, *)) {
if (controller.extendedGamepad != nil && if (controller.extendedGamepad != nil &&