sm64-mirrors/sm64ex-alo
1
0
Fork 0
mirror of https://github.com/AloUltraExt/sm64ex-alo.git synced 2025-01-23 08:02:14 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

r15: Renamed frame_buffer funcs and _ZBUFFER

Browse source
This commit is contained in:
AloXado320 2021-10-31 15:54:12 -05:00
parent d6b4aae276
commit 36a68f4deb
7 changed files with 13 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/engine/geo_layout.c
View file

@ -293,7 +293,7 @@ void geo_layout_cmd_nop3(void) {
}
/*
0x0C: Create zbuffer-toggling scene graph node
0x0C: Create z-buffer-toggling scene graph node
cmd+0x01: u8 enableZBuffer (1 = on, 0 = off)
*/
void geo_layout_cmd_node_master_list(void) {

2
src/game/area.c
View file

@ -442,7 +442,7 @@ void render_game(void) {
if (D_8032CE78 != NULL) {
clear_viewport(D_8032CE78, gWarpTransFBSetColor);
} else {
clear_frame_buffer(gWarpTransFBSetColor);
clear_framebuffer(gWarpTransFBSetColor);
}
}

8
src/game/game_init.c
View file

@ -170,7 +170,7 @@ void init_z_buffer(void) {
/**
* Tells the RDP which of the three framebuffers it shall draw to.
*/
void select_frame_buffer(void) {
void select_framebuffer(void) {
gDPPipeSync(gDisplayListHead++);
gDPSetCycleType(gDisplayListHead++, G_CYC_1CYCLE);
@ -184,7 +184,7 @@ void select_frame_buffer(void) {
* Clear the framebuffer and fill it with a 32-bit color.
* Information about the color argument: https://jrra.zone/n64/doc/n64man/gdp/gDPSetFillColor.htm
*/
void clear_frame_buffer(s32 color) {
void clear_framebuffer(s32 color) {
gDPPipeSync(gDisplayListHead++);
gDPSetRenderMode(gDisplayListHead++, G_RM_OPA_SURF, G_RM_OPA_SURF2);
@ -299,7 +299,7 @@ void init_rcp(void) {
init_rdp();
init_rsp();
init_z_buffer();
select_frame_buffer();
select_framebuffer();
}
/**
@ -358,7 +358,7 @@ void render_init(void) {
gDisplayListHead = gGfxPool->buffer;
gGfxPoolEnd = (u8 *)(gGfxPool->buffer + GFX_POOL_SIZE);
init_rcp();
clear_frame_buffer(0);
clear_framebuffer(0);
end_master_display_list();
exec_display_list(&gGfxPool->spTask);

2
src/game/game_init.h
View file

@ -69,7 +69,7 @@ extern u32 gGlobalTimer;
void setup_game_memory(void);
void thread5_game_loop(UNUSED void *arg);
void clear_frame_buffer(s32 color);
void clear_framebuffer(s32 color);
void clear_viewport(Vp *viewport, s32 color);
void make_viewport_clip_rect(Vp *viewport);
void init_rcp(void);

4
src/game/rendering_graph_node.c
View file

@ -1608,7 +1608,7 @@ void geo_process_root(struct GraphNodeRoot *node, Vp *b, Vp *c, s32 clearColor)
vec3s_set(viewport->vp.vtrans, node->x * 4, node->y * 4, 511);
vec3s_set(viewport->vp.vscale, node->width * 4, node->height * 4, 511);
if (b != NULL) {
clear_frame_buffer(clearColor);
clear_framebuffer(clearColor);
#ifdef HIGH_FPS_PC
viewportInterpolated = alloc_display_list(sizeof(*viewportInterpolated));
interpolate_vectors_s16(viewportInterpolated->vp.vtrans, sPrevViewport.vp.vtrans, b->vp.vtrans);
@ -1623,7 +1623,7 @@ void geo_process_root(struct GraphNodeRoot *node, Vp *b, Vp *c, s32 clearColor)
}
else if (c != NULL) {
clear_frame_buffer(clearColor);
clear_framebuffer(clearColor);
make_viewport_clip_rect(c);
}
#ifdef HIGH_FPS_PC

4
src/goddard/renderer.c
View file

@ -1670,7 +1670,7 @@ void gd_dl_set_fill(struct GdColour *colour) {
}
/* 24CDB4 -> 24CE10; orig name: func_8019E5E4 */
void gd_dl_set_zbuffer_area(void) {
void gd_dl_set_z_buffer_area(void) {
gDPSetDepthImage(next_gfx(), GD_LOWER_24(sActiveView->parent->zbuf));
}
@ -2378,7 +2378,7 @@ void Unknown801A1E70(void) {
gDPPipeSync(next_gfx());
gDPSetCycleType(next_gfx(), G_CYC_FILL);
gDPSetRenderMode(next_gfx(), G_RM_OPA_SURF, G_RM_OPA_SURF2);
gd_dl_set_zbuffer_area();
gd_dl_set_z_buffer_area();
gDPSetColorImage(next_gfx(), G_IM_FMT_RGBA, G_IM_SIZ_16b, sActiveView->parent->lowerRight.x,
GD_LOWER_24(sActiveView->parent->zbuf));
gDPSetFillColor(next_gfx(), GPACK_ZDZ(G_MAXFBZ, 0) << 16 | GPACK_ZDZ(G_MAXFBZ, 0));

4
src/menu/intro_geo.c
View file

@ -511,7 +511,7 @@ Gfx *intro_draw_face(u16 *image, s32 imageW, s32 imageH) {
return dl;
}
u16 *intro_sample_frame_buffer(s32 imageW, s32 imageH, s32 sampleW, s32 sampleH) {
u16 *intro_sample_framebuffer(s32 imageW, s32 imageH, s32 sampleW, s32 sampleH) {
u16 *fb;
u16 *image;
s32 pixel;
@ -608,7 +608,7 @@ Gfx *geo_intro_face_easter_egg(s32 state, struct GraphNode *node, UNUSED void *c
// Draw while the first or last face is visible.
if (sFaceVisible[0] == 1 || sFaceVisible[17] == 1) {
image = intro_sample_frame_buffer(40, 40, 2, 2);
image = intro_sample_framebuffer(40, 40, 2, 2);
if (image != NULL) {
genNode->fnNode.node.flags = (genNode->fnNode.node.flags & 0xFF) | (LAYER_OPAQUE << 8);
dl = intro_draw_face(image, 40, 40);