ebiten: convert view-set

cmd/view-set/main.go

@@ -2,14 +2,13 @@ package main
 
 import (
 	"flag"
+	"image"
 	"log"
 	"math"
 	"os"
 	"path/filepath"
 
-	"github.com/faiface/pixel"
+	"github.com/hajimehoshi/ebiten"
-	"github.com/faiface/pixel/pixelgl"
-	"golang.org/x/image/colornames"
 
 	"ur.gs/ordoor/internal/conv"
 	"ur.gs/ordoor/internal/data"
@@ -25,20 +24,18 @@ var (
 type env struct {
 	set     *sets.MapSet
 	objects map[string]*conv.Object
-	batch   *pixel.Batch
+
+	step      int
+	state     state
+	lastState state
 }
 
 type state struct {
-	env *env
-
-	step      int
 	objIdx    int
 	spriteIdx int
 
-	zoom float64
+	zoom   float64
-
+	origin image.Point
-	cam    pixel.Matrix
-	camPos pixel.Vec
 }
 
 func main() {
@@ -54,7 +51,7 @@ func main() {
 		log.Fatalf("Couldn't load set file %s: %v", *setFile, err)
 	}
 
-	rawObjs := []*data.Object{}
+	rawObjs := make([]*data.Object, 0, len(mapSet.Palette))
 	for _, name := range mapSet.Palette {
 		objFile := filepath.Join(*gamePath, "Obj", name+".obj")
 		obj, err := data.LoadObject(objFile)
@@ -66,109 +63,115 @@ func main() {
 		rawObjs = append(rawObjs, obj)
 	}
 
-	objects, spritesheet := conv.ConvertObjects(rawObjs)
+	objs := make([]*conv.Object, 0, len(rawObjs))
-	batch := pixel.NewBatch(&pixel.TrianglesData{}, spritesheet)
+	for _, rawObj := range rawObjs {
+		obj, err := conv.ConvertObject(rawObj, rawObj.Name)
+		if err != nil {
+			log.Fatal(err)
+		}
 
-	env := &env{objects: conv.MapByName(objects), set: mapSet, batch: batch}
+		objs = append(objs, obj)
+	}
 
-	// The main thread now belongs to pixelgl
-	pixelgl.Run(env.run)
-}
-
-func (e *env) run() {
 	win, err := ui.NewWindow("View Set: " + *setFile)
 	if err != nil {
 		log.Fatal("Couldn't create window: %v", err)
 	}
 
-	pWin := win.PixelWindow
+	state := state{zoom: 8.0}
-	state := &state{
+	env := &env{
-		env:    e,
+		set:       mapSet,
-		camPos: pixel.V(0, float64(-pWin.Bounds().Size().Y)),
+		objects:   conv.MapByName(objs),
-		zoom:   8.0,
+		state:     state,
+		lastState: state,
 	}
 
-	// For now, just try to display the various objects
+	win.OnKeyUp(ebiten.KeyLeft, env.changeObjIdx(-1))
-	// left + right to change object, up + down to change frame
+	win.OnKeyUp(ebiten.KeyRight, env.changeObjIdx(+1))
-	win.Run(func() {
-		oldState := *state
-		state = state.runStep(pWin)
 
-		if oldState != *state || oldState.step == 0 {
+	win.OnKeyUp(ebiten.KeyUp, env.changeSpriteIdx(+1))
-			log.Printf(
+	win.OnKeyUp(ebiten.KeyDown, env.changeSpriteIdx(-1))
-				"new state: numObj=%d object=%d (%s) numFrames=%d sprite=%d zoom=%.2f",
-				state.env.set.Count(),
-				state.objIdx,
-				state.env.set.Palette[state.objIdx], // FIXME: palette is a confusing name
-				len(state.curObject().Sprites),
-				state.spriteIdx,
-				state.zoom,
-			)
-			state.present(pWin)
-		}
 
-		state.step += 1
+	win.OnMouseWheel(env.changeZoom)
-	})
+
+	// Main thread now belongs to ebiten
+	if err := win.Run(env.Update, env.Draw); err != nil {
+		log.Fatal(err)
+	}
 }
 
-func (s *state) runStep(pWin *pixelgl.Window) *state {
+func (e *env) Update() error {
-	newState := *s
+	if e.step == 0 || e.lastState != e.state {
-	newState.handleKeys(pWin)
+		log.Printf(
+			"new state: numObj=%d object=%d (%s) numFrames=%d sprite=%d zoom=%.2f",
+			e.set.Count(),
+			e.state.objIdx,
+			e.set.Palette[e.state.objIdx], // FIXME: palette is a confusing name
+			len(e.curObject().Sprites),
+			e.state.spriteIdx,
+			e.state.zoom,
+		)
+	}
 
-	return &newState
+	e.step += 1
+	e.lastState = e.state
+
+	return nil
 }
 
-func (s *state) present(pWin *pixelgl.Window) {
+func (e *env) Draw(screen *ebiten.Image) error {
-	obj := s.curObject()
+	obj := e.curObject()
-	sprite := obj.Sprites[s.spriteIdx]
+	sprite := obj.Sprites[e.state.spriteIdx]
 
-	pWin.Clear(colornames.Black)
+	cam := ebiten.GeoM{}
-	s.env.batch.Clear()
+	cam.Scale(e.state.zoom, e.state.zoom) // apply current zoom factor
 
-	center := pWin.Bounds().Center()
+	// TODO: centre the image
 
-	cam := pixel.IM
+	return screen.DrawImage(sprite.Image, &ebiten.DrawImageOptions{GeoM: cam})
-	cam = cam.ScaledXY(center, pixel.Vec{1.0, -1.0}) // invert the Y axis
-	cam = cam.Scaled(center, s.zoom)                 // apply current zoom factor
-	s.cam = cam
-	pWin.SetMatrix(s.cam)
-
-	sprite.Spr.Draw(s.env.batch, pixel.IM.Moved(center))
-	s.env.batch.Draw(pWin)
 }
 
-func (s *state) handleKeys(pWin *pixelgl.Window) {
+func (e *env) changeObjIdx(by int) func() {
-	if pWin.JustPressed(pixelgl.KeyLeft) {
+	return func() {
-		if s.objIdx > 0 {
+		old := e.state.objIdx
-			s.objIdx -= 1
+		e.state.objIdx += by
-			s.spriteIdx = 0
+
+		if e.state.objIdx < 0 {
+			e.state.objIdx = 0
+		}
+
+		if e.state.objIdx > e.set.Count()-1 {
+			e.state.objIdx = e.set.Count() - 1
+		}
+
+		// reset sprite index when object changes
+		if old != e.state.objIdx {
+			e.state.spriteIdx = 0
 		}
 	}
+}
 
-	if pWin.JustPressed(pixelgl.KeyRight) {
+func (e *env) changeSpriteIdx(by int) func() {
-		if s.objIdx < s.env.set.Count()-1 {
+	return func() {
-			s.objIdx += 1
+		e.state.spriteIdx += by
-			s.spriteIdx = 0
+
-		}
+		if e.state.spriteIdx < 0 {
-	}
+			e.state.spriteIdx = 0
-
+		}
-	if pWin.JustPressed(pixelgl.KeyDown) {
+
-		if s.spriteIdx > 0 {
+		count := len(e.curObject().Sprites)
-			s.spriteIdx -= 1
+		if e.state.spriteIdx > count-1 {
-		}
+			e.state.spriteIdx = count - 1
-	}
-
-	if pWin.JustPressed(pixelgl.KeyUp) {
-		if s.spriteIdx < len(s.curObject().Sprites)-1 {
-			s.spriteIdx += 1
 		}
 	}
+}
 
+func (e *env) changeZoom(_, y float64) {
 	// Zoom in and out with the mouse wheel
-	s.zoom *= math.Pow(1.2, pWin.MouseScroll().Y)
+	e.state.zoom *= math.Pow(1.2, y)
 }
 
-func (s *state) curObject() *conv.Object {
+func (e *env) curObject() *conv.Object {
-	name := s.env.set.Palette[s.objIdx]
+	name := e.set.Palette[e.state.objIdx]
-	return s.env.objects[name]
+	return e.objects[name]
 }