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

ui: Refactoring

Browse Source
This commit is contained in:
Hajime Hoshi 2019-12-22 17:22:54 +09:00
parent 1566bb1cd3
commit 4c6006343e
1 changed files with 6 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
run.go
View File

@ -158,20 +158,11 @@ func Run(f func(*Image) error, width, height int, scale float64, title string) e
width: width, width: width,
height: height, height: height,
} }
theUIContext = newUIContext(game, scale)
ww, wh := int(float64(width)*scale), int(float64(height)*scale) ww, wh := int(float64(width)*scale), int(float64(height)*scale)
fixWindowPosition(ww, wh) fixWindowPosition(ww, wh)
SetWindowSize(ww, wh) SetWindowSize(ww, wh)
SetWindowTitle(title) SetWindowTitle(title)
if err := uiDriver().Run(theUIContext, graphicsDriver()); err != nil { return runGame(game, scale)
if err == driver.RegularTermination {
return nil
}
return err
}
return nil
} }
// RunGame starts the main loop and runs the game. // RunGame starts the main loop and runs the game.
@ -216,7 +207,11 @@ func RunGame(game Game) error {
if uiDriver().CanHaveWindow() { if uiDriver().CanHaveWindow() {
fixWindowPosition(WindowSize()) fixWindowPosition(WindowSize())
} }
theUIContext = newUIContext(game, 1) return runGame(game, 1)
}
func runGame(game Game, scale float64) error {
theUIContext = newUIContext(game, scale)
if err := uiDriver().Run(theUIContext, graphicsDriver()); err != nil { if err := uiDriver().Run(theUIContext, graphicsDriver()); err != nil {
if err == driver.RegularTermination { if err == driver.RegularTermination {
return nil return nil