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

Name most sky symbols

This commit is contained in:
Ryan Dwyer 2023-05-25 17:35:22 +10:00
parent 5cc44be4da
commit be585be596
8 changed files with 1245 additions and 1191 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/game/bondview.c
View File

@ -1965,7 +1965,7 @@ Gfx *bviewDrawNvLens(Gfx *gdl)
brightness = roomGetFinalBrightness(g_Vars.currentplayer->prop->rooms[0]);
if (brightness > 128) {
sky0f127334(brightness, brightness, brightness);
skySetOverexposure(brightness, brightness, brightness);
}
if (g_Menus[g_Vars.currentplayerstats->mpindex].curdialog == NULL) {

2
src/game/game_13c510.c
View File

@ -505,7 +505,7 @@ Gfx *artifactsRenderGlaresForRoom(Gfx *gdl, s32 roomnum)
f0 = s3[2] * (1.0f / 255.0f);
sky0f127334((s32) ((f32)f0 * r), (s32) ((f32)f0 * g), (s32) ((f32)f0 * b));
skySetOverexposure((s32) ((f32)f0 * r), (s32) ((f32)f0 * g), (s32) ((f32)f0 * b));
for (l = 0; l < 3; l++) {
lightroompos[l] = (light->bbox[0].s[l] + light->bbox[1].s[l] + light->bbox[2].s[l] + light->bbox[3].s[l]) / 4;

2
src/game/lv.c
View File

@ -1632,7 +1632,7 @@ Gfx *lvRender(Gfx *gdl)
#endif
}
gdl = sky0f1274d8(gdl);
gdl = skyRenderOverexposure(gdl);
gdl = amRender(gdl);
mtx00016748(1);

12
src/game/player.c
View File

@ -796,12 +796,12 @@ void playerLoadDefaults(void)
g_Vars.currentplayer->usinggoggles = false;
g_Vars.currentplayer->nvhum = NULL;
g_Vars.currentplayer->nvoverload = NULL;
g_Vars.currentplayer->unk1c28 = 0;
g_Vars.currentplayer->unk1c2c = 0;
g_Vars.currentplayer->unk1c30 = 0;
g_Vars.currentplayer->unk1c34 = 0;
g_Vars.currentplayer->unk1c38 = 0;
g_Vars.currentplayer->unk1c3c = 0;
g_Vars.currentplayer->overexposurered = 0;
g_Vars.currentplayer->overexposuregreen = 0;
g_Vars.currentplayer->overexposureblue = 0;
g_Vars.currentplayer->prevoverexposurered = 0;
g_Vars.currentplayer->prevoverexposuregreen = 0;
g_Vars.currentplayer->prevoverexposureblue = 0;
}
bool playerSpawnAnti(struct chrdata *hostchr, bool force)

2346
src/game/sky.c
View File

File diff suppressed because it is too large Load Diff

36
src/include/game/sky.h
View File

@ -8,28 +8,28 @@ void skyReset(u32 stagenum);
void skyTick(void);
void sky0f11f000(f32 left, f32 top, struct coord *arg2);
bool sky0f11f07c(struct coord *arg0, struct coord *arg1, f32 *arg2);
bool sky0f11f1fc(struct coord *arg0, struct coord *arg1, f32 *arg2);
void sky0f11f384(struct coord *arg0, struct coord *arg1, struct coord *out);
void skyGetWorldPosFromScreenPos(f32 left, f32 top, struct coord *dst);
bool skyIsScreenCornerInSky(struct coord *corner3dpos, struct coord *dstpos, f32 *dstfrac);
bool skyIsCornerInWater(struct coord *corner3dpos, struct coord *dstpos, f32 *dstfrac);
void skyCalculateEdgeVertex(struct coord *arg0, struct coord *arg1, struct coord *out);
f32 skyClamp(f32 value, f32 min, f32 max);
f32 skyRound(f32 value);
void skyChooseCloudVtxColour(struct skything18 *arg0, f32 arg1);
void sky0f11f6ec(struct skything18 *arg0, f32 arg1);
void skyChooseCloudVtxColour(struct skyvtx3d *arg0, f32 arg1);
void skyChooseWaterVtxColour(struct skyvtx3d *arg0, f32 arg1);
Gfx *skyRender(Gfx *gdl);
void sky0f1228d0(struct skything18 *arg0, Mtxf *arg1, u16 arg2, f32 arg3, f32 arg4, struct skything38 *arg5);
bool sky0f122ce8(struct skything38 *arg0, struct skything38 *arg1);
Gfx *sky0f122d4c(Gfx *gdl, struct skything38 *arg1, struct skything38 *arg2, struct skything38 *arg3, f32 arg4, bool textured);
Gfx *sky0f123fd4(Gfx *gdl, struct skything38 *arg1, struct skything38 *arg2, struct skything38 *arg3, struct skything38 *arg4, f32 arg5);
void skyCreateArtifact(struct artifact *artifact, s32 x, s32 y);
f32 sky0f125a1c(struct artifact *artifacts);
void skyConvertVertex(struct skyvtx3d *arg0, Mtxf *arg1, u16 arg2, f32 arg3, f32 arg4, struct skyvtx2d *arg5);
bool skyVerticesAreSame(struct skyvtx2d *arg0, struct skyvtx2d *arg1);
Gfx *skyRenderTri(Gfx *gdl, struct skyvtx2d *arg1, struct skyvtx2d *arg2, struct skyvtx2d *arg3, f32 arg4, bool textured);
Gfx *skyRenderFull(Gfx *gdl, struct skyvtx2d *arg1, struct skyvtx2d *arg2, struct skyvtx2d *arg3, struct skyvtx2d *arg4, f32 arg5);
void skyCreateSunArtifact(struct artifact *artifact, s32 x, s32 y);
f32 skyGetArtifactGroupIntensityFrac(struct artifact *artifacts);
Gfx *skyRenderSuns(Gfx *gdl, bool xray);
Gfx *sky0f126384(Gfx *gdl, f32 x, f32 y, f32 arg3, f32 orbsize, s32 arg5, f32 arg6);
Gfx *sky0f126c3c(Gfx *gdl, f32 x, f32 y, f32 z, f32 arg4, f32 arg5);
Gfx *sky0f126de8(Gfx *gdl);
Gfx *skyRenderFlare(Gfx *gdl, f32 x, f32 y, f32 intensityfrac, f32 size, s32 flaretimer240, f32 alphafrac);
Gfx *skyRenderTeleportFlare(Gfx *gdl, f32 x, f32 y, f32 z, f32 size, f32 intensityfrac);
Gfx *skyRenderTeleportFlares(Gfx *gdl);
Gfx *skyRenderArtifacts(Gfx *gdl);
void sky0f127334(s32 arg0, s32 arg1, s32 arg2);
s32 sky0f127490(s32 arg0, s32 arg1);
Gfx *sky0f1274d8(Gfx *gdl);
void skySetOverexposure(s32 arg0, s32 arg1, s32 arg2);
s32 skyCalculateOverexposureComponent(s32 arg0, s32 arg1);
Gfx *skyRenderOverexposure(Gfx *gdl);
#endif

