thirdpartymirrors/sm64coopdx
1
0
Fork 0
mirror of https://github.com/coop-deluxe/sm64coopdx.git synced 2025-10-30 08:01:01 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

stop djui_hud_set_render_behind_hud from effecting the main djui (#359)

Browse source 
* stop djui_hud_set_render_behind_hud from effecting the main djui

* use djui_reset_hud_params
This commit is contained in:
Isaac0-dev 2023-04-26 11:42:21 +10:00 • committed by GitHub
parent 93a1b7af8c
commit 03ddc00525
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 15 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/game/area.c
View file

@ -425,8 +425,13 @@ void render_game(void) {
gDPSetScissor(gDisplayListHead++, G_SC_NON_INTERLACE, 0, BORDER_HEIGHT, SCREEN_WIDTH, gDPSetScissor(gDisplayListHead++, G_SC_NON_INTERLACE, 0, BORDER_HEIGHT, SCREEN_WIDTH,
SCREEN_HEIGHT - BORDER_HEIGHT); SCREEN_HEIGHT - BORDER_HEIGHT);
if (gDjuiRenderBehindHud && !gDjuiPanelPauseCreated) {
djui_render(); if (!gDjuiDisabled && gDjuiRenderBehindHud) {
djui_reset_hud_params();
create_dl_ortho_matrix();
djui_gfx_displaylist_begin();
smlua_call_event_hooks_with_reset_func(HOOK_ON_HUD_RENDER, djui_reset_hud_params);
djui_gfx_displaylist_end();
} }
render_hud(); render_hud();

6
src/game/game_init.c
View file

@ -260,10 +260,8 @@ void end_master_display_list(void) {
draw_profiler(); draw_profiler();
} }
if (!gDjuiRenderBehindHud || gDjuiPanelPauseCreated) { extern void djui_render(void);
extern void djui_render(void); djui_render();
djui_render();
}
gDPFullSync(gDisplayListHead++); gDPFullSync(gDisplayListHead++);
gSPEndDisplayList(gDisplayListHead++); gSPEndDisplayList(gDisplayListHead++);

8
src/pc/djui/djui.c
View file

@ -91,7 +91,7 @@ void djui_lua_error(char* text) {
sDjuiLuaErrorTimeout = 30 * 5; sDjuiLuaErrorTimeout = 30 * 5;
} }
static void djui_reset_hud_params(void) { void djui_reset_hud_params(void) {
djui_hud_set_resolution(RESOLUTION_DJUI); djui_hud_set_resolution(RESOLUTION_DJUI);
djui_hud_set_font(FONT_NORMAL); djui_hud_set_font(FONT_NORMAL);
djui_hud_set_rotation(0, 0, 0); djui_hud_set_rotation(0, 0, 0);
@ -108,8 +108,10 @@ void djui_render(void) {
create_dl_ortho_matrix(); create_dl_ortho_matrix();
djui_gfx_displaylist_begin(); djui_gfx_displaylist_begin();
djui_reset_hud_params(); if (!gDjuiRenderBehindHud) {
smlua_call_event_hooks_with_reset_func(HOOK_ON_HUD_RENDER, djui_reset_hud_params); djui_reset_hud_params();
smlua_call_event_hooks_with_reset_func(HOOK_ON_HUD_RENDER, djui_reset_hud_params);
}
djui_panel_update(); djui_panel_update();
djui_popup_update(); djui_popup_update();

1
src/pc/djui/djui.h
View file

@ -43,3 +43,4 @@ void djui_init(void);
void djui_connect_menu_open(void); void djui_connect_menu_open(void);
void djui_lua_error(char* text); void djui_lua_error(char* text);
void djui_render(void); void djui_render(void);
void djui_reset_hud_params(void);