mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2025-08-21 22:41:14 +00:00
Code Issues Projects Releases Wiki Activity

PlayState Rename (#1231)

Browse source 
* global context -> play

* fix PlayState* PlayState
This commit is contained in:
fig02 2022-05-21 14:23:43 -04:00 • committed by GitHub
parent 154f44b6da
commit 2e6279bc8e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
912 changed files with 40489 additions and 41078 deletions
Download patch file Download diff file Expand all files Collapse all files

78
src/overlays/actors/ovl_Mir_Ray/z_mir_ray.c
View file

@ -9,10 +9,10 @@
#define FLAGS (ACTOR_FLAG_4 | ACTOR_FLAG_5)
void MirRay_Init(Actor* thisx, GlobalContext* globalCtx);
void MirRay_Destroy(Actor* thisx, GlobalContext* globalCtx);
void MirRay_Update(Actor* thisx, GlobalContext* globalCtx);
void MirRay_Draw(Actor* thisx, GlobalContext* globalCtx);
void MirRay_Init(Actor* thisx, PlayState* play);
void MirRay_Destroy(Actor* thisx, PlayState* play);
void MirRay_Update(Actor* thisx, PlayState* play);
void MirRay_Draw(Actor* thisx, PlayState* play);
s32 MirRay_CheckInFrustum(Vec3f* vecA, Vec3f* vecB, f32 pointx, f32 pointy, f32 pointz, s16 radiusA, s16 radiusB);
@ -126,8 +126,8 @@ void MirRay_SetupCollider(MirRay* this) {
// Set up a light point between source point and reflection point. Reflection point is the pool point (for windows) or
// at the player position (for mirrors)
void MirRay_MakeShieldLight(MirRay* this, GlobalContext* globalCtx) {
Player* player = GET_PLAYER(globalCtx);
void MirRay_MakeShieldLight(MirRay* this, PlayState* play) {
Player* player = GET_PLAYER(play);
MirRayDataEntry* dataEntry = &sMirRayData[this->actor.params];
Vec3f reflectionPt;
Vec3s lightPt;
@ -158,7 +158,7 @@ void MirRay_MakeShieldLight(MirRay* this, GlobalContext* globalCtx) {
}
}
void MirRay_Init(Actor* thisx, GlobalContext* globalCtx) {
void MirRay_Init(Actor* thisx, PlayState* play) {
s32 pad;
MirRay* this = (MirRay*)thisx;
MirRayDataEntry* dataEntry = &sMirRayData[this->actor.params];
@ -187,7 +187,7 @@ void MirRay_Init(Actor* thisx, GlobalContext* globalCtx) {
Lights_PointNoGlowSetInfo(&this->lightInfo, this->sourcePt.x, this->sourcePt.y, this->sourcePt.z, 255, 255, 255,
100);
this->lightNode = LightContext_InsertLight(globalCtx, &globalCtx->lightCtx, &this->lightInfo);
this->lightNode = LightContext_InsertLight(play, &play->lightCtx, &this->lightInfo);
this->shieldCorners[0].x = -536.0f;
this->shieldCorners[0].y = -939.0f;
@ -208,15 +208,15 @@ void MirRay_Init(Actor* thisx, GlobalContext* globalCtx) {
this->shieldCorners[5].y = -800.0f;
if (dataEntry->params & 2) {
Collider_InitJntSph(globalCtx, &this->colliderSph);
Collider_SetJntSph(globalCtx, &this->colliderSph, &this->actor, &sJntSphInit, &this->colliderSphItem);
Collider_InitJntSph(play, &this->colliderSph);
Collider_SetJntSph(play, &this->colliderSph, &this->actor, &sJntSphInit, &this->colliderSphItem);
if (!(dataEntry->params & 4)) { // Beams not from mirrors
MirRay_SetupCollider(this);
}
}
Collider_InitQuad(globalCtx, &this->shieldRay);
Collider_SetQuad(globalCtx, &this->shieldRay, &this->actor, &sQuadInit);
Collider_InitQuad(play, &this->shieldRay);
Collider_SetQuad(play, &this->shieldRay, &this->actor, &sQuadInit);
// Spirit Temple top room mirrors
if ((this->actor.params == 5) || (this->actor.params == 7) || (this->actor.params == 8)) {
@ -224,22 +224,22 @@ void MirRay_Init(Actor* thisx, GlobalContext* globalCtx) {
}
}
void MirRay_Destroy(Actor* thisx, GlobalContext* globalCtx) {
void MirRay_Destroy(Actor* thisx, PlayState* play) {
MirRay* this = (MirRay*)thisx;
LightContext_RemoveLight(globalCtx, &globalCtx->lightCtx, this->lightNode);
LightContext_RemoveLight(play, &play->lightCtx, this->lightNode);
if (sMirRayData[this->actor.params].params & 2) {
Collider_DestroyJntSph(globalCtx, &this->colliderSph);
Collider_DestroyJntSph(play, &this->colliderSph);
}
Collider_DestroyQuad(globalCtx, &this->shieldRay);
Collider_DestroyQuad(play, &this->shieldRay);
}
void MirRay_Update(Actor* thisx, GlobalContext* globalCtx) {
void MirRay_Update(Actor* thisx, PlayState* play) {
s32 pad;
MirRay* this = (MirRay*)thisx;
Player* player = GET_PLAYER(globalCtx);
Player* player = GET_PLAYER(play);
D_80B8E670 = 0;
@ -248,12 +248,12 @@ void MirRay_Update(Actor* thisx, GlobalContext* globalCtx) {
if (sMirRayData[this->actor.params].params & 4) { // Beams from mirrors
MirRay_SetupCollider(this);
}
CollisionCheck_SetAT(globalCtx, &globalCtx->colChkCtx, &this->colliderSph.base);
CollisionCheck_SetAT(play, &play->colChkCtx, &this->colliderSph.base);
}
if (this->reflectIntensity > 0.0f) {
CollisionCheck_SetAT(globalCtx, &globalCtx->colChkCtx, &this->shieldRay.base);
CollisionCheck_SetAT(play, &play->colChkCtx, &this->shieldRay.base);
}
MirRay_MakeShieldLight(this, globalCtx);
MirRay_MakeShieldLight(this, play);
if (this->reflectIntensity > 0.0f) {
func_8002F8F0(&player->actor, NA_SE_IT_SHIELD_BEAM - SFX_FLAG);
@ -261,13 +261,13 @@ void MirRay_Update(Actor* thisx, GlobalContext* globalCtx) {
}
}
void MirRay_SetIntensity(MirRay* this, GlobalContext* globalCtx) {
void MirRay_SetIntensity(MirRay* this, PlayState* play) {
f32 sp4C[3];
f32 temp_f0;
f32 temp_f0_2;
f32 temp_f2_2;
s32 pad;
Player* player = GET_PLAYER(globalCtx);
Player* player = GET_PLAYER(play);
MtxF* shieldMtx = &player->shieldMf;
this->reflectIntensity = 0.0f;
@ -305,8 +305,8 @@ void MirRay_SetIntensity(MirRay* this, GlobalContext* globalCtx) {
// Draws six images, one for each corner of the shield, by finding the intersection of a line segment from the corner
// perpendicular to the shield with the nearest collision (if any).
void MirRay_SetupReflectionPolys(MirRay* this, GlobalContext* globalCtx, MirRayShieldReflection* reflection) {
Player* player = GET_PLAYER(globalCtx);
void MirRay_SetupReflectionPolys(MirRay* this, PlayState* play, MirRayShieldReflection* reflection) {
Player* player = GET_PLAYER(play);
MtxF* shieldMtx;
s32 i;
Vec3f posA;
@ -331,7 +331,7 @@ void MirRay_SetupReflectionPolys(MirRay* this, GlobalContext* globalCtx, MirRayS
posB.x = sp60[0] + posA.x;
posB.y = sp60[1] + posA.y;
posB.z = sp60[2] + posA.z;
if (BgCheck_AnyLineTest1(&globalCtx->colCtx, &posA, &posB, &posResult, &outPoly, 1)) {
if (BgCheck_AnyLineTest1(&play->colCtx, &posA, &posB, &posResult, &outPoly, 1)) {
reflection[i].reflectionPoly = outPoly;
} else {
reflection[i].reflectionPoly = NULL;
@ -360,8 +360,8 @@ void MirRay_RemoveSimilarReflections(MirRayShieldReflection* reflection) {
}
// Creates the reflected beam's collider (to interact with objects) and places and orients the shield images
void MirRay_ReflectedBeam(MirRay* this, GlobalContext* globalCtx, MirRayShieldReflection* reflection) {
Player* player = GET_PLAYER(globalCtx);
void MirRay_ReflectedBeam(MirRay* this, PlayState* play, MirRayShieldReflection* reflection) {
Player* player = GET_PLAYER(play);
s32 i;
f32 temp_f0;
Vec3f vecB;
@ -473,29 +473,29 @@ void MirRay_ReflectedBeam(MirRay* this, GlobalContext* globalCtx, MirRayShieldRe
}
}
void MirRay_Draw(Actor* thisx, GlobalContext* globalCtx) {
void MirRay_Draw(Actor* thisx, PlayState* play) {
MirRay* this = (MirRay*)thisx;
Player* player = GET_PLAYER(globalCtx);
Player* player = GET_PLAYER(play);
s32 i;
MirRayShieldReflection reflection[6];
s32 temp;
this->reflectIntensity = 0.0f;
if ((D_80B8E670 == 0) && !this->unLit && Player_HasMirrorShieldSetToDraw(globalCtx)) {
if ((D_80B8E670 == 0) && !this->unLit && Player_HasMirrorShieldSetToDraw(play)) {
Matrix_Mult(&player->shieldMf, MTXMODE_NEW);
MirRay_SetIntensity(this, globalCtx);
MirRay_SetIntensity(this, play);
if (!(this->reflectIntensity <= 0.0f)) {
OPEN_DISPS(globalCtx->state.gfxCtx, "../z_mir_ray.c", 966);
OPEN_DISPS(play->state.gfxCtx, "../z_mir_ray.c", 966);
func_80093D84(globalCtx->state.gfxCtx);
func_80093D84(play->state.gfxCtx);
Matrix_Scale(1.0f, 1.0f, this->reflectIntensity * 5.0f, MTXMODE_APPLY);
gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_mir_ray.c", 972),
gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(play->state.gfxCtx, "../z_mir_ray.c", 972),
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gDPSetPrimColor(POLY_XLU_DISP++, 0, 0, 255, 255, 150, (s16)(temp = this->reflectIntensity * 100.0f));
gSPDisplayList(POLY_XLU_DISP++, gShieldBeamGlowDL);
MirRay_SetupReflectionPolys(this, globalCtx, reflection);
MirRay_SetupReflectionPolys(this, play, reflection);
MirRay_RemoveSimilarReflections(reflection);
MirRay_ReflectedBeam(this, globalCtx, reflection);
MirRay_ReflectedBeam(this, play, reflection);
if (reflection[0].reflectionPoly == NULL) {
reflection[0].opacity = 0;
@ -512,7 +512,7 @@ void MirRay_Draw(Actor* thisx, GlobalContext* globalCtx) {
Matrix_Translate(reflection[i].pos.x, reflection[i].pos.y, reflection[i].pos.z, MTXMODE_NEW);
Matrix_Scale(0.01f, 0.01f, 0.01f, MTXMODE_APPLY);
Matrix_Mult(&reflection[i].mtx, MTXMODE_APPLY);
gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_mir_ray.c", 1006),
gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(play->state.gfxCtx, "../z_mir_ray.c", 1006),
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gDPSetRenderMode(POLY_XLU_DISP++, G_RM_FOG_SHADE_A, G_RM_AA_ZB_XLU_DECAL2);
gDPSetPrimColor(POLY_XLU_DISP++, 0, 0, 255, 255, 150, reflection[0].opacity);
@ -522,7 +522,7 @@ void MirRay_Draw(Actor* thisx, GlobalContext* globalCtx) {
D_80B8E670 = 1;
CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_mir_ray.c", 1027);
CLOSE_DISPS(play->state.gfxCtx, "../z_mir_ray.c", 1027);
}
}
}