Clean up variable and macro naming

1 files changed, 38 insertions, 60 deletions

diff --git a/src/main.c b/src/main.c
index b3b86bc..bcd72c9 100644
--- a/src/main.c
+++ b/src/main.c
@@ -5,9 +5,9 @@
 #define STB_IMAGE_IMPLEMENTATION
 #include "stb_image.h"
 
-#define TILE_SIZE_X 8
-#define TILE_SIZE_Y 8
-#define PALETTE_SIZE 16
+#define TILE_SIZE 8
+#define DEFAULT_PALETTE_SIZE 16
+#define DEFAULT_BG_COLOR 0x0000
 
 typedef u16 Color;
 
@@ -16,25 +16,19 @@ rgb15(u32 red, u32 green, u32 blue ) {
     return (blue << 10) | (green << 5) | red;
 }
 
-// TODO: Assuming 8bpp tiles. The tile is an index to a palette.
-typedef struct Tile {
-    u32 data[8];
-} Tile;
-
-typedef u16 Palette[PALETTE_SIZE];
-
-// TODO: Support passing a background parameter.
-// TODO: Add option to flip sprites horizontally or vertically.
+// TODO: Assuming 4bpp tiles. The tile is an index to a palette.
+// TODO: Write more documentation about this.
+typedef u32 Tile[TILE_SIZE];
 
 void
