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

Effect Deaddd OK (#1019) 

* OK

* cleanup

* Add unused comment
This commit is contained in:
Derek Hensley 2022-08-15 11:31:36 -07:00 committed by GitHub
parent 4b545bc259
commit 24ba04d70c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 131 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
spec
View File

@ -1943,8 +1943,7 @@ beginseg
name "ovl_Effect_Ss_Dead_Dd"
compress
include "build/src/overlays/effects/ovl_Effect_Ss_Dead_Dd/z_eff_ss_dead_dd.o"
include "build/data/ovl_Effect_Ss_Dead_Dd/ovl_Effect_Ss_Dead_Dd.data.o"
include "build/data/ovl_Effect_Ss_Dead_Dd/ovl_Effect_Ss_Dead_Dd.reloc.o"
include "build/src/overlays/effects/ovl_Effect_Ss_Dead_Dd/ovl_Effect_Ss_Dead_Dd_reloc.o"
endseg
beginseg

2
src/code/z_effect_soft_sprite_old_init.c
View File

@ -978,7 +978,7 @@ void EffectSsDeadDd_Spawn(PlayState* play, Vec3f* pos, Vec3f* velocity, Vec3f* a
initParams.envColor.r = env->r;
initParams.envColor.g = env->g;
initParams.envColor.b = env->b;
initParams.type = 0;
initParams.type = DEADDD_TYPE_0;
initParams.alphaStep = alphaStep;
initParams.life = life;

130
src/overlays/effects/ovl_Effect_Ss_Dead_Dd/z_eff_ss_dead_dd.c
View File

@ -5,23 +5,141 @@
*/
#include "z_eff_ss_dead_dd.h"
#include "objects/gameplay_keep/gameplay_keep.h"
#define rScale regs[0]
#define rPrimColorR regs[2]
#define rPrimColorG regs[3]
#define rPrimColorB regs[4]
#define rAlpha regs[5]
#define rEnvColorR regs[6]
#define rEnvColorG regs[7]
#define rEnvColorB regs[8]
#define rScaleStep regs[9]
#define rAlphaStep regs[10]
#define rAlphaMode regs[11]
#define PARAMS ((EffectSsDeadDdInitParams*)initParamsx)
s32 EffectSsDeadDd_Init(PlayState* play, u32 index, EffectSs* this, void* initParamsx);
u32 EffectSsDeadDd_Init(PlayState* play, u32 index, EffectSs* this, void* initParamsx);
void EffectSsDeadDd_Update(PlayState* play, u32 index, EffectSs* this);
void EffectSsDeadDd_Draw(PlayState* play, u32 index, EffectSs* this);
#if 0
const EffectSsInit Effect_Ss_Dead_Dd_InitVars = {
EFFECT_SS_DEAD_DD,
EffectSsDeadDd_Init,
};
#endif
u32 EffectSsDeadDd_Init(PlayState* play, u32 index, EffectSs* this, void* initParamsx) {
EffectSsDeadDdInitParams* initParams = PARAMS;
#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_Effect_Ss_Dead_Dd/EffectSsDeadDd_Init.s")
if (initParams->type == DEADDD_TYPE_0) {
this->pos = initParams->pos;
this->velocity = initParams->velocity;
this->accel = initParams->accel;
this->life = initParams->life;
this->rScaleStep = initParams->scaleStep;
this->rAlphaMode = initParams->alphaStep;
#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_Effect_Ss_Dead_Dd/EffectSsDeadDd_Draw.s")
if (initParams->alphaStep != 0) {
this->rAlphaStep = initParams->alphaStep;
} else {
this->rAlphaStep = initParams->primColor.a / initParams->life;
}
#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_Effect_Ss_Dead_Dd/EffectSsDeadDd_Update.s")
this->draw = EffectSsDeadDd_Draw;
this->update = EffectSsDeadDd_Update;
this->rScale = initParams->scale;
this->rPrimColorR = initParams->primColor.r;
this->rPrimColorG = initParams->primColor.g;
this->rPrimColorB = initParams->primColor.b;
this->rAlpha = initParams->primColor.a;
this->rEnvColorR = initParams->envColor.r;
this->rEnvColorG = initParams->envColor.g;
this->rEnvColorB = initParams->envColor.b;
} else if (initParams->type == DEADDD_TYPE_1) {
s32 i;
this->life = initParams->life;
this->rScaleStep = initParams->scaleStep;
this->rAlphaMode = 0;
this->rAlphaStep = 155 / initParams->life;
this->rScale = initParams->scale;
this->rPrimColorR = 255;
this->rPrimColorG = 255;
this->rPrimColorB = 155;
this->rAlpha = 155;
this->rEnvColorR = 250;
this->rEnvColorG = 180;
this->rEnvColorB = 0;
this->draw = EffectSsDeadDd_Draw;
this->update = EffectSsDeadDd_Update;
for (i = initParams->randIter; i > 0; i--) {
this->pos.x = ((Rand_ZeroOne() - 0.5f) * initParams->randPosScale) + initParams->pos.x;
this->pos.y = ((Rand_ZeroOne() - 0.5f) * initParams->randPosScale) + initParams->pos.y;
this->pos.z = ((Rand_ZeroOne() - 0.5f) * initParams->randPosScale) + initParams->pos.z;
this->accel.x = this->velocity.x = (Rand_ZeroOne() - 0.5f) * 2.0f;
this->accel.y = this->velocity.y = (Rand_ZeroOne() - 0.5f) * 2.0f;
this->accel.z = this->velocity.z = (Rand_ZeroOne() - 0.5f) * 2.0f;
}
} else {
return 0;
}
return 1;
}
void EffectSsDeadDd_Draw(PlayState* play, u32 index, EffectSs* this) {
GraphicsContext* gfxCtx = play->state.gfxCtx;
MtxF mfTrans;
MtxF mfScale;
MtxF mfResult;
Mtx* mtx;
f32 scale;
OPEN_DISPS(gfxCtx);
scale = this->rScale * 0.01f;
SkinMatrix_SetTranslate(&mfTrans, this->pos.x, this->pos.y, this->pos.z);
SkinMatrix_SetScale(&mfScale, scale, scale, scale);
SkinMatrix_MtxFMtxFMult(&mfTrans, &mfScale, &mfResult);
mtx = SkinMatrix_MtxFToNewMtx(gfxCtx, &mfResult);
if (mtx != NULL) {
func_8012C974(gfxCtx);
gDPSetPrimColor(POLY_XLU_DISP++, 0, 0, this->rPrimColorR, this->rPrimColorG, this->rPrimColorB, this->rAlpha);
gDPSetEnvColor(POLY_XLU_DISP++, this->rEnvColorR, this->rEnvColorG, this->rEnvColorB, this->rAlpha);
gSPMatrix(POLY_XLU_DISP++, mtx, G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gSPMatrix(POLY_XLU_DISP++, &D_01000000, G_MTX_NOPUSH | G_MTX_MUL | G_MTX_MODELVIEW);
gDPSetCombineLERP(POLY_XLU_DISP++, 0, 0, 0, PRIMITIVE, TEXEL0, 0, PRIMITIVE, 0, 0, 0, 0, PRIMITIVE, TEXEL0, 0,
PRIMITIVE, 0);
gSPDisplayList(POLY_XLU_DISP++, gameplay_keep_DL_054940);
}
CLOSE_DISPS(gfxCtx);
}
void EffectSsDeadDd_Update(PlayState* play, u32 index, EffectSs* this) {
this->rScale += this->rScaleStep;
if (this->rScale < 0) {
this->rScale = 0;
}
if (this->rAlphaMode != 0) {
this->rAlpha += this->rAlphaStep;
if (this->rAlpha > 255) {
this->rAlpha = 255;
}
} else {
if (this->rAlpha < this->rAlphaStep) {
this->rAlpha = 0;
} else {
this->rAlpha -= this->rAlphaStep;
}
}
}

5
src/overlays/effects/ovl_Effect_Ss_Dead_Dd/z_eff_ss_dead_dd.h
View File

@ -3,6 +3,11 @@
#include "global.h"
typedef enum {
/* 0 */ DEADDD_TYPE_0,
/* 1 */ DEADDD_TYPE_1 // Unused
} DeadDDType;
typedef struct {
/* 0x00 */ Vec3f pos;
/* 0x0C */ Vec3f velocity;