mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2025-02-03 01:54:37 +00:00
Code Issues Projects Releases Wiki Activity

format files

Browse source 
Signed-off-by: angie <angheloalf95@gmail.com>
This commit is contained in:
angie 2021-01-23 01:20:46 -03:00
parent 82bba72375
commit 272fc5ca0f
No known key found for this signature in database
GPG key ID: E5212BA1B6FEA700
1 changed files with 132 additions and 150 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

54
src/overlays/actors/ovl_Eff_Dust/z_eff_dust.c
View file

@ -31,19 +31,9 @@ const ActorInit Eff_Dust_InitVars = {
(ActorFunc)EffDust_Draw, (ActorFunc)EffDust_Draw,
}; };
static Gfx *D_8099EB60[] = { static Gfx* D_8099EB60[] = { 0xDF000000, 0x00000000, 0x00000000, 0x00000000 };
0xDF000000, 0x00000000, 0x00000000, 0x00000000
};
enum DustEffect{
Effect_0 = 0,
Effect_1 = 1,
Effect_2 = 2,
Effect_3 = 3,
Effect_4 = 4
};
enum DustEffect { Effect_0 = 0, Effect_1 = 1, Effect_2 = 2, Effect_3 = 3, Effect_4 = 4 };
void EffDust_setUpdateFunc(EffDust* this, EffDustActionFunc callback_updateFunc) { void EffDust_setUpdateFunc(EffDust* this, EffDustActionFunc callback_updateFunc) {
this->updateFunc = callback_updateFunc; this->updateFunc = callback_updateFunc;
@ -53,7 +43,6 @@ void EffDust_setDrawFunc(EffDust* this, EffDustActionFunc callback_drawFunc) {
this->drawFunc = callback_drawFunc; this->drawFunc = callback_drawFunc;
} }
// Members initializer (?) // Members initializer (?)
void EffDust_InitPosAndDistance(EffDust* this) { void EffDust_InitPosAndDistance(EffDust* this) {
s32 i; s32 i;
@ -69,7 +58,6 @@ void EffDust_InitPosAndDistance(EffDust *this) {
this->index = 0; this->index = 0;
} }
void EffDust_Init(Actor* thisx, GlobalContext* globalCtx) { void EffDust_Init(Actor* thisx, GlobalContext* globalCtx) {
EffDust* this = THIS; EffDust* this = THIS;
enum DustEffect dust_effect; enum DustEffect dust_effect;
@ -121,17 +109,14 @@ void EffDust_Init(Actor *thisx, GlobalContext *globalCtx) {
default: default:
SystemArena_FreeDebug(this, "../z_eff_dust.c", 202); SystemArena_FreeDebug(this, "../z_eff_dust.c", 202);
break; break;
} }
this->life = 0xA; this->life = 0xA;
} }
void EffDust_Destroy(Actor* thisx, GlobalContext* globalCtx) { void EffDust_Destroy(Actor* thisx, GlobalContext* globalCtx) {
} }
void EffDust_UpdateFunc_8099DB28(EffDust* this, GlobalContext* globalCtx) { void EffDust_UpdateFunc_8099DB28(EffDust* this, GlobalContext* globalCtx) {
s16 theta; s16 theta;
s16 fi; s16 fi;
@ -168,7 +153,6 @@ void EffDust_UpdateFunc_8099DB28(EffDust *this, GlobalContext *globalCtx) {
} }
} }
void EffDust_UpdateFunc_8099DD74(EffDust* this, GlobalContext* globalCtx) { void EffDust_UpdateFunc_8099DD74(EffDust* this, GlobalContext* globalCtx) {
s16 theta; s16 theta;
s16 fi; s16 fi;
@ -205,7 +189,6 @@ void EffDust_UpdateFunc_8099DD74(EffDust *this, GlobalContext *globalCtx) {
} }
} }
void EffDust_UpdateFunc_8099DFC0(EffDust* this, GlobalContext* globalCtx) { void EffDust_UpdateFunc_8099DFC0(EffDust* this, GlobalContext* globalCtx) {
s16 theta; s16 theta;
@ -225,8 +208,7 @@ void EffDust_UpdateFunc_8099DFC0(EffDust *this, GlobalContext *globalCtx) {
if (parent == NULL || parent->update == NULL || !(player->stateFlags1 & 0x1000)) { if (parent == NULL || parent->update == NULL || !(player->stateFlags1 & 0x1000)) {
if (this->life != 0) { if (this->life != 0) {
this->life -= 1; this->life -= 1;
} } else {
else {
Actor_Kill(&this->actor); Actor_Kill(&this->actor);
} }
@ -298,13 +280,11 @@ void EffDust_UpdateFunc_8099DFC0(EffDust *this, GlobalContext *globalCtx) {
} }
} }
void EffDust_Update(Actor* thisx, GlobalContext* globalCtx) { void EffDust_Update(Actor* thisx, GlobalContext* globalCtx) {
EffDust* this = THIS; EffDust* this = THIS;
this->updateFunc(this, globalCtx); this->updateFunc(this, globalCtx);
} }
void EffDust_DrawFunc_8099E4F4(EffDust* this, GlobalContext* globalCtx) { void EffDust_DrawFunc_8099E4F4(EffDust* this, GlobalContext* globalCtx) {
EffDust* this2; EffDust* this2;
@ -345,19 +325,23 @@ void EffDust_DrawFunc_8099E4F4(EffDust *this, GlobalContext *globalCtx) {
this2->actor.posRot.pos.x + (initialPositions->x * ((this2->dx * aux) + (1.0f - this2->dx))), this2->actor.posRot.pos.x + (initialPositions->x * ((this2->dx * aux) + (1.0f - this2->dx))),
this2->actor.posRot.pos.y + (initialPositions->y * ((this2->dy * aux) + (1.0f - this2->dy))), this2->actor.posRot.pos.y + (initialPositions->y * ((this2->dy * aux) + (1.0f - this2->dy))),
this2->actor.posRot.pos.z + (initialPositions->z * ((this2->dz * aux) + (1.0f - this2->dz))), this2->actor.posRot.pos.z + (initialPositions->z * ((this2->dz * aux) + (1.0f - this2->dz))),
MTXMODE_NEW MTXMODE_NEW);
);
Matrix_Scale(this2->scalingFactor, this2->scalingFactor, this2->scalingFactor, MTXMODE_APPLY); Matrix_Scale(this2->scalingFactor, this2->scalingFactor, this2->scalingFactor, MTXMODE_APPLY);
Matrix_Mult(&glb_ctx->mf_11DA0, MTXMODE_APPLY); Matrix_Mult(&glb_ctx->mf_11DA0, MTXMODE_APPLY);
gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(gfx_ctx, "../z_eff_dust.c", 449), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(gfx_ctx, "../z_eff_dust.c", 449),
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gSPDisplayList(POLY_XLU_DISP++, SEGMENTED_TO_VIRTUAL(D_04037880)); gSPDisplayList(POLY_XLU_DISP++, SEGMENTED_TO_VIRTUAL(D_04037880));
} }
initialPositions++; initialPositions++;
distanceTraveled++; distanceTraveled++;
// Needed for matching. // Needed for matching.
if (1) { } { } if (1) { } if (1) { } if (1 != 0) { } if (1) {}
{}
if (1) {}
if (1) {}
if (1 != 0) {}
} }
CLOSE_DISPS(gfx_ctx, "../z_eff_dust.c", 458); CLOSE_DISPS(gfx_ctx, "../z_eff_dust.c", 458);
@ -389,8 +373,7 @@ void EffDust_DrawFunc_8099E784(EffDust *this, GlobalContext *globalCtx) {
gDPSetPrimColor(POLY_XLU_DISP++, 0, 0, 0xFF, 0xFF, 0xFF, 0xFF); gDPSetPrimColor(POLY_XLU_DISP++, 0, 0, 0xFF, 0xFF, 0xFF, 0xFF);
if (player->unk_858 >= 0.85f) { if (player->unk_858 >= 0.85f) {
gDPSetEnvColor(POLY_XLU_DISP++, 0xFF, 0x00, 0x00, 0x00); gDPSetEnvColor(POLY_XLU_DISP++, 0xFF, 0x00, 0x00, 0x00);
} } else {
else {
gDPSetEnvColor(POLY_XLU_DISP++, 0x00, 0x00, 0xFF, 0x00); gDPSetEnvColor(POLY_XLU_DISP++, 0x00, 0x00, 0xFF, 0x00);
} }
@ -411,18 +394,17 @@ void EffDust_DrawFunc_8099E784(EffDust *this, GlobalContext *globalCtx) {
Matrix_Mult(&player->mf_9E0, MTXMODE_NEW); Matrix_Mult(&player->mf_9E0, MTXMODE_NEW);
Matrix_Translate( Matrix_Translate(initialPositions->x * ((this2->dx * aux) + (1.0f - this2->dx)),
initialPositions->x * ((this2->dx * aux) + (1.0f - this2->dx)),
initialPositions->y * (1.0f - *distanceTraveled) + 320.0f, initialPositions->y * (1.0f - *distanceTraveled) + 320.0f,
initialPositions->z * (1.0f - *distanceTraveled) + -20.0f, initialPositions->z * (1.0f - *distanceTraveled) + -20.0f, MTXMODE_APPLY);
MTXMODE_APPLY
);
Matrix_Scale(*distanceTraveled * this2->scalingFactor, *distanceTraveled * this2->scalingFactor, *distanceTraveled * this2->scalingFactor, MTXMODE_APPLY); Matrix_Scale(*distanceTraveled * this2->scalingFactor, *distanceTraveled * this2->scalingFactor,
*distanceTraveled * this2->scalingFactor, MTXMODE_APPLY);
func_800D1FD4(&glb_ctx->mf_11DA0); func_800D1FD4(&glb_ctx->mf_11DA0);
gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(gfx_ctx, "../z_eff_dust.c", 506), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(gfx_ctx, "../z_eff_dust.c", 506),
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gSPDisplayList(POLY_XLU_DISP++, SEGMENTED_TO_VIRTUAL(D_04037880)); gSPDisplayList(POLY_XLU_DISP++, SEGMENTED_TO_VIRTUAL(D_04037880));
} }