ebiten: convert view-obj

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)
 }