move tags under own package

Author: niedzielski

makefile

@@ -20,7 +20,7 @@ tinygo_flags += $(go_tags) --ldflags="-X github.com/oidoid/void/src/demo/engine.
 pack_demo = go run ./src/cmd/pack --out=dist/demo/ --tsconfig=src/demo/web/tsconfig.json $(1) src/demo/web/assets/index.html
 # $(1) flags
 tileset_manifest_demo := dist/demo/tileset-manifest.json
-packatlas_demo = go run ./src/cmd/packatlas --name=atlas --img-out=dist/demo/ --code-out=src/demo/assets/ --tileset-manifest-out=$(tileset_manifest_demo) $(1) src/demo/assets/atlas/
+packatlas_demo = go run ./src/cmd/packatlas --name=atlas --img-out=dist/demo/ --atlas-out=src/demo/assets/atlas_bin.go --tags-out=src/demo/tags/tags.go --tileset-manifest-out=$(tileset_manifest_demo) $(1) src/demo/assets/atlas/
 packlevels_demo = go run ./src/cmd/packlevels --tileset-manifest=$(tileset_manifest_demo) --out=src/demo/levels $(1) src/demo/assets/levels/
 favicon_demo = \
 	mkdir -p dist/demo/favicon; \
@@ -51,7 +51,7 @@ build-levels: build-atlas; $(call packlevels_demo,)
 build-favicon:; $(favicon_demo)
 build-web: build-demo build-atlas; $(call pack_demo,--minify --one-file)
 
-clean:; rm --force --recursive dist/ src/demo/assets/atlas_bin.go src/demo/assets/atlas_tags.go
+clean:; rm --force --recursive dist/ src/demo/assets/atlas_bin.go src/demo/tags/tags.go
 
 # to-do:
 # go generate

src/cmd/internal/tilesetmanifest/tileset_manifest.go

@@ -21,10 +21,9 @@ type TilesetManifest struct {
 	TileW uint8 `json:"tileW"`
 	// native tileset cell height in pixels.
 	TileH uint8 `json:"tileH"`
-	// indexes final atlas tags by row-major preview canvas cell after
-	// resolving the Aseprite native tile stored in each cell. adjacent cells
-	// need not map to contiguous or increasing tags; eg, `[164, 163, 168]` maps
-	// preview cells 0, 1, and 2 to atlas tags 164, 163, and 168. every tag
-	// references one cel.
+	// indexes final tags by row-major preview canvas cell after resolving the
+	// Aseprite native tile stored in each cell. adjacent cells need not map to
+	// contiguous or increasing tags; eg, `[164, 163, 168]` maps preview cells
+	// 0, 1, and 2 to tags 164, 163, and 168. every tag references one cel.
 	Tags []vatlas.Tag `json:"tags"`
 }

src/cmd/packatlas/argv.go

@@ -4,16 +4,15 @@ import (
 	"errors"
 	"flag"
 	"fmt"
-	"path/filepath"
 )
 
 type Argv struct {
 	ColorMode          string
 	Entries            []string
 	Name               string
 	ImgOut             string
-	Pkg                string
-	CodeOut            string
+	AtlasOut           string
+	TagsOut            string
 	TilesetManifestOut string
 	Watch              bool
 }
