Started asset refact

src/asset/asset.h

@@ -7,98 +7,48 @@
 
 #pragma once
 #include "error/error.h"
-#include "util/reflist.h"
 #include <zip.h>
 
-#include "asset/type/assetpaletteimage.h"
-#include "asset/type/assetalphaimage.h"
+#if ASSET_TYPE == wad
+#else
+  #error "Unsupported ASSET_TYPE"
+#endif
 
-#define ASSET_HEADER_SIZE 3
-#define ASSET_REFERENCE_COUNT_MAX 8
+#define ASSET_FILE "dusk.dsk"
+
+static const char_t *ASSET_SEARCH_PATHS[] = {
+  "%s/%s",
+  "%s",
+  "../%s",
+  "../../%s",
+  "data/%s",
+  "../data/%s",
+  NULL
+};
 
 typedef struct {
-  void (*load)();
-} assetcallback_t;
-
-typedef enum {
-  ASSET_STATE_NOT_LOADED,
-  ASSET_STATE_LOADING,
-  ASSET_STATE_LOADED,
-  ASSET_STATE_ERROR,
-} assetstate_t;
-
-typedef enum {
-  ASSET_TYPE_UNKNOWN,
-  ASSET_TYPE_PALETTE_IMAGE,
-  ASSET_TYPE_ALPHA_IMAGE,
-
-  ASSET_TYPE_COUNT
-} assettype_t;
-
-typedef struct asset_s {
-  char_t filename[FILENAME_MAX];
-  ref_t refListArray[ASSET_REFERENCE_COUNT_MAX];
-  reflist_t refList;
-  assetstate_t state;
-  assettype_t type;
-  zip_file_t *file;
-
-  union {
-    assetpaletteimage_t paletteImage;
-    assetalphaimage_t alphaImage;
-  };
+  zip_t *zip;
+  char_t systemPath[FILENAME_MAX];
+  uint8_t assetCount;
 } asset_t;
 
-typedef struct {
-  const char_t header[ASSET_HEADER_SIZE + 1];
-  errorret_t (*load)(asset_t *asset);
-  errorret_t (*dispose)(asset_t *asset);
-} assetdef_t;
-
-extern assetdef_t ASSET_DEFINITIONS[ASSET_TYPE_COUNT];
+static asset_t ASSET;
 
 /**
- * Initializes an asset structure. This should be called by the asset manager
- * only.
- * 
- * @param asset The asset structure to initialize.
- * @param filename The filename of the asset.
- * @return An error code.
+ * Initializes the asset system.
  */
-errorret_t assetInit(asset_t *asset, const char_t *filename);
+errorret_t assetInit(void);
 
 /**
- * Requests a lock on the given asset. This will increase the reference count
- * of the asset, and prevent it from being unloaded until all locks are
- * released.
+ * Loads an asset by its filename, the output type depends on the asset type.
  * 
- * @param asset The asset to lock.
- * @return A unique reference ID for the lock.
+ * @param filename The filename of the asset to retrieve.
+ * @param output The output pointer to store the loaded asset data.
+ * @return An error code if the asset could not be loaded.
  */
-ref_t assetLock(asset_t *asset);
+errorret_t assetLoad(const char_t *filename, void *output);
 
 /**
- * Releases a lock on the given asset. This will decrease the reference count
- * of the asset, and allow it to be unloaded if there are no more locks.
- * 
- * @param asset The asset to unlock.
- * @param ref The reference ID of the lock to release.
+ * Disposes/cleans up the asset system.
  */
-void assetUnlock(asset_t *asset, const ref_t ref);
-
-/**
- * Permission has been granted to load the asset data from disk. This should
- * only be called by the asset manager.
- * 
- * @param asset The asset to load.
- * @return An error code.
- */
-errorret_t assetLoad(asset_t *asset);
-
-/**
- * Disposes of the asset, freeing any allocated memory and closing any open
- * file handles. This should only be called by the asset manager.
- * 
- * @param asset The asset to dispose of.
- */
-errorret_t assetDispose(asset_t *asset);
+void assetDispose(void);