Overview
Comment: | Several fixes for the last commit |
---|---|
Downloads: | Tarball | ZIP archive | SQL archive |
Timelines: | family | ancestors | descendants | both | trunk |
Files: | files | file ages | folders |
SHA3-256: |
fc2b668c5704e43f4de0c5b98e8ab093 |
User & Date: | js on 2024-06-09 11:51:02 |
Other Links: | manifest | tags |
Context
2024-06-09
| ||
11:56 | GitHub Actions: Use fedora, not fedora:41 check-in: c418c97bdd user: js tags: trunk | |
11:51 | Several fixes for the last commit check-in: fc2b668c57 user: js tags: trunk | |
11:43 | OHGamepad: Move some elements to OHExtendedGamepad check-in: 998339ff24 user: js tags: trunk | |
Changes
Modified .fossil-settings/ignore-glob from [affe6beb0b] to [3a81b89ba8].
︙ | ︙ | |||
41 42 43 44 45 46 47 | tests/DerivedData tests/EBOOT.PBP tests/Info.plist tests/PARAM.SFO tests/big_dictionary_msgpack_gz.m tests/boot.dol tests/gamecontroller/boot.dol | | | | | | 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 | tests/DerivedData tests/EBOOT.PBP tests/Info.plist tests/PARAM.SFO tests/big_dictionary_msgpack_gz.m tests/boot.dol tests/gamecontroller/boot.dol tests/gamecontroller/tests tests/gamecontroller/tests.3dsx tests/gamecontroller/tests.arm9 tests/gamecontroller/tests.nds tests/iOS.xcodeproj/*.pbxuser tests/iOS.xcodeproj/project.xcworkspace tests/iOS.xcodeproj/xcuserdata tests/objc_sync/objc_sync tests/plugin/Info.plist tests/subprocess/subprocess tests/terminal/terminal_tests |
︙ | ︙ |
Modified src/hid/Makefile from [68a99cecdd] to [14a7f00a36].
︙ | ︙ | |||
24 25 26 27 28 29 30 | ${USE_SRCS_XINPUT} SRCS_EVDEV = OHEvdevDualSense.m \ OHEvdevDualShock4.m \ OHEvdevExtendedGamepad.m \ OHEvdevGameController.m \ OHEvdevPlayStationExtendedGamepad.m \ OHEvdevStadiaExtendedGamepad.m | | | | 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 | ${USE_SRCS_XINPUT} SRCS_EVDEV = OHEvdevDualSense.m \ OHEvdevDualShock4.m \ OHEvdevExtendedGamepad.m \ OHEvdevGameController.m \ OHEvdevPlayStationExtendedGamepad.m \ OHEvdevStadiaExtendedGamepad.m SRCS_NINTENDO_3DS = OHNintendo3DSExtendedGamepad.m \ OHNintendo3DSGameController.m SRCS_NINTENDO_DS = OHNintendoDSGameController.m SRCS_XINPUT = OHXInputExtendedGamepad.m \ OHXInputGameController.m INCLUDES := ${SRCS:.m=.h} \ ObjFWHID.h |
︙ | ︙ |
Modified src/hid/OHCombinedJoyCons.h from [3b3290c60a] to [0b0c5cd7ee].
︙ | ︙ | |||
13 14 15 16 17 18 19 | * 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/>. */ | | | | 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 | * 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 "OHExtendedGamepad.h" OF_ASSUME_NONNULL_BEGIN @class OHGameController; /** * @class OHCombinedJoyCons OHCombinedJoyCons.h ObjFWHID/OHCombinedJoyCons.h * * @brief Combines a left and a right Joy-Con into a gamepad. */ @interface OHCombinedJoyCons: OHExtendedGamepad { OHGameControllerProfile *_leftJoyCon, *_rightJoyCon; } /** * @brief Creates a new @ref OHCombinedJoyCons with the specified left and * right Joy-Con. |
︙ | ︙ |
Modified tests/gamecontroller/GameControllerTests.m from [79671ffcff] to [7ea7d25a9a].
︙ | ︙ | |||
25 26 27 28 29 30 31 32 33 34 35 36 37 38 | #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" | > | 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 | #import "OFDate.h" #import "OFDictionary.h" #import "OFNumber.h" #import "OFStdIOStream.h" #import "OFThread.h" #import "OHCombinedJoyCons.h" #import "OHExtendedGamepad.h" #import "OHGameController.h" #import "OHGameControllerAxis.h" #import "OHGameControllerButton.h" #import "OHGameControllerDirectionalPad.h" #import "OHGameControllerProfile.h" #import "OHGamepad.h" |
︙ | ︙ | |||
133 134 135 136 137 138 139 140 141 | @"[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", | > > > > > > | | | | > > > > > | | > > > > > > > | > > > | 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 | @"[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]; } if ([profile isKindOfClass: [OHExtendedGamepad class]]) { OHExtendedGamepad *extendedGamepad = (OHExtendedGamepad *)profile; [OFStdOut writeFormat: @"[Map] Left Trigger: %@ Right Trigger: %@\n", extendedGamepad.leftTriggerButton.name, extendedGamepad.rightTriggerButton.name]; [OFStdOut writeFormat: @"[Map] Left Thumbstick: %@ Right Thumbstick: %@\n", extendedGamepad.leftThumbstickButton.name, extendedGamepad.rightThumbstickButton.name]; } if ([profile isKindOfClass: [OHGamepad class]]) { OHGamepad *gamepad = (OHGamepad *)profile; [OFStdOut writeFormat: @"[Map] Menu: %@ Options: %@", gamepad.menuButton.name, gamepad.optionsButton.name]; } if ([profile isKindOfClass: [OHExtendedGamepad class]]) { OHExtendedGamepad *extendedGamepad = (OHExtendedGamepad *)profile; [OFStdOut writeFormat: @" Home: %@", extendedGamepad.homeButton.name]; } if ([profile isKindOfClass: [OHGamepad class]]) [OFStdOut writeString: @"\n"]; } @implementation GameControllerTests - (void)applicationDidFinishLaunching: (OFNotification *)notification { #if defined(OF_WII) || defined(OF_NINTENDO_DS) || defined(OF_NINTENDO_3DS) [OFStdIOStream setUpConsole]; |
︙ | ︙ |
Modified tests/gamecontroller/Makefile from [1986e83bf3] to [5719799b8f].
1 2 3 4 5 6 7 | include ../../extra.mk CLEAN = boot.dol \ ${PROG_NOINST}.3dsx \ ${PROG_NOINST}.arm9 \ ${PROG_NOINST}.ndsd \ | | | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 | include ../../extra.mk CLEAN = boot.dol \ ${PROG_NOINST}.3dsx \ ${PROG_NOINST}.arm9 \ ${PROG_NOINST}.ndsd \ PROG_NOINST = tests${PROG_SUFFIX} SRCS = GameControllerTests.m include ../../buildsys.mk .PHONY: run run: rm -f libobjfw.so.${OBJFW_LIB_MAJOR} |
︙ | ︙ |