2 files changed, 48 insertions, 41 deletions

diff --git a/demos/isomap/CMakeLists.txt b/demos/isomap/CMakeLists.txt
index 2dbfd32..9467625 100644
--- a/demos/isomap/CMakeLists.txt
+++ b/demos/isomap/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.0)
+cmake_minimum_required(VERSION 3.5)
 
 project(isomap)
 
diff --git a/demos/isomap/isomap.c b/demos/isomap/isomap.c
index a940535..471ef57 100644
--- a/demos/isomap/isomap.c
+++ b/demos/isomap/isomap.c
@@ -1,5 +1,5 @@
 #include <isogfx/backend.h>
-#include <isogfx/isogfx.h>
+#include <isogfx/gfx2d.h>
 
 #include <gfx/app.h>
 #include <math/vec2.h>
@@ -16,73 +16,77 @@ static const int MAX_FPS       = 60;
 static const int SCREEN_WIDTH  = 704;
 static const int SCREEN_HEIGHT = 480;
 
-static const R CAMERA_SPEED = 400;
+static const R CAMERA_SPEED = 800;
 
-#define MEMORY_SIZE (2 * 1024 * 1024)
+#define MEMORY_SIZE (8 * 1024 * 1024)
 uint8_t MEMORY[MEMORY_SIZE];
 
 typedef struct GfxAppState {
-  IsoBackend* backend;
-  IsoGfx*     iso;
-  int         xpick;
-  int         ypick;
-  vec2        camera;
-  SpriteSheet stag_sheet;
-  Sprite      stag;
+  Gfx2dBackend* backend;
+  Gfx2d*        gfx;
+  int           xpick;
+  int           ypick;
+  vec2          camera;
+  SpriteSheet   stag_sheet;
+  Sprite        stag;
 } GfxAppState;
 
-static bool init(GfxAppState* state, int argc, const char** argv) {
+static bool init(GfxApp* app, GfxAppState* state, int argc, const char** argv) {
+  assert(app);
   assert(state);
   (void)argc;
   (void)argv;
 
-  if (!((state->iso =
-             isogfx_new(&(IsoGfxDesc){.memory        = MEMORY,
-                                      .memory_size   = MEMORY_SIZE,
-                                      .screen_width  = SCREEN_WIDTH,
-                                      .screen_height = SCREEN_HEIGHT})))) {
+  if (!((state->gfx =
+             gfx2d_new(&(Gfx2dDesc){.memory        = MEMORY,
+                                    .memory_size   = MEMORY_SIZE,
+                                    .screen_width  = SCREEN_WIDTH,
+                                    .screen_height = SCREEN_HEIGHT})))) {
     return false;
   }
-  IsoGfx* iso = state->iso;
+  Gfx2d* iso = state->gfx;
 
-  if (!isogfx_load_world(iso, "/home/jeanne/Nextcloud/assets/maps/demo-1.tm")) {
+  if (!gfx2d_load_map(
+          iso, "/home/jeanne/Nextcloud/assets/tilemaps/scrabling1.tm")) {
     return false;
   }
 
-  if (!((state->stag_sheet = isogfx_load_sprite_sheet(
+  if (!((state->stag_sheet = gfx2d_load_sprite_sheet(
              iso,
              "/home/jeanne/Nextcloud/assets/tilesets/scrabling/critters/stag/"
              "stag.ss")))) {
     return false;
   }
 
-  state->stag = isogfx_make_sprite(iso, state->stag_sheet);
-  isogfx_set_sprite_position(iso, state->stag, 5, 4);
+  state->stag = gfx2d_make_sprite(iso, state->stag_sheet);
+  gfx2d_set_sprite_position(iso, state->stag, 0, 0);
 
-  if (!((state->backend = iso_backend_init(iso)))) {
+  if (!((state->backend = gfx2d_backend_init(iso)))) {
     return false;
   }
 
   return true;
 }
 
-static void shutdown(GfxAppState* state) {
+static void shutdown(GfxApp* app, GfxAppState* state) {
+  assert(app);
   assert(state);
-  //
 }
 
-static vec2 get_camera_movement(R dt) {
+static vec2 get_camera_movement(GfxApp* app, R dt) {
+  assert(app);
+
   vec2 offset = {0};
-  if (gfx_app_is_key_pressed(KeyA)) {
+  if (gfx_app_is_key_pressed(app, KeyA)) {
     offset.x -= 1;
   }
-  if (gfx_app_is_key_pressed(KeyD)) {
+  if (gfx_app_is_key_pressed(app, KeyD)) {
     offset.x += 1;
   }
-  if (gfx_app_is_key_pressed(KeyW)) {
+  if (gfx_app_is_key_pressed(app, KeyW)) {
     offset.y -= 1;
   }
-  if (gfx_app_is_key_pressed(KeyS)) {
+  if (gfx_app_is_key_pressed(app, KeyS)) {
     offset.y += 1;
   }
   if ((offset.x != 0) || (offset.y != 0)) {
@@ -91,28 +95,31 @@ static vec2 get_camera_movement(R dt) {
   return offset;
 }
 
-static void update(GfxAppState* state, double t, double dt) {
+static void update(GfxApp* app, GfxAppState* state, double t, double dt) {
+  assert(app);
   assert(state);
 
-  state->camera = vec2_add(state->camera, get_camera_movement((R)dt));
+  state->camera = vec2_add(state->camera, get_camera_movement(app, (R)dt));
 
-  IsoGfx* iso = state->iso;
-  isogfx_set_camera(iso, (int)state->camera.x, (int)state->camera.y);
-  isogfx_update(iso, t);
+  Gfx2d* iso = state->gfx;
+  gfx2d_set_camera(iso, (int)state->camera.x, (int)state->camera.y);
+  gfx2d_update(iso, t);
 }
 
-static void render(GfxAppState* state) {
+static void render(const GfxApp* app, GfxAppState* state) {
+  assert(app);
   assert(state);
 
-  IsoGfx* iso = state->iso;
-  isogfx_render(iso);
-  iso_backend_render(state->backend, iso);
+  Gfx2d* iso = state->gfx;
+  gfx2d_render(iso);
+  gfx2d_backend_render(state->backend, iso);
 }
 
-static void resize(GfxAppState* state, int width, int height) {
+static void resize(GfxApp* app, GfxAppState* state, int width, int height) {
+  assert(app);
   assert(state);
 
-  iso_backend_resize_window(state->backend, state->iso, width, height);
+  gfx2d_backend_resize_window(state->backend, state->gfx, width, height);
 }
 
 int main(int argc, const char** argv) {