4 files changed, 132 insertions, 56 deletions

diff --git a/gfx-iso/demos/checkerboard/CMakeLists.txt b/gfx-iso/demos/checkerboard/CMakeLists.txt
index f178262..d1691c6 100644
--- a/gfx-iso/demos/checkerboard/CMakeLists.txt
+++ b/gfx-iso/demos/checkerboard/CMakeLists.txt
@@ -10,6 +10,7 @@ add_executable(checkerboard
   checkerboard.c)
 
 target_link_libraries(checkerboard PRIVATE
-  isogfx-app)
+  gfx-app
+  isogfx-backend)
 
 target_compile_options(checkerboard PRIVATE -Wall -Wextra -Wpedantic)
diff --git a/gfx-iso/demos/checkerboard/checkerboard.c b/gfx-iso/demos/checkerboard/checkerboard.c
index e684bc3..0f01b72 100644
--- a/gfx-iso/demos/checkerboard/checkerboard.c
+++ b/gfx-iso/demos/checkerboard/checkerboard.c
@@ -1,10 +1,20 @@
-#include <isogfx/app.h>
+#include <isogfx/backend.h>
 #include <isogfx/isogfx.h>
 
+#include <gfx/app.h>
+
 #include <assert.h>
 #include <stdbool.h>
 #include <stdio.h>
 
+static const int WINDOW_WIDTH  = 1408;
+static const int WINDOW_HEIGHT = 960;
+static const int MAX_FPS       = 60;
+
+// Virtual screen dimensions.
+static const int SCREEN_WIDTH  = 704;
+static const int SCREEN_HEIGHT = 480;
+
 static const int TILE_WIDTH   = 64;
 static const int TILE_HEIGHT  = TILE_WIDTH / 2;
 static const int WORLD_WIDTH  = 20;
@@ -31,11 +41,13 @@ typedef enum Colour {
   Red,
 } Colour;
 
-typedef struct IsoGfxAppState {
-  Tile red;
-  int  xpick;
-  int  ypick;
-} IsoGfxAppState;
+typedef struct GfxAppState {
+  IsoBackend* backend;
+  IsoGfx*     iso;
+  Tile        red;
+  int         xpick;
+  int         ypick;
+} GfxAppState;
 
 static void make_checkerboard(IsoGfx* iso, Tile black, Tile white) {
   assert(iso);
@@ -49,14 +61,20 @@ static void make_checkerboard(IsoGfx* iso, Tile black, Tile white) {
   }
 }
 
