etc/sm64coopdx
0
0
Fork 0
mirror of https://github.com/coop-deluxe/sm64coopdx.git synced 2024-12-22 16:30:23 +00:00
Code Issues Projects Releases Packages Wiki Activity

fixed Lua profiler showing mods that aren't active

Browse source
This commit is contained in:
Isaac0-dev 2024-10-20 21:36:30 +10:00
parent a0ae1cdc02
commit d7352b8d2a
1 changed files with 45 additions and 33 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

78
src/pc/djui/djui_lua_profiler.c
View file

@ -26,11 +26,12 @@ struct DjuiPrfDisplay {
struct DjuiBase base;
};
struct DjuiPrfDisplay *sPrfDisplay = NULL;
static struct DjuiPrfDisplay *sPrfDisplay = NULL;
static u8 sPrfDisplayCount = 0;
void lua_profiler_start_counter(UNUSED struct Mod *mod) {
if (!configLuaProfiler || sPrfDisplay == NULL) { return; }
#ifndef WAPI_DUMMY
for (s32 i = 0; i != MIN(MAX_PROFILED_MODS, gActiveMods.entryCount); ++i) {
if (gActiveMods.entries[i] == mod) {
@ -45,13 +46,13 @@ void lua_profiler_start_counter(UNUSED struct Mod *mod) {
void lua_profiler_stop_counter(UNUSED struct Mod *mod) {
if (!configLuaProfiler || sPrfDisplay == NULL) { return; }
#ifndef WAPI_DUMMY
for (s32 i = 0; i != MIN(MAX_PROFILED_MODS, gActiveMods.entryCount); ++i) {
if (gActiveMods.entries[i] == mod) {
f64 freq = SDL_GetPerformanceFrequency();
f64 curr = SDL_GetPerformanceCounter();
struct DjuiPrfCounter *counter = &sPrfDisplay->entries[i].counter;
counter->end = curr / freq;
counter->sum += counter->end - counter->start;
@ -61,19 +62,54 @@ void lua_profiler_stop_counter(UNUSED struct Mod *mod) {
#endif
}
void djui_lua_profiler_initialize_entry(struct DjuiBase *base, struct DjuiPrfEntry *entry, f64 offset) {
struct DjuiText *name = djui_text_create(base, "");
djui_text_set_alignment(name, DJUI_HALIGN_LEFT, DJUI_VALIGN_TOP);
djui_base_set_size_type(&name->base, DJUI_SVT_RELATIVE, DJUI_SVT_ABSOLUTE);
djui_base_set_size(&name->base, 1.0f, name->fontScale * 2);
djui_base_set_location(&name->base, 0, -name->fontScale / 3.0f + offset);
djui_base_set_color(&name->base, 255, 255, 255, 240);
struct DjuiText *timing = djui_text_create(base, "");
djui_text_set_alignment(timing, DJUI_HALIGN_RIGHT, DJUI_VALIGN_TOP);
djui_base_set_size_type(&timing->base, DJUI_SVT_RELATIVE, DJUI_SVT_ABSOLUTE);
djui_base_set_size(&timing->base, 1.0f, timing->fontScale * 2);
djui_base_set_location(&timing->base, 0, -timing->fontScale / 3.0f + offset);
djui_base_set_color(&timing->base, 255, 255, 255, 240);
entry->name = name;
entry->timing = timing;
}
void djui_lua_profiler_update(void) {
if (!configLuaProfiler || sPrfDisplay == NULL) { return; }
if (sPrfDisplayCount != gActiveMods.entryCount) {
for (s32 i = 0; i < MAX(sPrfDisplayCount, gActiveMods.entryCount); i++) {
struct DjuiPrfEntry *entry = &sPrfDisplay->entries[i];
if (i >= sPrfDisplayCount) {
djui_lua_profiler_initialize_entry(&sPrfDisplay->base, entry, 4.0 + (i * 22.0));
}
if (i >= gActiveMods.entryCount) {
djui_base_destroy(&entry->name->base);
djui_base_destroy(&entry->timing->base);
entry->name = NULL;
entry->timing = NULL;
}
}
sPrfDisplayCount = gActiveMods.entryCount;
}
// Draw the counters.
for (s32 i = 0; i < MIN(MAX_PROFILED_MODS, gActiveMods.entryCount); i++) {
struct DjuiPrfEntry *entry = &sPrfDisplay->entries[i];
struct DjuiPrfCounter *counter = &entry->counter;
if (gGlobalTimer % REFRESH_RATE == 0) {
counter->display = counter->sum / (f64) REFRESH_RATE;
counter->sum = 0;
}
char name[256];
memset(name, 0, 256);
const char *modName = gActiveMods.entries[i]->relativePath;
@ -85,7 +121,7 @@ void djui_lua_profiler_update(void) {
name[j] = c;
}
djui_text_set_text(entry->name, name);
// The timing is in microseconds.
s32 counterMs = (s32)(counter->display * 1000000.0);
char timing[32];
@ -96,7 +132,7 @@ void djui_lua_profiler_update(void) {
void djui_lua_profiler_render(void) {
if (!configLuaProfiler || sPrfDisplay == NULL) { return; }
djui_rect_render(&sPrfDisplay->base);
djui_base_render(&sPrfDisplay->base);
}
@ -105,25 +141,6 @@ void djui_lua_profiler_on_destroy(UNUSED struct DjuiBase* base) {
free(sPrfDisplay);
}
void djui_lua_profiler_initialize_entry(struct DjuiBase *base, struct DjuiPrfEntry *entry, f64 offset) {
struct DjuiText *name = djui_text_create(base, "");
djui_text_set_alignment(name, DJUI_HALIGN_LEFT, DJUI_VALIGN_TOP);
djui_base_set_size_type(&name->base, DJUI_SVT_RELATIVE, DJUI_SVT_ABSOLUTE);
djui_base_set_size(&name->base, 1.0f, name->fontScale * 2);
djui_base_set_location(&name->base, 0, -name->fontScale / 3.0f + offset);
djui_base_set_color(&name->base, 255, 255, 255, 240);
struct DjuiText *timing = djui_text_create(base, "");
djui_text_set_alignment(timing, DJUI_HALIGN_RIGHT, DJUI_VALIGN_TOP);
djui_base_set_size_type(&timing->base, DJUI_SVT_RELATIVE, DJUI_SVT_ABSOLUTE);
djui_base_set_size(&timing->base, 1.0f, timing->fontScale * 2);
djui_base_set_location(&timing->base, 0, -timing->fontScale / 3.0f + offset);
djui_base_set_color(&timing->base, 255, 255, 255, 240);
entry->name = name;
entry->timing = timing;
}
void djui_lua_profiler_create(void) {
struct DjuiPrfDisplay *prfDisplay = calloc(1, sizeof(struct DjuiPrfDisplay));
struct DjuiBase *base = &prfDisplay->base;
@ -134,11 +151,6 @@ void djui_lua_profiler_create(void) {
djui_base_set_border_width(base, 4);
djui_base_set_padding(base, 4, 4, 4, 4);
djui_base_set_location(base, 0, 300.0f);
f64 offset = 4.0;
for (s32 i = 0; i < MAX_PROFILED_MODS; ++i, offset += 22.0) {
djui_lua_profiler_initialize_entry(base, &prfDisplay->entries[i], offset);
}
sPrfDisplay = prfDisplay;
}