1 files changed, 23 insertions, 34 deletions

diff --git a/include/isogfx/isogfx.h b/include/isogfx/isogfx.h
index 3421a7b..93c6d4e 100644
--- a/include/isogfx/isogfx.h
+++ b/include/isogfx/isogfx.h
@@ -3,26 +3,18 @@
  */
 #pragma once
 
-#include <stdbool.h>
+#include <isogfx/types.h>
+
+#include <stddef.h>
 #include <stdint.h>
 
 typedef struct IsoGfx IsoGfx;
 
 /// Sprite sheet handle.
-typedef uint16_t SpriteSheet;
+typedef uintptr_t SpriteSheet;
 
 /// Sprite handle.
-typedef uint16_t Sprite;
-
-/// Tile handle.
-typedef uint16_t Tile;
-
-/// Colour channel.
-typedef uint8_t Channel;
-
-typedef struct Pixel {
-  Channel r, g, b, a;
-} Pixel;
+typedef uintptr_t Sprite;
 
 typedef enum TileDescType {
   TileFromColour,
@@ -32,32 +24,32 @@ typedef enum TileDescType {
 
 typedef struct TileDesc {
   TileDescType type;
-  int          width;  /// Tile width in pixels.
-  int          height; /// Tile height in pixels.
+  int          width;  // Tile width in pixels.
+  int          height; // Tile height in pixels.
   union {
-    Pixel colour; /// Constant colour tile.
+    Pixel colour; // Constant colour tile.
     struct {
       const char* path;
     } file;
     struct {
-      const uint8_t* data; /// sizeof(Pixel) * width * height
+      const uint8_t* data; // sizeof(Pixel) * width * height
     } mem;
   };
 } TileDesc;
 
 typedef struct WorldDesc {
-  int tile_width;    /// Base tile width in pixels.
-  int tile_height;   /// Base tile height in pixels.
-  int world_width;   /// World width in tiles.
-  int world_height;  /// World height in tiles.
-  int max_num_tiles; /// 0 for an implementation-defined default.
+  int tile_width;   // Base tile width in pixels.
+  int tile_height;  // Base tile height in pixels.
+  int world_width;  // World width in tiles.
+  int world_height; // World height in tiles.
+  int num_tiles;    // Number of tiles to allocate memory for.
 } WorldDesc;
 
 typedef struct IsoGfxDesc {
-  int screen_width;                 /// Screen width in pixels.
-  int screen_height;                /// Screen height in pixels.
-  int max_num_sprites;              /// 0 for an implementation-defined default.
-  int sprite_sheet_pool_size_bytes; /// 0 for an implementation-defined default.
+  void*  memory;        // Block of memory for the engine to use.
+  size_t memory_size;   // Size of memory block in bytes.
+  int    screen_width;  // Screen width in pixels.
+  int    screen_height; // Screen height in pixels.
 } IsoGfxDesc;
 
 /// Create a new isometric graphics engine.
@@ -66,8 +58,11 @@ IsoGfx* isogfx_new(const IsoGfxDesc*);
 /// Destroy the isometric graphics engine.
 void isogfx_del(IsoGfx**);
 
+/// Clear all loaded worlds and sprites.
+void isogfx_clear(IsoGfx*);
+
 /// Create an empty world.
-bool isogfx_make_world(IsoGfx*, const WorldDesc*);
+void isogfx_make_world(IsoGfx*, const WorldDesc*);
 
 /// Load a world from a tile map (.TM) file.
 bool isogfx_load_world(IsoGfx*, const char* filepath);
@@ -88,14 +83,11 @@ void isogfx_set_tile(IsoGfx*, int x, int y, Tile);
 void isogfx_set_tiles(IsoGfx*, int x0, int y0, int x1, int y1, Tile);
 
 /// Load a sprite sheet (.SS) file.
-bool isogfx_load_sprite_sheet(IsoGfx*, const char* filepath, SpriteSheet*);
+SpriteSheet isogfx_load_sprite_sheet(IsoGfx*, const char* filepath);
 
 /// Create an animated sprite.
 Sprite isogfx_make_sprite(IsoGfx*, SpriteSheet);
 
-/// Destroy the sprite.
-void isogfx_del_sprite(IsoGfx*, Sprite);
-
 /// Destroy all the sprites.
 void isogfx_del_sprites(IsoGfx*);
 
@@ -120,9 +112,6 @@ void isogfx_render(IsoGfx*);
 /// position (x,y) instead, use isogfx_set_tile().
 void isogfx_draw_tile(IsoGfx*, int x, int y, Tile);
 
-/// Resize the virtual screen's dimensions.
-bool isogfx_resize(IsoGfx*, int screen_width, int screen_height);
-
 /// Get the virtual screen's dimensions.
 void isogfx_get_screen_size(const IsoGfx*, int* width, int* height);