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

internal/ui: bug fix: native APIs must be called from the main thread

Browse Source 
Updates #2763
This commit is contained in:
Hajime Hoshi 2023-09-17 15:12:58 +09:00
parent 0475baf9e2
commit 7becaa19e6
2 changed files with 20 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
internal/ui/input_glfw.go
View File

@ -47,8 +47,16 @@ func (u *userInterfaceImpl) registerInputCallbacks() {
})) }))
} }
// updateInput must be called from the main thread.
func (u *userInterfaceImpl) updateInputState() error { func (u *userInterfaceImpl) updateInputState() error {
var err error
u.mainThread.Call(func() {
err = u.updateInputStateImpl()
})
return err
}
// updateInputStateImpl must be called from the main thread.
func (u *userInterfaceImpl) updateInputStateImpl() error {
u.m.Lock() u.m.Lock()
defer u.m.Unlock() defer u.m.Unlock()

19
internal/ui/input_nintendosdk.go
View File

@ -30,18 +30,19 @@ import (
) )
func (u *userInterfaceImpl) updateInputState() error { func (u *userInterfaceImpl) updateInputState() error {
var ferr error var err error
u.mainThread.Call(func() { u.mainThread.Call(func() {
if err := gamepad.Update(); err != nil { err = u.updateInputStateImpl()
ferr = err
return
}
u.updateInputStateImpl()
}) })
return ferr return err
}
// updateInputStateImpl must be called from the main thread.
func (u *userInterfaceImpl) updateInputStateImpl() error {
if err := gamepad.Update(); err != nil {
return err
} }
func (u *userInterfaceImpl) updateInputStateImpl() {
C.ebitengine_UpdateTouches() C.ebitengine_UpdateTouches()
u.nativeTouches = u.nativeTouches[:0] u.nativeTouches = u.nativeTouches[:0]
@ -66,6 +67,8 @@ func (u *userInterfaceImpl) updateInputStateImpl() {
Y: int(y), Y: int(y),
}) })
} }
return nil
} }
func KeyName(key Key) string { func KeyName(key Key) string {