From e1fa28bd5417e5c2d180c3d12f6b4f1aa342cf2d Mon Sep 17 00:00:00 2001 From: Lior Halphon Date: Mon, 31 Oct 2022 22:49:17 +0200 Subject: [PATCH] Adjust Joy-Con terminology --- Cocoa/GBJoyConManager.m | 46 +++++++++--------- Cocoa/GBView.m | 4 +- ...nedTemplate.png => JoyConDualTemplate.png} | Bin ...plate@2x.png => JoyConDualTemplate@2x.png} | Bin Cocoa/Preferences.xib | 36 +++++++------- JoyKit/JOYController.h | 4 +- JoyKit/JOYController.m | 12 ++--- 7 files changed, 51 insertions(+), 51 deletions(-) rename Cocoa/{JoyConCombinedTemplate.png => JoyConDualTemplate.png} (100%) rename Cocoa/{JoyConCombinedTemplate@2x.png => JoyConDualTemplate@2x.png} (100%) diff --git a/Cocoa/GBJoyConManager.m b/Cocoa/GBJoyConManager.m index ca49f0e..fe00602 100644 --- a/Cocoa/GBJoyConManager.m +++ b/Cocoa/GBJoyConManager.m @@ -7,7 +7,7 @@ GBTintedImageCell *_tintedImageCell; NSImageCell *_imageCell; NSMutableDictionary *_pairings; - NSMutableDictionary *_orientationSettings; + NSMutableDictionary *_gripSettings; NSButton *_autoPairCheckbox; bool _unpairing; } @@ -50,7 +50,7 @@ _tintedImageCell.tint = [NSColor selectedMenuItemColor]; } _pairings = [[[NSUserDefaults standardUserDefaults] dictionaryForKey:@"GBJoyConPairings"] ?: @{} mutableCopy]; - _orientationSettings = [[[NSUserDefaults standardUserDefaults] dictionaryForKey:@"GBJoyConOrientations"] ?: @{} mutableCopy]; + _gripSettings = [[[NSUserDefaults standardUserDefaults] dictionaryForKey:@"GBJoyConGrips"] ?: @{} mutableCopy]; // Sanity check the pairings for (NSString *key in _pairings) { @@ -85,11 +85,11 @@ case JOYJoyConTypeNone: return nil; case JOYJoyConTypeLeft: - return [NSImage imageNamed:[NSString stringWithFormat:@"%sJoyConLeftTemplate", controller.usesHorizontalJoyConMode? "Horizontal" :""]]; + return [NSImage imageNamed:[NSString stringWithFormat:@"%sJoyConLeftTemplate", controller.usesHorizontalJoyConGrip? "Horizontal" :""]]; case JOYJoyConTypeRight: - return [NSImage imageNamed:[NSString stringWithFormat:@"%sJoyConRightTemplate", controller.usesHorizontalJoyConMode? "Horizontal" :""]]; - case JOYJoyConTypeCombined: - return [NSImage imageNamed:@"JoyConCombinedTemplate"]; + return [NSImage imageNamed:[NSString stringWithFormat:@"%sJoyConRightTemplate", controller.usesHorizontalJoyConGrip? "Horizontal" :""]]; + case JOYJoyConTypeDual: + return [NSImage imageNamed:@"JoyConDualTemplate"]; } } case 1: { @@ -104,19 +104,19 @@ return ret; } case 2: - return @([(_orientationSettings[controller.uniqueID] ?: @(-1)) unsignedIntValue] + 1); + return @([(_gripSettings[controller.uniqueID] ?: @(-1)) unsignedIntValue] + 1); } return nil; } -- (void)updateOrientationForController:(JOYController *)controller +- (void)updateGripForController:(JOYController *)controller { - NSNumber *orientation = _orientationSettings[controller.uniqueID]; - if (!orientation) { - controller.usesHorizontalJoyConMode = [[NSUserDefaults standardUserDefaults] boolForKey:@"GBJoyConsDefaultsToHorizontal"]; + NSNumber *grip = _gripSettings[controller.uniqueID]; + if (!grip) { + controller.usesHorizontalJoyConGrip = [[NSUserDefaults standardUserDefaults] boolForKey:@"GBJoyConsDefaultsToHorizontal"]; return; } - controller.usesHorizontalJoyConMode = [orientation unsignedIntValue] == 1; + controller.usesHorizontalJoyConGrip = [grip unsignedIntValue] == 1; } - (void)tableView:(NSTableView *)tableView setObjectValue:(id)object forTableColumn:(NSTableColumn *)tableColumn row:(NSInteger)row @@ -125,22 +125,22 @@ if (columnIndex != 2) return; if (row >= [self numberOfRowsInTableView:tableView]) return; JOYController *controller = self.joycons[row]; - if (controller.joyconType == JOYJoyConTypeCombined) { + if (controller.joyconType == JOYJoyConTypeDual) { return; } switch ([object unsignedIntValue]) { case 0: - [_orientationSettings removeObjectForKey:controller.uniqueID]; + [_gripSettings removeObjectForKey:controller.uniqueID]; break; case 1: - _orientationSettings[controller.uniqueID] = @(0); + _gripSettings[controller.uniqueID] = @(0); break; case 2: - _orientationSettings[controller.uniqueID] = @(1); + _gripSettings[controller.uniqueID] = @(1); break; } - [[NSUserDefaults standardUserDefaults] setObject:_orientationSettings forKey:@"GBJoyConOrientations"]; - [self updateOrientationForController:controller]; + [[NSUserDefaults standardUserDefaults] setObject:_gripSettings forKey:@"GBJoyConGrips"]; + [self updateGripForController:controller]; } - (NSCell *)tableView:(NSTableView *)tableView dataCellForTableColumn:(NSTableColumn *)tableColumn row:(NSInteger)row @@ -150,7 +150,7 @@ unsigned columnIndex = [[tableView tableColumns] indexOfObject:tableColumn]; if (columnIndex == 2) { JOYCombinedController *controller = (JOYCombinedController *)self.joycons[row]; - if (controller.joyconType == JOYJoyConTypeCombined) { + if (controller.joyconType == JOYJoyConTypeDual) { NSButtonCell *cell = [[NSButtonCell alloc] initTextCell:@"Separate Joy-Cons"]; cell.bezelStyle = NSBezelStyleRounded; cell.action = @selector(invoke); @@ -185,7 +185,7 @@ - (void)controllerConnected:(JOYController *)controller { - [self updateOrientationForController:controller]; + [self updateGripForController:controller]; for (JOYController *partner in [JOYController allControllers]) { if ([partner.uniqueID isEqualToString:_pairings[controller.uniqueID]]) { [self pairJoyCon:controller withJoyCon:partner]; @@ -241,8 +241,8 @@ _pairings[first.uniqueID] = second.uniqueID; _pairings[second.uniqueID] = first.uniqueID; - first.usesHorizontalJoyConMode = false; - second.usesHorizontalJoyConMode = false; + first.usesHorizontalJoyConGrip = false; + second.usesHorizontalJoyConGrip = false; [[NSUserDefaults standardUserDefaults] setObject:_pairings forKey:@"GBJoyConPairings"]; return [[JOYCombinedController alloc] initWithChildren:@[first, second]]; } @@ -305,7 +305,7 @@ { [[NSUserDefaults standardUserDefaults] setBool:sender.state forKey:@"GBJoyConsDefaultsToHorizontal"]; for (JOYController *controller in self.joycons) { - [self updateOrientationForController:controller]; + [self updateGripForController:controller]; } if (_arrangementMode) { [self.tableView reloadData]; diff --git a/Cocoa/GBView.m b/Cocoa/GBView.m index 3ce1a8c..65b807c 100644 --- a/Cocoa/GBView.m +++ b/Cocoa/GBView.m @@ -524,8 +524,8 @@ static const uint8_t workboy_vk_to_key[] = { if ([[NSUserDefaults standardUserDefaults] boolForKey:@"GBMBC7JoystickOverride"]) return; if (self.mouseControlsActive) return; if (controller != lastController) return; - // When using a combined two Joy-Cons, ignore motion data from the left Joy-Con - if (controller.joyconType == JOYJoyConTypeCombined) { + // When using Joy-Cons in dual-controller grip, ignore motion data from the left Joy-Con + if (controller.joyconType == JOYJoyConTypeDual) { for (JOYController *child in [(JOYCombinedController *)controller children]) { if (child.joyconType != JOYJoyConTypeRight && [child.axes3D containsObject:axes]) { return; diff --git a/Cocoa/JoyConCombinedTemplate.png b/Cocoa/JoyConDualTemplate.png similarity index 100% rename from Cocoa/JoyConCombinedTemplate.png rename to Cocoa/JoyConDualTemplate.png diff --git a/Cocoa/JoyConCombinedTemplate@2x.png b/Cocoa/JoyConDualTemplate@2x.png similarity index 100% rename from Cocoa/JoyConCombinedTemplate@2x.png rename to Cocoa/JoyConDualTemplate@2x.png diff --git a/Cocoa/Preferences.xib b/Cocoa/Preferences.xib index 00b8908..4641eba 100644 --- a/Cocoa/Preferences.xib +++ b/Cocoa/Preferences.xib @@ -1322,7 +1322,7 @@ + - + @@ -1394,14 +1405,14 @@ Test - + - - - + + + @@ -1424,17 +1435,6 @@ Test - diff --git a/JoyKit/JOYController.h b/JoyKit/JOYController.h index 7bda3a9..5bd6338 100644 --- a/JoyKit/JOYController.h +++ b/JoyKit/JOYController.h @@ -33,7 +33,7 @@ typedef enum { JOYJoyConTypeNone, JOYJoyConTypeLeft, JOYJoyConTypeRight, - JOYJoyConTypeCombined, + JOYJoyConTypeDual, } JOYJoyConType; @interface JOYController : NSObject @@ -55,7 +55,7 @@ typedef enum { @property (readonly) JOYJoyConType joyconType; @property (readonly) NSString *deviceName; @property (readonly) NSString *uniqueID; -@property (nonatomic) bool usesHorizontalJoyConMode; +@property (nonatomic) bool usesHorizontalJoyConGrip; @end @interface JOYCombinedController : JOYController diff --git a/JoyKit/JOYController.m b/JoyKit/JOYController.m index b3fa541..dc55c74 100644 --- a/JoyKit/JOYController.m +++ b/JoyKit/JOYController.m @@ -1111,15 +1111,15 @@ typedef union { return ret; } -- (void)setUsesHorizontalJoyConMode:(bool)usesHorizontalJoyConMode +- (void)setusesHorizontalJoyConGrip:(bool)usesHorizontalJoyConGrip { - if (usesHorizontalJoyConMode == _usesHorizontalJoyConMode) return; // Nothing to do - _usesHorizontalJoyConMode = usesHorizontalJoyConMode; + if (usesHorizontalJoyConGrip == _usesHorizontalJoyConGrip) return; // Nothing to do + _usesHorizontalJoyConGrip = usesHorizontalJoyConGrip; switch (self.joyconType) { case JOYJoyConTypeLeft: case JOYJoyConTypeRight: { NSArray *buttons = _buttons.allValues; // not self.buttons to skip emulated buttons - if (!usesHorizontalJoyConMode) { + if (!usesHorizontalJoyConGrip) { for (JOYAxes2D *axes in self.axes2D) { axes.rotation = 0; } @@ -1476,12 +1476,12 @@ typedef union { if (_children.count != 2) return JOYJoyConTypeNone; if (_children[0].joyconType == JOYJoyConTypeLeft && _children[1].joyconType == JOYJoyConTypeRight) { - return JOYJoyConTypeCombined; + return JOYJoyConTypeDual; } if (_children[1].joyconType == JOYJoyConTypeLeft && _children[0].joyconType == JOYJoyConTypeRight) { - return JOYJoyConTypeCombined; + return JOYJoyConTypeDual; } return JOYJoyConTypeNone; }