-static bool init(
-    IsoGfxAppState* state, IsoGfx* iso, int argc, const char** argv) {
+static bool init(GfxAppState* state, int argc, const char** argv) {
   assert(state);
-  assert(iso);
 
   (void)argc;
   (void)argv;
 
+  if (!(state->iso = isogfx_new(&(IsoGfxDesc){
+            .screen_width = SCREEN_WIDTH, .screen_height = SCREEN_HEIGHT}))) {
+    return false;
+  }
+  IsoGfx* iso = state->iso;
+
+  isogfx_resize(iso, SCREEN_WIDTH, SCREEN_HEIGHT);
+
   if (!isogfx_make_world(
           iso, &(WorldDesc){
                    .tile_width   = TILE_WIDTH,
@@ -71,50 +89,78 @@ static bool init(
   state->red       = isogfx_make_tile(iso, &tile_set[Red]);
   make_checkerboard(iso, black, white);
 
+  if (!(state->backend = IsoBackendInit(iso))) {
+    return false;
+  }
+
   return true;
 }
 
-static void shutdown(IsoGfxAppState* state, IsoGfx* iso) {
+static void shutdown(GfxAppState* state) {
   assert(state);
-  assert(iso);
+
+  IsoBackendShutdown(&state->backend);
+  isogfx_del(&state->iso);
 }
 
-static void update(IsoGfxAppState* state, IsoGfx* iso, double t, double dt) {
+static void update(GfxAppState* state, double t, double dt) {
   assert(state);
-  assert(iso);
-
-  (void)t;
   (void)dt;
 
+  IsoGfx* iso = state->iso;
+
+  isogfx_update(iso, t);
+
+  // Get mouse position in window coordinates.
   double mouse_x, mouse_y;
   gfx_app_get_mouse_position(&mouse_x, &mouse_y);
 
+  // Map from window coordinates to virtual screen coordinates.
+  IsoBackendGetMousePosition(
+      state->backend, mouse_x, mouse_y, &mouse_x, &mouse_y);
+
   isogfx_pick_tile(iso, mouse_x, mouse_y, &state->xpick, &state->ypick);
 
   printf("Picked tile: (%d, %d)\n", state->xpick, state->ypick);
 }
 
-static void render(IsoGfxAppState* state, IsoGfx* iso) {
+static void render(GfxAppState* state) {
   assert(state);
-  assert(iso);
+
+  IsoGfx* iso = state->iso;
 
   isogfx_render(iso);
 
   if ((state->xpick != -1) && (state->ypick != -1)) {
     isogfx_draw_tile(iso, state->xpick, state->ypick, state->red);
   }
+
+  IsoBackendRender(state->backend, iso);
+}
+
+static void resize(GfxAppState* state, int width, int height) {
+  assert(state);
+
+  IsoBackendResizeWindow(state->backend, state->iso, width, height);
 }
 
 int main(int argc, const char** argv) {
-  IsoGfxAppState state = {0};
-  iso_run(
-      argc, argv,
-      &(IsoGfxApp){
-          .state    = &state,
+  GfxAppState state = {0};
+  gfx_app_run(
+      &(GfxAppDesc){
+          .argc              = argc,
+          .argv              = argv,
+          .width             = WINDOW_WIDTH,
+          .height            = WINDOW_HEIGHT,
+          .max_fps           = MAX_FPS,
+          .update_delta_time = MAX_FPS > 0 ? 1.0 / (double)MAX_FPS : 0.0,
+          .title             = "Isometric Renderer",
+          .app_state         = &state},
+      &(GfxAppCallbacks){
           .init     = init,
-          .shutdown = shutdown,
           .update   = update,
           .render   = render,
-      });
+          .resize   = resize,
+          .shutdown = shutdown});
   return 0;
 }
diff --git a/gfx-iso/demos/isomap/CMakeLists.txt b/gfx-iso/demos/isomap/CMakeLists.txt
index 13edcc7..2dbfd32 100644
--- a/gfx-iso/demos/isomap/CMakeLists.txt
+++ b/gfx-iso/demos/isomap/CMakeLists.txt
@@ -10,6 +10,7 @@ add_executable(isomap
   isomap.c)
 
 target_link_libraries(isomap PRIVATE
-  isogfx-app)
+  gfx-app
+  isogfx-backend)
 
 target_compile_options(isomap PRIVATE -Wall -Wextra -Wpedantic)
diff --git a/gfx-iso/demos/isomap/isomap.c b/gfx-iso/demos/isomap/isomap.c
index 5ab926c..a233659 100644
--- a/gfx-iso/demos/isomap/isomap.c
+++ b/gfx-iso/demos/isomap/isomap.c
@@ -1,23 +1,41 @@
-#include <isogfx/app.h>
+#include <isogfx/backend.h>
 #include <isogfx/isogfx.h>
 
+#include <gfx/app.h>
+
 #include <assert.h>
 #include <stdbool.h>
 
-typedef struct IsoGfxAppState {
+static const int WINDOW_WIDTH  = 1408;
+static const int WINDOW_HEIGHT = 960;
+static const int MAX_FPS       = 60;
+
+// Virtual screen dimensions.
+static const int SCREEN_WIDTH  = 704;
+static const int SCREEN_HEIGHT = 480;
+
+typedef struct GfxAppState {
+  IsoBackend* backend;
+  IsoGfx*     iso;
   int         xpick;
   int         ypick;
   SpriteSheet stag_sheet;
   Sprite      stag;
-} IsoGfxAppState;
+} GfxAppState;
 
-static bool init(
-    IsoGfxAppState* state, IsoGfx* iso, int argc, const char** argv) {
+static bool init(GfxAppState* state, int argc, const char** argv) {
   assert(state);
-  assert(iso);
   (void)argc;
   (void)argv;
 
+  if (!(state->iso = isogfx_new(&(IsoGfxDesc){
+            .screen_width = SCREEN_WIDTH, .screen_height = SCREEN_HEIGHT}))) {
+    return false;
+  }
+  IsoGfx* iso = state->iso;
+
+  isogfx_resize(iso, SCREEN_WIDTH, SCREEN_HEIGHT);
+
   if (!isogfx_load_world(iso, "/home/jeanne/assets/tilemaps/demo1.tm")) {
     return false;
   }
@@ -31,47 +49,57 @@ static bool init(
   state->stag = isogfx_make_sprite(iso, state->stag_sheet);
   isogfx_set_sprite_position(iso, state->stag, 5, 4);
 
+  if (!(state->backend = IsoBackendInit(iso))) {
+    return false;
+  }
+
   return true;
 }
 
-static void shutdown(IsoGfxAppState* state, IsoGfx* iso) {
+static void shutdown(GfxAppState* state) {
   assert(state);
-  assert(iso);
+  //
 }
 
-static void update(IsoGfxAppState* state, IsoGfx* iso, double t, double dt) {
+static void update(GfxAppState* state, double t, double dt) {
   assert(state);
-  assert(iso);
-
-  (void)t;
   (void)dt;
 
-  double mouse_x, mouse_y;
-  gfx_app_get_mouse_position(&mouse_x, &mouse_y);
+  IsoGfx* iso = state->iso;
+  isogfx_update(iso, t);
+}
 
-  isogfx_pick_tile(iso, mouse_x, mouse_y, &state->xpick, &state->ypick);
+static void render(GfxAppState* state) {
+  assert(state);
 
-  // printf("Picked tile: (%d, %d)\n", state->xpick, state->ypick);
+  IsoGfx* iso = state->iso;
+  isogfx_render(iso);
+  IsoBackendRender(state->backend, iso);
 }
 
-static void render(IsoGfxAppState* state, IsoGfx* iso) {
+static void resize(GfxAppState* state, int width, int height) {
   assert(state);
-  assert(iso);
 
-  isogfx_render(iso);
+  IsoBackendResizeWindow(state->backend, state->iso, width, height);
 }
 
 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,
-      });
+  GfxAppState state = {0};
+  gfx_app_run(
+      &(GfxAppDesc){
+          .argc              = argc,
+          .argv              = argv,
+          .width             = WINDOW_WIDTH,
+          .height            = WINDOW_HEIGHT,
+          .max_fps           = MAX_FPS,
+          .update_delta_time = MAX_FPS > 0 ? 1.0 / (double)MAX_FPS : 0.0,
+          .title             = "Isometric Renderer",
+          .app_state         = &state},
+      &(GfxAppCallbacks){
+          .init     = init,
+          .update   = update,
+          .render   = render,
+          .resize   = resize,
+          .shutdown = shutdown});
   return 0;
 }