refactor some things...

src/pxl8_tilesheet.c

@@ -6,17 +6,47 @@
 #include "pxl8_tilesheet.h"
 #include "pxl8_tilemap.h"
 
-void pxl8_tilesheet_free(pxl8_tilesheet* tilesheet) {
+struct pxl8_tilesheet {
+    u8* data;
+    bool* tile_valid;
+
+    u32 height;
+    u32 tile_size;
+    u32 tiles_per_row;
+    u32 total_tiles;
+    u32 width;
+
+    pxl8_color_mode color_mode;
+    u32 ref_count;
+
+    pxl8_tile_animation* animations;
+    u32 animation_count;
+
+    pxl8_tile_properties* properties;
+
+    pxl8_autotile_rule** autotile_rules;
+    u32* autotile_rule_counts;
+};
+
+pxl8_tilesheet* pxl8_tilesheet_create(u32 tile_size) {
+    pxl8_tilesheet* tilesheet = calloc(1, sizeof(pxl8_tilesheet));
+    if (!tilesheet) return NULL;
+
+    tilesheet->tile_size = tile_size;
+    tilesheet->ref_count = 1;
+
+    return tilesheet;
+}
+
+void pxl8_tilesheet_destroy(pxl8_tilesheet* tilesheet) {
     if (!tilesheet) return;
 
     if (tilesheet->data) {
         free(tilesheet->data);
-        tilesheet->data = NULL;
     }
 
     if (tilesheet->tile_valid) {
         free(tilesheet->tile_valid);
-        tilesheet->tile_valid = NULL;
     }
 
     if (tilesheet->animations) {
@@ -26,12 +56,10 @@ void pxl8_tilesheet_free(pxl8_tilesheet* tilesheet) {
             }
         }
         free(tilesheet->animations);
-        tilesheet->animations = NULL;
     }
 
     if (tilesheet->properties) {
         free(tilesheet->properties);
-        tilesheet->properties = NULL;
     }
 
     if (tilesheet->autotile_rules) {
@@ -42,12 +70,12 @@ void pxl8_tilesheet_free(pxl8_tilesheet* tilesheet) {
         }
         free(tilesheet->autotile_rules);
         free(tilesheet->autotile_rule_counts);
-        tilesheet->autotile_rules = NULL;
-        tilesheet->autotile_rule_counts = NULL;
     }
+
+    free(tilesheet);
 }
 
-pxl8_result pxl8_tilesheet_load(pxl8_tilesheet* tilesheet, const char* filepath, pxl8_gfx_ctx* gfx) {
+pxl8_result pxl8_tilesheet_load(pxl8_tilesheet* tilesheet, const char* filepath, pxl8_gfx* gfx) {
     if (!tilesheet || !filepath || !gfx) return PXL8_ERROR_NULL_POINTER;
 
     pxl8_ase_file ase_file;
@@ -74,16 +102,16 @@ pxl8_result pxl8_tilesheet_load(pxl8_tilesheet* tilesheet, const char* filepath,
     tilesheet->height = height;
     tilesheet->tiles_per_row = width / tilesheet->tile_size;
     tilesheet->total_tiles = (width / tilesheet->tile_size) * (height / tilesheet->tile_size);
-    tilesheet->color_mode = gfx->color_mode;
+    tilesheet->color_mode = pxl8_gfx_get_color_mode(gfx);
 
     size_t data_size = width * height;
-    if (gfx->color_mode == PXL8_COLOR_MODE_HICOLOR) {
+    if (pxl8_gfx_get_color_mode(gfx) == PXL8_COLOR_MODE_HICOLOR) {
         data_size *= 4;
     }
 
     tilesheet->data = malloc(data_size);
     if (!tilesheet->data) {
-        pxl8_ase_free(&ase_file);
+        pxl8_ase_destroy(&ase_file);
         return PXL8_ERROR_OUT_OF_MEMORY;
     }
 
@@ -95,7 +123,7 @@ pxl8_result pxl8_tilesheet_load(pxl8_tilesheet* tilesheet, const char* filepath,
     if (!tilesheet->tile_valid) {
         free(tilesheet->data);
         tilesheet->data = NULL;
-        pxl8_ase_free(&ase_file);
+        pxl8_ase_destroy(&ase_file);
         return PXL8_ERROR_OUT_OF_MEMORY;
     }
 
@@ -135,11 +163,11 @@ pxl8_result pxl8_tilesheet_load(pxl8_tilesheet* tilesheet, const char* filepath,
               filepath, width, height, valid_tiles, tilesheet->total_tiles,
               tilesheet->tile_size, tilesheet->tile_size);
 
-    pxl8_ase_free(&ase_file);
+    pxl8_ase_destroy(&ase_file);
     return PXL8_OK;
 }
 
-void pxl8_tilesheet_render_tile(const pxl8_tilesheet* tilesheet, pxl8_gfx_ctx* gfx,
+void pxl8_tilesheet_render_tile(const pxl8_tilesheet* tilesheet, pxl8_gfx* gfx,
                                 u16 tile_id, i32 x, i32 y, u8 flags) {
     if (!tilesheet || !gfx || !tilesheet->data) return;
     if (tile_id == 0 || tile_id > tilesheet->total_tiles) return;
@@ -163,8 +191,8 @@ void pxl8_tilesheet_render_tile(const pxl8_tilesheet* tilesheet, pxl8_gfx_ctx* g
                 i32 screen_x = x + px;
                 i32 screen_y = y + py;
 
-                if (screen_x >= 0 && screen_x < gfx->framebuffer_width &&
-                    screen_y >= 0 && screen_y < gfx->framebuffer_height) {
+                if (screen_x >= 0 && screen_x < pxl8_gfx_get_width(gfx) &&
+                    screen_y >= 0 && screen_y < pxl8_gfx_get_height(gfx)) {
                     pxl8_pixel(gfx, screen_x, screen_y, color_idx);
                 }
             }
@@ -186,7 +214,7 @@ void pxl8_tilesheet_unref(pxl8_tilesheet* tilesheet) {
     if (!tilesheet) return;
 
     if (--tilesheet->ref_count == 0) {
-        pxl8_tilesheet_free(tilesheet);
+        pxl8_tilesheet_destroy(tilesheet);
     }
 }
 
@@ -261,6 +289,10 @@ const pxl8_tile_properties* pxl8_tilesheet_get_tile_property(const pxl8_tileshee
     return &tilesheet->properties[tile_id];
 }
 
+u32 pxl8_tilesheet_get_tile_size(const pxl8_tilesheet* tilesheet) {
+    return tilesheet ? tilesheet->tile_size : 0;
+}
+
 pxl8_result pxl8_tilesheet_add_autotile_rule(pxl8_tilesheet* tilesheet, u16 base_tile_id,
                                              u8 neighbor_mask, u16 result_tile_id) {
     if (!tilesheet || base_tile_id == 0 || base_tile_id > tilesheet->total_tiles) {