12 files changed, 213 insertions, 194 deletions

diff --git a/gfx-iso/CMakeLists.txt b/gfx-iso/CMakeLists.txt
index 993bbb3..673cb68 100644
--- a/gfx-iso/CMakeLists.txt
+++ b/gfx-iso/CMakeLists.txt
@@ -2,33 +2,42 @@ cmake_minimum_required(VERSION 3.0)
 
 project(isogfx)
 
-set(CMAKE_C_STANDARD 11)
+set(CMAKE_C_STANDARD 17)
 set(CMAKE_C_STANDARD_REQUIRED On)
 set(CMAKE_C_EXTENSIONS Off)
 
+# isogfx
+
 add_library(isogfx
   src/isogfx.c)
 
 target_include_directories(isogfx PUBLIC
   include)
 
-target_link_libraries(isogfx PRIVATE
+target_link_libraries(isogfx PUBLIC
   filesystem
   mem
   mempool)
 
 target_compile_options(isogfx PRIVATE -Wall -Wextra -Wpedantic)
 
-# Demo
+# App
 
-project(isogfx-app)
+add_library(isogfx-app
+  src/app.c)
 
-add_executable(isogfx-app
-  app/checkerboard.c
-  app/isogfx-demo.c
-  app/main.c)
+target_include_directories(isogfx-app PUBLIC
+  include)
 
-target_link_libraries(isogfx-app PRIVATE
-  gfx
+target_link_libraries(isogfx-app PUBLIC
   gfx-app
   isogfx)
+
+target_link_libraries(isogfx-app PRIVATE
+  gfx)
+
+target_compile_options(isogfx-app PRIVATE -Wall -Wextra -Wpedantic)
+
+# Demos
+
+add_subdirectory(demos)
diff --git a/gfx-iso/app/app.h b/gfx-iso/app/app.h
deleted file mode 100644
index 25e55eb..0000000
--- a/gfx-iso/app/app.h
+++ /dev/null
@@ -1,12 +0,0 @@
-#pragma once
-
-typedef struct IsoGfx    IsoGfx;
-typedef struct IsoGfxApp IsoGfxApp;
-
-typedef struct IsoGfxApp {
-  int   pixel_scale; // 0 or 1 for 1:1 scale.
-  void* state;
-  void (*shutdown)(IsoGfx*, void* state);
-  void (*update)(IsoGfx*, void* state, double t, double dt);
-  void (*render)(IsoGfx*, void* state);
-} IsoGfxApp;
diff --git a/gfx-iso/app/checkerboard.h b/gfx-iso/app/checkerboard.h
deleted file mode 100644
index 61725a5..0000000
--- a/gfx-iso/app/checkerboard.h
+++ /dev/null
@@ -1,9 +0,0 @@
-#pragma once
-
-#include "app.h"
-
-#include <stdbool.h>
-
-typedef struct IsoGfxApp IsoGfxApp;
-
-bool make_checkerboard_app(IsoGfx*, IsoGfxApp*);
diff --git a/gfx-iso/app/isogfx-demo.h b/gfx-iso/app/isogfx-demo.h
deleted file mode 100644
index d099824..0000000
--- a/gfx-iso/app/isogfx-demo.h
+++ /dev/null
@@ -1,9 +0,0 @@
-#pragma once
-
-#include "app.h"
-
-#include <stdbool.h>
-
-typedef struct IsoGfxApp IsoGfxApp;
-
-bool make_demo_app(IsoGfx*, IsoGfxApp*);
diff --git a/gfx-iso/demos/CMakeLists.txt b/gfx-iso/demos/CMakeLists.txt
new file mode 100644
index 0000000..c0a4101
--- /dev/null
+++ b/gfx-iso/demos/CMakeLists.txt
@@ -0,0 +1,2 @@
+add_subdirectory(checkerboard)
+add_subdirectory(isomap)
diff --git a/gfx-iso/demos/checkerboard/CMakeLists.txt b/gfx-iso/demos/checkerboard/CMakeLists.txt
new file mode 100644
index 0000000..f178262
--- /dev/null
+++ b/gfx-iso/demos/checkerboard/CMakeLists.txt
@@ -0,0 +1,15 @@
+cmake_minimum_required(VERSION 3.0)
+
+project(checkerboard)
+
+set(CMAKE_C_STANDARD 17)
+set(CMAKE_C_STANDARD_REQUIRED On)
+set(CMAKE_C_EXTENSIONS Off)
+
+add_executable(checkerboard
+  checkerboard.c)
+
+target_link_libraries(checkerboard PRIVATE
+  isogfx-app)
+
+target_compile_options(checkerboard PRIVATE -Wall -Wextra -Wpedantic)
diff --git a/gfx-iso/app/checkerboard.c b/gfx-iso/demos/checkerboard/checkerboard.c
index 8b394c4..9730aea 100644
--- a/gfx-iso/app/checkerboard.c
+++ b/gfx-iso/demos/checkerboard/checkerboard.c
@@ -1,12 +1,9 @@
-#include "isogfx-demo.h"
-
-#include <gfx/gfx_app.h>
+#include <isogfx/app.h>
 #include <isogfx/isogfx.h>
 
 #include <assert.h>
 #include <stdbool.h>
 #include <stdio.h>
-#include <stdlib.h>
 
 static const int TILE_WIDTH   = 64;
 static const int TILE_HEIGHT  = TILE_WIDTH / 2;
@@ -34,11 +31,11 @@ typedef enum Colour {
   Red,
 } Colour;
 
-typedef struct State {
+typedef struct IsoGfxAppState {
   Tile red;
   int  xpick;
   int  ypick;
-} State;
+} IsoGfxAppState;
 
 static void make_checkerboard(IsoGfx* iso, Tile black, Tile white) {
   assert(iso);
@@ -52,17 +49,36 @@ static void make_checkerboard(IsoGfx* iso, Tile black, Tile white) {
   }
 }
 
-static void shutdown(IsoGfx* iso, void* app_state) {
+static bool init(
+    IsoGfxAppState* state, IsoGfx* iso, int argc, const char** argv) {
+  assert(state);
   assert(iso);
-  if (app_state) {
-    free(app_state);
+
+  if (!isogfx_make_world(
+          iso, &(WorldDesc){
+                   .tile_width   = TILE_WIDTH,
+                   .tile_height  = TILE_HEIGHT,
+                   .world_width  = WORLD_WIDTH,
+                   .world_height = WORLD_HEIGHT})) {
+    return false;
   }
+
+  const Tile black = isogfx_make_tile(iso, &tile_set[Black]);
+  const Tile white = isogfx_make_tile(iso, &tile_set[White]);
+  state->red       = isogfx_make_tile(iso, &tile_set[Red]);
+  make_checkerboard(iso, black, white);
+
+  return true;
 }
 
-static void update(IsoGfx* iso, void* app_state, double t, double dt) {
+static void shutdown(IsoGfxAppState* state, IsoGfx* iso) {
+  assert(state);
+  assert(iso);
+}
+
+static void update(IsoGfxAppState* state, IsoGfx* iso, double t, double dt) {
+  assert(state);
   assert(iso);
-  assert(app_state);
-  State* state = (State*)(app_state);
 
   double mouse_x, mouse_y;
   gfx_app_get_mouse_position(&mouse_x, &mouse_y);
@@ -72,49 +88,27 @@ static void update(IsoGfx* iso, void* app_state, double t, double dt) {
   printf("Picked tile: (%d, %d)\n", state->xpick, state->ypick);
 }
 
-static void render(IsoGfx* iso, void* app_state) {
+static void render(IsoGfxAppState* state, IsoGfx* iso) {
+  assert(state);
   assert(iso);
-  assert(app_state);
-  State* state = (State*)(app_state);
 
   isogfx_render(iso);
+
   if ((state->xpick != -1) && (state->ypick != -1)) {
     isogfx_draw_tile(iso, state->xpick, state->ypick, state->red);
   }
 }
 
-bool make_checkerboard_app(IsoGfx* iso, IsoGfxApp* app) {
-  assert(iso);
-  assert(app);
-
-  State* state = calloc(1, sizeof(State));
-  if (!state) {
-    return false;
-  }
-
-  if (!isogfx_make_world(
-          iso, &(WorldDesc){
-                   .tile_width   = TILE_WIDTH,
-                   .tile_height  = TILE_HEIGHT,
-                   .world_width  = WORLD_WIDTH,
-                   .world_height = WORLD_HEIGHT})) {
-    goto cleanup;
-  }
-
-  const Tile black = isogfx_make_tile(iso, &tile_set[Black]);
-  const Tile white = isogfx_make_tile(iso, &tile_set[White]);
-  state->red       = isogfx_make_tile(iso, &tile_set[Red]);
-  make_checkerboard(iso, black, white);
-  isogfx_render(iso);
-
-  app->state    = state;
-  app->shutdown = shutdown;
-  app->update   = update;
-  app->render   = render;
-
-  return true;
-
-cleanup:
-  free(state);
-  return false;
+int main(int argc, const char** argv) {
+  IsoGfxAppState state = {0};
+  iso_run(
+      argc, argv,
+      &(IsoGfxApp){
+          .state    = &state,
+          .init     = init,
+          .shutdown = shutdown,
+          .update   = update,
+          .render   = render,
+      });
+  return 0;
 }
diff --git a/gfx-iso/demos/isomap/CMakeLists.txt b/gfx-iso/demos/isomap/CMakeLists.txt
new file mode 100644
index 0000000..13edcc7
--- /dev/null
+++ b/gfx-iso/demos/isomap/CMakeLists.txt
@@ -0,0 +1,15 @@
+cmake_minimum_required(VERSION 3.0)
+
+project(isomap)
+
+set(CMAKE_C_STANDARD 17)
+set(CMAKE_C_STANDARD_REQUIRED On)
+set(CMAKE_C_EXTENSIONS Off)
+
+add_executable(isomap
+  isomap.c)
+
+target_link_libraries(isomap PRIVATE
+  isogfx-app)
+
+target_compile_options(isomap PRIVATE -Wall -Wextra -Wpedantic)
diff --git a/gfx-iso/app/isogfx-demo.c b/gfx-iso/demos/isomap/isomap.c
index 9889275..d204d28 100644
--- a/gfx-iso/app/isogfx-demo.c
+++ b/gfx-iso/demos/isomap/isomap.c
@@ -1,31 +1,45 @@
-#include "isogfx-demo.h"
-
-#include <gfx/gfx_app.h>
+#include <isogfx/app.h>
 #include <isogfx/isogfx.h>
 
 #include <assert.h>
 #include <stdbool.h>
-#include <stdio.h>
-#include <stdlib.h>
 
-typedef struct State {
+typedef struct IsoGfxAppState {
   int         xpick;
   int         ypick;
   SpriteSheet stag_sheet;
   Sprite      stag;
-} State;
+} IsoGfxAppState;
 
-static void shutdown(IsoGfx* iso, void* app_state) {
+static bool init(
+    IsoGfxAppState* state, IsoGfx* iso, int argc, const char** argv) {
+  assert(state);
   assert(iso);
-  if (app_state) {
-    free(app_state);
+
+  if (!isogfx_load_world(iso, "/home/jeanne/assets/tilemaps/demo1.tm")) {
+    return false;
+  }
+
+  if (!isogfx_load_sprite_sheet(
+          iso, "/home/jeanne/assets/tilesets/scrabling/critters/stag/stag.ss",
+          &state->stag_sheet)) {
+    return false;
   }
+
+  state->stag = isogfx_make_sprite(iso, state->stag_sheet);
+  isogfx_set_sprite_position(iso, state->stag, 5, 4);
+
+  return true;
 }
 
-static void update(IsoGfx* iso, void* app_state, double t, double dt) {
+static void shutdown(IsoGfxAppState* state, IsoGfx* iso) {
+  assert(state);
+  assert(iso);
+}
+
+static void update(IsoGfxAppState* state, IsoGfx* iso, double t, double dt) {
+  assert(state);
   assert(iso);
-  assert(app_state);
-  State* state = (State*)(app_state);
 
   double mouse_x, mouse_y;
   gfx_app_get_mouse_position(&mouse_x, &mouse_y);
@@ -35,45 +49,24 @@ static void update(IsoGfx* iso, void* app_state, double t, double dt) {
   // printf("Picked tile: (%d, %d)\n", state->xpick, state->ypick);
 }
 
-static void render(IsoGfx* iso, void* app_state) {
+static void render(IsoGfxAppState* state, IsoGfx* iso) {
+  assert(state);
   assert(iso);
-  assert(app_state);
-  State* state = (State*)(app_state);
 
   isogfx_render(iso);
 }
 
-bool make_demo_app(IsoGfx* iso, IsoGfxApp* app) {
-  assert(iso);
-  assert(app);
-
-  State* state = calloc(1, sizeof(State));
-  if (!state) {
-    return false;
-  }
-
-  if (!isogfx_load_world(iso, "/home/jeanne/assets/tilemaps/demo1.tm")) {
-    goto cleanup;
-  }
-
-  if (!isogfx_load_sprite_sheet(
-          iso, "/home/jeanne/assets/tilesets/scrabling/critters/stag/stag.ss",
-          &state->stag_sheet)) {
-    goto cleanup;
-  }
-
-  state->stag = isogfx_make_sprite(iso, state->stag_sheet);
-  isogfx_set_sprite_position(iso, state->stag, 5, 4);
-
-  app->pixel_scale = 2;
-  app->state       = state;
-  app->shutdown    = shutdown;
-  app->update      = update;
-  app->render      = render;
-
-  return true;
-
-cleanup:
-  free(state);
-  return false;
+int main(int argc, const char** argv) {
+  IsoGfxAppState state = {0};
+  iso_run(
+      argc, argv,
+      &(IsoGfxApp){
+          .pixel_scale = 2,
+          .state       = &state,
+          .init        = init,
+          .shutdown    = shutdown,
+          .update      = update,
+          .render      = render,
+      });
+  return 0;
 }
diff --git a/gfx-iso/include/isogfx/app.h b/gfx-iso/include/isogfx/app.h
new file mode 100644
index 0000000..0a0fcc1
--- /dev/null
+++ b/gfx-iso/include/isogfx/app.h
@@ -0,0 +1,22 @@
+#pragma once
+
+#include <gfx/gfx_app.h>
+
+#include <stdbool.h>
+
+typedef struct IsoGfx    IsoGfx;
+typedef struct IsoGfxApp IsoGfxApp;
+
+typedef struct IsoGfxAppState IsoGfxAppState;
+
+typedef struct IsoGfxApp {
+  int             pixel_scale; // 0 or 1 for 1:1 scale.
+  IsoGfxAppState* state;
+
+  bool (*init)(IsoGfxAppState*, IsoGfx*, int argc, const char** argv);
+  void (*shutdown)(IsoGfxAppState*, IsoGfx*);
+  void (*update)(IsoGfxAppState*, IsoGfx*, double t, double dt);
+  void (*render)(IsoGfxAppState*, IsoGfx*);
+} IsoGfxApp;
+
+void iso_run(int argc, const char** argv, IsoGfxApp*);
diff --git a/gfx-iso/app/main.c b/gfx-iso/src/app.c
index 050a42f..079ac96 100644
--- a/gfx-iso/app/main.c
+++ b/gfx-iso/src/app.c
@@ -1,7 +1,4 @@
-#include "app.h"
-#include "checkerboard.h"
-#include "isogfx-demo.h"
-
+#include <isogfx/app.h>
 #include <isogfx/isogfx.h>
 
 #include <gfx/gfx.h>
@@ -18,37 +15,40 @@
 
 static const int SCREEN_WIDTH  = 1408;
 static const int SCREEN_HEIGHT = 960;
+static const int MAX_FPS       = 60;
 
-typedef struct State {
-  Gfx*      gfx;
-  IsoGfx*   iso;
-  IsoGfxApp app;
-  Texture*  screen_texture;
-  Scene*    scene;
-} State;
-
-static bool init(const GfxAppDesc* desc, void** app_state) {
-  State* state = calloc(1, sizeof(State));
-  if (!state) {
-    return false;
-  }
+typedef struct AppState {
+  Gfx*       gfx;
+  IsoGfx*    iso;
+  IsoGfxApp* app;
+  Texture*   screen_texture;
+  Scene*     scene;
+} AppState;
+
+typedef struct GfxAppState {
+  AppState state;
+} GfxAppState;
+
+static bool init(GfxAppState* gfx_app_state, int argc, const char** argv) {
+  assert(gfx_app_state);
+  AppState* state = &gfx_app_state->state;
+
+  IsoGfxApp* app = state->app;
 
   if (!(state->iso = isogfx_new(&(IsoGfxDesc){
             .screen_width = SCREEN_WIDTH, .screen_height = SCREEN_HEIGHT}))) {
     goto cleanup;
   }
-  //  if (!make_checkerboard_app(state->iso, &state->app)) {
-  //    goto cleanup;
-  //  }
-  if (!make_demo_app(state->iso, &state->app)) {
+
+  if (!(*app->init)(app->state, state->iso, argc, argv)) {
     goto cleanup;
   }
 
   // Apply pixel scaling if requested by the app.
   int texture_width, texture_height;
-  if (state->app.pixel_scale > 1) {
-    texture_width  = SCREEN_WIDTH / state->app.pixel_scale;
-    texture_height = SCREEN_HEIGHT / state->app.pixel_scale;
+  if (app->pixel_scale > 1) {
+    texture_width  = SCREEN_WIDTH / app->pixel_scale;
+    texture_height = SCREEN_HEIGHT / app->pixel_scale;
     isogfx_resize(state->iso, texture_width, texture_height);
   } else {
     texture_width  = SCREEN_WIDTH;
@@ -110,7 +110,6 @@ static bool init(const GfxAppDesc* desc, void** app_state) {
   SceneNode* root = gfx_get_scene_root(state->scene);
   gfx_set_node_parent(node, root);
 
-  *app_state = state;
   return true;
 
 cleanup:
@@ -121,35 +120,35 @@ cleanup:
   return false;
 }
 
-static void shutdown(void* app_state) {
-  assert(app_state);
-  State* state = (State*)(app_state);
+static void shutdown(GfxAppState* gfx_app_state) {
+  assert(gfx_app_state);
+  AppState* state = &gfx_app_state->state;
 
-  if (state->app.state) {
+  if (state->app) {
     assert(state->iso);
-    (*state->app.shutdown)(state->iso, state->app.state);
+    (*state->app->shutdown)(state->app->state, state->iso);
   }
+
   isogfx_del(&state->iso);
   gfx_destroy(&state->gfx);
-  free(app_state);
 }
 
-static void update(void* app_state, double t, double dt) {
-  assert(app_state);
-  State* state = (State*)(app_state);
+static void update(GfxAppState* gfx_app_state, double t, double dt) {
+  assert(gfx_app_state);
+  AppState* state = &gfx_app_state->state;
 
   isogfx_update(state->iso, t);
 
-  assert(state->app.update);
-  (*state->app.update)(state->iso, state->app.state, t, dt);
+  assert(state->app->update);
+  (*state->app->update)(state->app->state, state->iso, t, dt);
 }
 
-static void render(void* app_state) {
-  assert(app_state);
-  State* state = (State*)(app_state);
+static void render(GfxAppState* gfx_app_state) {
+  assert(gfx_app_state);
+  AppState* state = &gfx_app_state->state;
 
-  assert(state->app.render);
-  (*state->app.render)(state->iso, state->app.state);
+  assert(state->app->render);
+  (*state->app->render)(state->app->state, state->iso);
 
   const Pixel* screen = isogfx_get_screen_buffer(state->iso);
   assert(screen);
@@ -166,34 +165,34 @@ static void render(void* app_state) {
   gfx_end_frame(render_backend);
 }
 
-static void resize(void* app_state, int width, int height) {
-  assert(app_state);
-  State* state = (State*)(app_state);
+static void resize(GfxAppState* gfx_app_state, int width, int height) {
+  assert(gfx_app_state);
+  AppState* state = &gfx_app_state->state;
 
   RenderBackend* render_backend = gfx_get_render_backend(state->gfx);
   gfx_set_viewport(render_backend, width, height);
 }
 
-int main(int argc, const char** argv) {
-  const int initial_width  = SCREEN_WIDTH;
-  const int initial_height = SCREEN_HEIGHT;
-  const int max_fps        = 60;
-
+void iso_run(int argc, const char** argv, IsoGfxApp* app) {
+  GfxAppState app_state = {
+      .state = (AppState){
+                          .app = app,
+                          }
+  };
   gfx_app_run(
       &(GfxAppDesc){
           .argc              = argc,
           .argv              = argv,
-          .width             = initial_width,
-          .height            = initial_height,
-          .max_fps           = max_fps,
-          .update_delta_time = max_fps > 0 ? 1.0 / (double)max_fps : 0.0,
-          .title             = "Isometric Renderer"},
+          .width             = SCREEN_WIDTH,
+          .height            = SCREEN_HEIGHT,
+          .max_fps           = MAX_FPS,
+          .update_delta_time = MAX_FPS > 0 ? 1.0 / (double)MAX_FPS : 0.0,
+          .title             = "Isometric Renderer",
+          .app_state         = &app_state},
       &(GfxAppCallbacks){
           .init     = init,
           .update   = update,
           .render   = render,
           .resize   = resize,
           .shutdown = shutdown});
-
-  return 0;
 }
diff --git a/gfx-iso/asset/mkasset.py b/gfx-iso/tools/mkasset.py
index 3ca8a1d..3ca8a1d 100644
--- a/gfx-iso/asset/mkasset.py
+++ b/gfx-iso/tools/mkasset.py