thirdpartymirrors/sm64coopdx
1
0
Fork 0
mirror of https://github.com/coop-deluxe/sm64coopdx.git synced 2026-04-22 01:52:43 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Add Dynamic Custom Model Allocation (#642)

Browse source
This commit is contained in:
Prince Frizzy 2025-02-12 21:58:29 -05:00 • committed by GitHub
parent cddf78cf12
commit cfbd0b1025
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 22 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/pc/lua/smlua.c
View file

@ -309,6 +309,7 @@ void smlua_init(void) {
smlua_exec_str(gSmluaConstants);
smlua_cobject_init_globals();
smlua_model_util_initialize();
// load scripts
mods_size_enforce(&gActiveMods);

27
src/pc/lua/utils/smlua_model_utils.c
View file

@ -462,12 +462,21 @@ struct ModelUtilsInfo sModels[E_MODEL_MAX] = {
MODEL_UTIL_GEO_PERM(E_MODEL_WARIOS_WINGED_METAL_CAP, warios_winged_metal_cap_geo, MODEL_WARIOS_WINGED_METAL_CAP),
};
#define MAX_CUSTOM_MODELS 1024
#define CUSTOM_MODEL_CHUNK_SIZE 256
static u16 sCustomModelsCount = 0;
struct ModelUtilsInfo sCustomModels[MAX_CUSTOM_MODELS] = { 0 };
static u16 sMaxCustomModelsCount = CUSTOM_MODEL_CHUNK_SIZE;
struct ModelUtilsInfo *sCustomModels = NULL;
void smlua_model_util_initialize(void) {
// Allocate the custom models array. We start off with a maximum of 256 custom models.
sCustomModels = (struct ModelUtilsInfo *)calloc(sMaxCustomModelsCount, sizeof(struct ModelUtilsInfo));
}
void smlua_model_util_clear(void) {
sCustomModelsCount = 0;
sMaxCustomModelsCount = CUSTOM_MODEL_CHUNK_SIZE;
if (sCustomModels) { free(sCustomModels); }
sCustomModels = NULL;
}
void smlua_model_util_store_in_slot(u32 slot, const char* name) {
@ -494,14 +503,14 @@ u16 smlua_model_util_load(enum ModelExtendedId extId) {
}
enum ModelExtendedId smlua_model_util_get_id(const char* name) {
// find geolayout
// Find geolayout
const void* asset = dynos_geolayout_get(name);
if (asset == NULL) {
LOG_LUA_LINE("Could not find model: '%s'", name);
return E_MODEL_ERROR_MODEL;
}
// find existing built-in model
// Find existing built-in model
for (u32 i = 0; i < E_MODEL_MAX; i++) {
struct ModelUtilsInfo* m = &sModels[i];
if (m->asset == asset) {
@ -509,7 +518,7 @@ enum ModelExtendedId smlua_model_util_get_id(const char* name) {
}
}
// find existing custom model
// Find existing custom model
for (u32 i = 0; i < sCustomModelsCount; i++) {
struct ModelUtilsInfo* m = &sCustomModels[i];
if (m->asset == asset) {
@ -517,12 +526,16 @@ enum ModelExtendedId smlua_model_util_get_id(const char* name) {
}
}
if (sCustomModelsCount >= MAX_CUSTOM_MODELS) {
// If we've extended past our current custom model limit. Reallocate so we have more space.
if (sCustomModelsCount >= sMaxCustomModelsCount && sMaxCustomModelsCount + CUSTOM_MODEL_CHUNK_SIZE < 65535) {
sMaxCustomModelsCount += CUSTOM_MODEL_CHUNK_SIZE;
sCustomModels = (struct ModelUtilsInfo *)realloc(sCustomModels, sMaxCustomModelsCount * sizeof(struct ModelUtilsInfo));
} else {
LOG_LUA("Failed to get model: '%s' (too many custom models!)", name);
return E_MODEL_ERROR_MODEL;
}
// allocate custom model
// Allocate custom model
u16 customIndex = sCustomModelsCount++;
struct ModelUtilsInfo* info = &sCustomModels[customIndex];
info->asset = asset;

1
src/pc/lua/utils/smlua_model_utils.h
View file

@ -395,6 +395,7 @@ enum ModelExtendedId {
E_MODEL_MAX
};
void smlua_model_util_initialize(void);
void smlua_model_util_clear(void);
void smlua_model_util_store_in_slot(u32 slot, const char* name);
u16 smlua_model_util_load(enum ModelExtendedId extId);