mirror/ac-decomp
1
0
Fork 0
mirror of https://github.com/ACreTeam/ac-decomp synced 2026-06-03 10:01:10 -04:00
Code Issues Packages Projects Releases Wiki Activity

Implement & link ef_shock

Browse Source
This commit is contained in:
Norgesnerd
2025-06-15 16:58:39 +02:00
parent 5df8955502
commit ed41b6180f
2 changed files with 87 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
configure.py
+1 -1
View File
@@ -1316,7 +1316,7 @@ config.libs = [
Object(Matching, "effect/ef_room_sunshine_police.c"),
Object(Matching, "effect/ef_room_sunshine_posthouse.c"),
Object(Matching, "effect/ef_sandsplash.c"),
Object(NonMatching, "effect/ef_shock.c"),
Object(Matching, "effect/ef_shock.c"),
Object(Matching, "effect/ef_shooting.c"),
Object(Matching, "effect/ef_shooting_kira.c"),
Object(Matching, "effect/ef_shooting_set.c"),
src/effect/ef_shock.c
+86 -6
View File
@@ -1,12 +1,16 @@
#include "ef_effect_control.h"
#include "m_common_data.h"
extern Gfx ef_shock01_00_modelT[];
static void eSK_init(xyz_t pos, int prio, s16 angle, GAME* game, u16 item_name, s16 arg0, s16 arg1);
static void eSK_ct(eEC_Effect_c* effect, GAME* game, void* ct_arg);
static void eSK_mv(eEC_Effect_c* effect, GAME* game);
static void eSK_dw(eEC_Effect_c* effect, GAME* game);
// clang-format off
eEC_PROFILE_c iam_ef_shock = {
// clang-format off
&eSK_init,
&eSK_ct,
&eSK_mv,
@@ -14,21 +18,97 @@ eEC_PROFILE_c iam_ef_shock = {
eEC_IGNORE_DEATH,
eEC_NO_CHILD_ID,
eEC_DEFAULT_DEATH_DIST,
// clang-format on
};
static rgba_t eSK_prim_table[] = {
{ 255, 0, 0, 200 },
{ 255, 128, 0, 227 },
{ 255, 255, 0, 255 },
{ 255, 191, 0, 191 },
{ 255, 128, 0, 128 },
{ 255, 63, 0, 63 },
{ 255, 0, 0, 0 },
{ 0, 0, 0, 0 },
{ 0, 0, 0, 0 },
{ 0, 0, 0, 0 },
{ 0, 0, 0, 0 },
{ 0, 0, 0, 0 },
{ 0, 0, 0, 0 },
{ 0, 0, 0, 0 },
};
static f32 eSK_scale_table[] = {
0.019f, 0.02375f, 0.028499999f, 0.026124999f, 0.02375f, 0.021374999f, 0.019f,
0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f,
};
// clang-format on
typedef struct {
xyz_t velocity;
xyz_t acceleration;
f32 scale;
} eSK_dt_c;
static void eSK_init(xyz_t pos, int prio, s16 angle, GAME* game, u16 item_name, s16 arg0, s16 arg1) {
// TODO
xyz_t ofs;
eSK_dt_c data;
data.velocity.x = 0.0f;
data.velocity.y = 1.0f;
data.velocity.z = 0.0f;
data.acceleration.x = 0.0f;
data.acceleration.y = -0.1f;
data.acceleration.z = 0.0f;
data.scale = 1.0f;
ofs.x = 0.0f;
ofs.y = 4.0f;
ofs.z = 6.0f;
eEC_CLIP->make_effect_proc(eEC_EFFECT_SHOCK, pos, &ofs, game, &data, item_name, prio, 0, 0);
}
static void eSK_ct(eEC_Effect_c* effect, GAME* game, void* ct_arg) {
// TODO
eSK_dt_c* data = (eSK_dt_c*)ct_arg;
effect->scale.x = data->scale;
effect->scale.y = data->scale;
effect->scale.z = data->scale;
effect->timer = 14;
effect->acceleration = data->acceleration;
effect->velocity = data->velocity;
}
static void eSK_mv(eEC_Effect_c* effect, GAME* game) {
// TODO
s16 timer = 14 - effect->timer;
if (timer == 0) {
sAdo_OngenTrgStart(0x2d, &effect->position);
}
}
static void eSK_dw(eEC_Effect_c* effect, GAME* game) {
// TODO
xyz_t* pos = &effect->position;
xyz_t* scale = &effect->scale;
xyz_t* ofs = &effect->offset;
s16 idx = (14 - effect->timer) >> 1;
idx = CLAMP(idx, 0, 6);
scale->x = eSK_scale_table[idx];
scale->y = eSK_scale_table[idx];
scale->z = eSK_scale_table[idx];
OPEN_DISP(game->graph);
eEC_CLIP->auto_matrix_xlu_offset_proc(game, pos, scale, ofs);
gDPSetPrimColor(NEXT_POLY_XLU_DISP, 0, 128, eSK_prim_table[idx].r, eSK_prim_table[idx].g, eSK_prim_table[idx].b,
eSK_prim_table[idx].a);
gSPDisplayList(NEXT_POLY_XLU_DISP, ef_shock01_00_modelT);
CLOSE_DISP(game->graph);
}