Max/nunuhara_xsystem4
1
0
Fork 0
mirror of https://github.com/nunuhara/xsystem4.git synced 2026-10-10 00:08:23 +03:00
Code Issues Packages Projects Releases Wiki Activity

Add interface for loading CGs by name

Browse Source
This commit is contained in:
Nunuhara Cabbage
2022-01-30 10:03:59 -08:00
parent 6f750e4007
commit 9904754f06
2 changed files with 48 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/asset_manager.h
+1
View File
@@ -42,6 +42,7 @@ struct archive_data *asset_get(enum asset_type type, int no);
// FIXME: CG code should be refactored to read from buffer only, not archive,
// then caller can just use asset_get and cg_load
struct cg *asset_cg_load(int no);
struct cg *asset_cg_load_by_name(const char *name, int *no);
bool asset_cg_exists(int no);
bool asset_cg_get_metrics(int no, struct cg_metrics *metrics);
void asset_cg_index_init(void);
src/asset_manager.c
+47 -5
View File
@@ -220,7 +220,8 @@ struct archive_data *asset_get(enum asset_type type, int no)
return archive_get(archives[type], no);
}
static struct hash_table *cg_index = NULL;
static struct hash_table *cg_name_index = NULL;
static struct hash_table *cg_id_index = NULL;
// Convert the last sequence of digits in a string to an integer.
static int cg_name_to_int(const char *name)
@@ -247,7 +248,7 @@ static void add_cg_to_index(struct archive_data *data, possibly_unused void *_)
return;
}
struct ht_slot *slot = ht_put_int(cg_index, logical_no, NULL);
struct ht_slot *slot = ht_put_int(cg_id_index, logical_no, NULL);
if (slot->value)
ERROR("Duplicate CG numbers");
slot->value = (void*)(uintptr_t)(data->no + 1);
@@ -263,15 +264,47 @@ void asset_cg_index_init(void)
if (!archives[ASSET_CG])
return;
cg_index = ht_create(4096);
cg_id_index = ht_create(4096);
archive_for_each(archives[ASSET_CG], add_cg_to_index, NULL);
}
static void add_cg_name_to_index(struct archive_data *data, possibly_unused void *_)
{
// copy name and strip file extension
char *name = strdup(data->name);
char *dot = strrchr(name, '.');
if (dot)
*dot = '\0';
struct ht_slot *slot = ht_put(cg_name_index, name, NULL);
if (slot->value)
ERROR("Duplicate CG names");
slot->value = (void*)(uintptr_t)(data->no + 1);
free(name);
}
static void init_cg_name_index(void)
{
if (!archives[ASSET_CG])
return;
cg_name_index = ht_create(4096);
archive_for_each(archives[ASSET_CG], add_cg_name_to_index, NULL);
}
static int cg_translate_name(const char *name)
{
if (!cg_name_index)
init_cg_name_index();
return (uintptr_t)ht_get(cg_name_index, name, NULL);
}
static int cg_translate_index(int no)
{
if (!cg_index)
if (!cg_id_index)
return no;
return (uintptr_t)ht_get_int(cg_index, no, NULL);
return (uintptr_t)ht_get_int(cg_id_index, no, NULL);
}
struct cg *asset_cg_load(int no)
@@ -283,6 +316,15 @@ struct cg *asset_cg_load(int no)
return cg_load(archives[ASSET_CG], no - 1);
}
struct cg *asset_cg_load_by_name(const char *name, int *no)
{
if (!archives[ASSET_CG])
return NULL;
if (!(*no = cg_translate_name(name)))
return NULL;
return cg_load(archives[ASSET_CG], *no - 1);
}
bool asset_cg_exists(int no)
{
if (!archives[ASSET_CG])