-export_c_file(Tile *tiles, Palette palette, size_t n_tiles) {
+export_c_file(Tile *tiles, Color *palette, size_t n_tiles, size_t palette_size) {
     // Output tiles.
-    printf("u32 tiles[][8] = {\n");
+    printf("u32 tiles[][%u] = {\n", TILE_SIZE);
     for (size_t i = 0; i < n_tiles; ++i) {
         printf("    {");
-        for (size_t j = 0; j < 8; ++j) {
-            printf("0x%08x", tiles[i].data[j]);
-            if (j != (8 - 1)) {
+        for (size_t j = 0; j < TILE_SIZE; ++j) {
+            printf("0x%08x", tiles[i][j]);
+            if (j != (TILE_SIZE - 1)) {
                 printf(", ");
             }
         }
@@ -44,15 +38,17 @@ export_c_file(Tile *tiles, Palette palette, size_t n_tiles) {
     printf("\n");
 
     // Output palette.
-    printf("u16 palette[16] = {\n");
+    printf("u16 palette[%u] = {\n", palette_size);
     printf("    ");
-    for (size_t i = 0; i < PALETTE_SIZE; ++i) {
-            if (i % 4 == 0 && i != 0) {
+    size_t counter = 0;
+    for (size_t i = 0; i < palette_size; ++i, ++counter) {
+            if (counter == 4) {
+                counter = 0;
                 printf("\n    ");
             }
-            printf("0x%04x", palette[i]);
-            if (i != (PALETTE_SIZE - 1)) {
-                printf(", ");
+            printf("0x%04x,", palette[i]);
+            if (counter < 3) {
+                printf(" ");
             }
     }
     printf("\n");
@@ -70,7 +66,8 @@ print_usage(void) {
 
 int
 main(int argc, char *argv[]) {
-    u16 background_color = 0x0000;
+    u16 background_color = DEFAULT_BG_COLOR;
+    u16 palette_size = DEFAULT_PALETTE_SIZE;
 
     int option;
     while ((option = getopt(argc, argv, "hb:")) != -1) {
@@ -81,15 +78,14 @@ main(int argc, char *argv[]) {
             //           number of parameters 8x8, 16x16, 16x8, etc.
             case 'b': {
                 char *bg = optarg;
-                printf("Background color: %s\n", bg);
                 if (strlen(bg) != 6) {
                     fprintf(stderr, "%s: Invalid background color.\n", BIN_NAME);
                     print_usage();
                     return EXIT_FAILURE;
                 }
-                int red = 0;
-                int green = 0;
-                int blue = 0;
+                unsigned int red = 0;
+                unsigned int green = 0;
+                unsigned int blue = 0;
 
                 // Undefined behaviour, here we go! Also, no error checks, so if
                 // an invalid number is given it will be parsed as 0.
@@ -126,8 +122,8 @@ main(int argc, char *argv[]) {
     char *file_name = argv[optind];
 
     // Fill the palette with the background color if one was given.
-    Palette palette;
-    for (size_t i = 0; i < PALETTE_SIZE; ++i) {
+    Color *palette = malloc(palette_size * sizeof(Color));
+    for (size_t i = 0; i < palette_size; ++i) {
         palette[i] = background_color;
     }
 
@@ -145,17 +141,16 @@ main(int argc, char *argv[]) {
 
     // TODO: Implement support for different file inputs.
     if (n != 3) {
-        fprintf(stderr, "No support for this file format. Only supporting 3 channel files for now.\n");
+        fprintf(stderr, "File format not supported. Only 3 channel files for now.\n");
         return EXIT_FAILURE;
     }
 
-    int n_tiles_x = x / TILE_SIZE_X;
-    int n_tiles_y = y / TILE_SIZE_Y;
+    int n_tiles_x = x / TILE_SIZE;
+    int n_tiles_y = y / TILE_SIZE;
     int n_tiles = n_tiles_x * n_tiles_y;
 
     // Allocate memory for the tiles in this file.
     Tile *tiles = malloc(n_tiles * sizeof(Tile));
-    // Palette palette = {0};
 
     // NOTE: We are going to brute-force this for now. Checking if the color is
     // in the palette and add it to the next slot if possible. In the future we
@@ -164,9 +159,9 @@ main(int argc, char *argv[]) {
     int tile_offset_x = 0;
     int tile_offset_y = 0;
     for (size_t k = 0; k < n_tiles; ++k) {
-        for (size_t j = 0; j < TILE_SIZE_Y; ++j) {
+        for (size_t j = 0; j < TILE_SIZE; ++j) {
             u32 col_index = 0x00000000;
-            for (size_t i = 0; i < TILE_SIZE_X; ++i) {
+            for (size_t i = 0; i < TILE_SIZE; ++i) {
                 // Find the memory index for this pixel.
                 int idx = (i + tile_offset_x) + (j + tile_offset_y) * x;
                 idx *= n;
@@ -182,7 +177,9 @@ main(int argc, char *argv[]) {
 
                 Color clr = rgb15(red, green, blue);
                 bool found = false;
-                for (size_t p = 0; p < PALETTE_SIZE; ++p) {
+                // TODO: If the palette is full, find the closest perceived
+                // color instead.
+                for (size_t p = 0; p < palette_size; ++p) {
                     if (clr == palette[p]) {
                         col_index |= (p & 0xF) << ((i) * 4) ;
                         found = true;
@@ -194,35 +191,16 @@ main(int argc, char *argv[]) {
                     palette[pal_idx++] = clr;
                 }
             }
-            (tiles + k)->data[j] = col_index;
+            tiles[k][j] = col_index;
         }
-        tile_offset_x += TILE_SIZE_X;
+        tile_offset_x += TILE_SIZE;
         if (tile_offset_x >= x) {
             tile_offset_x = 0;
-            tile_offset_y += TILE_SIZE_Y;
+            tile_offset_y += TILE_SIZE;
         }
     }
 
-    // DEBUG:...
-    // printf("PALETTE:\n");
-    // for (size_t j = 0; j < PALETTE_SIZE; ++j) {
-    //     printf("0x%x ", palette[j]);
-    // }
-    // printf("\n");
-
-    // printf("TILES:\n");
-    // for (size_t j = 0; j < n_tiles; ++j) {
-    //     for (size_t i = 0; i < 8; ++i) {
-    //         printf("0x%08x ", (tiles + j)->data[i]);
-    //     }
-    //     printf("\n");
-    // }
-
-    // printf("x: %d  y: %d  n: %d\n", x, y, n);
-    // for (size_t i = 0; i < 3 * 8; ++i) {
-    //     printf("0x%x\n", data[i]);
-    // }
-    export_c_file(tiles, palette, n_tiles);
+    export_c_file(tiles, palette, n_tiles, palette_size);
     stbi_image_free(data);
     return EXIT_SUCCESS;
 }