mth/ebiten
1
0
Fork 0
mirror of https://github.com/hajimehoshi/ebiten.git synced 2025-02-04 23:14:28 +01:00
Code Issues Packages Projects Releases Wiki Activity

internal/ui: replace (*userInterface).err with (*globalState).err

Browse Source
This commit is contained in:
Hajime Hoshi 2023-10-05 00:39:15 +09:00
parent cc999a4c5b
commit aa55953c11
3 changed files with 26 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
internal/ui/context.go
View File

@ -89,10 +89,6 @@ func (c *context) forceUpdateFrame(graphicsDriver graphicsdriver.Graphics, outsi
} }
func (c *context) updateFrameImpl(graphicsDriver graphicsdriver.Graphics, updateCount int, outsideWidth, outsideHeight float64, deviceScaleFactor float64, ui *userInterfaceImpl, forceDraw bool, swapBuffersForGL func()) (err error) { func (c *context) updateFrameImpl(graphicsDriver graphicsdriver.Graphics, updateCount int, outsideWidth, outsideHeight float64, deviceScaleFactor float64, ui *userInterfaceImpl, forceDraw bool, swapBuffersForGL func()) (err error) {
if err := theGlobalState.error(); err != nil {
return err
}
ui.beginFrame() ui.beginFrame()
defer ui.endFrame() defer ui.endFrame()

7
internal/ui/ui_glfw.go
View File

@ -70,9 +70,6 @@ type userInterfaceImpl struct {
windowClosingHandled bool windowClosingHandled bool
windowResizingMode WindowResizingMode windowResizingMode WindowResizingMode
// err must be accessed from the main thread.
err error
lastDeviceScaleFactor float64 lastDeviceScaleFactor float64
initMonitor *Monitor initMonitor *Monitor
@ -1059,8 +1056,8 @@ func (u *userInterfaceImpl) setFPSMode(fpsMode FPSModeType) {
// update must be called from the main thread. // update must be called from the main thread.
func (u *userInterfaceImpl) update() (float64, float64, error) { func (u *userInterfaceImpl) update() (float64, float64, error) {
if u.err != nil { if err := theGlobalState.error(); err != nil {
return 0, 0, u.err return 0, 0, err
} }
if u.window.ShouldClose() { if u.window.ShouldClose() {

50
internal/ui/ui_js.go
View File

@ -96,8 +96,6 @@ type userInterfaceImpl struct {
deviceScaleFactor float64 deviceScaleFactor float64
err error
context *context context *context
inputState InputState inputState InputState
cursorXInClient float64 cursorXInClient float64
@ -406,8 +404,8 @@ func (u *userInterfaceImpl) loop(game Game) <-chan error {
var cf js.Func var cf js.Func
f := func() { f := func() {
if u.err != nil { if err := theGlobalState.error(); err != nil {
errCh <- u.err errCh <- err
return return
} }
if u.needsUpdate() { if u.needsUpdate() {
@ -574,8 +572,8 @@ func setWindowEventHandlers(v js.Value) {
// updateImpl can block. Use goroutine. // updateImpl can block. Use goroutine.
// See https://pkg.go.dev/syscall/js#FuncOf. // See https://pkg.go.dev/syscall/js#FuncOf.
go func() { go func() {
if err := theUI.updateImpl(true); err != nil && theUI.err != nil { if err := theUI.updateImpl(true); err != nil {
theUI.err = err theGlobalState.setError(err)
return return
} }
}() }()
@ -591,8 +589,8 @@ func setCanvasEventHandlers(v js.Value) {
e := args[0] e := args[0]
e.Call("preventDefault") e.Call("preventDefault")
if err := theUI.updateInputFromEvent(e); err != nil && theUI.err != nil { if err := theUI.updateInputFromEvent(e); err != nil {
theUI.err = err theGlobalState.setError(err)
return nil return nil
} }
return nil return nil
@ -600,8 +598,8 @@ func setCanvasEventHandlers(v js.Value) {
v.Call("addEventListener", "keyup", js.FuncOf(func(this js.Value, args []js.Value) any { v.Call("addEventListener", "keyup", js.FuncOf(func(this js.Value, args []js.Value) any {
e := args[0] e := args[0]
e.Call("preventDefault") e.Call("preventDefault")
if err := theUI.updateInputFromEvent(e); err != nil && theUI.err != nil { if err := theUI.updateInputFromEvent(e); err != nil {
theUI.err = err theGlobalState.setError(err)
return nil return nil
} }
return nil return nil
@ -614,8 +612,8 @@ func setCanvasEventHandlers(v js.Value) {
e := args[0] e := args[0]
e.Call("preventDefault") e.Call("preventDefault")
if err := theUI.updateInputFromEvent(e); err != nil && theUI.err != nil { if err := theUI.updateInputFromEvent(e); err != nil {
theUI.err = err theGlobalState.setError(err)
return nil return nil
} }
return nil return nil
@ -623,8 +621,8 @@ func setCanvasEventHandlers(v js.Value) {
v.Call("addEventListener", "mouseup", js.FuncOf(func(this js.Value, args []js.Value) any { v.Call("addEventListener", "mouseup", js.FuncOf(func(this js.Value, args []js.Value) any {
e := args[0] e := args[0]
e.Call("preventDefault") e.Call("preventDefault")
if err := theUI.updateInputFromEvent(e); err != nil && theUI.err != nil { if err := theUI.updateInputFromEvent(e); err != nil {
theUI.err = err theGlobalState.setError(err)
return nil return nil
} }
return nil return nil
@ -632,8 +630,8 @@ func setCanvasEventHandlers(v js.Value) {
v.Call("addEventListener", "mousemove", js.FuncOf(func(this js.Value, args []js.Value) any { v.Call("addEventListener", "mousemove", js.FuncOf(func(this js.Value, args []js.Value) any {
e := args[0] e := args[0]
e.Call("preventDefault") e.Call("preventDefault")
if err := theUI.updateInputFromEvent(e); err != nil && theUI.err != nil { if err := theUI.updateInputFromEvent(e); err != nil {
theUI.err = err theGlobalState.setError(err)
return nil return nil
} }
return nil return nil
@ -641,8 +639,8 @@ func setCanvasEventHandlers(v js.Value) {
v.Call("addEventListener", "wheel", js.FuncOf(func(this js.Value, args []js.Value) any { v.Call("addEventListener", "wheel", js.FuncOf(func(this js.Value, args []js.Value) any {
e := args[0] e := args[0]
e.Call("preventDefault") e.Call("preventDefault")
if err := theUI.updateInputFromEvent(e); err != nil && theUI.err != nil { if err := theUI.updateInputFromEvent(e); err != nil {
theUI.err = err theGlobalState.setError(err)
return nil return nil
} }
return nil return nil
@ -655,8 +653,8 @@ func setCanvasEventHandlers(v js.Value) {
e := args[0] e := args[0]
e.Call("preventDefault") e.Call("preventDefault")
if err := theUI.updateInputFromEvent(e); err != nil && theUI.err != nil { if err := theUI.updateInputFromEvent(e); err != nil {
theUI.err = err theGlobalState.setError(err)
return nil return nil
} }
return nil return nil
@ -664,8 +662,8 @@ func setCanvasEventHandlers(v js.Value) {
v.Call("addEventListener", "touchend", js.FuncOf(func(this js.Value, args []js.Value) any { v.Call("addEventListener", "touchend", js.FuncOf(func(this js.Value, args []js.Value) any {
e := args[0] e := args[0]
e.Call("preventDefault") e.Call("preventDefault")
if err := theUI.updateInputFromEvent(e); err != nil && theUI.err != nil { if err := theUI.updateInputFromEvent(e); err != nil {
theUI.err = err theGlobalState.setError(err)
return nil return nil
} }
return nil return nil
@ -673,8 +671,8 @@ func setCanvasEventHandlers(v js.Value) {
v.Call("addEventListener", "touchmove", js.FuncOf(func(this js.Value, args []js.Value) any { v.Call("addEventListener", "touchmove", js.FuncOf(func(this js.Value, args []js.Value) any {
e := args[0] e := args[0]
e.Call("preventDefault") e.Call("preventDefault")
if err := theUI.updateInputFromEvent(e); err != nil && theUI.err != nil { if err := theUI.updateInputFromEvent(e); err != nil {
theUI.err = err theGlobalState.setError(err)
return nil return nil
} }
return nil return nil
@ -735,8 +733,8 @@ func (u *userInterfaceImpl) forceUpdateOnMinimumFPSMode() {
// updateImpl can block. Use goroutine. // updateImpl can block. Use goroutine.
// See https://pkg.go.dev/syscall/js#FuncOf. // See https://pkg.go.dev/syscall/js#FuncOf.
go func() { go func() {
if err := u.updateImpl(true); err != nil && u.err != nil { if err := u.updateImpl(true); err != nil {
u.err = err theGlobalState.setError(err)
} }
}() }()
} }