using gdl_head to tie the engine less to SM64

This commit is contained in:
farisawan-2000
2020-12-12 20:28:07 -05:00
parent c52a054fdb
commit 738c0a220e
2 changed files with 13 additions and 13 deletions

View File

@@ -31,14 +31,14 @@ static Gfx s2d_init_dl[] = {
int s2d_red = 255, s2d_green = 255, s2d_blue = 255, s2d_alpha = 255;
void setup_font(int idx) {
gDPPipeSync(gDisplayListHead++);
gDPSetTextureFilter(gDisplayListHead++, G_TF_POINT);
gSPDisplayList(gDisplayListHead++, s2d_init_dl);
gDPSetEnvColor(gDisplayListHead++, s2d_red, s2d_green, s2d_blue, s2d_alpha);
gDPSetCycleType(gDisplayListHead++, G_CYC_1CYCLE);
gDPSetRenderMode(gDisplayListHead++, G_RM_XLU_SPRITE, G_RM_XLU_SPRITE2);
gSPObjRenderMode(gDisplayListHead++, G_OBJRM_XLU | G_OBJRM_BILERP);
gSPObjLoadTxtr(gDisplayListHead++, &s2d_tex[idx]);
gDPPipeSync(gdl_head++);
gDPSetTextureFilter(gdl_head++, G_TF_POINT);
gSPDisplayList(gdl_head++, s2d_init_dl);
gDPSetEnvColor(gdl_head++, s2d_red, s2d_green, s2d_blue, s2d_alpha);
gDPSetCycleType(gdl_head++, G_CYC_1CYCLE);
gDPSetRenderMode(gdl_head++, G_RM_XLU_SPRITE, G_RM_XLU_SPRITE2);
gSPObjRenderMode(gdl_head++, G_OBJRM_XLU | G_OBJRM_BILERP);
gSPObjLoadTxtr(gdl_head++, &s2d_tex[idx]);
}
extern void mat2_translate_vec(uObjMtx *m, f32 degrees, f32 mag);
@@ -61,7 +61,7 @@ void mtx_pipeline(uObjMtx *m, int x, int y) {
mat2_translate(m, x, y);
// yeah
gSPObjMatrix(gDisplayListHead++, m);
gSPObjMatrix(gdl_head++, m);
}
#include <PR/gu.h>
@@ -89,7 +89,7 @@ void mtx_pipeline2(uObjMtx *m, int x, int y) {
}
// yeah
gSPObjMatrix(gDisplayListHead++, m);
gSPObjMatrix(gdl_head++, m);
}
void draw_s2d_glyph(char c, int x, int y, uObjMtx *mt) {
@@ -98,7 +98,7 @@ void draw_s2d_glyph(char c, int x, int y, uObjMtx *mt) {
// mtx_pipeline(mt, x, y);
mtx_pipeline(mt, x, y);
gSPObjSprite(gDisplayListHead++, &s2d_font);
gSPObjSprite(gdl_head++, &s2d_font);
}

View File

@@ -48,10 +48,10 @@ void s2d_print(int x, int y, const char *str, uObjMtx *buf) {
break;
case CH_TRANSLATE:
CH_GET_NEXT(p);
tx = s2d_atoi(p, &p);
x = s2d_atoi(p, &p);
CH_GET_NEXT(p);
CH_GET_NEXT(p);
ty = s2d_atoi(p, &p);
y = s2d_atoi(p, &p);
break;
case CH_COLOR:
CH_GET_NEXT(p);