diff --git a/assets/asset_builder/README.md b/assets/asset_builder/README.md index 832e61c..213a007 100644 --- a/assets/asset_builder/README.md +++ b/assets/asset_builder/README.md @@ -8,4 +8,9 @@ | Asset start index | int (32 bits) | | Asset end index | int (32 bits) | | ... | | -| Asset data | depend on assets content and number | \ No newline at end of file +| Asset data | depend on assets content and number | + +## PNG + +Convert RGBA to RGB with #FF00FF as the transparent color. +If alpha null then the color of the pixel will be replaced with this. \ No newline at end of file diff --git a/assets/asset_builder/src/asset_file.c b/assets/asset_builder/src/asset_file.c index 038a3a1..e3ffcf8 100644 --- a/assets/asset_builder/src/asset_file.c +++ b/assets/asset_builder/src/asset_file.c @@ -3,6 +3,7 @@ #include #include #include +#include int parse_png_for_header(const char *file_name, asset_def_t *asset_def); @@ -36,13 +37,9 @@ int parse_png_for_header(const char *file_name, asset_def_t *asset_def) if(!input_png_file) { fclose(input_png_file); - return -3; + return -3; // failed to open file } - fclose(input_png_file); - - return 0; - // Check png autenticity. unsigned char sig[8]; fread(sig, 1, 8, input_png_file); @@ -52,7 +49,7 @@ int parse_png_for_header(const char *file_name, asset_def_t *asset_def) return -4; // bad signature } - // PNG structs + // PNG structs. png_structp png_ptr = png_create_read_struct(PNG_LIBPNG_VER_STRING, NULL, NULL, NULL); if(!png_ptr) { @@ -68,13 +65,152 @@ int parse_png_for_header(const char *file_name, asset_def_t *asset_def) return -5; // out of memory } - // Fill structs and load data + // Fill structs and load data. png_init_io(png_ptr, input_png_file); png_set_sig_bytes(png_ptr, 8); png_read_info(png_ptr, info_ptr); - printf("%s bit depth : %d", file_name, png_get_bit_depth(png_ptr, info_ptr)); + size_t width = png_get_image_width(png_ptr, info_ptr); + size_t height = png_get_image_height(png_ptr, info_ptr); + png_byte bit_depth = png_get_bit_depth(png_ptr, info_ptr); + png_byte color_type = png_get_color_type(png_ptr, info_ptr); + // Print infos. + printf("%s : %lux%lu -%d ", file_name, width, height, bit_depth); + + // Verify png attributes. + if(bit_depth != 8) + return -6; // png bit depth not supported + + switch(color_type) + { + case PNG_COLOR_TYPE_RGB: + puts("RGB"); break; + + case PNG_COLOR_TYPE_RGB_ALPHA: + puts("RGBA"); break; + + case PNG_COLOR_TYPE_GRAY: + case PNG_COLOR_TYPE_GRAY_ALPHA: + case PNG_COLOR_TYPE_PALETTE: + return -7; // png color type not supported + } + + // Fill asset def. + const char *last_slash = strrchr(file_name, '/'); + const char *base_name = last_slash ? last_slash + 1 : file_name; + + asset_def->name = malloc(strlen(base_name) - 4); + strncpy(asset_def->name, base_name, strlen(base_name) - 4); + + asset_def->start = 0; + asset_def->end = height * width * 3; + + png_destroy_read_struct(&png_ptr, &info_ptr, NULL); + fclose(input_png_file); + + return 0; +} + +int parse_png_for_content(const char *file_name, void *buffer) +{ + FILE *input_png_file = fopen(file_name, "rb"); + + if(!input_png_file) + { + fclose(input_png_file); + return -3; // failed to open file + } + + // Check png autenticity. + unsigned char sig[8]; + fread(sig, 1, 8, input_png_file); + if(!png_check_sig(sig, 8)) + { + fclose(input_png_file); + return -4; // bad signature + } + + // PNG structs. + png_structp png_ptr = png_create_read_struct(PNG_LIBPNG_VER_STRING, NULL, NULL, NULL); + if(!png_ptr) + { + fclose(input_png_file); + return -5; // out of memory + } + + png_infop info_ptr = png_create_info_struct(png_ptr); + if(!info_ptr) + { + png_destroy_read_struct(&png_ptr, NULL, NULL); + fclose(input_png_file); + return -5; // out of memory + } + + // Fill structs and load data. + png_init_io(png_ptr, input_png_file); + png_set_sig_bytes(png_ptr, 8); + png_read_info(png_ptr, info_ptr); + + size_t width = png_get_image_width(png_ptr, info_ptr); + size_t height = png_get_image_height(png_ptr, info_ptr); + size_t row_length = png_get_rowbytes(png_ptr, info_ptr); + png_byte bit_depth = png_get_bit_depth(png_ptr, info_ptr); + png_byte color_type = png_get_color_type(png_ptr, info_ptr); + + // Show infos. + printf("%s : %lux%lu -%d ", file_name, width, height, bit_depth); + + switch(color_type) + { + case PNG_COLOR_TYPE_GRAY : + puts("grayscale"); break; + + case PNG_COLOR_TYPE_GRAY_ALPHA : + puts("gray with alpha"); break; + + case PNG_COLOR_TYPE_PALETTE : + puts("palette"); break; + + case PNG_COLOR_TYPE_RGB : + puts("RGB"); break; + + case PNG_COLOR_TYPE_RGB_ALPHA : + puts("RGBA"); + } + + // Prepare storage. + png_byte pixels[height * row_length]; + png_bytep row_ptrs[height]; + for(png_uint_32 i = 0; i < height; i++) + row_ptrs[i] = &pixels[i * row_length]; + + // Read pixels. + png_read_image(png_ptr, row_ptrs); + + for(size_t i = 0; i < height; i += 2) + { + for(size_t j = 0; j < row_length; j += 4) + { + if(pixels[i * row_length + j + 3]) + printf("\033[48;2;%d;%d;%dm", pixels[i * row_length + j], pixels[i * row_length + j + 1], pixels[i * row_length + j + 2]); + else + printf("\033[48;2;255;0;255m"); + + if(pixels[(i + 1) * row_length + j + 3]) + printf("\033[38;2;%d;%d;%dm", pixels[(i + 1) * row_length + j], pixels[(i + 1) * row_length + j + 1], pixels[(i + 1) * row_length + j + 2]); + else + printf("\033[38;2;255;0;255m"); + + printf("▄"); + } + + puts("\033[m"); + } + + fflush(stdout); + + png_destroy_read_struct(&png_ptr, &info_ptr, NULL); fclose(input_png_file); return 0; diff --git a/assets/asset_builder/src/headers/asset_file.h b/assets/asset_builder/src/headers/asset_file.h index 11e6080..12678cd 100644 --- a/assets/asset_builder/src/headers/asset_file.h +++ b/assets/asset_builder/src/headers/asset_file.h @@ -2,15 +2,18 @@ #define ASSET_FILE_H #include +#include typedef struct asset_def_t { - const char *name; + char *name; uint32_t start, end; } asset_def_t; typedef struct asset_file_header_t { uint32_t assets_number; asset_def_t *assets_def; + + size_t header_size; } asset_file_header_t; int parse_file_for_header(const char *file_name, asset_def_t *asset_def); diff --git a/assets/asset_builder/src/main.c b/assets/asset_builder/src/main.c index 8895d0b..9f49f6b 100644 --- a/assets/asset_builder/src/main.c +++ b/assets/asset_builder/src/main.c @@ -1,5 +1,6 @@ #include - +#include +#include #include "asset_file.h" void print_error(const char *content) @@ -10,11 +11,9 @@ void print_error(const char *content) int main(int argc, char *argv[]) { // Verify arguments minimum number. - printf("%d args\n", argc); - if(argc < 3) { - print_error("not enough args."); + printf("\033[33musage\033[m: asset_builder output_file input_file [input_file_2 ...]"); return -1; } @@ -22,7 +21,7 @@ int main(int argc, char *argv[]) puts(argv[i]); // Create and open output file. - FILE *output_asset = fopen(argv[2], "wb"); + FILE *output_asset = fopen(argv[1], "wb"); if(!output_asset) { @@ -34,34 +33,66 @@ int main(int argc, char *argv[]) asset_file_header_t asset_file_header; asset_file_header.assets_number = argc - 2; + asset_file_header.assets_def = malloc(asset_file_header.assets_number * sizeof(asset_def_t)); + asset_file_header.header_size = sizeof(uint32_t) + sizeof(uint32_t) * 2 * asset_file_header.assets_number; - for(size_t i = 2; i < (size_t)argc; i++) + for(size_t i = 0; i < asset_file_header.assets_number; i++) { - asset_def_t asset_def; - int ret = parse_file_for_header(argv[i], &asset_def); + // Fill asset_def. + int ret = parse_file_for_header(argv[i + 2], &asset_file_header.assets_def[i]); if(ret) { - puts(argv[i]); - switch(ret) { case -1: print_error("file does not have an extension."); return -1; + case -2: print_error("extension not yet supported."); return -1; + case -3: print_error("failed to open file."); return -1; + case -4: print_error("file not valid."); return -1; + case -5: print_error("memory allocation failed."); return -1; + + case -6: + print_error("png bit depth not supported."); + return -1; + + case -7: + print_error("png color type not supported."); + return -1; + + default: + print_error("unknown error"); + return -1; } } + asset_file_header.header_size += strlen(asset_file_header.assets_def[i].name); + } + + asset_file_header.assets_def[0].start = asset_file_header.header_size + 1; + asset_file_header.assets_def[0].end += asset_file_header.assets_def[0].start; + + for(size_t i = 1; i < asset_file_header.assets_number; i++) + { + // Adjust start and end. + asset_file_header.assets_def[i].start = asset_file_header.assets_def[i - 1].end + 1; + asset_file_header.assets_def[i].end += asset_file_header.assets_def[i].start; + } + + for(size_t i = 0; i < asset_file_header.assets_number; i++) + { + printf("%s : %d - %d\n", asset_file_header.assets_def[i].name, asset_file_header.assets_def[i].start, asset_file_header.assets_def[i].end); } return 0;