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

internal/uidriver/js: Bug fix: nil map

Browse Source
This commit is contained in:
Hajime Hoshi 2021-01-26 10:26:52 +09:00
parent 2dadfdb88e
commit b9a0906537
1 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -329,6 +329,9 @@ func (i *Input) updateGamepads() {
g.buttonPressed[b] = buttons.Index(b).Get("pressed").Bool() g.buttonPressed[b] = buttons.Index(b).Get("pressed").Bool()
} }
if i.gamepads == nil {
i.gamepads = map[driver.GamepadID]gamepad{}
}
i.gamepads[id] = g i.gamepads[id] = g
} }
} }
@ -405,6 +408,9 @@ func (in *Input) updateTouchesFromEvent(e js.Value) {
for i := 0; i < j.Length(); i++ { for i := 0; i < j.Length(); i++ {
jj := j.Call("item", i) jj := j.Call("item", i)
id := driver.TouchID(jj.Get("identifier").Int()) id := driver.TouchID(jj.Get("identifier").Int())
if in.touches == nil {
in.touches = map[driver.TouchID]pos{}
}
in.touches[id] = pos{ in.touches[id] = pos{
X: jj.Get("clientX").Int(), X: jj.Get("clientX").Int(),
Y: jj.Get("clientY").Int(), Y: jj.Get("clientY").Int(),
@ -425,6 +431,9 @@ func (i *Input) updateForGo2Cpp() {
id := go2cpp.Call("getTouchId", idx) id := go2cpp.Call("getTouchId", idx)
x := go2cpp.Call("getTouchX", idx) x := go2cpp.Call("getTouchX", idx)
y := go2cpp.Call("getTouchY", idx) y := go2cpp.Call("getTouchY", idx)
if i.touches == nil {
i.touches = map[driver.TouchID]pos{}
}
i.touches[driver.TouchID(id.Int())] = pos{ i.touches[driver.TouchID(id.Int())] = pos{
X: x.Int(), X: x.Int(),
Y: y.Int(), Y: y.Int(),
@ -461,6 +470,9 @@ func (i *Input) updateForGo2Cpp() {
g.axes[j] = go2cpp.Call("getGamepadAxis", idx, j).Float() g.axes[j] = go2cpp.Call("getGamepadAxis", idx, j).Float()
} }
if i.gamepads == nil {
i.gamepads = map[driver.GamepadID]gamepad{}
}
i.gamepads[id] = g i.gamepads[id] = g
} }
} }