Add Texpacker #18

silverweed · 2017-12-20T13:10:45Z

(See #12)
Texpacker now works hopefully well. I tried sticking to the rest of the tools' style as much as possible, so it should be pretty familiar to review.

Usage

$ ./texpacker -h
Usage: ./texpacker [flags] <file1> [<file2> ...]
  -noheader
    	Don't write header, output raw PNG
  -o string
    	Output file (- for STDOUT) (default "-")
  -strip string
    	Prefix to strip from file paths for hashing (default <cwd>)

Supported input formats:
    JPEG
    GIF
    PNG

Basically it takes input textures as positional arguments and spits out a binary file with the format [header | PNG image]. It can be told to output just the PNG for debugging purposes.
The -strip flag is used to make the tool usable from any directory: the hashed paths will be relative to the path given to -strip.

The packing algorithm is currently maxrects and uses "github.com/adinfinit/texpack/maxrect" which is MIT-licensed.

Header format

The header looks like this:

ParentTexture Hashed Path [4B]
Entry Count               [4B]
Entry0                    [12B]
...

where Entry is:
Hashed Path [4B]
StartX      [2B]
StartY      [2B]
SizeX       [2B]
SizeY       [2B]

Forgot anything?

Hamcha

This is still using a single file for output while it should do two (packed PNG + metadata). My original doc referred to "Header" meaning "C header file", not header of the actual texture.

Hamcha · 2017-12-20T15:02:24Z

tools/build.sh

+go build -o bin/tevasm ./tevasm
+go build -o bin/texpacker ./texpacker


Please add the "go get" command on top of both build files, just like tools-extra/build.*

zeroZshadow · 2017-12-20T15:03:01Z

tools/texpacker/format.go

+
+// 8 bytes
+type Rect struct {
+	Start, Size Point


Size isn't a point, so either rename Point to be less specialized (Vector2?)
Or change what Size is?

zeroZshadow · 2017-12-20T15:08:50Z

tools/texpacker/main.go

+	noheader := flag.Bool("noheader", false, "Don't write header, output raw PNG")
+	cwd, err := os.Getwd()
+	checkErr(err, "Couldn't get working directory")
+	stripPfx := flag.String("strip", cwd, "Prefix to strip from file paths for hashing")


Why not call this -prefix? The current name sounds like its a toggle flag

zeroZshadow · 2017-12-20T15:09:30Z

tools/texpacker/main.go

+	// All positional arguments are input files
+	inputFiles := flag.Args()
+
+	maxBounds := image.Point{1 << 16, 1 << 16} // TODO


Forgot a TODO here, flag?

zeroZshadow · 2017-12-20T15:10:00Z

tools/texpacker/format.go

+func ToFileHash(s string) FileHash {
+	hash.Reset()
+	_, err := fmt.Fprintf(hash, s)
+	if err != nil {


Why doesnt this use checkErr ?

zeroZshadow · 2017-12-20T15:10:23Z

tools/texpacker/main.go

+		checkErr(err, "Error converting file path %s to absolute", path)
+		packer.Add(abspath)
+	}
+	if err := packer.Save(); err != nil {


Why doesn this use checkErr ?

zeroZshadow · 2017-12-20T15:20:19Z

tools/texpacker/packer.go

+
+// writeImageAt adds all pixels of `src` to `dst`, starting from pixel at (`x`,`y`).
+// It returns an error if the whole source image couldn't be added to the target.
+func writeImageAt(dst *image.RGBA, src image.Image, x, y int) error {


This could instead use image.SubImage and the image/draw functions?

zeroZshadow · 2017-12-20T15:21:18Z

tools/texpacker/packer.go

+			if tryOk {
+				contextSize = trySize
+				rects = tryRects
+				shrunk = true


This will still cause it to try shrinkY, is that ok?

That's probably a typo in the function I copy-pasted, it should be shrinkY = false in the shrinkY branch.

- add go get to build scripts - change Point -> Vector2 - use checkErr where appropriate - change -strip -> -prefix - pass max bounds via flags - use image/draw functions instead of writeImageAt - fix typo in minimizeFit

silverweed · 2017-12-21T10:48:49Z

Ok, I should have fixed all issues. Now the tool outputs 2 files: <outfile> and <outfile>.atlas, the latter containing the metadata in the exact same format as described in OP.
I removed the -noheader flag and the possibility to output to stdout, as these would yield ill-defined image/metadata pairs.

zeroZshadow · 2017-12-21T13:17:15Z

tools/texpacker/main.go

-	outpath := flag.String("o", "-", "Output file (- for STDOUT)")
-	noheader := flag.Bool("noheader", false, "Don't write header, output raw PNG")
+	outpath := flag.String("o", "out.png", "Output file")
+	maxW := flag.Int("maxwidth", 1<<16, "Max width of output texture in pixels")


Up for discussion, do we wanna support non-square atlasses? if not, only needs 1 flag ;)

No reason to, I think.

zeroZshadow · 2017-12-21T13:19:46Z

tools/texpacker/packer.go

 	}
-	return out, nil
+	headerOut, err = os.Create(packer.outfile + ".atlas")
+	return


If this returns an error, TexPacker.Save will not close the imageOut

silverweed · 2017-12-22T15:27:52Z

Latest commit should have fixed both issues.

silverweed added 9 commits December 20, 2017 14:00

implement basic texture packing

f37543e

make it work with maxrect

25bf54b

add texpacker to build.{sh,cmd}

b96044b

add header outputting

3b5b84a

fix PutUint's in format.go

c9ba390

add noheader flag

faa1f33

add prefix stripping option to texpacker

933d1ff

small fix to usage

85eb22b

forgot to relativize outpath too

9f73d3c

Hamcha requested changes Dec 20, 2017

View reviewed changes

zeroZshadow requested changes Dec 20, 2017

View reviewed changes

Hamcha added the enhancement Missing or better functionality label Dec 20, 2017

silverweed added 2 commits December 21, 2017 11:38

fix some issues:

6fb5c53

- add go get to build scripts - change Point -> Vector2 - use checkErr where appropriate - change -strip -> -prefix - pass max bounds via flags - use image/draw functions instead of writeImageAt - fix typo in minimizeFit

output 2 separate files for image and header

8a39048

zeroZshadow reviewed Dec 21, 2017

View reviewed changes

Hamcha approved these changes Dec 21, 2017

View reviewed changes

use single flag for size, close imageOut on err

dd688bb

zeroZshadow approved these changes Dec 22, 2017

View reviewed changes

Hamcha merged commit 6728419 into hoverguys:master Dec 22, 2017

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Add Texpacker #18

Add Texpacker #18

silverweed commented Dec 20, 2017 •

edited

Loading

Hamcha left a comment •

edited

Loading

Hamcha Dec 20, 2017

zeroZshadow Dec 20, 2017

zeroZshadow Dec 20, 2017

zeroZshadow Dec 20, 2017

zeroZshadow Dec 20, 2017

zeroZshadow Dec 20, 2017

zeroZshadow Dec 20, 2017

zeroZshadow Dec 20, 2017

silverweed Dec 21, 2017

silverweed commented Dec 21, 2017 •

edited

Loading

zeroZshadow Dec 21, 2017

Hamcha Dec 21, 2017

zeroZshadow Dec 21, 2017

silverweed commented Dec 22, 2017

		go build -o bin/tevasm ./tevasm
		go build -o bin/texpacker ./texpacker

Add Texpacker #18

Add Texpacker #18

Conversation

silverweed commented Dec 20, 2017 • edited Loading

Usage

Header format

Hamcha left a comment • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

silverweed commented Dec 21, 2017 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

silverweed commented Dec 22, 2017

silverweed commented Dec 20, 2017 •

edited

Loading

Hamcha left a comment •

edited

Loading

silverweed commented Dec 21, 2017 •

edited

Loading