Controllers bindings for windows (#86)

* Xbox One and 360 controllers for windows

* DS4 bindings

* Code cleaning

Author: kivutar

input/binds_windows.go

@@ -3,26 +3,71 @@ package input
 import "github.com/libretro/ludo/libretro"
 
 var joyBinds = map[string]joybinds{
-	"Microsoft X-Box 360 pad": xbox360JoyBinds,
+	"Microsoft X-Box 360 pad":    xbox360JoyBinds,
+	"Xbox 360 Controller":        xboxOneJoyBinds,
+	"Wireless Controller":        ds4JoyBinds,
+	"PLAYSTATION(R)3 Controller": ds3JoyBinds,
 }
 
-// FIXME Joypad bindings fox Xbox360 pad on Windows
 var xbox360JoyBinds = joybinds{
-	bind{btn, 0, 0, 0}:      libretro.DeviceIDJoypadB,
-	bind{btn, 1, 0, 0}:      libretro.DeviceIDJoypadA,
-	bind{btn, 2, 0, 0}:      libretro.DeviceIDJoypadY,
-	bind{btn, 3, 0, 0}:      libretro.DeviceIDJoypadX,
-	bind{btn, 4, 0, 0}:      libretro.DeviceIDJoypadL,
-	bind{btn, 5, 0, 0}:      libretro.DeviceIDJoypadR,
-	bind{btn, 6, 0, 0}:      libretro.DeviceIDJoypadSelect,
-	bind{btn, 7, 0, 0}:      libretro.DeviceIDJoypadStart,
-	bind{btn, 8, 0, 0}:      ActionMenuToggle,
-	bind{btn, 9, 0, 0}:      libretro.DeviceIDJoypadL3,
-	bind{btn, 10, 0, 0}:     libretro.DeviceIDJoypadR3,
-	bind{axis, 6, -1, -0.5}: libretro.DeviceIDJoypadLeft,
-	bind{axis, 6, 1, 0.5}:   libretro.DeviceIDJoypadRight,
-	bind{axis, 7, -1, -0.5}: libretro.DeviceIDJoypadUp,
-	bind{axis, 7, 1, 0.5}:   libretro.DeviceIDJoypadDown,
-	bind{axis, 2, 1, 0.5}:   libretro.DeviceIDJoypadL2,
-	bind{axis, 5, 1, 0.5}:   libretro.DeviceIDJoypadR2,
+	bind{btn, 0, 0, 0}:  libretro.DeviceIDJoypadB,
+	bind{btn, 1, 0, 0}:  libretro.DeviceIDJoypadA,
+	bind{btn, 2, 0, 0}:  libretro.DeviceIDJoypadY,
+	bind{btn, 3, 0, 0}:  libretro.DeviceIDJoypadX,
+	bind{btn, 4, 0, 0}:  libretro.DeviceIDJoypadL,
+	bind{btn, 5, 0, 0}:  libretro.DeviceIDJoypadR,
+	bind{btn, 6, 0, 0}:  libretro.DeviceIDJoypadSelect,
+	bind{btn, 7, 0, 0}:  libretro.DeviceIDJoypadStart,
+	bind{btn, 8, 0, 0}:  libretro.DeviceIDJoypadL3,
+	bind{btn, 9, 0, 0}:  libretro.DeviceIDJoypadR3,
+	bind{btn, 10, 0, 0}: libretro.DeviceIDJoypadUp,
+	bind{btn, 11, 0, 0}: libretro.DeviceIDJoypadRight,
+	bind{btn, 12, 0, 0}: libretro.DeviceIDJoypadDown,
+	bind{btn, 13, 0, 0}: libretro.DeviceIDJoypadLeft,
+	bind{axis, 4, 1, 0}: libretro.DeviceIDJoypadL2,
+	bind{axis, 5, 1, 0}: libretro.DeviceIDJoypadL3,
 }
+
+var xboxOneJoyBinds = joybinds{
+	bind{btn, 0, 0, 0}:  libretro.DeviceIDJoypadB,
+	bind{btn, 1, 0, 0}:  libretro.DeviceIDJoypadA,
+	bind{btn, 2, 0, 0}:  libretro.DeviceIDJoypadY,
+	bind{btn, 3, 0, 0}:  libretro.DeviceIDJoypadX,
+	bind{btn, 4, 0, 0}:  libretro.DeviceIDJoypadL,
+	bind{btn, 5, 0, 0}:  libretro.DeviceIDJoypadR,
+	bind{btn, 6, 0, 0}:  libretro.DeviceIDJoypadSelect,
+	bind{btn, 7, 0, 0}:  libretro.DeviceIDJoypadStart,
+	bind{btn, 8, 0, 0}:  libretro.DeviceIDJoypadL3,
+	bind{btn, 9, 0, 0}:  libretro.DeviceIDJoypadR3,
+	bind{btn, 10, 0, 0}: libretro.DeviceIDJoypadUp,
+	bind{btn, 11, 0, 0}: libretro.DeviceIDJoypadRight,
+	bind{btn, 12, 0, 0}: libretro.DeviceIDJoypadDown,
+	bind{btn, 13, 0, 0}: libretro.DeviceIDJoypadLeft,
+	bind{axis, 4, 1, 0}: libretro.DeviceIDJoypadL2,
+	bind{axis, 5, 1, 0}: libretro.DeviceIDJoypadL3,
+}
+
+var ds4JoyBinds = joybinds{
+	bind{btn, 0, 0, 0}:  libretro.DeviceIDJoypadX,
+	bind{btn, 1, 0, 0}:  libretro.DeviceIDJoypadB,
+	bind{btn, 2, 0, 0}:  libretro.DeviceIDJoypadA,
+	bind{btn, 3, 0, 0}:  libretro.DeviceIDJoypadY,
+	bind{btn, 4, 0, 0}:  libretro.DeviceIDJoypadL,
+	bind{btn, 5, 0, 0}:  libretro.DeviceIDJoypadR,
+	bind{btn, 4, 0, 0}:  libretro.DeviceIDJoypadL2,
+	bind{btn, 5, 0, 0}:  libretro.DeviceIDJoypadR2,
+	bind{btn, 6, 0, 0}:  libretro.DeviceIDJoypadSelect,
+	bind{btn, 7, 0, 0}:  libretro.DeviceIDJoypadStart,
+	bind{btn, 8, 0, 0}:  libretro.DeviceIDJoypadL3,
+	bind{btn, 9, 0, 0}:  libretro.DeviceIDJoypadR3,
+	bind{btn, 10, 0, 0}: ActionMenuToggle,
+	bind{btn, 14, 0, 0}: libretro.DeviceIDJoypadUp,
+	bind{btn, 15, 0, 0}: libretro.DeviceIDJoypadRight,
+	bind{btn, 16, 0, 0}: libretro.DeviceIDJoypadDown,
+	bind{btn, 17, 0, 0}: libretro.DeviceIDJoypadLeft,
+	bind{axis, 3, 1, 0}: libretro.DeviceIDJoypadL2,
+	bind{axis, 4, 1, 0}: libretro.DeviceIDJoypadL3,
+}
+
+// Detected but doesn't send inputs
+var ds3JoyBinds = joybinds{}

input/input.go

@@ -99,11 +99,13 @@ func pollJoypads(state inputstate) inputstate {
 			for k, v := range jb {
 				switch k.kind {
 				case btn:
-					if glfw.Action(buttonState[k.index]) == glfw.Press {
+					if int(k.index) < len(buttonState) &&
+						glfw.Action(buttonState[k.index]) == glfw.Press {
 						state[p][v] = true
 					}
 				case axis:
-					if k.direction*axisState[k.index] > k.threshold*k.direction {
+					if int(k.index) < len(axisState) &&
+						k.direction*axisState[k.index] > k.threshold*k.direction {
 						state[p][v] = true
 					}
 				}