mth/ebiten
1
0
Fork 0
mirror of https://github.com/hajimehoshi/ebiten.git synced 2025-01-12 20:18:59 +01:00
Code Issues Packages Projects Releases Wiki Activity

internal/uidriver/js: Refactoring: Detect the standard layout at update

Browse Source
This commit is contained in:
Hajime Hoshi 2021-07-20 21:56:15 +09:00
parent c54418c3e4
commit 8656786721
2 changed files with 20 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
internal/driver/gamepadbutton.go
View File

@ -74,6 +74,8 @@ const (
StandardGamepadButtonLeftLeft
StandardGamepadButtonLeftRight
StandardGamepadButtonCenterCenter
StandardGamepadButtonMax = StandardGamepadButtonCenterCenter
)
type StandardGamepadAxis int
@ -84,4 +86,6 @@ const (
StandardGamepadAxisLeftStickVertical
StandardGamepadAxisRightStickHorizontal
StandardGamepadAxisRightStickVertical
StandardGamepadAxisMax = StandardGamepadAxisRightStickVertical
)

24
internal/uidriver/js/input_js.go
View File

@ -66,9 +66,16 @@ type gamepad struct {
axes [16]float64
buttonNum int
buttonPressed [256]bool
standardButtonPressed [driver.StandardGamepadButtonMax + 1]bool
standardAxisValues [driver.StandardGamepadAxisMax + 1]float64
}
func (g *gamepad) hasStandardLayoutMapping() bool {
// With go2cpp, the controller must have the standard
if go2cpp.Truthy() {
return true
}
return g.mapping == "standard"
}
@ -325,6 +332,13 @@ func (i *Input) updateGamepads() {
g.buttonPressed[b] = buttons.Index(b).Get("pressed").Bool()
}
if g.mapping == "standard" {
// When the gamepad's mapping is "standard", the button and axis IDs are already mapped as the standard layout.
// See https://www.w3.org/TR/gamepad/#remapping.
copy(g.standardButtonPressed[:], g.buttonPressed[:])
copy(g.standardAxisValues[:], g.axes[:])
}
if i.gamepads == nil {
i.gamepads = map[driver.GamepadID]gamepad{}
}
@ -503,10 +517,7 @@ func (i *Input) StandardGamepadAxisValue(id driver.GamepadID, axis driver.Standa
if !g.hasStandardLayoutMapping() {
return 0
}
// When the gamepad's mapping is "standard", the axes IDs are already mapped as the standard layout.
// See https://www.w3.org/TR/gamepad/#remapping.
return i.GamepadAxisValue(id, int(axis))
return g.standardAxisValues[axis]
}
func (i *Input) IsStandardGamepadButtonPressed(id driver.GamepadID, button driver.StandardGamepadButton) bool {
@ -517,8 +528,5 @@ func (i *Input) IsStandardGamepadButtonPressed(id driver.GamepadID, button drive
if !g.hasStandardLayoutMapping() {
return false
}
// When the gamepad's mapping is "standard", the button IDs are already mapped as the standard layout.
// See https://www.w3.org/TR/gamepad/#remapping.
return i.IsGamepadButtonPressed(id, driver.GamepadButton(button))
return g.standardButtonPressed[button]
}