1 files changed, 19 insertions, 23 deletions

diff --git a/gfx/src/asset/asset_cache.c b/gfx/src/asset/asset_cache.c
index 0075d41..037f62b 100644
--- a/gfx/src/asset/asset_cache.c
+++ b/gfx/src/asset/asset_cache.c
@@ -4,15 +4,12 @@
 #include "texture.h"
 #include <gfx/asset.h>
 #include <gfx/gfx.h>
-#include <gfx/scene/node.h>
 #include <gfx_assert.h>
 
-#include "scene/node_impl.h"
-
 #include <cstring.h>
 #include <log/log.h>
 
-static Hash calc_scene_hash(const LoadSceneCmd* cmd) {
+static Hash calc_model_hash(const LoadModelCmd* cmd) {
   assert(cmd);
   switch (cmd->origin) {
   case AssetFromFile:
@@ -20,7 +17,7 @@ static Hash calc_scene_hash(const LoadSceneCmd* cmd) {
   case AssetFromMemory:
     return (Hash)cmd->data;
   }
-  FAIL("Unhandled scene asset origin");
+  FAIL("Unhandled model asset origin");
   return 0;
 }
 
@@ -74,7 +71,7 @@ static Asset* lookup_cache(AssetCache* cache, Hash hash) {
   return 0;
 }
 
-static void log_scene_cache_hit(const LoadSceneCmd* cmd, Hash hash) {
+static void log_model_cache_hit(const LoadModelCmd* cmd, Hash hash) {
   assert(cmd);
   switch (cmd->origin) {
   case AssetFromFile:
@@ -88,7 +85,7 @@ static void log_scene_cache_hit(const LoadSceneCmd* cmd, Hash hash) {
   }
 }
 
-static void log_scene_loaded(const LoadSceneCmd* cmd) {
+static void log_model_loaded(const LoadModelCmd* cmd) {
   assert(cmd);
   switch (cmd->origin) {
   case AssetFromFile:
@@ -115,32 +112,31 @@ void gfx_destroy_asset_cache(AssetCache* cache) {
   mempool_del(&cache->assets);
 }
 
-SceneNode* gfx_load_scene(
-    Gfx* gfx, SceneNode* parent_node, const LoadSceneCmd* cmd) {
+Model* gfx_load_model(Gfx* gfx, const LoadModelCmd* cmd) {
   assert(gfx);
 
   AssetCache* cache = gfx_get_asset_cache(gfx);
 
   // First search for the asset in the cache.
-  const uint64_t hash  = calc_scene_hash(cmd);
+  const uint64_t hash  = calc_model_hash(cmd);
   Asset*         asset = lookup_cache(cache, hash);
   if (asset) {
-    log_scene_cache_hit(cmd, hash);
-    return (SceneNode*)asset;
+    log_model_cache_hit(cmd, hash);
+    return asset->model;
   }
 
   // Asset not found in the cache.
   // Load it, insert it into the cache, and return it.
-  SceneNode* node = gfx_scene_load(gfx, parent_node, cmd);
-  if (node) {
+  Model* model = gfx_model_load(gfx, cmd);
+  if (model) {
     *(Asset*)mempool_alloc(&cache->assets) = (Asset){
-        .type = SceneAsset,
-        .hash = hash,
-        .data = node,
+        .type  = ModelAsset,
+        .hash  = hash,
+        .model = model,
     };
-    log_scene_loaded(cmd);
+    log_model_loaded(cmd);
   }
-  return node;
+  return model;
 }
 
 Texture* gfx_load_texture(Gfx* gfx, const LoadTextureCmd* cmd) {
@@ -153,7 +149,7 @@ Texture* gfx_load_texture(Gfx* gfx, const LoadTextureCmd* cmd) {
   const uint64_t hash  = calc_texture_hash(cmd);
   Asset*         asset = lookup_cache(cache, hash);
   if (asset) {
-    return (Texture*)asset;
+    return asset->texture;
   }
 
   // Asset not found in the cache.
@@ -162,9 +158,9 @@ Texture* gfx_load_texture(Gfx* gfx, const LoadTextureCmd* cmd) {
   Texture*       texture        = gfx_texture_load(render_backend, cmd);
   if (texture) {
     *(Asset*)mempool_alloc(&cache->assets) = (Asset){
-        .type = TextureAsset,
-        .hash = hash,
-        .data = texture,
+        .type    = TextureAsset,
+        .hash    = hash,
+        .texture = texture,
     };
   }
   return texture;