falso
/
perfect_dark
mirror of https://github.com/n64decomp/perfect_dark.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Attempt to decompile sightRenderClassic

This commit is contained in:
Ryan Dwyer 2021-01-23 22:12:59 +10:00
parent 98f341c0aa
commit 97ed3ff422
2 changed files with 80 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

87
src/game/game_0d7070.c
View File

@ -2787,9 +2787,68 @@ glabel sightRenderClassic
/* f0d9924: 00000000 */ nop
);
Gfx *sightRenderType2(Gfx *gdl, bool arg1)
// Mismatch: Arguments for gDPFillRectangle are calculated differently
//Gfx *sightRenderClassic(Gfx *gdl, bool aiming)
//{
// struct textureconfig *tconfig = &var800ab580[0];
//
// s32 x = g_Vars.currentplayer->crosspos[0];
// s32 y = g_Vars.currentplayer->crosspos[1];
//
// f32 spc4[2];
// f32 spbc[2];
//
// s32 xradius;
// s32 yradius;
//
// if (!aiming) {
// return gdl;
// }
//
// gDPSetColorDither(gdl++, G_CD_DISABLE);
// gDPSetTexturePersp(gdl++, G_TP_NONE);
// gDPSetAlphaCompare(gdl++, G_AC_NONE);
// gDPSetTextureLOD(gdl++, G_TL_TILE);
// gDPSetTextureFilter(gdl++, G_TF_POINT);
// gDPSetTextureConvert(gdl++, G_TC_FILT);
// gDPSetTextureLUT(gdl++, G_TT_NONE);
// gDPPipeSync(gdl++);
// gDPSetCycleType(gdl++, G_CYC_1CYCLE);
// gDPSetRenderMode(gdl++, G_RM_XLU_SURF, G_RM_XLU_SURF2);
// gDPSetCombineMode(gdl++, G_CC_PRIMITIVE, G_CC_PRIMITIVE);
// gDPSetPrimColor(gdl++, 0, 0, 0x00, 0x00, 0x00, 0x00);
//
// xradius = tconfig->width >> 1;
// yradius = tconfig->height >> 1;
//
// gDPFillRectangle(gdl++, x - xradius, y - yradius, x + xradius, y + yradius);
//
// spc4[0] = x;
// spc4[1] = y;
//
// spbc[0] = (tconfig->width >> 1) * (f32)g_ScaleX;
// spbc[1] = tconfig->height >> 1;
//
// func0f0b39c0(&gdl, tconfig, 2, 0, 0, 1, 0);
//
// func0f0b278c(&gdl, spc4, spbc, tconfig->width, tconfig->height,
// 0, 0, 1, 0xff, 0xff, 0xff, 0x7f, tconfig->level > 0, 0);
//
// gDPPipeSync(gdl++);
// gDPSetColorDither(gdl++, G_CD_BAYER);
// gDPSetTexturePersp(gdl++, G_TP_PERSP);
// gDPSetAlphaCompare(gdl++, G_AC_NONE);
// gDPSetTextureLOD(gdl++, G_TL_LOD);
// gDPSetTextureFilter(gdl++, G_TF_BILERP);
// gDPSetTextureConvert(gdl++, G_TC_FILT);
// gDPSetTextureLUT(gdl++, G_TT_NONE);
//
// return gdl;
//}
Gfx *sightRenderType2(Gfx *gdl, bool aiming)
{
return sightRenderClassic(gdl, arg1);
return sightRenderClassic(gdl, aiming);
}
GLOBAL_ASM(
@ -5964,7 +6023,7 @@ bool sightHasTargetWhileAiming(s32 sight)
return false;
}
Gfx *sightRender(Gfx *gdl, bool arg1, s32 sight)
Gfx *sightRender(Gfx *gdl, bool aiming, s32 sight)
{
if (sight);
@ -5986,40 +6045,40 @@ Gfx *sightRender(Gfx *gdl, bool arg1, s32 sight)
sight = SIGHT_DEFAULT;
}
func0f0d7390(arg1);
func0f0d7390(aiming);
switch (sight) {
case SIGHT_DEFAULT:
gdl = sightRenderDefault(gdl, arg1 && optionsGetSightOnScreen(g_Vars.currentplayerstats->mpindex));
gdl = sightRenderDefault(gdl, aiming && optionsGetSightOnScreen(g_Vars.currentplayerstats->mpindex));
break;
case SIGHT_CLASSIC:
gdl = sightRenderClassic(gdl, arg1 && optionsGetSightOnScreen(g_Vars.currentplayerstats->mpindex));
gdl = sightRenderClassic(gdl, aiming && optionsGetSightOnScreen(g_Vars.currentplayerstats->mpindex));
break;
case SIGHT_2:
gdl = sightRenderType2(gdl, arg1 && optionsGetSightOnScreen(g_Vars.currentplayerstats->mpindex));
gdl = sightRenderType2(gdl, aiming && optionsGetSightOnScreen(g_Vars.currentplayerstats->mpindex));
break;
case SIGHT_3:
gdl = sightRenderDefault(gdl, arg1 && optionsGetSightOnScreen(g_Vars.currentplayerstats->mpindex));
gdl = sightRenderDefault(gdl, aiming && optionsGetSightOnScreen(g_Vars.currentplayerstats->mpindex));
break;
case SIGHT_SKEDAR:
gdl = sightRenderSkedar(gdl, arg1 && optionsGetSightOnScreen(g_Vars.currentplayerstats->mpindex));
gdl = sightRenderSkedar(gdl, aiming && optionsGetSightOnScreen(g_Vars.currentplayerstats->mpindex));
break;
case SIGHT_ZOOM:
gdl = sightRenderZoom(gdl, arg1 && optionsGetSightOnScreen(g_Vars.currentplayerstats->mpindex));
gdl = sightRenderZoom(gdl, aiming && optionsGetSightOnScreen(g_Vars.currentplayerstats->mpindex));
break;
case SIGHT_MAIAN:
gdl = sightRenderMaian(gdl, arg1 && optionsGetSightOnScreen(g_Vars.currentplayerstats->mpindex));
gdl = sightRenderMaian(gdl, aiming && optionsGetSightOnScreen(g_Vars.currentplayerstats->mpindex));
break;
default:
gdl = sightRenderDefault(gdl, arg1 && optionsGetSightOnScreen(g_Vars.currentplayerstats->mpindex));
gdl = sightRenderDefault(gdl, aiming && optionsGetSightOnScreen(g_Vars.currentplayerstats->mpindex));
break;
case SIGHT_NONE:
break;
}
if (sight != SIGHT_NONE && optionsGetSightOnScreen(g_Vars.currentplayerstats->mpindex)) {
if ((optionsGetAlwaysShowTarget(g_Vars.currentplayerstats->mpindex) && !arg1)
|| (arg1 && sightHasTargetWhileAiming(sight))) {
if ((optionsGetAlwaysShowTarget(g_Vars.currentplayerstats->mpindex) && !aiming)
|| (aiming && sightHasTargetWhileAiming(sight))) {
gdl = sightRenderTarget(gdl);
}
}

14
src/include/game/game_0d7070.h
View File

@ -13,15 +13,15 @@ s32 func0f0d789c(s32 arg0, s32 arg1, s32 arg2, s32 arg3);
u32 func0f0d78f4(void);
u32 func0f0d7f54(void);
u32 func0f0d87a8(void);
Gfx *sightRenderDefault(Gfx *gdl, bool arg1);
Gfx *sightRenderClassic(Gfx *gdl, bool arg1);
Gfx *sightRenderType2(Gfx *gdl, bool arg1);
Gfx *sightRenderDefault(Gfx *gdl, bool aiming);
Gfx *sightRenderClassic(Gfx *gdl, bool aiming);
Gfx *sightRenderType2(Gfx *gdl, bool aiming);
u32 func0f0d9948(void);
Gfx *sightRenderSkedar(Gfx *gdl, bool arg1);
Gfx *sightRenderZoom(Gfx *gdl, bool arg1);
Gfx *sightRenderMaian(Gfx *gdl, bool arg1);
Gfx *sightRenderSkedar(Gfx *gdl, bool aiming);
Gfx *sightRenderZoom(Gfx *gdl, bool aiming);
Gfx *sightRenderMaian(Gfx *gdl, bool aiming);
Gfx *sightRenderTarget(Gfx *gdl);
bool sightHasTargetWhileAiming(s32 sight);
Gfx *sightRender(Gfx *gdl, bool arg1, s32 sight);
Gfx *sightRender(Gfx *gdl, bool aiming, s32 sight);
#endif