From 6f605aa502aaf5692af8a73c4ad45426a3c0d47a Mon Sep 17 00:00:00 2001 From: Nick Thomas Date: Sun, 29 Dec 2019 15:38:49 +0000 Subject: [PATCH] ebiten: convert view-obj --- Makefile | 4 +- cmd/view-obj/main.go | 135 ++++++++++++++++++---------------- go.mod | 4 +- go.sum | 43 +++++++++++ internal/conv/object.go | 155 +++++---------------------------------- internal/data/palette.go | 2 +- internal/ui/window.go | 64 +++++++++------- 7 files changed, 179 insertions(+), 228 deletions(-) diff --git a/Makefile b/Makefile index 7ac087b..1a8ba73 100644 --- a/Makefile +++ b/Makefile @@ -1,4 +1,4 @@ -srcfiles = $(shell find . -iname *.go) +srcfiles = Makefile $(shell find . -iname *.go) all: loader palette-idx view-obj view-map view-menu view-minimap view-set wh40k @@ -9,7 +9,7 @@ palette-idx: $(srcfiles) go build -o palette-idx ur.gs/ordoor/cmd/palette-idx view-obj: $(srcfiles) - go build -o view-obj ur.gs/ordoor/cmd/view-obj + go build -o view-obj -tags ebitengl ur.gs/ordoor/cmd/view-obj view-map: $(srcfiles) go build -o view-map ur.gs/ordoor/cmd/view-map diff --git a/cmd/view-obj/main.go b/cmd/view-obj/main.go index 1d2e3db..6b363e1 100644 --- a/cmd/view-obj/main.go +++ b/cmd/view-obj/main.go @@ -2,14 +2,14 @@ package main import ( "flag" + "image" "log" "math" "os" "path/filepath" - "github.com/faiface/pixel" - "github.com/faiface/pixel/pixelgl" - "golang.org/x/image/colornames" + "github.com/hajimehoshi/ebiten" + "github.com/hajimehoshi/ebiten/inpututil" "ur.gs/ordoor/internal/conv" "ur.gs/ordoor/internal/data" @@ -22,19 +22,17 @@ var ( ) type env struct { - obj *conv.Object + obj *conv.Object + state *state } type state struct { - env *env - step int spriteIdx int + maxSprite int - zoom float64 - - cam pixel.Matrix - camPos pixel.Vec + zoom float64 + origin image.Point } func main() { @@ -49,86 +47,97 @@ func main() { if err != nil { log.Fatalf("Failed to load %s: %v", *objFile, err) } - obj := conv.ConvertObject(rawObj, filepath.Base(*objFile)) - env := &env{obj: obj} + obj, err := conv.ConvertObject(rawObj, filepath.Base(*objFile)) + if err != nil { + log.Fatalf("Failed to convert %s: %v", *objFile, err) + } - // The main thread now belongs to pixelgl - pixelgl.Run(env.run) -} + state := &state{ + zoom: 6.0, + origin: image.Point{0, 0}, + maxSprite: len(obj.Sprites) - 1, + } + env := &env{obj: obj, state: state} -func (e *env) run() { win, err := ui.NewWindow("View Object: " + *objFile) if err != nil { - log.Fatal("Couldn't create window: %v", err) + log.Fatal(err) } - pWin := win.PixelWindow - state := &state{ - env: e, - camPos: pixel.V(0, float64(-pWin.Bounds().Size().Y)), - zoom: 8.0, + // The main thread now belongs to ebiten + if err := win.Run(env.Update, env.Draw); err != nil { + log.Fatal(err) } - - // For now, just try to display the various objects - // left + right to change object, up + down to change frame - win.Run(func() { - oldState := *state - state = state.runStep(pWin) - - if oldState != *state || oldState.step == 0 { - log.Printf( - "new state: numSprites=%d sprite=%d zoom=%.2f", - len(state.env.obj.Sprites), - state.spriteIdx, - state.zoom, - ) - state.present(pWin) - } - - state.step += 1 - }) } -func (s *state) runStep(pWin *pixelgl.Window) *state { +func (e *env) Update() error { + oldState := e.state + state := oldState.runStep() + + if oldState.step == 0 || *oldState != *state { + log.Printf( + "new state: numSprites=%d sprite=%d zoom=%.2f, origin=%+v", + len(e.obj.Sprites), + state.spriteIdx, + state.zoom, + state.origin, + ) + } + + state.step += 1 + e.state = state + + return nil +} + +func (s *state) runStep() *state { newState := *s - newState.handleKeys(pWin) + newState.handleKeys() return &newState } -func (s *state) present(pWin *pixelgl.Window) { - obj := s.env.obj - sprite := obj.Sprites[s.spriteIdx] +func (e *env) Draw(screen *ebiten.Image) error { + sprite := e.obj.Sprites[e.state.spriteIdx] - center := pWin.Bounds().Center() + cam := ebiten.GeoM{} + cam.Translate(float64(e.state.origin.X), float64(e.state.origin.Y)) // Move to origin + cam.Scale(e.state.zoom, e.state.zoom) // apply current zoom factor - cam := pixel.IM - cam = cam.ScaledXY(center, pixel.Vec{1.0, -1.0}) // invert the Y axis - cam = cam.Scaled(center, s.zoom) // apply current zoom factor - //cam = cam.Moved(center.Sub(s.camPos)) // Make it central - //cam = cam.Rotated(center, -0.785) // Apply isometric angle - s.cam = cam - pWin.SetMatrix(s.cam) - - pWin.Clear(colornames.Black) - pixel.NewSprite(sprite.Pic, sprite.Pic.Bounds()).Draw(pWin, pixel.IM.Moved(center)) + return screen.DrawImage(sprite.Image, &ebiten.DrawImageOptions{GeoM: cam}) } -func (s *state) handleKeys(pWin *pixelgl.Window) { - - if pWin.JustPressed(pixelgl.KeyMinus) { +func (s *state) handleKeys() { + if inpututil.IsKeyJustReleased(ebiten.KeyMinus) { if s.spriteIdx > 0 { s.spriteIdx -= 1 } } - if pWin.JustPressed(pixelgl.KeyEqual) { - if s.spriteIdx < len(s.env.obj.Sprites)-1 { + if inpututil.IsKeyJustReleased(ebiten.KeyEqual) { + if s.spriteIdx < s.maxSprite { s.spriteIdx += 1 } } + if ebiten.IsKeyPressed(ebiten.KeyLeft) { + s.origin.X += 4 + } + + if ebiten.IsKeyPressed(ebiten.KeyRight) { + s.origin.X -= 4 + } + + if ebiten.IsKeyPressed(ebiten.KeyUp) { + s.origin.Y += 4 + } + + if ebiten.IsKeyPressed(ebiten.KeyDown) { + s.origin.Y -= 4 + } + // Zoom in and out with the mouse wheel - s.zoom *= math.Pow(1.2, pWin.MouseScroll().Y) + _, wheelY := ebiten.Wheel() + s.zoom *= math.Pow(1.2, wheelY) } diff --git a/go.mod b/go.mod index fdce0c4..49a3f8a 100644 --- a/go.mod +++ b/go.mod @@ -8,8 +8,8 @@ require ( github.com/faiface/mainthread v0.0.0-20171120011319-8b78f0a41ae3 // indirect github.com/faiface/pixel v0.8.0 github.com/go-gl/gl v0.0.0-20190320180904-bf2b1f2f34d7 // indirect - github.com/go-gl/glfw v0.0.0-20190409004039-e6da0acd62b1 // indirect github.com/go-gl/mathgl v0.0.0-20190713194549-592312d8590a // indirect + github.com/hajimehoshi/ebiten v1.10.2 github.com/pkg/errors v0.8.1 // indirect - golang.org/x/image v0.0.0-20190910094157-69e4b8554b2a + golang.org/x/image v0.0.0-20191009234506-e7c1f5e7dbb8 ) diff --git a/go.sum b/go.sum index cc2aa51..ea1bef2 100644 --- a/go.sum +++ b/go.sum @@ -1,5 +1,6 @@ github.com/BurntSushi/toml v0.3.1 h1:WXkYYl6Yr3qBf1K79EBnL4mak0OimBfB0XUf9Vl28OQ= github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= +github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo= github.com/faiface/glhf v0.0.0-20181018222622-82a6317ac380 h1:FvZ0mIGh6b3kOITxUnxS3tLZMh7yEoHo75v3/AgUqg0= github.com/faiface/glhf v0.0.0-20181018222622-82a6317ac380/go.mod h1:zqnPFFIuYFFxl7uH2gYByJwIVKG7fRqlqQCbzAnHs9g= github.com/faiface/mainthread v0.0.0-20171120011319-8b78f0a41ae3 h1:baVdMKlASEHrj19iqjARrPbaRisD7EuZEVJj6ZMLl1Q= @@ -12,9 +13,51 @@ github.com/go-gl/glfw v0.0.0-20190409004039-e6da0acd62b1 h1:QbL/5oDUmRBzO9/Z7Seo github.com/go-gl/glfw v0.0.0-20190409004039-e6da0acd62b1/go.mod h1:vR7hzQXu2zJy9AVAgeJqvqgH9Q5CA+iKCZ2gyEVpxRU= github.com/go-gl/mathgl v0.0.0-20190713194549-592312d8590a h1:yoAEv7yeWqfL/l9A/J5QOndXIJCldv+uuQB1DSNQbS0= github.com/go-gl/mathgl v0.0.0-20190713194549-592312d8590a/go.mod h1:yhpkQzEiH9yPyxDUGzkmgScbaBVlhC06qodikEM0ZwQ= +github.com/gofrs/flock v0.7.1/go.mod h1:F1TvTiK9OcQqauNUHlbJvyl9Qa1QvF/gOUDKA14jxHU= +github.com/golang/freetype v0.0.0-20170609003504-e2365dfdc4a0/go.mod h1:E/TSTwGwJL78qG/PmXZO1EjYhfJinVAhrmmHX6Z8B9k= +github.com/hajimehoshi/bitmapfont v1.2.0/go.mod h1:h9QrPk6Ktb2neObTlAbma6Ini1xgMjbJ3w7ysmD7IOU= +github.com/hajimehoshi/ebiten v1.10.2 h1:PiJBY4Q4udip675T+Zqvb3NKMp1eyLWBelp660ZMrkQ= +github.com/hajimehoshi/ebiten v1.10.2/go.mod h1:i9dIEUf5/MuPtbK1/wHR0PB7ZtqhjOxxg+U1xfxapcY= +github.com/hajimehoshi/go-mp3 v0.2.1/go.mod h1:Rr+2P46iH6PwTPVgSsEwBkon0CK5DxCAeX/Rp65DCTE= +github.com/hajimehoshi/oto v0.3.4/go.mod h1:PgjqsBJff0efqL2nlMJidJgVJywLn6M4y8PI4TfeWfA= +github.com/hajimehoshi/oto v0.5.4/go.mod h1:0QXGEkbuJRohbJaxr7ZQSxnju7hEhseiPx2hrh6raOI= +github.com/jakecoffman/cp v0.1.0/go.mod h1:a3xPx9N8RyFAACD644t2dj/nK4SuLg1v+jL61m2yVo4= +github.com/jfreymuth/oggvorbis v1.0.0/go.mod h1:abe6F9QRjuU9l+2jek3gj46lu40N4qlYxh2grqkLEDM= +github.com/jfreymuth/vorbis v1.0.0/go.mod h1:8zy3lUAm9K/rJJk223RKy6vjCZTWC61NA2QD06bfOE0= +github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo= +github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= +github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI= +github.com/pkg/browser v0.0.0-20180916011732-0a3d74bf9ce4/go.mod h1:4OwLy04Bl9Ef3GJJCoec+30X3LQs/0/m4HFRt/2LUSA= github.com/pkg/errors v0.8.1 h1:iURUrRGxPUNPdy5/HRSm+Yj6okJ6UtLINN0Q9M4+h3I= github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= +golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= +golang.org/x/crypto v0.0.0-20190510104115-cbcb75029529/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= +golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= +golang.org/x/exp v0.0.0-20190731235908-ec7cb31e5a56/go.mod h1:JhuoJpWY28nO4Vef9tZUw9qufEGTyX1+7lmHxV5q5G4= +golang.org/x/image v0.0.0-20190227222117-0694c2d4d067/go.mod h1:kZ7UVZpmo3dzQBMxlp+ypCbDeSB+sBbTgSJuh5dn5js= golang.org/x/image v0.0.0-20190321063152-3fc05d484e9f/go.mod h1:kZ7UVZpmo3dzQBMxlp+ypCbDeSB+sBbTgSJuh5dn5js= +golang.org/x/image v0.0.0-20190703141733-d6a02ce849c9/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0= +golang.org/x/image v0.0.0-20190802002840-cff245a6509b/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0= golang.org/x/image v0.0.0-20190910094157-69e4b8554b2a h1:gHevYm0pO4QUbwy8Dmdr01R5r1BuKtfYqRqF0h/Cbh0= golang.org/x/image v0.0.0-20190910094157-69e4b8554b2a/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0= +golang.org/x/image v0.0.0-20191009234506-e7c1f5e7dbb8 h1:hVwzHzIUGRjiF7EcUjqNxk3NCfkPxbDKRdnNE1Rpg0U= +golang.org/x/image v0.0.0-20191009234506-e7c1f5e7dbb8/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0= +golang.org/x/mobile v0.0.0-20190312151609-d3739f865fa6/go.mod h1:z+o9i4GpDbdi3rU15maQ/Ox0txvL9dWGYEHz965HBQE= +golang.org/x/mobile v0.0.0-20190415191353-3e0bab5405d6/go.mod h1:E/iHnbuqvinMTCcRqshq8CkpyQDoeVncDDYHnLhea+o= +golang.org/x/mobile v0.0.0-20191025110607-73ccc5ba0426/go.mod h1:p895TfNkDgPEmEQrNiOtIl3j98d/tGU95djDj7NfyjQ= +golang.org/x/mod v0.1.0/go.mod h1:0QHyrYULN0/3qlju5TqG8bIK38QM8yzMo5ekMj3DlcY= +golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= +golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= +golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= +golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/sys v0.0.0-20190312061237-fead79001313/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20190429190828-d89cdac9e872/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= +golang.org/x/tools v0.0.0-20190312151545-0bb0c0a6e846/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= +golang.org/x/tools v0.0.0-20190909214602-067311248421/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= +golang.org/x/tools v0.0.0-20191026034945-b2104f82a97d/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= +golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= +gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= diff --git a/internal/conv/object.go b/internal/conv/object.go index 004da45..32b68e1 100644 --- a/internal/conv/object.go +++ b/internal/conv/object.go @@ -1,23 +1,11 @@ package conv import ( - "fmt" - "image/color" - "log" - - "github.com/faiface/pixel" + "github.com/hajimehoshi/ebiten" "ur.gs/ordoor/internal/data" ) -const ( - // Textures can be this size at most. So putting every sprite onto the same - // sheet is a fraught business. With effective packing, it may be fine. - // If not, I'll have to come up with another idea - maxTextureX = 8192 - maxTextureY = 8192 -) - // Important conversions: // // * Width & height now stored using int @@ -26,8 +14,7 @@ type Sprite struct { Width int Height int - Pic *pixel.PictureData - Spr *pixel.Sprite + Image *ebiten.Image } type Object struct { @@ -45,140 +32,38 @@ func MapByName(objects []*Object) map[string]*Object { return out } -func ConvertObjects(objects []*data.Object) ([]*Object, *pixel.PictureData) { - // FIXME: this is rather inefficient. It would be better to determine the - // maximum size we need for the objects at hand. - spritesheet := pixel.MakePictureData( - pixel.R(0.0, 0.0, float64(maxTextureX), float64(maxTextureY)), - ) - - // These are updated each time a sprite is added to the sheet - xOffset := 0 - yOffset := 0 - rowMaxY := 0 - - out := make([]*Object, 0, len(objects)) - - for _, rawObj := range objects { - sprites := make([]*Sprite, 0, len(rawObj.Sprites)) - - for i, rawSpr := range rawObj.Sprites { - width := int(rawSpr.Width) - height := int(rawSpr.Height) - - // CR+LF if needed - if xOffset+width > maxTextureX { - xOffset = 0 - yOffset += rowMaxY - } - - if xOffset+width > maxTextureX || yOffset+height > maxTextureY { - panic("Sprite does not fit in spritesheet") - } - - spr := spriteToPic(rawObj.Name, i, rawSpr, spritesheet, xOffset, yOffset) - sprites = append(sprites, &Sprite{width, height, spritesheet, spr}) - - xOffset = xOffset + width - if height > rowMaxY { - rowMaxY = height - } - } - - out = append(out, &Object{Name: rawObj.Name, Sprites: sprites}) - } - - return out, spritesheet -} - -func ConvertObjectWithSpritesheet(rawObj *data.Object, name string, pic *pixel.PictureData, xOffset int) *Object { - // We store the sprites vertically in the provided pic - yOffset := 0 - +func ConvertObject(rawObj *data.Object, name string) (*Object, error) { out := &Object{ Name: name, Sprites: make([]*Sprite, len(rawObj.Sprites)), } for i, rawSpr := range rawObj.Sprites { - spr := spriteToPic(name, i, rawSpr, pic, xOffset, yOffset) - out.Sprites[i] = &Sprite{ - Width: int(rawSpr.Width), - Height: int(rawSpr.Height), - Pic: pic, - Spr: spr, - } + w := int(rawSpr.Width) + h := int(rawSpr.Height) + data := spriteToData(name, i, rawSpr) - yOffset = yOffset + int(rawSpr.Height) + image, err := ebiten.NewImage(w, h, ebiten.FilterDefault) + if err != nil { + return nil, err + } + _ = image.ReplacePixels(data) + + out.Sprites[i] = &Sprite{Width: w, Height: h, Image: image} } - return out + return out, nil } -func ConvertObject(rawObj *data.Object, name string) *Object { - out := &Object{ - Name: name, - Sprites: make([]*Sprite, len(rawObj.Sprites)), - } - - for i, rawSpr := range rawObj.Sprites { - pic := pixel.MakePictureData( - pixel.R( - float64(0), - float64(0), - float64(rawSpr.Width), - float64(rawSpr.Height), - ), - ) - spr := spriteToPic(name, i, rawSpr, pic, 0, 0) - - out.Sprites[i] = &Sprite{ - Width: int(rawSpr.Width), - Height: int(rawSpr.Height), - Pic: pic, - Spr: spr, - } - } - - return out -} - -func spriteToPic(name string, idx int, sprite *data.Sprite, pic *pixel.PictureData, xOffset, yOffset int) *pixel.Sprite { +func spriteToData(name string, idx int, sprite *data.Sprite) []byte { width := int(sprite.Width) height := int(sprite.Height) + out := make([]byte, 0, 4*width*height) - for y := 0; y < height; y++ { - for x := 0; x < width; x++ { - b := sprite.Data[y*width+x] - - // Update the picture - if err := setPaletteColor(pic, x+xOffset, y+yOffset, b); err != nil { - log.Printf("%s %d: %d,%d: %v", name, idx, x, y, err) - } - } + for _, palette := range sprite.Data { + color := data.ColorPalette[int(palette)] + out = append(out, color.R, color.G, color.B, color.A) } - bounds := pixel.R( - float64(xOffset), - float64(yOffset), - float64(xOffset+width), - float64(yOffset+height), - ) - - return pixel.NewSprite(pic, bounds) -} - -func setPaletteColor(pic *pixel.PictureData, x int, y int, colorIdx byte) error { - vec := pixel.V(float64(x), float64(y)) - idx := pic.Index(vec) - - if idx > len(pic.Pix)-1 { - return fmt.Errorf("Got index %v which exceeds bounds", idx) - } - - r, g, b, a := data.ColorPalette[int(colorIdx)].RGBA() - color := color.RGBA{uint8(r), uint8(g), uint8(b), uint8(a)} - - pic.Pix[idx] = color - return nil + return out } diff --git a/internal/data/palette.go b/internal/data/palette.go index d32bceb..0135cb3 100644 --- a/internal/data/palette.go +++ b/internal/data/palette.go @@ -5,7 +5,7 @@ import "image/color" var ( Transparent = color.RGBA{R: 0, G: 0, B: 0, A: 0} - ColorPalette = color.Palette{ + ColorPalette = []color.RGBA{ Transparent, color.RGBA{R: 128, G: 0, B: 0, A: 255}, color.RGBA{R: 0, G: 128, B: 0, A: 255}, diff --git a/internal/ui/window.go b/internal/ui/window.go index 0d15733..976c671 100644 --- a/internal/ui/window.go +++ b/internal/ui/window.go @@ -3,8 +3,7 @@ package ui import ( "flag" - "github.com/faiface/pixel" - "github.com/faiface/pixel/pixelgl" + "github.com/hajimehoshi/ebiten" ) var ( @@ -13,35 +12,50 @@ var ( ) type Window struct { - PixelWindow *pixelgl.Window - ButtonEventHandlers map[pixelgl.Button][]func() + Title string + KeyEventHandlers map[ebiten.Key][]func() + + // User-provided update actions + updateFn func() error + drawFn func(*ebiten.Image) error } -// WARE! 0,0 is the *bottom left* of the window +// 0,0 is the *top left* of the window // -// To invert things so 0,0 is the *top left*, apply the InvertY` matrix +// ebiten assumes a single window, so only call this once... func NewWindow(title string) (*Window, error) { - cfg := pixelgl.WindowConfig{ - Title: title, - Bounds: pixel.R(0, 0, float64(*winX), float64(*winY)), - VSync: true, - Resizable: true, - } - - pixelWindow, err := pixelgl.NewWindow(cfg) - if err != nil { - return nil, err - } - return &Window{ - PixelWindow: pixelWindow, + Title: title, + KeyEventHandlers: make(map[ebiten.Key][]func()), }, nil } -// TODO: a stop or other cancellation mechanism -func (w *Window) Run(f func()) { - for !w.PixelWindow.Closed() { - f() - w.PixelWindow.Update() - } +func (w *Window) OnKeyUp(key ebiten.Key, f func()) { + +} + +func (w *Window) run(screen *ebiten.Image) error { + if err := w.updateFn(); err != nil { + return err + } + + // Process keys + + if !ebiten.IsDrawingSkipped() { + if err := w.drawFn(screen); err != nil { + return err + } + } + + return nil +} + +// TODO: a stop or other cancellation mechanism +// +// Note that this must be called on the main OS thread +func (w *Window) Run(updateFn func() error, drawFn func(*ebiten.Image) error) error { + w.updateFn = updateFn + w.drawFn = drawFn + + return ebiten.Run(w.run, *winX, *winY, 1, w.Title) }