Rooba
/
pokecrystal
mirror of https://github.com/pret/pokecrystal.git
1
1
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Rewrite tools/gfx.c

This commit is contained in:
Rangi 2021-09-20 21:39:39 -04:00
parent fb2a95afed
commit 314c5fc9ab
2 changed files with 132 additions and 138 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
tools/Makefile
View File

@ -5,11 +5,11 @@ CFLAGS := -O3 -std=c11 -Wall -Wextra -pedantic -Wno-missing-field-initializers
tools := \ tools := \
lzcomp \ lzcomp \
gfx \
png_dimensions \ png_dimensions \
scan_includes \
pokemon_animation \ pokemon_animation \
pokemon_animation_graphics \ pokemon_animation_graphics \
gfx \ scan_includes \
stadium stadium
all: $(tools) all: $(tools)
@: @:
@ -18,6 +18,11 @@ clean:
rm -f $(tools) rm -f $(tools)
gfx: common.h gfx: common.h
png_dimensions: common.h
pokemon_animation: common.h
pokemon_animation_graphics: common.h
scan_includes: common.h
stadium: common.h
lzcomp: CFLAGS = -O3 -flto -std=c11 -Wall -Wextra -pedantic -Wno-strict-overflow -Wno-sign-compare lzcomp: CFLAGS = -O3 -flto -std=c11 -Wall -Wextra -pedantic -Wno-strict-overflow -Wno-sign-compare
lzcomp: $(wildcard lz/*.c) $(wildcard lz/*.h) lzcomp: $(wildcard lz/*.c) $(wildcard lz/*.h)

261
tools/gfx.c
View File

@ -1,94 +1,98 @@
#include <stdio.h>
#include <stdlib.h>
#include <stdbool.h>
#include <getopt.h>
#include <string.h>
#include <stdint.h>
#include "common.h" #include "common.h"
static void usage(void) { static void usage(void) {
fprintf(stderr, "Usage: gfx [--trim-whitespace] [--remove-whitespace] [--interleave] [--remove-duplicates [--keep-whitespace]] [--remove-xflip] [--remove-yflip] [--preserve indexes] [--png filename] [-d depth] [-h] [-o outfile] infile\n"); fprintf(stderr, "Usage: gfx [-h|--help] [--trim-whitespace] [--remove-whitespace] [--interleave] [--remove-duplicates [--keep-whitespace]] [--remove-xflip] [--remove-yflip] [--preserve indexes] [-p|--png filename.png] [-d|--depth depth] [-o outfile] infile\n");
}
static void error(char *message) {
fputs(message, stderr);
fputs("\n", stderr);
} }
struct Options { struct Options {
int trim_whitespace; bool trim_whitespace;
int remove_whitespace; bool remove_whitespace;
int help; bool interleave;
char *outfile; bool remove_duplicates;
int depth; bool keep_whitespace;
int interleave; bool remove_xflip;
int remove_duplicates; bool remove_yflip;
int keep_whitespace;
int remove_xflip;
int remove_yflip;
int *preserved; int *preserved;
int num_preserved; int num_preserved;
char *png_file; char *png_file;
int depth;
char *outfile;
}; };
struct Options Options = { struct Options options = {.depth = 2};
.depth = 2,
};
void get_args(int argc, char *argv[]) { void parse_args(int argc, char *argv[]) {
struct option long_options[] = { struct option long_options[] = {
{"remove-whitespace", no_argument, &Options.remove_whitespace, 1}, {"remove-whitespace", no_argument, 0, 'R'},
{"trim-whitespace", no_argument, &Options.trim_whitespace, 1}, {"trim-whitespace", no_argument, 0, 'T'},
{"interleave", no_argument, &Options.interleave, 1}, {"interleave", no_argument, 0, 'I'},
{"remove-duplicates", no_argument, &Options.remove_duplicates, 1}, {"remove-duplicates", no_argument, 0, 'D'},
{"keep-whitespace", no_argument, &Options.keep_whitespace, 1}, {"keep-whitespace", no_argument, 0, 'W'},
{"remove-xflip", no_argument, &Options.remove_xflip, 1}, {"remove-xflip", no_argument, 0, 'X'},
{"remove-yflip", no_argument, &Options.remove_yflip, 1}, {"remove-yflip", no_argument, 0, 'Y'},
{"preserve", required_argument, 0, 'r'}, {"preserve", required_argument, 0, 'r'},
{"png", required_argument, 0, 'p'}, {"png", required_argument, 0, 'p'},
{"depth", required_argument, 0, 'd'}, {"depth", required_argument, 0, 'd'},
{"help", no_argument, 0, 'h'}, {"help", no_argument, 0, 'h'},
{0} {0}
}; };
char *token; for (int opt; (opt = getopt_long(argc, argv, "d:o:p:h", long_options)) != -1;) {
for (int opt = 0; opt != -1;) { switch (opt) {
switch (opt = getopt_long(argc, argv, "ho:d:p:", long_options)) { case 'R':
case 'h': options.remove_whitespace = true;
Options.help = true;
break; break;
case 'o': case 'T':
Options.outfile = optarg; options.trim_whitespace = true;
break; break;
case 'd': case 'I':
Options.depth = strtoul(optarg, NULL, 0); options.interleave = true;
break;
case 'D':
options.remove_duplicates = true;
break;
case 'W':
options.keep_whitespace = true;
break;
case 'X':
options.remove_xflip = true;
break;
case 'Y':
options.remove_yflip = true;
break; break;
case 'r': case 'r':
token = strtok(optarg, ","); for (char *token = strtok(optarg, ","); token; token = strtok(NULL, ",")) {
while (token) { options.preserved = realloc(options.preserved, ++options.num_preserved * sizeof(*options.preserved));
Options.num_preserved++; options.preserved[options.num_preserved-1] = strtoul(token, NULL, 0);
Options.preserved = realloc(Options.preserved, Options.num_preserved * sizeof(int));
Options.preserved[Options.num_preserved-1] = strtoul(token, NULL, 0);
token = strtok(NULL, ",");
} }
break; break;
case 'p': case 'd':
Options.png_file = optarg; options.depth = strtoul(optarg, NULL, 0);
break; break;
case 0: case 'o':
case -1: options.outfile = optarg;
break;
case 'p':
options.png_file = optarg;
break;
case 'h':
usage();
exit(0);
break; break;
default: default:
usage(); usage();
exit(1); exit(1);
break;
} }
} }
} }
struct Graphic {
uint8_t *data;
long size;
};
bool is_preserved(int index) { bool is_preserved(int index) {
for (int i = 0; i < Options.num_preserved; i++) { for (int i = 0; i < options.num_preserved; i++) {
if (Options.preserved[i] == index) { if (options.preserved[i] == index) {
return true; return true;
} }
} }
@ -96,22 +100,16 @@ bool is_preserved(int index) {
} }
void shift_preserved(int removed_index) { void shift_preserved(int removed_index) {
for (int i = 0; i < Options.num_preserved; i++) { for (int i = 0; i < options.num_preserved; i++) {
if (Options.preserved[i] >= removed_index) { if (options.preserved[i] >= removed_index) {
Options.preserved[i]--; options.preserved[i]--;
} }
} }
} }
struct Graphic { bool is_whitespace(const uint8_t *tile, int tile_size) {
long size;
uint8_t *data;
};
bool is_whitespace(uint8_t *tile, int tile_size) {
uint8_t WHITESPACE = 0;
for (int i = 0; i < tile_size; i++) { for (int i = 0; i < tile_size; i++) {
if (tile[i] != WHITESPACE) { if (tile[i] != 0) {
return false; return false;
} }
} }
@ -119,7 +117,7 @@ bool is_whitespace(uint8_t *tile, int tile_size) {
} }
void trim_whitespace(struct Graphic *graphic) { void trim_whitespace(struct Graphic *graphic) {
int tile_size = Options.depth * 8; int tile_size = options.depth * 8;
for (int i = graphic->size - tile_size; i > 0; i -= tile_size) { for (int i = graphic->size - tile_size; i > 0; i -= tile_size) {
if (is_whitespace(&graphic->data[i], tile_size) && !is_preserved(i / tile_size)) { if (is_whitespace(&graphic->data[i], tile_size) && !is_preserved(i / tile_size)) {
graphic->size = i; graphic->size = i;
@ -129,13 +127,13 @@ void trim_whitespace(struct Graphic *graphic) {
} }
} }
int get_tile_size() {
return options.depth * (options.interleave ? 16 : 8);
}
void remove_whitespace(struct Graphic *graphic) { void remove_whitespace(struct Graphic *graphic) {
int tile_size = Options.depth * 8; int tile_size = get_tile_size();
if (Options.interleave) tile_size *= 2;
// Make sure we have a whole number of tiles, round down if required
graphic->size &= ~(tile_size - 1); graphic->size &= ~(tile_size - 1);
int i = 0; int i = 0;
for (int j = 0, d = 0; i < graphic->size && j < graphic->size; i += tile_size, j += tile_size) { for (int j = 0, d = 0; i < graphic->size && j < graphic->size; i += tile_size, j += tile_size) {
while (j < graphic->size && is_whitespace(&graphic->data[j], tile_size) && !is_preserved(j / tile_size - d)) { while (j < graphic->size && is_whitespace(&graphic->data[j], tile_size) && !is_preserved(j / tile_size - d)) {
@ -153,7 +151,7 @@ void remove_whitespace(struct Graphic *graphic) {
graphic->size = i; graphic->size = i;
} }
bool tile_exists(uint8_t *tile, uint8_t *tiles, int tile_size, int num_tiles) { bool tile_exists(const uint8_t *tile, const uint8_t *tiles, int tile_size, int num_tiles) {
for (int i = 0; i < num_tiles; i++) { for (int i = 0; i < num_tiles; i++) {
bool match = true; bool match = true;
for (int j = 0; j < tile_size; j++) { for (int j = 0; j < tile_size; j++) {
@ -169,16 +167,12 @@ bool tile_exists(uint8_t *tile, uint8_t *tiles, int tile_size, int num_tiles) {
} }
void remove_duplicates(struct Graphic *graphic) { void remove_duplicates(struct Graphic *graphic) {
int tile_size = Options.depth * 8; int tile_size = get_tile_size();
if (Options.interleave) tile_size *= 2;
int num_tiles = 0;
// Make sure we have a whole number of tiles, round down if required
graphic->size &= ~(tile_size - 1); graphic->size &= ~(tile_size - 1);
int num_tiles = 0;
for (int i = 0, j = 0, d = 0; i < graphic->size && j < graphic->size; i += tile_size, j += tile_size) { for (int i = 0, j = 0, d = 0; i < graphic->size && j < graphic->size; i += tile_size, j += tile_size) {
while (j < graphic->size && tile_exists(&graphic->data[j], graphic->data, tile_size, num_tiles)) { while (j < graphic->size && tile_exists(&graphic->data[j], graphic->data, tile_size, num_tiles)) {
if ((Options.keep_whitespace && is_whitespace(&graphic->data[j], tile_size)) || is_preserved(j / tile_size - d)) { if ((options.keep_whitespace && is_whitespace(&graphic->data[j], tile_size)) || is_preserved(j / tile_size - d)) {
break; break;
} }
shift_preserved(j / tile_size - d); shift_preserved(j / tile_size - d);
@ -196,43 +190,46 @@ void remove_duplicates(struct Graphic *graphic) {
graphic->size = num_tiles * tile_size; graphic->size = num_tiles * tile_size;
} }
bool flip_exists(uint8_t *tile, uint8_t *tiles, int tile_size, int num_tiles, bool xflip, bool yflip) { // for (int i = 0; i < 256; i++)
// for (int bit = 0; bit < 8; bit++) {
// flipped[i] |= ((i >> bit) & 1) << (7 - bit);
const uint8_t flipped[256] = {
0x00, 0x80, 0x40, 0xc0, 0x20, 0xa0, 0x60, 0xe0, 0x10, 0x90, 0x50, 0xd0, 0x30, 0xb0, 0x70, 0xf0,
0x08, 0x88, 0x48, 0xc8, 0x28, 0xa8, 0x68, 0xe8, 0x18, 0x98, 0x58, 0xd8, 0x38, 0xb8, 0x78, 0xf8,
0x04, 0x84, 0x44, 0xc4, 0x24, 0xa4, 0x64, 0xe4, 0x14, 0x94, 0x54, 0xd4, 0x34, 0xb4, 0x74, 0xf4,
0x0c, 0x8c, 0x4c, 0xcc, 0x2c, 0xac, 0x6c, 0xec, 0x1c, 0x9c, 0x5c, 0xdc, 0x3c, 0xbc, 0x7c, 0xfc,
0x02, 0x82, 0x42, 0xc2, 0x22, 0xa2, 0x62, 0xe2, 0x12, 0x92, 0x52, 0xd2, 0x32, 0xb2, 0x72, 0xf2,
0x0a, 0x8a, 0x4a, 0xca, 0x2a, 0xaa, 0x6a, 0xea, 0x1a, 0x9a, 0x5a, 0xda, 0x3a, 0xba, 0x7a, 0xfa,
0x06, 0x86, 0x46, 0xc6, 0x26, 0xa6, 0x66, 0xe6, 0x16, 0x96, 0x56, 0xd6, 0x36, 0xb6, 0x76, 0xf6,
0x0e, 0x8e, 0x4e, 0xce, 0x2e, 0xae, 0x6e, 0xee, 0x1e, 0x9e, 0x5e, 0xde, 0x3e, 0xbe, 0x7e, 0xfe,
0x01, 0x81, 0x41, 0xc1, 0x21, 0xa1, 0x61, 0xe1, 0x11, 0x91, 0x51, 0xd1, 0x31, 0xb1, 0x71, 0xf1,
0x09, 0x89, 0x49, 0xc9, 0x29, 0xa9, 0x69, 0xe9, 0x19, 0x99, 0x59, 0xd9, 0x39, 0xb9, 0x79, 0xf9,
0x05, 0x85, 0x45, 0xc5, 0x25, 0xa5, 0x65, 0xe5, 0x15, 0x95, 0x55, 0xd5, 0x35, 0xb5, 0x75, 0xf5,
0x0d, 0x8d, 0x4d, 0xcd, 0x2d, 0xad, 0x6d, 0xed, 0x1d, 0x9d, 0x5d, 0xdd, 0x3d, 0xbd, 0x7d, 0xfd,
0x03, 0x83, 0x43, 0xc3, 0x23, 0xa3, 0x63, 0xe3, 0x13, 0x93, 0x53, 0xd3, 0x33, 0xb3, 0x73, 0xf3,
0x0b, 0x8b, 0x4b, 0xcb, 0x2b, 0xab, 0x6b, 0xeb, 0x1b, 0x9b, 0x5b, 0xdb, 0x3b, 0xbb, 0x7b, 0xfb,
0x07, 0x87, 0x47, 0xc7, 0x27, 0xa7, 0x67, 0xe7, 0x17, 0x97, 0x57, 0xd7, 0x37, 0xb7, 0x77, 0xf7,
0x0f, 0x8f, 0x4f, 0xcf, 0x2f, 0xaf, 0x6f, 0xef, 0x1f, 0x9f, 0x5f, 0xdf, 0x3f, 0xbf, 0x7f, 0xff
};
bool flip_exists(const uint8_t *tile, const uint8_t *tiles, int tile_size, int num_tiles, bool xflip, bool yflip) {
uint8_t flip[tile_size]; uint8_t flip[tile_size];
memset(flip, 0, sizeof(flip)); memset(flip, 0, tile_size);
int half_size = tile_size / 2; int half_size = tile_size / 2;
for (int i = 0; i < tile_size; i++) { for (int i = 0; i < tile_size; i++) {
int byte = i; int j = yflip ? (options.interleave && i < half_size ? half_size : tile_size) - 1 - (i ^ 1) : i;
if (yflip) { flip[j] = xflip ? flipped[tile[i]] : tile[i];
byte = tile_size - 1 - (i ^ 1);
if (Options.interleave && i < half_size) {
byte = half_size - 1 - (i ^ 1);
}
}
if (xflip) {
for (int bit = 0; bit < 8; bit++) {
flip[byte] |= ((tile[i] >> bit) & 1) << (7 - bit);
}
} else {
flip[byte] = tile[i];
}
} }
if (tile_exists(flip, tiles, tile_size, num_tiles)) { return tile_exists(flip, tiles, tile_size, num_tiles);
return true;
}
return false;
} }
void remove_flip(struct Graphic *graphic, bool xflip, bool yflip) { void remove_flip(struct Graphic *graphic, bool xflip, bool yflip) {
int tile_size = Options.depth * 8; int tile_size = get_tile_size();
if (Options.interleave) tile_size *= 2;
int num_tiles = 0;
// Make sure we have a whole number of tiles, round down if required
graphic->size &= ~(tile_size - 1); graphic->size &= ~(tile_size - 1);
int num_tiles = 0;
for (int i = 0, j = 0, d = 0; i < graphic->size && j < graphic->size; i += tile_size, j += tile_size) { for (int i = 0, j = 0, d = 0; i < graphic->size && j < graphic->size; i += tile_size, j += tile_size) {
while (j < graphic->size && flip_exists(&graphic->data[j], graphic->data, tile_size, num_tiles, xflip, yflip)) { while (j < graphic->size && flip_exists(&graphic->data[j], graphic->data, tile_size, num_tiles, xflip, yflip)) {
if ((Options.keep_whitespace && is_whitespace(&graphic->data[j], tile_size)) || is_preserved(j / tile_size - d)) { if ((options.keep_whitespace && is_whitespace(&graphic->data[j], tile_size)) || is_preserved(j / tile_size - d)) {
break; break;
} }
shift_preserved(j / tile_size - d); shift_preserved(j / tile_size - d);
@ -251,18 +248,13 @@ void remove_flip(struct Graphic *graphic, bool xflip, bool yflip) {
} }
void interleave(struct Graphic *graphic, int width) { void interleave(struct Graphic *graphic, int width) {
int tile_size = Options.depth * 8; int tile_size = options.depth * 8;
int width_tiles = width / 8; int width_tiles = width / 8;
int num_tiles = graphic->size / tile_size; int num_tiles = graphic->size / tile_size;
uint8_t *interleaved = malloc(graphic->size); uint8_t *interleaved = malloc(graphic->size);
for (int i = 0; i < num_tiles; i++) { for (int i = 0; i < num_tiles; i++) {
int tile = i * 2;
int row = i / width_tiles; int row = i / width_tiles;
tile -= width_tiles * row; int tile = i * 2 - (row % 2 ? width_tiles * (row + 1) - 1 : width_tiles * row);
if (row % 2) {
tile -= width_tiles;
tile += 1;
}
memcpy(&interleaved[tile * tile_size], &graphic->data[i * tile_size], tile_size); memcpy(&interleaved[tile * tile_size], &graphic->data[i * tile_size], tile_size);
} }
graphic->size = num_tiles * tile_size; graphic->size = num_tiles * tile_size;
@ -271,50 +263,47 @@ void interleave(struct Graphic *graphic, int width) {
} }
int main(int argc, char *argv[]) { int main(int argc, char *argv[]) {
get_args(argc, argv); parse_args(argc, argv);
argc -= optind; argc -= optind;
argv += optind; argv += optind;
if (Options.help) {
usage();
return 0;
}
if (argc < 1) { if (argc < 1) {
usage(); usage();
exit(1); exit(1);
} }
char *infile = argv[0];
struct Graphic graphic; struct Graphic graphic;
graphic.data = read_u8(infile, &graphic.size); graphic.data = read_u8(argv[0], &graphic.size);
if (Options.trim_whitespace) {
if (options.trim_whitespace) {
trim_whitespace(&graphic); trim_whitespace(&graphic);
} }
if (Options.interleave) { if (options.interleave) {
if (!Options.png_file) { if (!options.png_file) {
error("interleave: need --png to infer dimensions"); error_exit("interleave: need --png to infer dimensions");
usage();
exit(1);
} }
int width = read_png_width_verbose(Options.png_file); int width = read_png_width_verbose(options.png_file);
interleave(&graphic, width); interleave(&graphic, width);
} }
if (Options.remove_duplicates) { if (options.remove_duplicates) {
remove_duplicates(&graphic); remove_duplicates(&graphic);
} }
if (Options.remove_xflip) { if (options.remove_xflip) {
remove_flip(&graphic, true, false); remove_flip(&graphic, true, false);
} }
if (Options.remove_yflip) { if (options.remove_yflip) {
remove_flip(&graphic, false, true); remove_flip(&graphic, false, true);
} }
if (Options.remove_xflip && Options.remove_yflip) { if (options.remove_xflip && options.remove_yflip) {
remove_flip(&graphic, true, true); remove_flip(&graphic, true, true);
} }
if (Options.remove_whitespace) { if (options.remove_whitespace) {
remove_whitespace(&graphic); remove_whitespace(&graphic);
} }
if (Options.outfile) { if (options.outfile) {
write_u8(Options.outfile, graphic.data, graphic.size); write_u8(options.outfile, graphic.data, graphic.size);
} }
free(graphic.data); free(graphic.data);
return 0; return 0;
} }