@@ -23,7 +22,8 @@ func NewArgv() (Argv, error) {
 	flag.StringVar(&this.ColorMode, "color-mode", "indexed", "Aseprite color mode")
 	flag.StringVar(&this.Name, "name", "", "atlas name")
 	flag.StringVar(&this.ImgOut, "img-out", "", "image output directory")
-	flag.StringVar(&this.CodeOut, "code-out", "", "gencode output directory")
+	flag.StringVar(&this.AtlasOut, "atlas-out", "", "atlas Go output file")
+	flag.StringVar(&this.TagsOut, "tags-out", "", "tags Go output file")
 	flag.StringVar(
 		&this.TilesetManifestOut,
 		"tileset-manifest-out",
@@ -35,6 +35,7 @@ func NewArgv() (Argv, error) {
 		fmt.Fprintf(
 			flag.CommandLine.Output(),
 			"packatlas --name=<name> --img-out=<dir> "+
+				"--atlas-out=<file> --tags-out=<file> "+
 				"[--tileset-manifest-out=<file>] "+
 				"[--color-mode=<mode>] [--watch] <entries…>\n",
 		)
@@ -51,7 +52,12 @@ func NewArgv() (Argv, error) {
 	if this.ImgOut == "" {
 		return Argv{}, errors.New("--img-out required")
 	}
-	this.Pkg = filepath.Base(this.CodeOut)
+	if this.AtlasOut == "" {
+		return Argv{}, errors.New("--atlas-out required")
+	}
+	if this.TagsOut == "" {
+		return Argv{}, errors.New("--tags-out required")
+	}
 
 	return this, nil
 }

src/cmd/packatlas/atlas_parser.go

@@ -126,7 +126,7 @@ func filterAnims(assets []*asset) (anims []anim, err error) {
 		for _, tag := range asset.TagSpans {
 			k := stemTag{stem: stem, tag: tag.Name}
 			if seen[k] {
-				return nil, fmt.Errorf("atlas tag %q duplicate", k.qualifiedTag())
+				return nil, fmt.Errorf("tag %q duplicate", k.qualifiedTag())
 			}
 			seen[k] = true
 			anims = append(anims, anim{stemTag: k, asset: asset, tagSpan: tag})
@@ -516,7 +516,7 @@ func parseAtlas(
 	packed = append(packed, tiles...)
 	if len(packed) > vatlas.MaxTags {
 		return nil, nil, nil, fmt.Errorf(
-			"atlas tag count %d exceeds %d",
+			"tag count %d exceeds %d",
 			len(packed), vatlas.MaxTags,
 		)
 	}
@@ -609,7 +609,7 @@ func parseBoxes(
 		for _, k := range assetSlice.Keys {
 			if k.Header.Bounds != first {
 				return hit, hurt, fmt.Errorf(
-					"atlas tag %q hitbox bounds varies across frames", tag,
+					"tag %q hitbox bounds varies across frames", tag,
 				)
 			}
 		}
@@ -625,7 +625,7 @@ func parseBoxes(
 		case vatlas.AseRGBA{B: 255, A: 255}:
 			hit, hurt = box, box
 		default:
-			return hit, hurt, fmt.Errorf("atlas tag %q hitbox color unsupported", tag)
+			return hit, hurt, fmt.Errorf("tag %q hitbox color unsupported", tag)
 		}
 	}
 	return

src/cmd/packatlas/main.go

@@ -114,26 +114,28 @@ func packAtlas(argv *Argv) error {
 		return fmt.Errorf("converting to WebP: %w", err)
 	}
 	atlasBin := vatlas.EncodeAtlas(atlas)
-	dataSrc, err := genData(argv.Pkg, atlasBin)
+	dataSrc, err := genData(
+		filepath.Base(filepath.Dir(argv.AtlasOut)), atlasBin,
+	)
 	if err != nil {
 		return err
 	}
-	if err := os.WriteFile(
-		filepath.Join(argv.CodeOut, argv.Name+"_bin.go"),
-		dataSrc,
-		0o644,
-	); err != nil {
+	if err := os.MkdirAll(filepath.Dir(argv.AtlasOut), 0o755); err != nil {
+		return err
+	}
+	if err := os.WriteFile(argv.AtlasOut, dataSrc, 0o644); err != nil {
 		return err
 	}
-	tagsSrc, err := genTags(argv.Pkg, stemTags)
+	tagsSrc, err := genTags(
+		filepath.Base(filepath.Dir(argv.TagsOut)), stemTags,
+	)
 	if err != nil {
 		return err
 	}
-	if err := os.WriteFile(
-		filepath.Join(argv.CodeOut, argv.Name+"_tags.go"),
-		tagsSrc,
-		0o644,
-	); err != nil {
+	if err := os.MkdirAll(filepath.Dir(argv.TagsOut), 0o755); err != nil {
+		return err
+	}
+	if err := os.WriteFile(argv.TagsOut, tagsSrc, 0o644); err != nil {
 		return err
 	}
 	if argv.TilesetManifestOut == "" {

src/cmd/packlevels/tiled.go

@@ -178,7 +178,7 @@ func readLevel(path string, tilesets tilesetIndex) (vlevels.Level, error) {
 	}, nil
 }
 
-// resolves a Tiled global tile ID to its final atlas tag.
+// resolves a Tiled global tile ID to its final tag.
 func tagForGID(gid uint32, tilesets []tmxTileset) (vatlas.Tag, error) {
 	if gid == 0 {
 		return 0, nil
@@ -193,7 +193,7 @@ func tagForGID(gid uint32, tilesets []tmxTileset) (vatlas.Tag, error) {
 	if gid < tileset.FirstGID {
 		return 0, fmt.Errorf("GID %d has no tileset", gid)
 	}
-	// Tiled GID -> preview canvas cell -> Aseprite native tile -> final atlas tag.
+	// Tiled GID -> preview canvas cell -> Aseprite native tile -> final tag.
 	// adjacent preview cells may resolve to non-contiguous tags.
 	localID := gid - tileset.FirstGID
 	if localID >= uint32(len(tileset.manifest.Tags)) {

src/demo/assets/atlas_test.go

@@ -3,13 +3,14 @@ package assets
 import (
 	"testing"
 
+	"github.com/oidoid/void/src/demo/tags"
 	"github.com/oidoid/void/src/void/vatlas"
 	"github.com/oidoid/void/src/void/vgeo"
 )
 
 func TestSuperballHitbox(t *testing.T) {
 	atlas := vatlas.DecodeAtlas(AtlasBin)
-	if got, want := atlas.Anims[int(SuperballDefault)].Hitbox,
+	if got, want := atlas.Anims[int(tags.SuperballDefault)].Hitbox,
 		vgeo.XYWH[uint16](1, 1, 6, 6); got != want {
 		t.Fatalf("Superball hitbox = %v, want %v", got, want)
 	}

src/demo/engine/engine.go

@@ -8,6 +8,7 @@ import (
 	"github.com/oidoid/void/src/demo/game"
 	"github.com/oidoid/void/src/demo/gfx"
 	"github.com/oidoid/void/src/demo/levels"
+	"github.com/oidoid/void/src/demo/tags"
 	"github.com/oidoid/void/src/void/vatlas"
 	"github.com/oidoid/void/src/void/vengine"
 	"github.com/oidoid/void/src/void/ventities"
@@ -52,7 +53,7 @@ const (
 
 func New() *Engine {
 	font := vtext.MemProp5x6
-	font.FirstTag = assets.MemProp5x600
+	font.FirstTag = tags.MemProp5x600
 	this := &Engine{
 		Engine: vengine.New[*Engine](&vengine.EngineOpts{
 			Font:       font,
@@ -80,10 +81,10 @@ func New() *Engine {
 	this.Layer(gfx.LayerGrid).CamMode = vgfx.LayerCamModeFixed
 	this.Layer(gfx.LayerGrid).BlendMode = vgfx.LayerBlendModeMultiply
 	this.Atlas = vatlas.DecodeAtlas(assets.AtlasBin)
-	anim := this.Atlas.Anims[int(assets.SuperballDefault)]
+	anim := this.Atlas.Anims[int(tags.SuperballDefault)]
 	diameter := float32(anim.Hitbox.Max.X - anim.Hitbox.Min.X)
 	// omit level edge.
-	lvl := vgeo.NewBox[float32](
+	lvl := vgeo.NewBox(
 		float32(this.Level.Tile.W),
 		float32(this.Level.Tile.H),
 		float32(this.Level.W-int32(this.Level.Tile.W)),

src/demo/entities/button_ents.go

@@ -1,8 +1,8 @@
 package entities
 
 import (
-	"github.com/oidoid/void/src/demo/assets"
 	"github.com/oidoid/void/src/demo/gfx"
+	"github.com/oidoid/void/src/demo/tags"
 	"github.com/oidoid/void/src/void/ventities"
 	game "github.com/oidoid/void/src/void/vgame"
 	"github.com/oidoid/void/src/void/vgeo"
@@ -86,16 +86,16 @@ func newButtonEnt(
 	this := ventities.ButtonEnt{
 		NinePatchEnt: newWidgetNinePatch(),
 		Pals: ventities.ButtonPals{
-			Base:      assets.PalWidget,
-			Focused:   assets.PalWidgetFocused,
-			On:        assets.PalWidgetOn,
-			FocusedOn: assets.PalWidgetFocusedOn,
+			Base:      tags.PalWidget,
+			Focused:   tags.PalWidgetFocused,
+			On:        tags.PalWidgetOn,
+			FocusedOn: tags.PalWidgetFocusedOn,
 		},
 		TextPals: ventities.ButtonPals{
-			Base:      assets.PalText,
-			Focused:   assets.PalText,
-			On:        assets.PalTextLight,
-			FocusedOn: assets.PalTextLight,
+			Base:      tags.PalText,
+			Focused:   tags.PalText,
+			On:        tags.PalTextLight,
+			FocusedOn: tags.PalTextLight,
 		},
 		Anchor: ventities.AnchorEnt{
 			Dir:    vgeo.DirW,
@@ -112,8 +112,8 @@ func newButtonEnt(
 }
 
 func newWidgetNinePatch() ventities.NinePatchEnt {
-	edge := vgfx.Spr{TagCel: assets.WidgetEdgeLight.Cel(0)}
-	fill := vgfx.Spr{TagCel: assets.WidgetFill.Cel(0)}
+	edge := vgfx.Spr{TagCel: tags.WidgetEdgeLight.Cel(0)}
+	fill := vgfx.Spr{TagCel: tags.WidgetFill.Cel(0)}
 	return ventities.NinePatchEnt{
 		PatchByDir: [9]vgfx.Spr{
 			vgeo.DirE:      edge,

src/demo/entities/ent_status_ent.go

@@ -3,9 +3,9 @@ package entities
 import (
 	"strings"
 
-	"github.com/oidoid/void/src/demo/assets"
 	"github.com/oidoid/void/src/demo/game"
 	"github.com/oidoid/void/src/demo/gfx"
+	"github.com/oidoid/void/src/demo/tags"
 	"github.com/oidoid/void/src/void/ventities"
 	"github.com/oidoid/void/src/void/vgame"
 	"github.com/oidoid/void/src/void/vgeo"
@@ -25,11 +25,11 @@ func NewEntStatusEnt() EntStatusEnt {
 	this := EntStatusEnt{}
 	this.Fill = ventities.NinePatchEnt{
 		PatchByDir: [9]vgfx.Spr{
-			vgeo.DirE:      {TagCel: assets.ColorBlue.Cel(0)},
-			vgeo.DirN:      {TagCel: assets.ColorBlue.Cel(0)},
-			vgeo.DirW:      {TagCel: assets.ColorBlue.Cel(0)},
-			vgeo.DirS:      {TagCel: assets.ColorBlue.Cel(0)},
-			vgeo.DirCenter: {TagCel: assets.ColorBlue.Cel(0)},
+			vgeo.DirE:      {TagCel: tags.ColorBlue.Cel(0)},
+			vgeo.DirN:      {TagCel: tags.ColorBlue.Cel(0)},
+			vgeo.DirW:      {TagCel: tags.ColorBlue.Cel(0)},
+			vgeo.DirS:      {TagCel: tags.ColorBlue.Cel(0)},
+			vgeo.DirCenter: {TagCel: tags.ColorBlue.Cel(0)},
 		},
 		CornerWH: vgeo.NewWH[uint16](1, 1),
 	}