hackern64/ultrasm64-2
0
0
Fork 0
mirror of https://github.com/HackerN64/ultrasm64-2.git synced 2026-01-21 10:38:08 -08:00
Code Issues Packages Projects Releases Wiki Activity

RGFX5: Working 2D boxes

Browse Source
This commit is contained in:
a
2025-07-04 15:29:22 -04:00
parent 147c92fd0e
commit 43eaa38154
2 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/sm64.h
View File

@@ -434,6 +434,4 @@
#define CRASH *(vs8*)0 = 0; #define CRASH *(vs8*)0 = 0;
#define MASTERDL gDisplayListHead++
#endif // SM64_H #endif // SM64_H

8
src/game/rgfx_hud.c
View File

@@ -6,6 +6,8 @@
#include "n64-stdio.h" #include "n64-stdio.h"
#include "sm64.h" #include "sm64.h"
#include "segment2.h"
/* /*
* RGFXHUD 5 * RGFXHUD 5
* Features 3D transforms for menu elements. * Features 3D transforms for menu elements.
@@ -203,6 +205,7 @@ static void rgfx_draw_box(RgfxHud *c) {
y2 = SCREEN_HEIGHT; y2 = SCREEN_HEIGHT;
} }
gDPPipeSync(MASTERDL); gDPPipeSync(MASTERDL);
gDPSetCombineLERP(MASTERDL, 0, 0, 0, ENVIRONMENT, 0, 0, 0, ENVIRONMENT, 0, 0, 0, ENVIRONMENT, 0, 0, 0, ENVIRONMENT);
if (is_2d_element(c) && !is_parent_3d(c)) { // we are using fillrect if (is_2d_element(c) && !is_parent_3d(c)) { // we are using fillrect
if (c->d.box.color[3] == 255 && ABS(x - x2) % 4) { // fill cycle if (c->d.box.color[3] == 255 && ABS(x - x2) % 4) { // fill cycle
gDPSetCycleType(MASTERDL, G_CYC_FILL); gDPSetCycleType(MASTERDL, G_CYC_FILL);
@@ -220,10 +223,12 @@ static void rgfx_draw_box(RgfxHud *c) {
} }
gDPSetEnvColor(MASTERDL, c->d.box.color[0], c->d.box.color[1], c->d.box.color[2], c->d.box.color[3]); gDPSetEnvColor(MASTERDL, c->d.box.color[0], c->d.box.color[1], c->d.box.color[2], c->d.box.color[3]);
gDPFillRectangle(MASTERDL, x, y, x2, y2); gDPFillRectangle(MASTERDL, x, y, x2, y2);
gDPPipeSync(MASTERDL);
} else { // we are using ortho triangles } else { // we are using ortho triangles
v = alloc_display_list(sizeof(Vtx) * 4); v = alloc_display_list(sizeof(Vtx) * 4);
} }
gDPPipeSync(MASTERDL);
gDPSetEnvColor(MASTERDL, 255, 255, 255, 255);
gSPDisplayList(MASTERDL, dl_hud_img_end);
} }
static void rgfx_draw_text(RgfxHud *c) { static void rgfx_draw_text(RgfxHud *c) {
@@ -261,5 +266,6 @@ void rgfx_hud_draw() {
} }
c++; c++;
} }
sRgfxHudHead[i] = &sRgfxHudBuffer[i][0];
} }
} }