asset pipeline

3 files changed, 89 insertions, 14 deletions

diff --git a/utl/json2map/main.c b/utl/json2map/main.c
index 3bc7ba4..f3e7716 100644
--- a/utl/json2map/main.c
+++ b/utl/json2map/main.c
@@ -49,7 +49,7 @@ struct tilemap_T make_tilemap(cJSON const *const layer, int const wangStart, int
 	}
 	struct tilemap_T out = {.tilemap = NULL, .width = width - 1, .height = height - 1};
 	out.tilemap = malloc(out.width * out.height * sizeof (int));
-	printf("=== tilemap (%d tiles) ===\n", size);
+	//printf("=== tilemap (%d tiles) ===\n", size);
 	for (int y = 0; y < out.height; y++) {
 		for (int x = 0; x < out.width; x++) {
 			int a = in.tilemap[x + y * in.width];
@@ -122,12 +122,12 @@ int main(int argc, char **argv) {
 	struct sets counts = {0, 0};
 	
 	cJSON_ArrayForEach(tileset, tilesets) {
-		printf("=== tileset (%% tiles) ===\n");
+		//printf("=== tileset (%% tiles) ===\n");
 		cJSON const *wangs = cJSON_GetObjectItemCaseSensitive(tileset, "wangsets");
 		if (wangs != NULL) {
 			cJSON const *wang = NULL;
 			cJSON_ArrayForEach(wang, wangs) {
-				puts("=== wang ===");
+				//puts("=== wang ===");
 				cJSON const *type = cJSON_GetObjectItemCaseSensitive(wang, "type");
 				if (strcmp("corner", type->valuestring) == 0) {
 					if (wangStart != 0) {
@@ -148,7 +148,7 @@ int main(int argc, char **argv) {
 						default:
 							goto end;
 					}
-					printf("=== wang %u-%u ===\n", wangStart, wangStart + wangSize);
+					//printf("=== wang %u-%u ===\n", wangStart, wangStart + wangSize);
 					counts.wang_count++;
 					goto wang_continue;
 				}
@@ -176,11 +176,11 @@ int main(int argc, char **argv) {
 			memcpy(tilesets_data + tilesets_size, &height, sizeof (uint32_t));
 			memcpy(tilesets_data + tilesets_size + sizeof (uint32_t), str + start, length);
 			tilesets_data[tilesets_size + sizeof (uint32_t) + length] = 0;
-			puts(tilesets_data + tilesets_size + sizeof (uint32_t));
+			//puts(tilesets_data + tilesets_size + sizeof (uint32_t));
 			tilesets_size += length + sizeof (uint32_t) + 1;
 			counts.tilesets_count++;
 		}
-		puts(image->valuestring);
+		//puts(image->valuestring);
 		#if 0
 		char *str = cJSON_Print(tileset);
 		puts(str);
@@ -207,7 +207,7 @@ int main(int argc, char **argv) {
 		wang_tileset = malloc(length + 1);
 		memcpy(wang_tileset, str + start, length);
 		wang_tileset[length] = 0;
-		puts(wang_tileset);
+		//puts(wang_tileset);
 	}
 
 	cJSON const *width_obj = cJSON_GetObjectItemCaseSensitive(json, "width");
@@ -233,7 +233,7 @@ int main(int argc, char **argv) {
 			goto end;
 		}
 		char const *type = type_obj->valuestring;
-		puts(type);
+		//puts(type);
 		if (strcmp(type, "group") == 0) {
 			// group layer
 			cJSON const *sublayers = cJSON_GetObjectItemCaseSensitive(layer, "layers");
@@ -261,9 +261,9 @@ int main(int argc, char **argv) {
 			}
 			for (int y = 0; y < layert.height; y++) {
 				for (int x = 0; x < layert.width; x++) {
-					printf("%2x,", layert.tilemap[x + y * layert.width]);
+					//printf("%2x,", layert.tilemap[x + y * layert.width]);
 				}
-				fputc('\n', stdout);
+				//fputc('\n', stdout);
 			}
 
 			size_t const layer_size = map.width * map.height;
@@ -283,7 +283,7 @@ int main(int argc, char **argv) {
 			if (cJSON_IsNumber(parallax)) {
 				py = parallax->valuedouble;
 			}
-			printf("parallax: %fx%f\n", px, py);
+			//printf("parallax: %f %f\n", px, py);
 			parallaxes[map.layers * 2 + 0] = px;
 			parallaxes[map.layers * 2 + 1] = py;
 			
@@ -298,9 +298,9 @@ int main(int argc, char **argv) {
 			}
 			for (int y = 0; y < tilemap.height; y++) {
 				for (int x = 0; x < tilemap.width; x++) {
-					printf("%2x,", tilemap.tilemap[x + y * tilemap.width]);
+					//printf("%2x,", tilemap.tilemap[x + y * tilemap.width]);
 				}
-				fputc('\n', stdout);
+				//fputc('\n', stdout);
 			}
 
 			size_t const layer_size = map.width * map.height;
@@ -320,7 +320,7 @@ int main(int argc, char **argv) {
 			if (cJSON_IsNumber(parallax)) {
 				py = parallax->valuedouble;
 			}
-			printf("parallax: %fx%f\n", px, py);
+			//printf("parallax: %fx%f\n", px, py);
 			parallaxes[map.layers * 2 + 0] = px;
 			parallaxes[map.layers * 2 + 1] = py;
 			
diff --git a/utl/rearrange.c b/utl/rearrange.c
new file mode 100644
index 0000000..1d82029
--- /dev/null
+++ b/utl/rearrange.c
@@ -0,0 +1,73 @@
+#include <stdio.h>
+#include <libplum.h>
+
+int main(int const argc, char *const *const argv) {
+	if (argc < 3) {
+		fprintf(stderr, "usage: %s <OUT.png> <IN.png>...\n", argv[0]);
+		return 1;
+	}
+	unsigned error;
+	struct plum_image *outimage = plum_new_image();
+	outimage->type = PLUM_IMAGE_PNG;
+	outimage->color_format = PLUM_COLOR_32;
+	outimage->frames = 1;
+	outimage->width = 128;
+	if (argc == 3) {
+		struct plum_image *inimage = plum_load_image(argv[2], PLUM_MODE_FILENAME, PLUM_COLOR_32, &error);
+		if (inimage == NULL) {
+			printf("%s: read error (%s)\n", argv[2], plum_get_error_text(error));
+			return 1;
+		}
+		outimage->height = inimage->height / 4;
+		outimage->data = plum_malloc(outimage, plum_pixel_buffer_size(outimage));
+		for (int i = 0; i < inimage->height / 32; i++) {
+			int const toy = i * outimage->width * 8;
+			for (int j = 0; j < 16; j++) {
+				int const tox = j * 8;
+				int const tiy = ((int [16]) {0, 0, 1, 3, 3, 3, 0, 2, 0, 2, 1, 1, 1, 3, 2, 2}[j]) * 8 + inimage->width * 32 * i;
+				int const tix = ((int [16]) {0, 3, 0, 3, 0, 1, 2, 3, 1, 0, 3, 2, 1, 2, 1, 2}[j]) * 8 * inimage->width;
+				for (int py = 0; py < 8; py++) {
+					int const poy = py * outimage->width;
+					int const piy = py * inimage->width;
+					for (int px = 0; px < 8; px++) {
+						outimage->data32[toy + tox + poy + px] = inimage->data32[tiy + tix + piy + px];
+					}
+				}
+			}
+		}
+		plum_destroy_image(inimage);
+		
+	} else {
+		outimage->height = (argc - 2) * 8;
+		outimage->data = plum_malloc(outimage, plum_pixel_buffer_size(outimage));
+		
+		for (int i = 2; i < argc; i++) {
+			struct plum_image *inimage = plum_load_image(argv[i], PLUM_MODE_FILENAME, PLUM_COLOR_32, &error);
+			if (inimage == NULL) {
+				printf("%s: read error (%s)\n", argv[i], plum_get_error_text(error));
+				return 1;
+			}
+			int const toy = (i - 2) * outimage->width * 8;
+			for (int j = 0; j < 16; j++) {
+				int const tox = j * 8;
+				int const tiy = ((int [16]) {0, 0, 1, 3, 3, 3, 0, 2, 0, 2, 1, 1, 1, 3, 2, 2}[j]) * 8;
+				int const tix = ((int [16]) {0, 3, 0, 3, 0, 1, 2, 3, 1, 0, 3, 2, 1, 2, 1, 2}[j]) * 8 * inimage->width;
+				for (int py = 0; py < 8; py++) {
+					int const poy = py * outimage->width;
+					int const piy = py * inimage->width;
+					for (int px = 0; px < 8; px++) {
+						outimage->data32[toy + tox + poy + px] = inimage->data32[tiy + tix + piy + px];
+					}
+				}
+			}
+			plum_destroy_image(inimage);
+		}
+	}
+	plum_store_image(outimage, argv[1], PLUM_MODE_FILENAME, &error);
+	if (error) {
+		printf("%s: write error (%s)\n", argv[1], plum_get_error_text(error));
+		return 1;
+	}
+	plum_destroy_image(outimage);
+	return 0;
+}
diff --git a/utl/rearrange.mk b/utl/rearrange.mk
new file mode 100644
index 0000000..3475b38
--- /dev/null
+++ b/utl/rearrange.mk
@@ -0,0 +1,2 @@
+out/rearrange: utl/rearrange.c out/libplum.o # ugly hack
+	${CC} -g -Og -o $@ $^