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

internal/gamepad: bug fix: wrong ID usages on Android

Browse Source 
* IDs should have been decoded to a byte slice before checking the
  value.
* Ebitengine doesn't treat HID devices on Android so far, so checking
  whether the device was HID or not didn't make sense.

Updates #2309
This commit is contained in:
Hajime Hoshi 2022-09-07 01:05:12 +09:00
parent 34a500c305
commit f383580d7b
1 changed files with 11 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
internal/gamepaddb/gamepaddb.go
View File

@ -25,6 +25,7 @@ package gamepaddb
import (
"bufio"
"bytes"
"encoding/hex"
"fmt"
"runtime"
"strconv"
@ -344,11 +345,8 @@ func buttonMappings(id string) map[StandardButton]*mapping {
return m
}
if currentPlatform == platformAndroid {
// If the gamepad is not an HID API, use the default mapping on Android.
if id[14] != 'h' {
if addAndroidDefaultMappings(id) {
return gamepadButtonMappings[id]
}
if addAndroidDefaultMappings(id) {
return gamepadButtonMappings[id]
}
}
return nil
@ -359,11 +357,8 @@ func axisMappings(id string) map[StandardAxis]*mapping {
return m
}
if currentPlatform == platformAndroid {
// If the gamepad is not an HID API, use the default mapping on Android.
if id[14] != 'h' {
if addAndroidDefaultMappings(id) {
return gamepadAxisMappings[id]
}
if addAndroidDefaultMappings(id) {
return gamepadAxisMappings[id]
}
}
return nil
@ -622,8 +617,12 @@ func addAndroidDefaultMappings(id string) bool {
(1 << SDLControllerButtonX) |
(1 << SDLControllerButtonY))
buttonMask := uint16(id[12]) | (uint16(id[13]) << 8)
axisMask := uint16(id[14]) | (uint16(id[15]) << 8)
idBytes, err := hex.DecodeString(id)
if err != nil {
return false
}
buttonMask := uint16(idBytes[12]) | (uint16(idBytes[13]) << 8)
axisMask := uint16(idBytes[14]) | (uint16(idBytes[15]) << 8)
if buttonMask == 0 && axisMask == 0 {
return false
}