moonlight-stream/moonlight-ios
1
0
Fork 0
mirror of https://github.com/moonlight-stream/moonlight-ios.git synced 2026-06-17 14:11:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Don't emulate buttons when the controller already has them

Browse Source
This commit is contained in:
Cameron Gutman
2019-11-09 17:47:47 -08:00
parent 99fec8919e
commit 12a64f8626
2 changed files with 20 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Limelight/Input/Controller.h
+1
View File
@@ -14,6 +14,7 @@
@property (nonatomic) int playerIndex; @property (nonatomic) int playerIndex;
@property (nonatomic) int lastButtonFlags; @property (nonatomic) int lastButtonFlags;
@property (nonatomic) int emulatingButtonFlags; @property (nonatomic) int emulatingButtonFlags;
@property (nonatomic) int supportedEmulationFlags;
@property (nonatomic) unsigned char lastLeftTrigger; @property (nonatomic) unsigned char lastLeftTrigger;
@property (nonatomic) unsigned char lastRightTrigger; @property (nonatomic) unsigned char lastRightTrigger;
@property (nonatomic) short lastLeftStickX; @property (nonatomic) short lastLeftStickX;
Limelight/Input/ControllerSupport.m
+19 -6
View File
@@ -134,15 +134,19 @@
if (controller.lastButtonFlags & PLAY_FLAG) { if (controller.lastButtonFlags & PLAY_FLAG) {
// If LB and start are down, trigger select // If LB and start are down, trigger select
if (controller.lastButtonFlags & LB_FLAG) { if (controller.lastButtonFlags & LB_FLAG) {
controller.lastButtonFlags |= BACK_FLAG; if (controller.supportedEmulationFlags & EMULATING_SELECT) {
controller.lastButtonFlags &= ~(pressedButtons & (PLAY_FLAG | LB_FLAG)); controller.lastButtonFlags |= BACK_FLAG;
controller.emulatingButtonFlags |= EMULATING_SELECT; controller.lastButtonFlags &= ~(pressedButtons & (PLAY_FLAG | LB_FLAG));
controller.emulatingButtonFlags |= EMULATING_SELECT;
}
} }
// If (RB or select) and start are down, trigger special // If (RB or select) and start are down, trigger special
else if ((controller.lastButtonFlags & RB_FLAG) || (controller.lastButtonFlags & BACK_FLAG)) { else if ((controller.lastButtonFlags & RB_FLAG) || (controller.lastButtonFlags & BACK_FLAG)) {
controller.lastButtonFlags |= SPECIAL_FLAG; if (controller.supportedEmulationFlags & EMULATING_SPECIAL) {
controller.lastButtonFlags &= ~(pressedButtons & (PLAY_FLAG | RB_FLAG | BACK_FLAG)); controller.lastButtonFlags |= SPECIAL_FLAG;
controller.emulatingButtonFlags |= EMULATING_SPECIAL; controller.lastButtonFlags &= ~(pressedButtons & (PLAY_FLAG | RB_FLAG | BACK_FLAG));
controller.emulatingButtonFlags |= EMULATING_SPECIAL;
}
} }
} }
@@ -387,7 +391,16 @@
limeController.playerIndex = i; limeController.playerIndex = i;
} }
limeController.supportedEmulationFlags = EMULATING_SPECIAL | EMULATING_SELECT;
limeController.gamepad = controller; limeController.gamepad = controller;
if (@available(iOS 13.0, tvOS 13.0, *)) {
if (controller.extendedGamepad != nil &&
controller.extendedGamepad.buttonOptions != nil) {
// Disable select button emulation since we have a physical select button
limeController.supportedEmulationFlags &= ~EMULATING_SELECT;
}
}
[_controllers setObject:limeController forKey:[NSNumber numberWithInteger:controller.playerIndex]]; [_controllers setObject:limeController forKey:[NSNumber numberWithInteger:controller.playerIndex]];