mirror/ac-decomp
1
0
Fork 0
mirror of https://github.com/ACreTeam/ac-decomp synced 2026-07-09 20:41:31 -04:00
Code Issues Packages Projects Releases Wiki Activity

Implement & link ac_effectbg

Browse Source
This commit is contained in:
Cuyler36
2024-11-02 09:09:41 -04:00
parent 080d40dcf4
commit 6f6e80368b
14 changed files with 1421 additions and 190 deletions
Download Patch File Download Diff File Expand all files Collapse all files
configure.py
+1 -1
View File
@@ -951,7 +951,7 @@ config.libs = [
Object(Matching, "actor/ac_douzou.c"),
Object(Matching, "actor/ac_dummy.c"),
Object(Matching, "actor/ac_dump.c"),
Object(NonMatching, "actor/ac_effectbg.c"),
Object(Matching, "actor/ac_effectbg.c"),
Object(NonMatching, "actor/ac_event_manager.c"),
Object(Matching, "actor/ac_fallS.c"),
Object(Matching, "actor/ac_fallSESW.c"),
include/ac_effectbg.h
+67 -1
View File
@@ -3,11 +3,16 @@
#include "types.h"
#include "m_actor.h"
#include "c_keyframe.h"
#ifdef __cplusplus
extern "C" {
#endif
#define EffectBg_ENTRY_NUM 3
#define EffectBg_JOINT_NUM 4
#define EffectBg_JOINT_ALL 6
enum {
EffectBG_EFFECT_SHAKE,
EffectBG_EFFECT_CUT_LEFT,
@@ -15,11 +20,72 @@ enum {
EffectBG_EFFECT_SHAKE_SMALL,
EffectBG_EFFECT_SHAKE_LARGE,
EffectBG_EFFECT_NUM
EffectBG_EFFECT_NUM,
EffectBG_EFFECT_CUT_RIGHT_PALM = EffectBG_EFFECT_NUM,
EffectBG_EFFECT_CUT_RIGHT_CEDAR,
EffectBG_EFFECT_CUT_RIGHT_GOLD
};
enum {
EffectBG_VARIANT_TREE_SMALL = -1,
EffectBG_VARIANT_TREE_MED,
EffectBG_VARIANT_TREE_LARGE,
EffectBG_VARIANT_TREE_FULL,
EffectBG_VARIANT_NUM,
EffectBG_VARIANT_TREE_XMAS = EffectBG_VARIANT_NUM,
EffectBG_VARIANT_PALM_SMALL,
EffectBG_VARIANT_PALM_MED,
EffectBG_VARIANT_PALM_LARGE,
EffectBG_VARIANT_PALM_FULL,
EffectBG_VARIANT_CEDAR_SMALL,
EffectBG_VARIANT_CEDAR_MED,
EffectBG_VARIANT_CEDAR_LARGE,
EffectBG_VARIANT_CEDAR_FULL,
EffectBG_VARIANT_CEDAR_XMAS,
EffectBG_VARIANT_GOLD_SMALL,
EffectBG_VARIANT_GOLD_MED,
EffectBG_VARIANT_GOLD_LARGE,
EffectBG_VARIANT_GOLD_FULL,
EffectBG_VARIANT_ALL
};
typedef void (*EffectBG_MAKE_EFFECTBG_PROC)(GAME*, s16, s16, xyz_t*);
typedef struct effectbg_entry_s {
cKF_SkeletonInfo_R_c keyframe;
Mtx mtx[2][EffectBg_JOINT_ALL];
xyz_t base_pos;
xyz_t effect_pos;
s_xyz work[EffectBg_JOINT_NUM];
s_xyz morph[EffectBg_JOINT_NUM];
s16 timer;
s16 timer_max;
s16 type;
s16 variant;
s16 add_angle;
s16 leaf_angle;
u8 status;
int block_ux;
int block_uz;
} EffectBg_c;
typedef struct effectbg_actor_s EFFECTBG_ACTOR;
struct effectbg_actor_s {
ACTOR actor_class;
int _174;
EffectBg_c effect[EffectBg_ENTRY_NUM];
int _CE8;
u16* tree_pal;
u16* palm_pal;
u16* palm_pal2;
u16* gold_pal;
int _CFC;
};
extern ACTOR_PROFILE Effectbg_Profile;
#ifdef __cplusplus
include/audio_defs.h
+9
View File
@@ -83,6 +83,14 @@ typedef enum audio_sound_effects {
NA_SE_5E = 0x5E,
NA_SE_5F = 0x5F,
NA_SE_60 = 0x60,
NA_SE_61 = 0x61,
NA_SE_63 = 0x63,
NA_SE_64 = 0x64,
NA_SE_65 = 0x65,
NA_SE_66 = 0x66,
NA_SE_67 = 0x67,
NA_SE_68 = 0x68,
NA_SE_GASAGOSO = 0x69,
NA_SE_6A = 0x6A,
@@ -102,6 +110,7 @@ typedef enum audio_sound_effects {
NA_SE_KA_BUZZ = 0xCF,
NA_SE_108 = 0x108,
NA_SE_ROD_STROKE = 0x109,
NA_SE_ROD_BACK,
NA_SE_10B,
include/sys_matrix.h
+2 -2
View File
@@ -33,8 +33,8 @@ extern Mtx* _Matrix_to_Mtx(Mtx* dest);
extern Mtx* _Matrix_to_Mtx_new(GRAPH* graph);
extern void Matrix_Position(xyz_t* old_pos, xyz_t* new_pos);
extern void Matrix_Position_Zero(xyz_t* screen_pos);
extern void Matrix_Position_VecX(xyz_t* screen_pos, f32 x);
extern void Matrix_Position_VecZ(xyz_t* screen_pos, f32 x);
extern void Matrix_Position_VecX(f32 x, xyz_t* screen_pos);
extern void Matrix_Position_VecZ(f32 z, xyz_t* screen_pos);
extern void Matrix_copy_MtxF(MtxF* dest, MtxF* src);
extern void Matrix_MtxtoMtxF(Mtx* src, MtxF* dest);
extern void Matrix_reverse(MtxF* m);
src/actor/ac_effectbg.c
+1165
View File
File diff suppressed because it is too large Load Diff
src/game/m_inventory_ovl.c
+1 -1
View File
@@ -742,7 +742,7 @@ static void mIV_pl_shape_item_draw_rod(Submenu* submenu, GAME* game) {
if (mtx != NULL) {
xyz_t pos;
Matrix_Position_VecZ(&pos, 1500.0f);
Matrix_Position_VecZ(1500.0f, &pos);
cKF_Si3_draw_R_SV(game, item_kf, mtx, NULL, NULL, NULL);
Matrix_put(&submenu->overlay->inventory_ovl->item_mtx);
Matrix_translate(0.0f, 0.0f, 1500.0f, 1);
src/game/m_player_common.c_inc
+18 -18
View File
@@ -6045,49 +6045,49 @@ static void Player_actor_Set_EffectBgTree(GAME* game, mActor_name_t item, s16 bg
if (IS_ITEM_XMAS_TREE(item) != FALSE) {
if (FGTreeType_check(item) == mNT_TREE_TYPE_CEDAR) {
variant = 12;
variant = EffectBG_VARIANT_CEDAR_XMAS;
} else {
variant = 3;
variant = EffectBG_VARIANT_TREE_XMAS;
}
} else if (IS_ITEM_SMALL_TREE(item) != FALSE) {
if (FGTreeType_check(item) == mNT_TREE_TYPE_PALM) {
variant = 4;
variant = EffectBG_VARIANT_PALM_SMALL;
} else if (FGTreeType_check(item) == mNT_TREE_TYPE_CEDAR) {
variant = 8;
variant = EffectBG_VARIANT_CEDAR_SMALL;
} else if (FGTreeType_check(item) == mNT_TREE_TYPE_GOLD) {
variant = 13;
variant = EffectBG_VARIANT_GOLD_SMALL;
} else {
variant = -1;
variant = EffectBG_VARIANT_TREE_SMALL;
}
} else if (IS_ITEM_MED_TREE(item) != FALSE) {
if (FGTreeType_check(item) == mNT_TREE_TYPE_PALM) {
variant = 5;
variant = EffectBG_VARIANT_PALM_MED;
} else if (FGTreeType_check(item) == mNT_TREE_TYPE_CEDAR) {
variant = 9;
variant = EffectBG_VARIANT_CEDAR_MED;
} else if (FGTreeType_check(item) == mNT_TREE_TYPE_GOLD) {
variant = 14;
variant = EffectBG_VARIANT_GOLD_MED;
} else {
variant = 0;
variant = EffectBG_VARIANT_TREE_MED;
}
} else if (IS_ITEM_LARGE_TREE(item) != FALSE) {
if (FGTreeType_check(item) == mNT_TREE_TYPE_PALM) {
variant = 6;
variant = EffectBG_VARIANT_PALM_LARGE;
} else if (FGTreeType_check(item) == mNT_TREE_TYPE_CEDAR) {
variant = 10;
variant = EffectBG_VARIANT_CEDAR_LARGE;
} else if (FGTreeType_check(item) == mNT_TREE_TYPE_GOLD) {
variant = 15;
variant = EffectBG_VARIANT_GOLD_LARGE;
} else {
variant = 1;
variant = EffectBG_VARIANT_TREE_LARGE;
}
} else {
if (FGTreeType_check(item) == mNT_TREE_TYPE_PALM) {
variant = 7;
variant = EffectBG_VARIANT_PALM_FULL;
} else if (FGTreeType_check(item) == mNT_TREE_TYPE_CEDAR) {
variant = 11;
variant = EffectBG_VARIANT_CEDAR_FULL;
} else if (FGTreeType_check(item) == mNT_TREE_TYPE_GOLD) {
variant = 16;
variant = EffectBG_VARIANT_GOLD_FULL;
} else {
variant = 2;
variant = EffectBG_VARIANT_TREE_FULL;
}
}
src/game/m_player_draw.c_inc
+1 -1
View File
@@ -92,7 +92,7 @@ static void Player_actor_draw_After_Larm2(ACTOR* actorx, GAME* game, cKF_Skeleto
player->item_matrix_set = FALSE;
}
Matrix_Position_VecX(&player->left_hand_pos, 1100.0f);
Matrix_Position_VecX(1100.0f, &player->left_hand_pos);
Matrix_get(&player->left_hand_mtx);
}
src/game/m_player_item_axe.c_inc
+1 -1
View File
@@ -7,7 +7,7 @@ static void Player_actor_Item_draw_axe(ACTOR* actor, GAME* game) {
int shape_type;
Matrix_push();
Matrix_Position_VecZ(&player->axe_pos, 1500.0f);
Matrix_Position_VecZ(1500.0f, &player->axe_pos);
Matrix_pull();
shape_type = player->item_shape_type[player->item_bank_idx];
src/game/m_player_item_net.c_inc
+5 -5
View File
@@ -241,11 +241,11 @@ static void Player_actor_Item_draw_net(ACTOR* actor, GAME* game) {
Matrix_push();
Matrix_rotateXYZ(0, 3000, 0, 1);
Matrix_Position_VecZ(&player->net_start_pos, -2400.0f);
Matrix_Position_VecZ(&player->net_end_pos, 5500.0f);
Matrix_Position_VecZ(&player->net_pos, 4000.0f);
Matrix_Position_VecZ(&player->net_top_col_pos, 4000.0f);
Matrix_Position_VecZ(&player->net_bot_col_pos, 4000.0f);
Matrix_Position_VecZ(-2400.0f, &player->net_start_pos);
Matrix_Position_VecZ(5500.0f, &player->net_end_pos);
Matrix_Position_VecZ(4000.0f, &player->net_pos);
Matrix_Position_VecZ(4000.0f, &player->net_top_col_pos);
Matrix_Position_VecZ(4000.0f, &player->net_bot_col_pos);
Matrix_pull();
cKF_Si3_draw_R_SV(&play->game, &player->item_keyframe, player->item_work_mtx[game->frame_counter % 2], NULL,
Player_actor_Item_draw_net_After, &player->actor_class);
src/game/m_player_item_rod.c_inc
+2 -2
View File
@@ -331,7 +331,7 @@ static int Player_actor_Item_main_rod_putaway(ACTOR* actor, GAME* game) {
static void Player_actor_Item_draw_net_After_main4_sao(ACTOR* actor) {
PLAYER_ACTOR* player = (PLAYER_ACTOR*)actor;
Matrix_Position_VecX(&player->item_rod_top_pos, 1050.0f);
Matrix_Position_VecX(1050.0f, &player->item_rod_top_pos);
}
typedef void (*mPlayer_item_rod_draw_proc)(void* arg, GAME* game, cKF_SkeletonInfo_R_c* keyframe, Gfx** joint_shape,
@@ -365,7 +365,7 @@ static void Player_actor_Item_draw_rod(ACTOR* actor, GAME* game) {
graph = play->game.graph;
keyf = &player->item_keyframe;
Matrix_Position_VecZ(&player->item_rod_virtual_top_pos, 6000.0f);
Matrix_Position_VecZ(6000.0f, &player->item_rod_virtual_top_pos);
Matrix_push();
Matrix_RotateZ(player->item_rod_angle_z, 1);
src/game/m_player_item_scoop.c_inc
+1 -1
View File
@@ -7,7 +7,7 @@ static void Player_actor_Item_draw_scoop(ACTOR* actor, GAME* game) {
int type;
Matrix_push();
Matrix_Position_VecZ(&player->scoop_pos, 2200.0f);
Matrix_Position_VecZ(2200.0f, &player->scoop_pos);
Matrix_pull();
type = player->item_shape_type[player->item_bank_idx];
src/game/m_player_main_reflect_scoop.c_inc
+1 -1
View File
@@ -82,7 +82,7 @@ static void Player_actor_SetEffectHit_Reflect_scoop(ACTOR* actor, GAME* game) {
int ut_z;
if (mFI_Wpos2UtNum(&ut_x, &ut_z, *pos)) {
Player_actor_Set_EffectBgTree(game, item, 3, ut_x, ut_z);
Player_actor_Set_EffectBgTree(game, item, EffectBG_EFFECT_SHAKE_SMALL, ut_x, ut_z);
}
attr = 7;
src/system/sys_matrix.c
+147 -156
View File
@@ -6,65 +6,68 @@
#include "MSL_C/w_math.h"
#include "libforest/gbi_extensions.h"
// clang-format off
Mtx Mtx_clear = gdSPDefMtx(
1.0f, 0.0f, 0.0f, 0.0f,
0.0f, 1.0f, 0.0f, 0.0f,
0.0f, 0.0f, 1.0f, 0.0f,
0.0f, 0.0f, 0.0f, 1.0f
);
// clang-format on
// clang-format off
MtxF MtxF_clear = { {
{1.0f, 0.0f, 0.0f, 0.0f},
{0.0f, 1.0f, 0.0f, 0.0f},
{0.0f, 0.0f, 1.0f, 0.0f},
{0.0f, 0.0f, 0.0f, 1.0f},
} };
// clang-format on
static MtxF* Matrix_stack = NULL;
static MtxF* Matrix_now = NULL;
void new_Matrix(GAME* game){
Matrix_now = THA_alloc16(&game->tha, 0x500);
Matrix_stack = Matrix_now;
void new_Matrix(GAME* game) {
Matrix_now = THA_alloc16(&game->tha, 0x500);
Matrix_stack = Matrix_now;
}
void Matrix_push(){
void Matrix_push() {
Matrix_copy_MtxF(Matrix_now + 1, Matrix_now);
Matrix_now++;
}
void Matrix_pull(){
void Matrix_pull() {
Matrix_now--;
}
void Matrix_get(MtxF* dest){
void Matrix_get(MtxF* dest) {
Matrix_copy_MtxF(dest, Matrix_now);
}
void Matrix_put(MtxF* src){
void Matrix_put(MtxF* src) {
Matrix_copy_MtxF(Matrix_now, src);
}
MtxF* get_Matrix_now(void){
MtxF* get_Matrix_now(void) {
return (Matrix_now);
}
void Matrix_mult(MtxF* m, u8 mode){
void Matrix_mult(MtxF* m, u8 mode) {
MtxF* curm = get_Matrix_now();
if(mode == 1){
if (mode == 1) {
Skin_Matrix_MulMatrix(curm, m, curm);
}
else{
} else {
Matrix_copy_MtxF(Matrix_now, m);
}
}
void Matrix_translate(f32 x, f32 y, f32 z, u8 mode){
void Matrix_translate(f32 x, f32 y, f32 z, u8 mode) {
MtxF* curm = Matrix_now;
f32 tx, ty;
if(mode == 1){
if (mode == 1) {
tx = curm->xx;
ty = curm->xy;
curm->xw += tx * x + ty * y + curm->xz * z;
@@ -77,16 +80,15 @@ void Matrix_translate(f32 x, f32 y, f32 z, u8 mode){
tx = curm->wx;
ty = curm->wy;
curm->ww += tx * x + ty * y + curm->wz * z;
}
else{
Skin_Matrix_SetTranslate(curm, x, y , z);
} else {
Skin_Matrix_SetTranslate(curm, x, y, z);
}
}
void Matrix_scale(f32 x, f32 y, f32 z, u8 mode){
void Matrix_scale(f32 x, f32 y, f32 z, u8 mode) {
MtxF* curm = Matrix_now;
if(mode == 1){
if (mode == 1) {
curm->xx *= x;
curm->yx *= x;
curm->zx *= x;
@@ -99,20 +101,19 @@ void Matrix_scale(f32 x, f32 y, f32 z, u8 mode){
curm->wx *= x;
curm->wy *= y;
curm->wz *= z;
}
else{
} else {
Skin_Matrix_SetScale(curm, x, y, z);
}
}
void Matrix_RotateX(s16 x, int mode){
void Matrix_RotateX(s16 x, int mode) {
MtxF* curm;
f32 sin;
f32 cos;
f32 fp, st2;
if(mode == 1){
if(x != 0){
if (mode == 1) {
if (x != 0) {
curm = Matrix_now;
sin = sin_s(x);
@@ -120,22 +121,22 @@ void Matrix_RotateX(s16 x, int mode){
fp = curm->xy;
st2 = curm->xz;
curm->xy = (fp * cos)+ (st2 * sin);
curm->xy = (fp * cos) + (st2 * sin);
curm->xz = -(fp * sin) + (st2 * cos);
fp = curm->yy;
st2 = curm->yz;
curm->yy = (fp * cos)+ (st2 * sin);
curm->yy = (fp * cos) + (st2 * sin);
curm->yz = -(fp * sin) + (st2 * cos);
fp = curm->zy;
st2 = curm->zz;
curm->zy = (fp * cos)+ (st2 * sin);
curm->zy = (fp * cos) + (st2 * sin);
curm->zz = -(fp * sin) + (st2 * cos);
fp = curm->wy;
st2 = curm->wz;
curm->wy = (fp * cos)+ (st2 * sin);
curm->wy = (fp * cos) + (st2 * sin);
curm->wz = -(fp * sin) + (st2 * cos);
}
} else {
@@ -144,7 +145,7 @@ void Matrix_RotateX(s16 x, int mode){
if (x != 0) {
sin = sin_s(x);
cos = cos_s(x);
} else {
sin = 0.0f;
cos = 1.0f;
@@ -168,13 +169,13 @@ void Matrix_RotateX(s16 x, int mode){
}
}
void Matrix_RotateY(s16 y, int mode){
void Matrix_RotateY(s16 y, int mode) {
MtxF* curm;
f32 sin;
f32 cos;
f32 fp, st2;
if(mode == 1){
if (mode == 1) {
if (y != 0) {
curm = Matrix_now;
@@ -207,8 +208,7 @@ void Matrix_RotateY(s16 y, int mode){
if (y != 0) {
sin = sin_s(y);
cos = cos_s(y);
} else {
sin = 0.0f;
cos = 1.0f;
@@ -239,31 +239,31 @@ void Matrix_RotateZ(s16 z, int mode) {
f32 cos;
f32 fp, st2;
if(mode == 1){
if (mode == 1) {
if (z != 0) {
curm = Matrix_now;
sin = sin_s(z);
cos = cos_s(z);
fp = curm->xx;
st2 = curm->xy;
curm->xx = (fp * cos)+ (st2 * sin);
curm->xx = (fp * cos) + (st2 * sin);
curm->xy = -(fp * sin) + (st2 * cos);
fp = curm->yx;
st2 = curm->yy;
curm->yx = (fp * cos)+ (st2 * sin);
curm->yx = (fp * cos) + (st2 * sin);
curm->yy = -(fp * sin) + (st2 * cos);
fp = curm->zx;
st2 = curm->zy;
curm->zx = (fp * cos)+ (st2 * sin);
curm->zx = (fp * cos) + (st2 * sin);
curm->zy = -(fp * sin) + (st2 * cos);
fp = curm->wx;
st2 = curm->wy;
curm->wx = (fp * cos)+ (st2 * sin);
curm->wx = (fp * cos) + (st2 * sin);
curm->wy = -(fp * sin) + (st2 * cos);
}
} else {
@@ -272,7 +272,7 @@ void Matrix_RotateZ(s16 z, int mode) {
if (z != 0) {
sin = sin_s(z);
cos = cos_s(z);
} else {
sin = 0.0f;
cos = 1.0f;
@@ -297,34 +297,34 @@ void Matrix_RotateZ(s16 z, int mode) {
}
}
void Matrix_rotateXYZ(s16 x, s16 y, s16 z, int mode){
void Matrix_rotateXYZ(s16 x, s16 y, s16 z, int mode) {
MtxF* curm = Matrix_now;
f32 sin;
f32 cos;
f32 fp, st2;
if(mode == 1){
if (mode == 1) {
sin = sin_s(z);
cos = cos_s(z);
fp = curm->xx;
st2 = curm->xy;
curm->xx = (fp * cos)+ (st2 * sin);
curm->xx = (fp * cos) + (st2 * sin);
curm->xy = -(fp * sin) + (st2 * cos);
fp = curm->yx;
st2 = curm->yy;
curm->yx = (fp * cos)+ (st2 * sin);
curm->yx = (fp * cos) + (st2 * sin);
curm->yy = -(fp * sin) + (st2 * cos);
fp = curm->zx;
st2 = curm->zy;
curm->zx = (fp * cos)+ (st2 * sin);
curm->zx = (fp * cos) + (st2 * sin);
curm->zy = -(fp * sin) + (st2 * cos);
fp = curm->wx;
st2 = curm->wy;
curm->wx = (fp * cos)+ (st2 * sin);
curm->wx = (fp * cos) + (st2 * sin);
curm->wy = -(fp * sin) + (st2 * cos);
if (y != 0) {
@@ -338,17 +338,17 @@ void Matrix_rotateXYZ(s16 x, s16 y, s16 z, int mode){
fp = curm->yx;
st2 = curm->yz;
curm->yx = (fp * cos)- (st2 * sin);
curm->yx = (fp * cos) - (st2 * sin);
curm->yz = (fp * sin) + (st2 * cos);
fp = curm->zx;
st2 = curm->zz;
curm->zx = (fp * cos)- (st2 * sin);
curm->zx = (fp * cos) - (st2 * sin);
curm->zz = (fp * sin) + (st2 * cos);
fp = curm->wx;
st2 = curm->wz;
curm->wx = (fp * cos)- (st2 * sin);
curm->wx = (fp * cos) - (st2 * sin);
curm->wz = (fp * sin) + (st2 * cos);
}
@@ -358,22 +358,22 @@ void Matrix_rotateXYZ(s16 x, s16 y, s16 z, int mode){
fp = curm->xy;
st2 = curm->xz;
curm->xy = (fp * cos)+ (st2 * sin);
curm->xy = (fp * cos) + (st2 * sin);
curm->xz = -(fp * sin) + (st2 * cos);
fp = curm->yy;
st2 = curm->yz;
curm->yy = (fp * cos)+ (st2 * sin);
curm->yy = (fp * cos) + (st2 * sin);
curm->yz = -(fp * sin) + (st2 * cos);
fp = curm->zy;
st2 = curm->zz;
curm->zy = (fp * cos)+ (st2 * sin);
curm->zy = (fp * cos) + (st2 * sin);
curm->zz = -(fp * sin) + (st2 * cos);
fp = curm->wy;
st2 = curm->wz;
curm->wy = (fp * cos)+ (st2 * sin);
curm->wy = (fp * cos) + (st2 * sin);
curm->wz = -(fp * sin) + (st2 * cos);
}
} else {
@@ -391,21 +391,21 @@ void Matrix_softcv3_mult(xyz_t* pos, s_xyz* rot) {
fp = curm->xx;
st2 = curm->xy;
curm->xw = curm->xw + (fp * pos->x + st2 * pos->y + curm->xz * pos->z);
curm->xx = (fp * cos) + (st2 * sin);
curm->xy = -(fp * sin) + (st2 * cos);
curm->xx = (fp * cos) + (st2 * sin);
curm->xy = -(fp * sin) + (st2 * cos);
fp = curm->yx;
st2 = curm->yy;
curm->yw = curm->yw + (fp * pos->x + st2 * pos->y + curm->yz * pos->z);
curm->yx = (fp * cos) + (st2 * sin);
curm->yy = -(fp * sin) + (st2 * cos);
fp = curm->zx;
st2 = curm->zy;
curm->zw = curm->zw + (curm->zx * pos->x + curm->zy * pos->y + curm->zz * pos->z);
curm->zx = (fp * cos) + (st2 * sin);
curm->zy = -(fp * sin) + (st2 * cos);
@@ -416,53 +416,51 @@ void Matrix_softcv3_mult(xyz_t* pos, s_xyz* rot) {
curm->wx = (fp * cos) + (st2 * sin);
curm->wy = -(fp * sin) + (st2 * cos);
if(rot->y != 0){
if (rot->y != 0) {
sin = sin_s(rot->y);
cos = cos_s(rot->y);
fp = curm->xx;
st2 = curm->xz;
curm->xx = (fp * cos) - (st2 * sin);
curm->xz = (fp * sin) + (st2 * cos);
fp = curm->yx;
st2 = curm->yz;
curm->yx = (fp * cos) - (st2 * sin);
curm->yz = (fp * sin) + (st2 * cos);
fp = curm->zx;
st2 = curm->zz;
curm->zx = (fp * cos) - (st2 * sin);
curm->zz = (fp * sin) + (st2 * cos);
fp = curm->wx;
st2 = curm->wz;
curm->wx = (fp * cos) - (st2 * sin);
curm->wz = (fp * sin) + (st2 * cos);
}
if(rot->x != 0){
if (rot->x != 0) {
sin = sin_s(rot->x);
cos = cos_s(rot->x);
cos = cos_s(rot->x);
fp = curm->xy;
st2 = curm->xz;
curm->xy = (fp * cos) + (st2 * sin);
curm->xz = -(fp * sin) + (st2 * cos);
fp = curm->yy;
st2 = curm->yz;
curm->yy = (fp * cos) + (st2 * sin);
curm->yz = -(fp * sin) + (st2 * cos);
fp = curm->zy;
st2 = curm->zz;
curm->zy = (fp * cos) + (st2 * sin);
curm->zz = -(fp * sin) + (st2 * cos);
fp = curm->wy;
st2 = curm->wz;
curm->wy = (fp * cos) + (st2 * sin);
@@ -470,12 +468,11 @@ void Matrix_softcv3_mult(xyz_t* pos, s_xyz* rot) {
}
}
void Matrix_softcv3_load(s_xyz* src, f32 x, f32 y, f32 z){
void Matrix_softcv3_load(s_xyz* src, f32 x, f32 y, f32 z) {
MtxF* curm = Matrix_now;
f32 sin, cos;
f32 ss, sc;
sin = sin_s(src->y);
cos = cos_s(src->y);
@@ -489,51 +486,48 @@ void Matrix_softcv3_load(s_xyz* src, f32 x, f32 y, f32 z){
curm->wx = 0.0f;
curm->ww = 1.0f;
if(src->x != 0){
ss = sin_s(src->x);
sc = cos_s(src->x);
if (src->x != 0) {
ss = sin_s(src->x);
sc = cos_s(src->x);
curm->zz = cos * sc;
curm->zy = cos * ss;
curm->zz = cos * sc;
curm->zy = cos * ss;
curm->xz = sin * sc;
curm->xy = sin * ss;
curm->yz = -ss;
curm->yy = sc;
curm->xz = sin * sc;
curm->xy = sin * ss;
curm->yz = -ss;
curm->yy = sc;
} else {
curm->zz = cos;
curm->xz = sin;
curm->yz = 0.0f;
curm->zy = 0.0f;
curm->xy = 0.0f;
curm->yy = 1.0f;
}
else{
curm->zz = cos;
curm->xz = sin;
curm->yz = 0.0f;
curm->zy = 0.0f;
curm->xy = 0.0f;
curm->yy = 1.0f;
}
if(src->z != 0){
if (src->z != 0) {
sin = sin_s(src->z);
cos = cos_s(src->z);
ss = curm->xy;
sc = curm->xx;
curm->xx = (sc * cos) + (ss * sin);
curm->xy = -(sc * sin) + (ss * cos);
ss = curm->zy;
sc = curm->zx;
curm->zx = (sc * cos) + (ss * sin);
curm->zy = -(sc * sin) + (ss * cos);
ss = curm->yy;
curm->yx = curm->yy * sin;
curm->yy = ss * cos;
} else {
curm->yx = 0.0f;
}
else{
curm->yx = 0.0f;
}
}
Mtx* _MtxF_to_Mtx(MtxF* src, Mtx* dest) {
@@ -611,20 +605,19 @@ Mtx* _Matrix_to_Mtx(Mtx* dest) {
return _MtxF_to_Mtx(Matrix_now, dest);
}
Mtx* _Matrix_to_Mtx_new(GRAPH* graph){
Mtx* _Matrix_to_Mtx_new(GRAPH* graph) {
return _Matrix_to_Mtx(GRAPH_ALLOC(graph, sizeof(Mtx)));
}
void Matrix_Position(xyz_t* old_pos, xyz_t* new_pos){
void Matrix_Position(xyz_t* old_pos, xyz_t* new_pos) {
MtxF* curm = Matrix_now;
new_pos->x = (curm->xx * old_pos->x) + (curm->xy * old_pos->y) + (curm->xz * old_pos->z) + curm->xw;
new_pos->y = (curm->yx * old_pos->x) + (curm->yy * old_pos->y) + (curm->yz * old_pos->z) + curm->yw;
new_pos->z = (curm->zx * old_pos->x) + (curm->zy * old_pos->y) + (curm->zz * old_pos->z) + curm->zw;
}
void Matrix_Position_Zero(xyz_t* v){
void Matrix_Position_Zero(xyz_t* v) {
MtxF* curm = Matrix_now;
v->x = curm->xw;
@@ -632,23 +625,21 @@ void Matrix_Position_Zero(xyz_t* v){
v->z = curm->zw;
}
void Matrix_Position_VecX(xyz_t* v, f32 x){
MtxF* curm = Matrix_now;
void Matrix_Position_VecX(f32 x, xyz_t* v) {
MtxF* curm = Matrix_now;
v->x = curm->xw + (curm->xx * x);
v->y = curm->yw + (curm->yx * x);
v->z = curm->zw + (curm->zx * x);
}
void Matrix_Position_VecZ(xyz_t* v, f32 z){
MtxF* curm = Matrix_now;
void Matrix_Position_VecZ(f32 z, xyz_t* v) {
MtxF* curm = Matrix_now;
v->x = curm->xw + (curm->xz * z);
v->y = curm->yw + (curm->yz * z);
v->z = curm->zw + (curm->zz * z);
}
void Matrix_copy_MtxF(MtxF* dest, MtxF* src) {
dest->xx = src->xx;
dest->yx = src->yx;
@@ -706,7 +697,7 @@ void Matrix_reverse(MtxF* curm) {
curm->yz = fp;
}
void Matrix_to_rotate_new(MtxF* curm, s_xyz* vec, int flag){
void Matrix_to_rotate_new(MtxF* curm, s_xyz* vec, int flag) {
f32 temp;
f32 temp2;
f32 temp3;
@@ -728,10 +719,10 @@ void Matrix_to_rotate_new(MtxF* curm, s_xyz* vec, int flag){
vec->z = (fatan2(curm->yx, curm->yy) * 10430.3779297f);
} else {
temp = curm->xx;
temp2 = curm->yx;
temp *= temp;
temp += curm->zx * curm->zx;
temp += curm->zx * curm->zx;
temp += (temp2 * temp2);
/* temp = xx^2+zx^2+yx^2 == 1 for a rotation matrix */
temp = temp2 / sqrtf(temp);
@@ -739,7 +730,7 @@ void Matrix_to_rotate_new(MtxF* curm, s_xyz* vec, int flag){
temp2 = curm->xy;
temp3 = curm->yy;
temp2 *= temp2;
temp2 += curm->zy * curm->zy;
temp2 += curm->zy * curm->zy;
temp2 += (temp3 * temp3);
/* temp2 = xy^2+zy^2+yy^2 == 1 for a rotation matrix */
temp2 = temp3 / sqrtf(temp2);
@@ -772,10 +763,10 @@ void Matrix_to_rotate2_new(MtxF* curm, s_xyz* v, int flag) {
v->x = (fatan2(curm->zy, curm->zz) * 10430.3779297f);
} else {
temp = curm->xy;
temp2 = curm->zy;
temp *= temp;
temp += curm->yy * curm->yy;
temp += curm->yy * curm->yy;
temp += (temp2 * temp2);
/* temp = zx^2+yy^2+zy^2 == 1 for a rotation matrix */
temp = temp2 / sqrtf(temp);
@@ -783,7 +774,7 @@ void Matrix_to_rotate2_new(MtxF* curm, s_xyz* v, int flag) {
temp2 = curm->xz;
temp3 = curm->zz;
temp2 *= temp2;
temp2 += curm->yz * curm->yz;
temp2 += curm->yz * curm->yz;
temp2 += (temp3 * temp3);
/* temp2 = xz^2+yz^2+zz^2 == 1 for a rotation matrix */
temp2 = temp3 / sqrtf(temp2);
@@ -856,7 +847,7 @@ void Matrix_RotateVector(s16 angle, xyz_t* axis, u8 mode) {
temp2 = axis->z * ((1.0f - cos) * axis->y);
temp3 = axis->x * sin;
curm->zy = temp2 + temp3 ;
curm->zy = temp2 + temp3;
curm->yz = temp2 - temp3;
curm->wx = 0.0f;
@@ -887,8 +878,8 @@ void Matrix_RotateVector(s16 angle, xyz_t* axis, u8 mode) {
}
}
void suMtxMakeTS(Mtx *mtx, f32 scaleX, f32 scaleY, f32 scaleZ, f32 translateX, f32 translateY, f32 translateZ) {
struct {
void suMtxMakeTS(Mtx* mtx, f32 scaleX, f32 scaleY, f32 scaleZ, f32 translateX, f32 translateY, f32 translateZ) {
struct {
s16 intPart[4][4];
u16 fracPart[4][4];
}* mu = (void*)mtx;
@@ -926,13 +917,13 @@ void suMtxMakeTS(Mtx *mtx, f32 scaleX, f32 scaleY, f32 scaleZ, f32 translateX, f
mu->intPart[3][2] = ((u32)fp >> 16) & 0xFFFF;
mu->intPart[3][3] = 1;
mtx->m[3][3] = (u32)fp << 16;
}
// S(RxRyRz)T where S is a scale matrix, Rx/Ry/Rz are rotations about the x/y/z axes, and T is a translation
void suMtxMakeSRT(Mtx* mtx, f32 scaleX, f32 scaleY, f32 scaleZ, s16 rotX, s16 rotY, s16 rotZ, f32 translateX, f32 translateY, f32 translateZ) {
void suMtxMakeSRT(Mtx* mtx, f32 scaleX, f32 scaleY, f32 scaleZ, s16 rotX, s16 rotY, s16 rotZ, f32 translateX,
f32 translateY, f32 translateZ) {
int fp;
struct {
struct {
s16 intPart[4][4];
u16 fracPart[4][4];
}* mu = (void*)mtx;
@@ -944,51 +935,51 @@ void suMtxMakeSRT(Mtx* mtx, f32 scaleX, f32 scaleY, f32 scaleZ, s16 rotX, s16 ro
f32 cosZ = cos_s(rotZ);
fp = cosY * cosZ * scaleX * 0x10000;
mu->intPart[0][0] = ((u32) fp >> 0x10) & 0xFFFF;
mu->intPart[0][0] = ((u32)fp >> 0x10) & 0xFFFF;
mu->fracPart[0][0] = fp & 0xFFFF;
fp = cosY * sinZ * scaleX * 0x10000;
mu->intPart[0][1] = ((u32) fp >> 0x10) & 0xFFFF;
mu->intPart[0][1] = ((u32)fp >> 0x10) & 0xFFFF;
mu->fracPart[0][1] = fp & 0xFFFF;
fp = -sinY * scaleX * 0x10000;
mu->intPart[0][2] = ((u32) fp >> 0x10) & 0xFFFF;
mu->fracPart[0][2] = fp & 0xFFFF;
mu->intPart[0][2] = ((u32)fp >> 0x10) & 0xFFFF;
mu->fracPart[0][2] = fp & 0xFFFF;
fp = ((sinX * sinY * cosZ) - (cosX * sinZ)) * scaleY * 0x10000;
mu->intPart[1][0] = ((u32) fp >> 0x10) & 0xFFFF;
mu->fracPart[1][0] = fp & 0xFFFF;
mu->intPart[1][0] = ((u32)fp >> 0x10) & 0xFFFF;
mu->fracPart[1][0] = fp & 0xFFFF;
fp = ((sinX * sinY * sinZ) + (cosX * cosZ)) * scaleY * 0x10000;
mu->intPart[1][1] = ((u32) fp >> 0x10) & 0xFFFF;
mu->intPart[1][1] = ((u32)fp >> 0x10) & 0xFFFF;
mu->fracPart[1][1] = fp & 0xFFFF;
fp = sinX * cosY * scaleY * 0x10000;
mu->intPart[1][2] = ((u32) fp >> 0x10) & 0xFFFF;
mu->intPart[1][2] = ((u32)fp >> 0x10) & 0xFFFF;
mu->fracPart[1][2] = fp & 0xFFFF;
fp = ((cosX * sinY * cosZ) + (sinX * sinZ)) * scaleZ * 0x10000;
mu->intPart[2][0] = ((u32) fp >> 0x10) & 0xFFFF;
mu->intPart[2][0] = ((u32)fp >> 0x10) & 0xFFFF;
mu->fracPart[2][0] = fp & 0xFFFF;
fp = ((cosX * sinY * sinZ) - (sinX * cosZ)) * scaleZ * 0x10000;
mu->intPart[2][1] = ((u32) fp >> 0x10) & 0xFFFF;
mu->intPart[2][1] = ((u32)fp >> 0x10) & 0xFFFF;
mu->fracPart[2][1] = fp & 0xFFFF;
fp = cosX * cosY * scaleZ * 0x10000;
mu->intPart[2][2] = ((u32) fp >> 0x10) & 0xFFFF;
mu->intPart[2][2] = ((u32)fp >> 0x10) & 0xFFFF;
mu->fracPart[2][2] = fp & 0xFFFF;
fp = translateX * 0x10000;
mu->intPart[3][0] = ((u32) fp >> 0x10) & 0xFFFF;
mu->intPart[3][0] = ((u32)fp >> 0x10) & 0xFFFF;
mu->fracPart[3][0] = fp & 0xFFFF;
fp = translateY * 0x10000;
mu->intPart[3][1] = ((u32) fp >> 0x10) & 0xFFFF;
mu->intPart[3][1] = ((u32)fp >> 0x10) & 0xFFFF;
mu->fracPart[3][1] = fp & 0xFFFF;
fp = translateZ * 0x10000;
mu->intPart[3][2] = ((u32) fp >> 0x10) & 0xFFFF;
mu->intPart[3][2] = ((u32)fp >> 0x10) & 0xFFFF;
mu->fracPart[3][2] = fp & 0xFFFF;
mu->intPart[0][3] = mu->intPart[1][3] = mu->intPart[2][3] = 0;
@@ -998,7 +989,8 @@ void suMtxMakeSRT(Mtx* mtx, f32 scaleX, f32 scaleY, f32 scaleZ, s16 rotX, s16 ro
}
// S(RzRxRy)T where S is a scale matrix, Rx/Ry/Rz are rotations, and T is a translation
void suMtxMakeSRT_ZXY(Mtx* mtx, f32 scaleX, f32 scaleY, f32 scaleZ, s16 rotX, s16 rotY, s16 rotZ, f32 translateX, f32 translateY, f32 translateZ) {
void suMtxMakeSRT_ZXY(Mtx* mtx, f32 scaleX, f32 scaleY, f32 scaleZ, s16 rotX, s16 rotY, s16 rotZ, f32 translateX,
f32 translateY, f32 translateZ) {
int fp;
struct {
s16 intPart[4][4];
@@ -1012,51 +1004,51 @@ void suMtxMakeSRT_ZXY(Mtx* mtx, f32 scaleX, f32 scaleY, f32 scaleZ, s16 rotX, s1
f32 cosZ = cos_s(rotZ); // likely sp+38
fp = ((cosY * cosZ) + (sinX * sinY * sinZ)) * scaleX * 0x10000;
mu->intPart[0][0] = ((u32) fp >> 0x10) & 0xFFFF;
mu->intPart[0][0] = ((u32)fp >> 0x10) & 0xFFFF;
mu->fracPart[0][0] = fp & 0xFFFF;
fp = cosX * sinZ * scaleX * 0x10000;
mu->intPart[0][1] = ((u32) fp >> 0x10) & 0xFFFF;
mu->intPart[0][1] = ((u32)fp >> 0x10) & 0xFFFF;
mu->fracPart[0][1] = fp & 0xFFFF;
fp = ( - (sinY * cosZ) + (sinX * cosY * sinZ) ) * scaleX * 0x10000;
mu->intPart[0][2] = ((u32) fp >> 0x10) & 0xFFFF;
fp = (-(sinY * cosZ) + (sinX * cosY * sinZ)) * scaleX * 0x10000;
mu->intPart[0][2] = ((u32)fp >> 0x10) & 0xFFFF;
mu->fracPart[0][2] = fp & 0xFFFF;
fp = (- (cosY * sinZ) + (sinX * sinY * cosZ) ) * scaleY * 0x10000;
mu->intPart[1][0] = ((u32) fp >> 0x10) & 0xFFFF;
fp = (-(cosY * sinZ) + (sinX * sinY * cosZ)) * scaleY * 0x10000;
mu->intPart[1][0] = ((u32)fp >> 0x10) & 0xFFFF;
mu->fracPart[1][0] = fp & 0xFFFF;
fp = cosX * cosZ * scaleY * 0x10000;
mu->intPart[1][1] = ((u32) fp >> 0x10) & 0xFFFF;
mu->intPart[1][1] = ((u32)fp >> 0x10) & 0xFFFF;
mu->fracPart[1][1] = fp & 0xFFFF;
fp = ((sinY * sinZ) + (sinX * cosY * cosZ)) * scaleY * 0x10000;
mu->intPart[1][2] = ((u32) fp >> 0x10) & 0xFFFF;
mu->intPart[1][2] = ((u32)fp >> 0x10) & 0xFFFF;
mu->fracPart[1][2] = fp & 0xFFFF;
fp = cosX * sinY * scaleZ * 0x10000;
mu->intPart[2][0] = ((u32) fp >> 0x10) & 0xFFFF;
mu->intPart[2][0] = ((u32)fp >> 0x10) & 0xFFFF;
mu->fracPart[2][0] = fp & 0xFFFF;
fp = -sinX * scaleZ * 0x10000;
mu->intPart[2][1] = ((u32) fp >> 0x10) & 0xFFFF;
mu->intPart[2][1] = ((u32)fp >> 0x10) & 0xFFFF;
mu->fracPart[2][1] = fp & 0xFFFF;
fp = cosX * cosY * scaleZ * 0x10000;
mu->intPart[2][2] = ((u32) fp >> 0x10) & 0xFFFF;
mu->intPart[2][2] = ((u32)fp >> 0x10) & 0xFFFF;
mu->fracPart[2][2] = fp & 0xFFFF;
fp = translateX * 0x10000;
mu->intPart[3][0] = ((u32) fp >> 0x10) & 0xFFFF;
mu->intPart[3][0] = ((u32)fp >> 0x10) & 0xFFFF;
mu->fracPart[3][0] = fp & 0xFFFF;
fp = translateY * 0x10000;
mu->intPart[3][1] = ((u32) fp >> 0x10) & 0xFFFF;
mu->intPart[3][1] = ((u32)fp >> 0x10) & 0xFFFF;
mu->fracPart[3][1] = fp & 0xFFFF;
fp = translateZ * 0x10000;
mu->intPart[3][2] = ((u32) fp >> 0x10) & 0xFFFF;
mu->intPart[3][2] = ((u32)fp >> 0x10) & 0xFFFF;
mu->fracPart[3][2] = fp & 0xFFFF;
mu->intPart[0][3] = mu->intPart[1][3] = mu->intPart[2][3] = 0;
@@ -1064,4 +1056,3 @@ void suMtxMakeSRT_ZXY(Mtx* mtx, f32 scaleX, f32 scaleY, f32 scaleZ, s16 rotX, s1
mu->intPart[3][3] = 1;
mu->fracPart[3][3] = 0;
}