2 files changed, 34 insertions, 25 deletions

diff --git a/gfx-app/include/gfx/gfx_app.h b/gfx-app/include/gfx/gfx_app.h
index 86c502a..ffff4bc 100644
--- a/gfx-app/include/gfx/gfx_app.h
+++ b/gfx-app/include/gfx/gfx_app.h
@@ -2,6 +2,8 @@
 
 #include <stdbool.h>
 
+typedef struct GfxAppState GfxAppState;
+
 /// Application settings.
 typedef struct GfxAppDesc {
   int          argc;    // Number of application arguments.
@@ -11,21 +13,22 @@ typedef struct GfxAppDesc {
   int          max_fps; // Desired maximum display framerate. 0 to disable.
   double       update_delta_time; // Desired delta time between frame updates.
   const char*  title;             // Window title.
+  GfxAppState* app_state;
 } GfxAppDesc;
 
-typedef bool (*GfxAppInit)(const GfxAppDesc*, void** app_state);
-typedef void (*GfxAppUpdate)(void* app_state, double t, double dt);
-typedef void (*GfxAppRender)(void* app_state);
-typedef void (*GfxAppResize)(void* app_state, int width, int height);
-typedef void (*GfxAppShutdown)(void* app_state);
+typedef bool (*GfxAppInit)(GfxAppState*, int argc, const char** argv);
+typedef void (*GfxAppShutdown)(GfxAppState*);
+typedef void (*GfxAppUpdate)(GfxAppState*, double t, double dt);
+typedef void (*GfxAppRender)(GfxAppState*);
+typedef void (*GfxAppResize)(GfxAppState*, int width, int height);
 
 /// Application callback functions.
 typedef struct GfxAppCallbacks {
   GfxAppInit     init;
+  GfxAppShutdown shutdown;
   GfxAppUpdate   update;
   GfxAppRender   render;
   GfxAppResize   resize;
-  GfxAppShutdown shutdown;
 } GfxAppCallbacks;
 
 typedef enum Key {
@@ -68,21 +71,25 @@ bool gfx_is_key_pressed(Key);
 
 /// Define a main function that initializes and puts the application in a loop.
 /// See also: gfx_app_run().
-#define GFX_APP_MAIN(WIDTH, HEIGHT, MAX_FPS)                                 \
-  int main(int argc, const char** argv) {                                    \
-    gfx_app_run(                                                             \
-        &(GfxAppDesc){                                                       \
-            .argc              = argc,                                       \
-            .argv              = argv,                                       \
-            .width             = WIDTH,                                      \
-            .height            = HEIGHT,                                     \
-            .max_fps           = MAX_FPS,                                    \
-            .update_delta_time = MAX_FPS > 0 ? 1.0 / (double)MAX_FPS : 0.0}, \
-        &(GfxAppCallbacks){                                                  \
-            .init     = (GfxAppInit)app_init,                                \
-            .update   = (GfxAppUpdate)app_update,                            \
-            .render   = (GfxAppRender)app_render,                            \
-            .resize   = (GfxAppResize)app_resize,                            \
-            .shutdown = (GfxAppShutdown)app_end});                           \
-    return 0;                                                                \
+#define GFX_APP_MAIN(WIDTH, HEIGHT, MAX_FPS, TITLE)                         \
+  int main(int argc, const char** argv) {                                   \
+    GfxAppState app_state = {0};                                            \
+    gfx_app_run(                                                            \
+        &(GfxAppDesc){                                                      \
+            .argc              = argc,                                      \
+            .argv              = argv,                                      \
+            .width             = WIDTH,                                     \
+            .height            = HEIGHT,                                    \
+            .max_fps           = MAX_FPS,                                   \
+            .update_delta_time = MAX_FPS > 0 ? 1.0 / (double)MAX_FPS : 0.0, \
+            .title             = TITLE,                                     \
+            .app_state         = &app_state,                                \
+        },                                                                  \
+        &(GfxAppCallbacks){                                                 \
+            .init     = (GfxAppInit)app_init,                               \
+            .update   = (GfxAppUpdate)app_update,                           \
+            .render   = (GfxAppRender)app_render,                           \
+            .resize   = (GfxAppResize)app_resize,                           \
+            .shutdown = (GfxAppShutdown)app_end});                          \
+    return 0;                                                               \
   }
diff --git a/gfx-app/src/gfx_app.c b/gfx-app/src/gfx_app.c
index e0211b1..a93756c 100644
--- a/gfx-app/src/gfx_app.c
+++ b/gfx-app/src/gfx_app.c
@@ -9,7 +9,7 @@
 
 /// Application state.
 typedef struct GfxApp {
-  void*           app_state;
+  GfxAppState*    app_state;
   GfxAppCallbacks callbacks;
   int             max_fps;
   double          update_delta_time;
@@ -79,6 +79,7 @@ bool gfx_app_run(const GfxAppDesc* desc, const GfxAppCallbacks* callbacks) {
 
   bool success = false;
 
+  g_gfx_app.app_state         = desc->app_state;
   g_gfx_app.callbacks         = *callbacks;
   g_gfx_app.max_fps           = desc->max_fps;
   g_gfx_app.update_delta_time = desc->update_delta_time;
@@ -110,7 +111,8 @@ bool gfx_app_run(const GfxAppDesc* desc, const GfxAppCallbacks* callbacks) {
   glfwMakeContextCurrent(g_gfx_app.window);
 
   // Initialize the application's state before setting any callbacks.
-  if (!(*g_gfx_app.callbacks.init)(desc, &g_gfx_app.app_state)) {
+  if (!(*g_gfx_app.callbacks.init)(
+          g_gfx_app.app_state, desc->argc, desc->argv)) {
     LOGE("Failed to initialize application");
     goto cleanup;
   }