Some small changes

.gitattributes

@@ -0,0 +1 @@
+* text=auto

.gitignore

@@ -1,38 +1,2 @@
-# Compiled Object files
-*.slo
-*.lo
-*.o
-*.obj
-
-# Precompiled Headers
-*.gch
-*.pch
-
-# Compiled Dynamic libraries
-*.so
-*.dylib
-*.dll
-
-# Fortran module files
-*.mod
-*.smod
-
-# Compiled Static libraries
-*.lai
-*.la
-*.a
-*.lib
-
-# Executables
-*.exe
-*.out
-*.app
-*.ilk
-*.pdb
-*.tlog
-*.log
-Debug/*
-Release/*
-*.opendb
-*.db
-*.suo
+build
+.vscode

CMakeLists.txt

@@ -0,0 +1,23 @@
+cmake_minimum_required(VERSION 3.1.2)
+
+project(crunch VERSION 0.12 LANGUAGES C CXX)
+
+add_executable(crunch 
+    crunch/main.cpp
+
+    crunch/third_party/lodepng.cpp
+    crunch/third_party/MaxRectsBinPack.cpp
+    crunch/third_party/Rect.cpp
+
+    crunch/binary.cpp
+    crunch/bitmap.cpp
+    crunch/cli.cpp
+    crunch/hash.cpp
+    crunch/options.cpp
+    crunch/packer.cpp
+    )
+
+set(CMAKE_CXX_STANDARD 20)
+set(CMAKE_CXX_STANDARD_REQUIRED ON)
+set(CMAKE_CXX_EXTENSIONS OFF)
+target_compile_features(crunch PUBLIC cxx_std_20)

README.md

@@ -1,10 +1,10 @@
-# crunch
+# crunch v0.13
 
 This is a command line tool that will pack a bunch of images into a single, larger image. It was designed for [Celeste](http://www.celestegame.com/), but could be very helpful for other games.
 
 It is designed using libraries with permissible licenses, so you are able to use it freely in your commercial and non-commercial projects. Please see each source file for its respective copyright and license.
 
-### Features
+## Features
 
 - Export XML, JSON, or binary data
 - Trim excess transparency
@@ -16,11 +16,11 @@ It is designed using libraries with permissible licenses, so you are able to use
 - Caching to prevent redundant builds
 - Multi-image atlas when the sprites don't fit
 
-### What does it do?
+## What does it do?
 
 Given a folder with several images, like so:
 
-```
+```text
 images/
     player.png
     tree.png
@@ -29,7 +29,7 @@ images/
 
 It will output something like this:
 
-```
+```text
 bin/
     images.png
     images.xml
@@ -40,7 +40,7 @@ Where `images.png` is the packed image, `images.xml` is an xml file describing w
 
 There is also an option to use a binary format instead of xml.
 
-### Usage
+## Usage
 
 `crunch [OUTPUT] [INPUT1,INPUT2,INPUT3...] [OPTIONS...]`
 
@@ -50,52 +50,145 @@ For example...
 
 This will output the following files:
 
-```
+```text
 bin/atlases/atlas.png
 bin/atlases/atlas.json
 bin/atlases/atlas.hash
 ```
 
-### Options
-
-| option        | alias         | description |
-| ------------- | ------------- | ------------|
-| -d            | --default     | use default settings (-x -p -t -u)
-| -x            | --xml         | saves the atlas data as a .xml file
-| -b            | --binary      | saves the atlas data as a .bin file
-| -j            | --json        | saves the atlas data as a .json file
-| -p            | --premultiply | premultiplies the pixels of the bitmaps by their alpha channel
-| -t            | --trim        | trims excess transparency off the bitmaps
-| -v            | --verbose     | print to the debug console as the packer works
-| -f            | --force       | ignore caching, forcing the packer to repack
-| -u            | --unique      | remove duplicate bitmaps from the atlas
-| -r            | --rotate      | enabled rotating bitmaps 90 degrees clockwise when packing
-| -s#           | --size#       | max atlas size (# can be 4096, 2048, 1024, 512, 256, 128, or 64)
-| -p#           | --pad#        | padding between images (# can be from 0 to 16)
-
-### Binary Format
-
- ```
- [int16] num_textures (below block is repeated this many times)
-        [string] name
-        [int16] num_images (below block is repeated this many times)
-            [string] img_name
-            [int16] img_x
-            [int16] img_y
-            [int16] img_width
-            [int16] img_height
-            [int16] img_frame_x         (if --trim enabled)
-            [int16] img_frame_y         (if --trim enabled)
-            [int16] img_frame_width     (if --trim enabled)
-            [int16] img_frame_height    (if --trim enabled)
-            [byte] img_rotated          (if --rotate enabled)
+## Options
+
+| option          | alias           | description     |
+| --------------- | --------------- | --------------- |
+| `--default`     | `-d`            | use default settings (`-x -p -t -u`) |
+| `--xml`         | `-x`            | saves the atlas data as a `.xml` file |
+| `--json`        | `-j`            | saves the atlas data as a `.json` file |
+| `--binary`      | `-b`            | saves the atlas data as a `.bin` file |
+| `--size N`      | `-s N`          | max atlas size (`N` can be `4096`, `2048`, `1024`, `512`, `256`, `128`, or `64`) |
+| `--width N`     | `-w N`          | max atlas width (overrides `--size`) (`N` can be `4096`, `2048`, `1024`, `512`, `256`, `128`, or `64`) |
+| `--height N`    | `-h N`          | max atlas height (overrides `--size`) (`N` can be `4096`, `2048`, `1024`, `512`, `256`, `128`, or `64`) |
+| `--pad N`       | `-pd N`         | padding between images (`N` can be from `0` to `16`) |
+| `--stretch N`   | `-st N`         | makes images' edges stretched by N pixels (`N` can be from `0` to `16`) |
+| `--premultiply` | `-p`            | premultiplies the pixels of the bitmaps by their alpha channel |
+| `--unique`      | `-u`            | remove duplicate bitmaps from the atlas |
+| `--trim`        | `-t`            | trims excess transparency off the bitmaps |
+| `--rotate`      | `-r`            | enabled rotating bitmaps 90 degrees clockwise when packing |
+| `--heuristic`   | `-hr`           | use specific heuristic rule for packing images (`H` can be `bssf` (BestShortSideFit), `blsf` (BestLongSideFit), `baf` (BestAreaFit), `blr` (BottomLeftRule), `cpr` (ContactPointRule)) |
+| `--binstr T`    | `-bs T`         | string type in binary format (`T` can be: `0` - null-termainated, `16` - prefixed (int16), `7` - 7-bit prefixed) |
+| `--force`       | `-f`            | ignore caching, forcing the packer to repack |
+| `--verbose`     | `-v`            | print to the debug console as the packer works |
+| `--time`        | `-tm`           | use file's last write time instead of its content for hashing |
+| `--split`       | `-sp`           | split output textures by subdirectories |
+| `--nozero`      | `-nz`           | if there's only one packed texture, then zero at the end of its name will be omitted (ex. `images0.png` -> `images.png`) |
+
+## Binary Format
+
+```text
+crch (0x68637263 in hex or 1751347811 in decimal (little endian))
+[int16] version (current version is 0)
+[byte] --trim enabled
+[byte] --rotate enabled
+[byte] string type (0 - null-termainated, 1 - prefixed (int16), 2 - 7-bit prefixed)
+[int16] num_textures (below block is repeated this many times)
+    [string] name
+    [int16] num_images (below block is repeated this many times)
+        [string] img_name
+        [int16] img_x
+        [int16] img_y
+        [int16] img_width
+        [int16] img_height
+        [int16] img_frame_x         (if --trim enabled)
+        [int16] img_frame_y         (if --trim enabled)
+        [int16] img_frame_width     (if --trim enabled)
+        [int16] img_frame_height    (if --trim enabled)
+        [byte] img_rotated          (if --rotate enabled)
 ```
 
-### License
+## Splitting
 
-Unless otherwise specified in a source file, everything in this project falls under the following license:
+If `--split` (or `-sp`) is enabled output textures will be split by subdirectories.
+
+For example:
+
+`crunch bin/images images -b -sp` with input images
+
+```text
+images/
+    chars/
+        player.png
+        enemy.png
+    other/
+        tree.png
+        box.png
+```
+
+will output
+
+```text
+bin/
+    images_chars.png (with player.png and enemy.png)
+    images_chars.hash
+    images_chars.bin
+    images_other.png (with tree.png and box.png)
+    images_other.hash
+    images_other.bin
+    images.bin
+```
+
+If `player.png` is the only changed image then only `images_chars.bin` will be packed
+and `images_other.bin`  will be reused in `images.bin`.
+
+This can be used for faster packing: unchanged subdirectories will be skipped
+instead of packing unchanged images.
+
+But there're some limitations:
+
+- multiple inputs and images as inputs are not supported
+- images in input directory itself will be ignored and not packed
+
+## Building
 
+### Windows
+
+Create `build` directory:
+
+```text
+mkdir build
+cd build
+```
+
+- Visual Studio:
+
+```text
+cmake -DCMAKE_BUILD_TYPE=Release ..
+```
+
+- MinGW:
+
+```text
+cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_C_COMPILER=C:/your/mingw/path/gcc.exe -DCMAKE_CXX_COMPILER=C:/your/mingw/path/g++.exe -G "MinGW Makefiles" ..
+```
+
+Build command is same for both:
+
+```text
+cmake --build . --config Release
+```
+
+### Linux
+
+```text
+mkdir build
+cd build
+cmake -DCMAKE_BUILD_TYPE=Release ..
+cmake --build . --config Release
 ```
+
+## License
+
+Unless otherwise specified in a source file, everything in this project falls under the following license:
+
+```text
 MIT License
 
 Copyright (c) 2017 Chevy Ray Johnston