Skip to content

Commit 4d5879b

Browse files
committed
DualShock4/DualSense controls redesigned properly for USB/Bluetooth
1 parent d35ea71 commit 4d5879b

File tree

8 files changed

+727
-274
lines changed

8 files changed

+727
-274
lines changed

CHANGELOG.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -55,10 +55,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
5555
- Added the ability to side step hitting the *Left*/*Right* key while holding *Walk* key (optional feature).
5656
- Added possibility to hold up/down keys to quickly scroll through game menus.
5757
- Added a configurable number of saved game slots (16-24).
58-
- Joystick support completely migrated from WinAPI to DirectInput. Added XInput controllers support. Added DualShock 4 support.
58+
- Joystick support completely migrated from WinAPI to DirectInput. Added XInput controllers support. Added DualShock 4 / DualSense support.
5959
- Joystick controls redesigned to use thumb sticks and D-Pad at the same time.
60-
- Added vibration feedback support for XInput gamepads and DualShock 4.
61-
- Added the light bar color feedback support for DualShock 4. The color changes depending from health and oxygen.
60+
- Added vibration feedback support for XInput gamepads and DualShock 4 / DualSense.
61+
- Added the light bar color feedback support for DualShock 4 / DualSense. The color changes depending from health and oxygen.
6262
- Passport text box height is adjusted depending from HUD scale.
6363
- Some legacy options are removed (Triple Buffer, Dither, Perspective Correction, Texel Adjustment, Disable 16 bit textures, Don't sort transparent polys).
6464
- Screen resolution settings reworked, now the game automatically selects between True Color / High Color.

TR2Main.cbp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -161,6 +161,7 @@
161161
<Add library="hid" />
162162
<Add library="ole32" />
163163
<Add library="oleaut32" />
164+
<Add library="setupapi" />
164165
<Add library="xinput" />
165166
</Linker>
166167
<ExtraCommands>

global/types.h

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -685,6 +685,14 @@ typedef enum {
685685
TAM_Always,
686686
} TEX_ADJUST_MODE;
687687

688+
#ifdef FEATURE_INPUT_IMPROVED
689+
typedef enum {
690+
JOY_DirectInput,
691+
JOY_XInput,
692+
JOY_RawInput,
693+
} JOY_INTERFACE;
694+
#endif // FEATURE_INPUT_IMPROVED
695+
688696
typedef enum {
689697
#ifdef FEATURE_HUD_IMPROVED
690698
CTRL_Joystick,
@@ -1283,7 +1291,7 @@ typedef struct Joystick_t {
12831291
STRING_FLAGGED productName;
12841292
STRING_FLAGGED instanceName;
12851293
#ifdef FEATURE_INPUT_IMPROVED
1286-
HANDLE rawInputHandle;
1294+
JOY_INTERFACE iface;
12871295
#endif // FEATURE_INPUT_IMPROVED
12881296
} JOYSTICK;
12891297

0 commit comments

Comments
 (0)