2
src/include/gbiex.h
View File

@ -121,7 +121,7 @@
#define gDPSetFogColorViaWord(pkt, rgba) gDPSetColor(pkt, G_SETFOGCOLOR, rgba)
/**
* gDPFillRectangle - a wrapper around gDPFillRectangle which applies
* gDPFillRectangleScaled - a wrapper around gDPFillRectangle which applies
* g_ScaleX to the X coordinates.
*
* g_ScaleX is normally 1, but 2 when using hi-res.

34
src/include/types.h
View File

@ -2792,12 +2792,12 @@ struct player {
/*0x1c1c*/ bool usinggoggles; // using night vision or IR scanner
/*0x1c20*/ struct sndstate *nvhum;
/*0x1c24*/ struct sndstate *nvoverload;
/*0x1c28*/ s32 unk1c28;
/*0x1c2c*/ s32 unk1c2c;
/*0x1c30*/ s32 unk1c30;
/*0x1c34*/ s32 unk1c34;
/*0x1c38*/ s32 unk1c38;
/*0x1c3c*/ s32 unk1c3c;
/*0x1c28*/ s32 overexposurered;
/*0x1c2c*/ s32 overexposuregreen;
/*0x1c30*/ s32 overexposureblue;
/*0x1c34*/ s32 prevoverexposurered;
/*0x1c38*/ s32 prevoverexposuregreen;
/*0x1c3c*/ s32 prevoverexposureblue;
/*0x1c40*/ u32 joybutinhibit;
/*0x1c44*/ struct coord bondextrapos;
/*0x1c50*/ u8 menuisactive : 1;
@ -6316,19 +6316,19 @@ struct texcacheitem {
u8 heights[7];
};
struct skything18 {
/*0x00*/ f32 unk00;
/*0x04*/ f32 unk04;
/*0x08*/ f32 unk08;
/*0x0c*/ f32 unk0c;
/*0x10*/ f32 unk10;
struct skyvtx3d {
/*0x00*/ f32 x;
/*0x04*/ f32 y;
/*0x08*/ f32 z;
/*0x0c*/ f32 s;
/*0x10*/ f32 t;
/*0x14*/ u8 r;
/*0x15*/ u8 g;
/*0x16*/ u8 b;
/*0x17*/ u8 a;
};
struct skything38 {
struct skyvtx2d {
/*0x00*/ f32 unk00;
/*0x04*/ f32 unk04;
/*0x08*/ f32 unk08;
@ -6337,10 +6337,10 @@ struct skything38 {
/*0x14*/ f32 g;
/*0x18*/ f32 b;
/*0x1c*/ f32 a;
/*0x20*/ f32 unk20;
/*0x24*/ f32 unk24;
/*0x28*/ f32 unk28;
/*0x2c*/ f32 unk2c;
/*0x20*/ f32 s;
/*0x24*/ f32 t;
/*0x28*/ f32 x;
/*0x2c*/ f32 y;
/*0x30*/ f32 unk30;
/*0x34*/ f32 unk34;
};