From ddfa728d6091d322a038a14b7c613e4dfd6945e7 Mon Sep 17 00:00:00 2001 From: grizeldi Date: Wed, 26 Apr 2017 17:52:15 +0200 Subject: [PATCH 1/2] Add Xbone S controller mappings --- .../resources/joystick-mapping.properties | 21 ++++++++++++++++++- 1 file changed, 20 insertions(+), 1 deletion(-) diff --git a/jme3-core/src/main/resources/joystick-mapping.properties b/jme3-core/src/main/resources/joystick-mapping.properties index 83a6996de..3fb4791bf 100644 --- a/jme3-core/src/main/resources/joystick-mapping.properties +++ b/jme3-core/src/main/resources/joystick-mapping.properties @@ -149,6 +149,25 @@ XBOX\ 360\ For\ Windows\ (Controller).ry=rz # keeps it from confusing the .rx mapping. XBOX\ 360\ For\ Windows\ (Controller).z=trigger +#Xbox One S controller +Microsoft\ X-Box\ One\ S\ pad.0=2 +Microsoft\ X-Box\ One\ S\ pad.1=1 +Microsoft\ X-Box\ One\ S\ pad.2=3 +Microsoft\ X-Box\ One\ S\ pad.3=0 + +Microsoft\ X-Box\ One\ S\ pad.6=8 +Microsoft\ X-Box\ One\ S\ pad.7=9 + +Microsoft\ X-Box\ One\ S\ pad.8=10 +Microsoft\ X-Box\ One\ S\ pad.9=11 + +Microsoft\ X-Box\ One\ S\ pad.rx=z +Microsoft\ X-Box\ One\ S\ pad.ry=rz + +# requires custom code to support trigger buttons but this +# keeps it from confusing the .rx mapping. +Microsoft\ X-Box\ One\ S\ pad.z=trigger + # from : Freebox controller as "DragonRise Inc. Generic USB Joystick" DragonRise\ Inc.\ \ \ Generic\ \ \ USB\ \ Joystick.x=rx DragonRise\ Inc.\ \ \ Generic\ \ \ USB\ \ Joystick.y=ry @@ -174,4 +193,4 @@ GASIA\ CORP.\ PLAYSTATION(R)3\ Controller.2=11 GASIA\ CORP.\ PLAYSTATION(R)3\ Controller.5=POV +X GASIA\ CORP.\ PLAYSTATION(R)3\ Controller.6=POV -Y GASIA\ CORP.\ PLAYSTATION(R)3\ Controller.7=POV -X -GASIA\ CORP.\ PLAYSTATION(R)3\ Controller.4=POV +Y \ No newline at end of file +GASIA\ CORP.\ PLAYSTATION(R)3\ Controller.4=POV +Y From 23d6def5ed9deebe642282a457a83607363e4538 Mon Sep 17 00:00:00 2001 From: grizeldi Date: Wed, 26 Apr 2017 18:05:49 +0200 Subject: [PATCH 2/2] Made right trigger usable on Xbox based controllers --- jme3-core/src/main/resources/joystick-mapping.properties | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/jme3-core/src/main/resources/joystick-mapping.properties b/jme3-core/src/main/resources/joystick-mapping.properties index 3fb4791bf..6c0653c50 100644 --- a/jme3-core/src/main/resources/joystick-mapping.properties +++ b/jme3-core/src/main/resources/joystick-mapping.properties @@ -72,6 +72,7 @@ Controller\ (XBOX\ 360\ For\ Windows).ry=rz # requires custom code to support trigger buttons but this # keeps it from confusing the .rx mapping. Controller\ (XBOX\ 360\ For\ Windows).z=trigger +Controller\ (XBOX\ 360\ For\ Windows).rz=rtrigger # XBOX 360 Controller connected to Android using # the USB dongle @@ -110,6 +111,7 @@ Gamepad\ F310\ (Controller).ry=rz # requires custom code to support trigger buttons but this # keeps it from confusing the .rx mapping. Gamepad\ F310\ (Controller).z=trigger +Gamepad\ F310\ (Controller).rz=rtrigger # Logitech F310 gamepad with dip switch XInput for Windows 10 Controller\ (Gamepad\ F310).0=2 @@ -129,6 +131,7 @@ Controller\ (Gamepad\ F310).ry=rz # requires custom code to support trigger buttons but this # keeps it from confusing the .rx mapping. Controller\ (Gamepad\ F310).z=trigger +Controller\ (Gamepad\ F310).rz=rtrigger # Alternate version of the XBOX 360 controller XBOX\ 360\ For\ Windows\ (Controller).0=2 @@ -148,6 +151,7 @@ XBOX\ 360\ For\ Windows\ (Controller).ry=rz # requires custom code to support trigger buttons but this # keeps it from confusing the .rx mapping. XBOX\ 360\ For\ Windows\ (Controller).z=trigger +XBOX\ 360\ For\ Windows\ (Controller).rz=rtrigger #Xbox One S controller Microsoft\ X-Box\ One\ S\ pad.0=2 @@ -167,6 +171,7 @@ Microsoft\ X-Box\ One\ S\ pad.ry=rz # requires custom code to support trigger buttons but this # keeps it from confusing the .rx mapping. Microsoft\ X-Box\ One\ S\ pad.z=trigger +Microsoft\ X-Box\ One\ S\ pad.rz=rtrigger # from : Freebox controller as "DragonRise Inc. Generic USB Joystick" DragonRise\ Inc.\ \ \ Generic\ \ \ USB\ \ Joystick.x=rx