mirror/ac-decomp
1
0
Fork 0
mirror of https://github.com/ACreTeam/ac-decomp synced 2026-05-28 07:54:55 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #455 from Reaperoe/master

Browse Source 
Implement & link ef_kasamizutama
This commit is contained in:
Cuyler36
2024-12-27 11:23:41 -05:00
committed by GitHub
parent b7325560f3 315e1cdeb7
commit d30f66f766
2 changed files with 47 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
configure.py
+1 -1
View File
@@ -1268,7 +1268,7 @@ config.libs = [
Object(NonMatching, "effect/ef_kangaeru.c"),
Object(NonMatching, "effect/ef_kantanhu.c"),
Object(Matching, "effect/ef_kasamizu.c"),
Object(NonMatching, "effect/ef_kasamizutama.c"),
Object(Matching, "effect/ef_kasamizutama.c"),
Object(NonMatching, "effect/ef_kaze.c"),
Object(NonMatching, "effect/ef_kaze_happa.c"),
Object(NonMatching, "effect/ef_kigae.c"),
src/effect/ef_kasamizutama.c
+46 -4
View File
@@ -1,5 +1,17 @@
#include "ef_effect_control.h"
#include "m_common_data.h"
#include "sys_matrix.h"
#include "m_rcp.h"
static f32 eKasamizutama_scale_table[] = {
0.0f, 0.1f, 0.3f, 0.5f, 0.7f, 0.9f, 1.0f, 0.9f, 0.7f, 0.5f
};
extern Gfx ef_koke_suiteki01_0_int_i4[];
extern Gfx ef_koke_suiteki01_00_modelT[];
static void eKasamizutama_init(xyz_t pos, int prio, s16 angle, GAME* game, u16 item_name, s16 arg0, s16 arg1);
static void eKasamizutama_ct(eEC_Effect_c* effect, GAME* game, void* ct_arg);
static void eKasamizutama_mv(eEC_Effect_c* effect, GAME* game);
@@ -18,17 +30,47 @@ eEC_PROFILE_c iam_ef_kasamizutama = {
};
static void eKasamizutama_init(xyz_t pos, int prio, s16 angle, GAME* game, u16 item_name, s16 arg0, s16 arg1) {
// TODO
eEC_CLIP->make_effect_proc(eEC_EFFECT_KASAMIZUTAMA, pos, NULL, game, &angle, item_name, prio, arg0, arg1);
}
static void eKasamizutama_ct(eEC_Effect_c* effect, GAME* game, void* ct_arg) {
// TODO
s16 angle = *(s16*)ct_arg;
s16 rand = qrand();
s16 rand_angle = DEG2SHORT_ANGLE2(45.0f) + DEG2SHORT_ANGLE2(RANDOM_F(45.0f));
xyz_t pos;
f32 sin = 2.5f * sin_s(rand_angle);
Matrix_RotateY(angle, 0);
Matrix_RotateX(DEG2SHORT_ANGLE2(-45.0f), 1);
pos.x = (sin) * sin_s(rand);
pos.y = 2.5f * cos_s(rand_angle);
pos.z = (sin) * cos_s(rand);
Matrix_Position(&pos, &effect->velocity);
effect->acceleration = ZeroVec;
effect->acceleration.y = -0.105f;
effect->timer = 20;
}
static void eKasamizutama_mv(eEC_Effect_c* effect, GAME* game) {
// TODO
xyz_t_add(&effect->velocity, &effect->acceleration, &effect->velocity);
xyz_t_add(&effect->position, &effect->velocity, &effect->position);
}
static void eKasamizutama_dw(eEC_Effect_c* effect, GAME* game) {
// TODO
s16 remain = 20 - effect->timer;
s16 frame = remain >> 1;
effect->scale.x = effect->scale.y = effect->scale.z = eKasamizutama_scale_table[frame] * 0.005f;
_texture_z_light_fog_prim_xlu(game->graph);
OPEN_DISP(game->graph);
eEC_CLIP->auto_matrix_xlu_proc(game, &effect->position, &effect->scale);
gSPSegment(NEXT_POLY_XLU_DISP, ANIME_1_TXT_SEG, ef_koke_suiteki01_0_int_i4);
gSPDisplayList(NEXT_POLY_XLU_DISP, ef_koke_suiteki01_00_modelT);
CLOSE_DISP(game->graph);
}