Remove internal/conv

This sets font rendering back a little bit, but not much.

cmd/view-set/main.go

@@ -6,25 +6,20 @@ import (
 	"log"
 	"math"
 	"os"
-	"path/filepath"
 
 	"github.com/hajimehoshi/ebiten"
 
-	"code.ur.gs/lupine/ordoor/internal/conv"
-	"code.ur.gs/lupine/ordoor/internal/data"
-	"code.ur.gs/lupine/ordoor/internal/sets"
+	"code.ur.gs/lupine/ordoor/internal/assetstore"
 	"code.ur.gs/lupine/ordoor/internal/ui"
 )
 
 var (
 	gamePath = flag.String("game-path", "./orig", "Path to a WH40K: Chaos Gate installation")
-	setFile  = flag.String("set", "", "Path to a .set file, e.g. ./orig/Sets/map01.set")
+	setName  = flag.String("set", "", "Name of a set, e.g., map01")
 )
 
 type env struct {
-	set     *sets.MapSet
-	objects map[string]*conv.Object
-
+	set       *assetstore.Set
 	step      int
 	state     state
 	lastState state
@@ -41,47 +36,29 @@ type state struct {
 func main() {
 	flag.Parse()
 
-	if *gamePath == "" || *setFile == "" {
+	if *gamePath == "" || *setName == "" {
 		flag.Usage()
 		os.Exit(1)
 	}
 
-	mapSet, err := sets.LoadSet(*setFile)
+	assets, err := assetstore.New(*gamePath)
 	if err != nil {
-		log.Fatalf("Couldn't load set file %s: %v", *setFile, err)
+		log.Fatal(err)
 	}
 
-	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)
-		if err != nil {
-			log.Fatalf("Failed to load %s: %v", name, err)
-		}
-		obj.Name = name
-
-		rawObjs = append(rawObjs, obj)
+	set, err := assets.Set(*setName)
+	if err != nil {
+		log.Fatalf("Couldn't load set %s: %v", *setName, err)
 	}
 
-	objs := make([]*conv.Object, 0, len(rawObjs))
-	for _, rawObj := range rawObjs {
-		obj, err := conv.ConvertObject(rawObj, rawObj.Name)
-		if err != nil {
-			log.Fatal(err)
-		}
-
-		objs = append(objs, obj)
-	}
-
-	win, err := ui.NewWindow("View Set: " + *setFile)
+	win, err := ui.NewWindow("View Set: " + *setName)
 	if err != nil {
 		log.Fatal("Couldn't create window: %v", err)
 	}
 
 	state := state{zoom: 8.0}
 	env := &env{
-		set:       mapSet,
-		objects:   conv.MapByName(objs),
+		set:       set,
 		state:     state,
 		lastState: state,
 	}
@@ -101,13 +78,18 @@ func main() {
 }
 
 func (e *env) Update() error {
+	curObj, err := e.curObject()
+	if err != nil {
+		return err
+	}
+
 	if e.step == 0 || e.lastState != e.state {
 		log.Printf(
-			"new state: numObj=%d object=%d (%s) numFrames=%d sprite=%d zoom=%.2f",
-			e.set.Count(),
+			"new state: object=%d/%d (%s) numFrames=%d sprite=%d zoom=%.2f",
 			e.state.objIdx,
-			e.set.Palette[e.state.objIdx], // FIXME: palette is a confusing name
-			len(e.curObject().Sprites),
+			e.set.NumObjects,
+			curObj.Name,
+			curObj.NumSprites,
 			e.state.spriteIdx,
 			e.state.zoom,
 		)
@@ -120,8 +102,10 @@ func (e *env) Update() error {
 }
 
 func (e *env) Draw(screen *ebiten.Image) error {
-	obj := e.curObject()
-	sprite := obj.Sprites[e.state.spriteIdx]
+	sprite, err := e.curSprite()
+	if err != nil {
+		return err
+	}
 
 	cam := ebiten.GeoM{}
 	cam.Scale(e.state.zoom, e.state.zoom) // apply current zoom factor
@@ -140,8 +124,8 @@ func (e *env) changeObjIdx(by int) func() {
 			e.state.objIdx = 0
 		}
 
-		if e.state.objIdx > e.set.Count()-1 {
-			e.state.objIdx = e.set.Count() - 1
+		if e.state.objIdx > e.set.NumObjects-1 {
+			e.state.objIdx = e.set.NumObjects - 1
 		}
 
 		// reset sprite index when object changes
@@ -153,15 +137,19 @@ func (e *env) changeObjIdx(by int) func() {
 
 func (e *env) changeSpriteIdx(by int) func() {
 	return func() {
-		e.state.spriteIdx += by
+		obj, err := e.curObject()
+		if err != nil {
+			log.Printf("Encountered %v trying to change sprite index", err)
+			return
+		}
 
+		e.state.spriteIdx += by
 		if e.state.spriteIdx < 0 {
 			e.state.spriteIdx = 0
 		}
 
-		count := len(e.curObject().Sprites)
-		if e.state.spriteIdx > count-1 {
-			e.state.spriteIdx = count - 1
+		if e.state.spriteIdx > obj.NumSprites-1 {
+			e.state.spriteIdx = obj.NumSprites - 1
 		}
 	}
 }
@@ -171,7 +159,15 @@ func (e *env) changeZoom(_, y float64) {
 	e.state.zoom *= math.Pow(1.2, y)
 }
 
-func (e *env) curObject() *conv.Object {
-	name := e.set.Palette[e.state.objIdx]
-	return e.objects[name]
+func (e *env) curObject() (*assetstore.Object, error) {
+	return e.set.Object(e.state.objIdx)
+}
+
+func (e *env) curSprite() (*assetstore.Sprite, error) {
+	obj, err := e.curObject()
+	if err != nil {
+		return nil, err
+	}
+
+	return obj.Sprite(e.state.spriteIdx)
 }