Overview
Comment: | ObjFWHID: Add OHCombinedJoyCons |
---|---|
Downloads: | Tarball | ZIP archive | SQL archive |
Timelines: | family | ancestors | descendants | both | trunk |
Files: | files | file ages | folders |
SHA3-256: |
1ba9cce3762e3930845e80a7b71edb96 |
User & Date: | js on 2024-06-09 11:17:00 |
Other Links: | manifest | tags |
Context
2024-06-09
| ||
11:43 | OHGamepad: Move some elements to OHExtendedGamepad check-in: 998339ff24 user: js tags: trunk | |
11:17 | ObjFWHID: Add OHCombinedJoyCons check-in: 1ba9cce376 user: js tags: trunk | |
09:53 | OHEvdevGameController: Buttons for N64 controller check-in: f5e3072b7e user: js tags: trunk | |
Changes
Modified src/hid/Makefile from [2701f58cde] to [c9eb22f3ea].
1 2 3 4 5 6 7 8 9 10 11 | include ../../extra.mk DISTCLEAN = Info.plist SHARED_LIB = ${OBJFWHID_SHARED_LIB} STATIC_LIB = ${OBJFWHID_STATIC_LIB} FRAMEWORK = ${OBJFWHID_FRAMEWORK} LIB_MAJOR = ${OBJFWHID_LIB_MAJOR} LIB_MINOR = ${OBJFWHID_LIB_MINOR} LIB_PATCH = ${OBJFWHID_LIB_PATCH} | > | | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 | include ../../extra.mk DISTCLEAN = Info.plist SHARED_LIB = ${OBJFWHID_SHARED_LIB} STATIC_LIB = ${OBJFWHID_STATIC_LIB} FRAMEWORK = ${OBJFWHID_FRAMEWORK} LIB_MAJOR = ${OBJFWHID_LIB_MAJOR} LIB_MINOR = ${OBJFWHID_LIB_MINOR} LIB_PATCH = ${OBJFWHID_LIB_PATCH} SRCS = OHCombinedJoyCons.m \ OHGameController.m \ OHGameControllerAxis.m \ OHGameControllerButton.m \ OHGameControllerDirectionalPad.m \ OHGameControllerElement.m \ OHGameControllerProfile.m \ OHGamepad.m \ ${USE_SRCS_EVDEV} \ |
︙ | ︙ |
Added src/hid/OHCombinedJoyCons.h version [8697cf7759].
> > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 | /* * Copyright (c) 2008-2024 Jonathan Schleifer <js@nil.im> * * All rights reserved. * * This program is free software: you can redistribute it and/or modify it * under the terms of the GNU Lesser General Public License version 3.0 only, * as published by the Free Software Foundation. * * This program is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License * version 3.0 for more details. * * You should have received a copy of the GNU Lesser General Public License * version 3.0 along with this program. If not, see * <https://www.gnu.org/licenses/>. */ #import "OHGamepad.h" OF_ASSUME_NONNULL_BEGIN @class OHGameController; /** * @brief Combines a left and a right Joy-Con into a gamepad. */ @interface OHCombinedJoyCons: OHGamepad { OHGameControllerProfile *_leftJoyCon, *_rightJoyCon; } /** * @brief Creates a new @ref OHCombinedJoyCons with the specified left and * right Joy-Con. * * @param leftJoyCon The left Joy-Con * @param rightJoyCon The right Joy-Con * @return An new @ref OHCombinedJoyCons */ + (instancetype)gamepadWithLeftJoyCon: (OHGameController *)leftJoyCon rightJoyCon: (OHGameController *)rightJoyCon; - (instancetype)init OF_UNAVAILABLE; /** * @brief Initializes an already allocated @ref OHCombinedJoyCons with the * specified left and right Joy-Con. * * @param leftJoyCon The left Joy-Con * @param rightJoyCon The right Joy-Con * @return An initialized @ref OHCombinedJoyCons */ - (instancetype)initWithLeftJoyCon: (OHGameController *)leftJoyCon rightJoyCon: (OHGameController *)rightJoyCon; @end OF_ASSUME_NONNULL_END |
Added src/hid/OHCombinedJoyCons.m version [3732ebd4b4].
> > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 | /* * Copyright (c) 2008-2024 Jonathan Schleifer <js@nil.im> * * All rights reserved. * * This program is free software: you can redistribute it and/or modify it * under the terms of the GNU Lesser General Public License version 3.0 only, * as published by the Free Software Foundation. * * This program is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License * version 3.0 for more details. * * You should have received a copy of the GNU Lesser General Public License * version 3.0 along with this program. If not, see * <https://www.gnu.org/licenses/>. */ #include "config.h" #import "OHCombinedJoyCons.h" #import "OFDictionary.h" #import "OFNumber.h" #import "OHGameController.h" #import "OHGameControllerDirectionalPad.h" #import "OFInvalidArgumentException.h" @implementation OHCombinedJoyCons + (instancetype)gamepadWithLeftJoyCon: (OHGameController *)leftJoyCon rightJoyCon: (OHGameController *)rightJoyCon { return [[[self alloc] initWithLeftJoyCon: leftJoyCon rightJoyCon: rightJoyCon] autorelease]; } - (instancetype)init { OF_INVALID_INIT_METHOD } - (instancetype)initWithLeftJoyCon: (OHGameController *)leftJoyCon rightJoyCon: (OHGameController *)rightJoyCon { self = [super init]; @try { void *pool = objc_autoreleasePoolPush(); OFDictionary *leftButtons, *rightButtons; OFMutableDictionary *buttons, *directionalPads; OHGameControllerDirectionalPad *directionalPad; if (leftJoyCon.vendorID.unsignedShortValue != OHVendorIDNintendo || rightJoyCon.vendorID.unsignedShortValue != OHVendorIDNintendo) @throw [OFInvalidArgumentException exception]; if (leftJoyCon.productID.unsignedShortValue != OHProductIDLeftJoyCon || rightJoyCon.productID.unsignedShortValue != OHProductIDRightJoyCon) @throw [OFInvalidArgumentException exception]; _leftJoyCon = [leftJoyCon.rawProfile retain]; _rightJoyCon = [rightJoyCon.rawProfile retain]; leftButtons = _leftJoyCon.buttons; rightButtons = _rightJoyCon.buttons; buttons = [OFMutableDictionary dictionaryWithCapacity: leftButtons.count + rightButtons.count]; [buttons addEntriesFromDictionary: leftButtons]; [buttons addEntriesFromDictionary: rightButtons]; [buttons removeObjectForKey: @"D-Pad Up"]; [buttons removeObjectForKey: @"D-Pad Down"]; [buttons removeObjectForKey: @"D-Pad Left"]; [buttons removeObjectForKey: @"D-Pad Right"]; [buttons removeObjectForKey: @"SL"]; [buttons removeObjectForKey: @"SR"]; [buttons makeImmutable]; _buttons = [buttons retain]; _axes = [[OFDictionary alloc] init]; directionalPads = [OFMutableDictionary dictionaryWithCapacity: 3]; directionalPad = [[[OHGameControllerDirectionalPad alloc] initWithName: @"Left Thumbstick" xAxis: [_leftJoyCon.axes objectForKey: @"X"] yAxis: [_leftJoyCon.axes objectForKey: @"Y"]] autorelease]; [directionalPads setObject: directionalPad forKey: @"Left Thumbstick"]; directionalPad = [[[OHGameControllerDirectionalPad alloc] initWithName: @"Right Thumbstick" xAxis: [_rightJoyCon.axes objectForKey: @"RX"] yAxis: [_rightJoyCon.axes objectForKey: @"RY"]] autorelease]; [directionalPads setObject: directionalPad forKey: @"Right Thumbstick"]; directionalPad = [[[OHGameControllerDirectionalPad alloc] initWithName: @"D-Pad" up: [leftButtons objectForKey: @"D-Pad Up"] down: [leftButtons objectForKey: @"D-Pad Down"] left: [leftButtons objectForKey: @"D-Pad Left"] right: [leftButtons objectForKey: @"D-Pad Right"]] autorelease]; [directionalPads setObject: directionalPad forKey: @"D-Pad"]; [directionalPads makeImmutable]; _directionalPads = [directionalPads retain]; objc_autoreleasePoolPop(pool); } @catch (id e) { [self release]; @throw e; } return self; } - (void)dealloc { [_leftJoyCon release]; [_rightJoyCon release]; [super dealloc]; } - (OHGameControllerButton *)northButton { return [_buttons objectForKey: @"X"]; } - (OHGameControllerButton *)southButton { return [_buttons objectForKey: @"B"]; } - (OHGameControllerButton *)westButton { return [_buttons objectForKey: @"Y"]; } - (OHGameControllerButton *)eastButton { return [_buttons objectForKey: @"A"]; } - (OHGameControllerButton *)leftShoulderButton { return [_buttons objectForKey: @"L"]; } - (OHGameControllerButton *)rightShoulderButton { return [_buttons objectForKey: @"R"]; } - (OHGameControllerButton *)leftTriggerButton { return [_buttons objectForKey: @"ZL"]; } - (OHGameControllerButton *)rightTriggerButton { return [_buttons objectForKey: @"ZR"]; } - (OHGameControllerButton *)leftThumbstickButton { return [_buttons objectForKey: @"Left Thumbstick"]; } - (OHGameControllerButton *)rightThumbstickButton { return [_buttons objectForKey: @"Right Thumbstick"]; } - (OHGameControllerButton *)menuButton { return [_buttons objectForKey: @"+"]; } - (OHGameControllerButton *)optionsButton { return [_buttons objectForKey: @"-"]; } - (OHGameControllerButton *)homeButton { return [_buttons objectForKey: @"Home"]; } - (OHGameControllerDirectionalPad *)leftThumbStick { return [_directionalPads objectForKey: @"Left Thumbstick"]; } - (OHGameControllerDirectionalPad *)rightThumbStick { return [_directionalPads objectForKey: @"Right Thumbstick"]; } - (OHGameControllerDirectionalPad *)dPad { return [_directionalPads objectForKey: @"D-Pad"]; } @end |
Modified src/hid/OHEvdevGameController.m from [47295b2089] to [1aae3bc76f].
︙ | ︙ | |||
125 126 127 128 129 130 131 | productID == OHProductIDLeftJoyCon) { switch (button) { case BTN_TL: return @"L"; case BTN_TL2: return @"ZL"; case BTN_THUMBL: | | | 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 | productID == OHProductIDLeftJoyCon) { switch (button) { case BTN_TL: return @"L"; case BTN_TL2: return @"ZL"; case BTN_THUMBL: return @"Left Thumbstick"; case BTN_SELECT: return @"-"; case BTN_Z: return @"Capture"; case BTN_TR: return @"SL"; case BTN_TR2: |
︙ | ︙ | |||
151 152 153 154 155 156 157 | case BTN_EAST: return @"A"; case BTN_TR: return @"R"; case BTN_TR2: return @"ZR"; case BTN_THUMBR: | | | 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 | case BTN_EAST: return @"A"; case BTN_TR: return @"R"; case BTN_TR2: return @"ZR"; case BTN_THUMBR: return @"Right Thumbstick"; case BTN_START: return @"+"; case BTN_MODE: return @"Home"; case BTN_TL: return @"SL"; case BTN_TL2: |
︙ | ︙ |
Modified tests/gamecontroller/GameControllerTests.m from [0c35b7944c] to [79671ffcff].
︙ | ︙ | |||
24 25 26 27 28 29 30 31 32 33 34 35 36 37 | #import "OFColor.h" #import "OFDate.h" #import "OFDictionary.h" #import "OFNumber.h" #import "OFStdIOStream.h" #import "OFThread.h" #import "OHGameController.h" #import "OHGameControllerAxis.h" #import "OHGameControllerButton.h" #import "OHGameControllerDirectionalPad.h" #import "OHGameControllerProfile.h" #import "OHGamepad.h" | > | 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 | #import "OFColor.h" #import "OFDate.h" #import "OFDictionary.h" #import "OFNumber.h" #import "OFStdIOStream.h" #import "OFThread.h" #import "OHCombinedJoyCons.h" #import "OHGameController.h" #import "OHGameControllerAxis.h" #import "OHGameControllerButton.h" #import "OHGameControllerDirectionalPad.h" #import "OHGameControllerProfile.h" #import "OHGamepad.h" |
︙ | ︙ | |||
49 50 51 52 53 54 55 | # define red maroon # define yellow olive # define gray silver #endif @interface GameControllerTests: OFObject <OFApplicationDelegate> { | | > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | < < < < < < < < < < < < | < < < | | < < | < < < < < < < < < | < < < < | | < | < | < < < < | < < < < | < < < < < | < | < | < < < < < < < | < < | < < < < < < | < < < < < < < < < < < < < < < < < < < | > | 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 | # define red maroon # define yellow olive # define gray silver #endif @interface GameControllerTests: OFObject <OFApplicationDelegate> { OFArray OF_GENERIC(OHGameController *) *_controllers; OFDate *_lastControllersUpdate; } @end OF_APPLICATION_DELEGATE(GameControllerTests) static void printProfile(OHGameControllerProfile *profile) { OFArray OF_GENERIC(OFString *) *buttons = profile.buttons.allKeys.sortedArray; OFArray OF_GENERIC(OFString *) *axes = profile.axes.allKeys.sortedArray; OFArray OF_GENERIC(OFString *) *directionalPads = profile.directionalPads.allKeys.sortedArray; size_t i; i = 0; for (OFString *name in buttons) { OHGameControllerButton *button = [profile.buttons objectForKey: name]; if (i++ == buttonsPerLine) { [OFStdOut writeString: @"\n"]; i = 0; } if (button.value == 1) [OFStdOut setForegroundColor: [OFColor red]]; else if (button.value > 0.5) [OFStdOut setForegroundColor: [OFColor yellow]]; else if (button.value > 0) [OFStdOut setForegroundColor: [OFColor green]]; else [OFStdOut setForegroundColor: [OFColor gray]]; [OFStdOut writeFormat: @"[%@] ", name]; } [OFStdOut setForegroundColor: [OFColor gray]]; [OFStdOut writeString: @"\n"]; i = 0; for (OFString *name in axes) { OHGameControllerAxis *axis = [profile.axes objectForKey: name]; if (i++ == buttonsPerLine) { [OFStdOut writeString: @"\n"]; i = 0; } [OFStdOut writeFormat: @"%@: %5.2f ", name, axis.value]; } if (axes.count > 0) [OFStdOut writeString: @"\n"]; i = 0; for (OFString *name in directionalPads) { OHGameControllerDirectionalPad *directionalPad = [profile.directionalPads objectForKey: name]; if (i++ == 2) { [OFStdOut writeString: @"\n"]; i = 0; } [OFStdOut writeFormat: @"%@: (%5.2f, %5.2f) ", name, directionalPad.xAxis.value, directionalPad.yAxis.value]; } if (directionalPads.count > 0) [OFStdOut writeString: @"\n"]; if ([profile isKindOfClass: [OHGamepad class]]) { OHGamepad *gamepad = (OHGamepad *)profile; [OFStdOut writeFormat: @"[Map] North: %@ South: %@ West: %@ East: %@\n", gamepad.northButton.name, gamepad.southButton.name, gamepad.westButton.name, gamepad.eastButton.name]; [OFStdOut writeFormat: @"[Map] Left Shoulder: %@ Right Shoulder: %@\n", gamepad.leftShoulderButton.name, gamepad.rightShoulderButton.name]; [OFStdOut writeFormat: @"[Map] Left Trigger: %@ Right Trigger: %@\n", gamepad.leftTriggerButton.name, gamepad.rightTriggerButton.name]; [OFStdOut writeFormat: @"[Map] Left Thumbstick: %@ Right Thumbstick: %@\n", gamepad.leftThumbstickButton.name, gamepad.rightThumbstickButton.name]; [OFStdOut writeFormat: @"[Map] Menu: %@ Options: %@ Home: %@\n", gamepad.menuButton.name, gamepad.optionsButton.name, gamepad.homeButton.name]; } } @implementation GameControllerTests - (void)applicationDidFinishLaunching: (OFNotification *)notification { #if defined(OF_WII) || defined(OF_NINTENDO_DS) || defined(OF_NINTENDO_3DS) [OFStdIOStream setUpConsole]; #endif for (;;) { void *pool = objc_autoreleasePoolPush(); OHGameController *leftJoyCon = nil, *rightJoyCon = nil; if (_lastControllersUpdate == nil || -[_lastControllersUpdate timeIntervalSinceNow] > 1) { [_controllers release]; [_lastControllersUpdate release]; _controllers = [[OHGameController controllers] retain]; _lastControllersUpdate = [[OFDate alloc] init]; [OFStdOut clear]; } [OFStdOut setCursorPosition: OFMakePoint(0, 0)]; for (OHGameController *controller in _controllers) { OHGameControllerProfile *profile = (controller.gamepad != nil ? controller.gamepad : controller.rawProfile); [OFStdOut setForegroundColor: [OFColor green]]; [OFStdOut writeLine: controller.description]; @try { [controller retrieveState]; } @catch (OFReadFailedException *e) { [OFStdOut setForegroundColor: [OFColor red]]; [OFStdOut writeString: e.description]; continue; } printProfile(profile); if (controller.vendorID.unsignedShortValue == OHVendorIDNintendo) { if (controller.productID.unsignedShortValue == OHProductIDLeftJoyCon) leftJoyCon = controller; if (controller.productID.unsignedShortValue == OHProductIDRightJoyCon) rightJoyCon = controller; } } if (leftJoyCon != nil && rightJoyCon != nil) { OHCombinedJoyCons *combinedJoyCons = [OHCombinedJoyCons gamepadWithLeftJoyCon: leftJoyCon rightJoyCon: rightJoyCon]; [OFStdOut setForegroundColor: [OFColor green]]; [OFStdOut writeLine: @"Combined Joy-Cons"]; printProfile(combinedJoyCons); } #if defined(OF_WII) || defined(OF_NINTENDO_DS) || defined(OF_NINTENDO_3DS) [OFThread waitForVerticalBlank]; #else [OFThread sleepForTimeInterval: 1.f / 60.f]; #endif objc_autoreleasePoolPop(pool); } } @end |