mirror/ac-decomp
1
0
Fork 0
mirror of https://github.com/ACreTeam/ac-decomp synced 2026-07-08 12:16:19 -04:00
Code Issues Packages Projects Releases Wiki Activity

Implement & link ac_airplane.c

Browse Source
This commit is contained in:
Cuyler36
2023-06-23 01:03:42 -04:00
parent b1a9b19323
commit a17be189b6
12 changed files with 577 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/ac_airplane.h
+62
View File
@@ -0,0 +1,62 @@
#ifndef AC_AIRPLANE_H
#define AC_AIRPLANE_H
#include "types.h"
#include "m_actor.h"
#ifdef __cplusplus
extern "C" {
#endif
enum {
aAp_STATUS_FREE_FLY_MOVE,
aAp_STATUS_FALL_FLY_MOVE,
aAp_STATUS_FALL_FLY_MOVE2,
aAp_STATUS_SOMER_FLY_MOVE,
aAp_STATUS_START_FLY_MOVE,
aAp_STATUS_STOP_FLY_MOVE,
aAp_STATUS_PLAYER_CATCH,
aAp_STATUS_NUM
};
enum {
aAp_TILT_DOWN,
aAp_TILT_UP,
aAp_TILT_NUM
};
typedef struct airplane_s {
ACTOR actor_class;
s16 status;
s16 tilt_status;
f32 speed;
f32 y_speed;
f32 rotY_goal;
f32 rotY_min;
f32 rotY;
f32 rotX;
f32 rotZ;
int joystick_y;
int joystick_x;
s16 ground_timer;
int wind_frame;
int wind_change_frame;
xyz_t* wind;
u8 _1AC[28]; // unused
} AIRPLANE_ACTOR;
extern ACTOR_PROFILE Airplane_Profile;
#ifdef __cplusplus
}
#endif
#endif
include/ef_effect_control.h
+41
View File
@@ -0,0 +1,41 @@
#ifndef EF_EFFECT_CONTROL_H
#define EF_EFFECT_CONTROL_H
#include "types.h"
#include "m_lib.h"
#include "m_actor.h"
#ifdef __cplusplus
extern "C" {
#endif
enum effect_type {
eEC_EFFECT_SHOCK,
eEC_EFFECT_DUST,
eEC_EFFECT_MUKA,
eEC_EFFECT_WARAU,
/* TODO: finish */
eEC_EFFECT_NUM = 126
};
typedef void (*eEC_NAME2EFFECTMAKE_PROC)(int, xyz_t, int, short, GAME*, u16, s16, s16);
typedef struct effect_control_clip_s {
eEC_NAME2EFFECTMAKE_PROC effect_make_proc;
/* TODO: finish */
} eEC_EffectControl_Clip_c;
typedef struct effect_control_s EFFECT_CONTROL_ACTOR;
struct effect_control_s {
ACTOR actor_class;
eEC_EffectControl_Clip_c clip;
};
#ifdef __cplusplus
}
#endif
#endif
include/m_actor.h
+10 -3
View File
@@ -5,6 +5,8 @@
#include "m_actor_type.h"
#include "game.h"
#include "m_lib.h"
#include "m_lights.h"
#include "m_collision_bg.h"
#ifdef __cplusplus
extern "C" {
@@ -18,6 +20,7 @@ typedef void (*mActor_proc)(ACTOR*, GAME*);
#define ACTOR_OBJ_BANK_NONE 0
#define ACTOR_OBJ_BANK_3 3 /* TODO: rename, also likely an enum */
#define ACTOR_OBJ_BANK_7 7
#define ACTOR_OBJ_BANK_12 12
enum actor_part {
@@ -48,7 +51,7 @@ typedef struct actor_profile_s {
/* 0x20 */ mActor_proc sv_proc; /* save */
} ACTOR_PROFILE;
typedef void (*mActor_shadow_proc)(ACTOR*, void*, GAME_PLAY*); /* TODO: void* is actually LightsN*, see m_lights */
typedef void (*mActor_shadow_proc)(ACTOR*, LightsN*, GAME_PLAY*);
/* sizeof(Shape_Info) == 0x48 */
typedef struct actor_shape_info_s {
@@ -95,8 +98,7 @@ struct actor_s {
/* 0x078 */ f32 gravity; /* gravity acting on actor */
/* 0x07C */ f32 max_velocity_y; /* maximum y velocity possible due to gravity, usually -20.0f */
/* 0x080 */ f32 ground_y; /* vertical position of ground underneath actor */
/* 0x084 */ u8 bg_collision_data[0xB2-0x84]; /* actor collision data, TODO: implement, mCoBG */
/* 0x0B2 */ u8 unused_b2[2];
/* 0x084 */ mCoBG_Check_c bg_collision_check; /* background object collision info with actor */
/* 0x0B4 */ u8 unknown_b4; /* some sort of flag */
/* 0x0B5 */ u8 drawn; /* was drawn flag, TRUE = actor was drawn, FALSE = actor was not drawn */
/* 0x0B6 */ s16 player_angle_y; /* Y angle (yaw) between actor and player actor */
@@ -141,6 +143,11 @@ typedef struct actor_info_s {
extern void Actor_delete(ACTOR* actor);
extern ACTOR* Actor_info_fgName_search(Actor_info* actor_info, mActor_name_t fg_name, int part);
extern void Actor_world_to_eye(ACTOR* actor, f32 eye_height);
extern void Shape_Info_init(ACTOR* actor, f32 y_ofs, mActor_shadow_proc shadow_proc, f32 shadow_sizeX, f32 shadow_sizeZ);
extern void Actor_position_moveF(ACTOR* actor);
extern void mAc_ActorShadowCircle(ACTOR* actor, LightsN* lightsN, GAME_PLAY* play);
extern void mAc_ActorShadowEllipse(ACTOR* actor, LightsN* lightsN, GAME_PLAY* play);
#ifdef __cplusplus
}
include/m_clip.h
+3 -1
View File
@@ -6,6 +6,7 @@
#include "ac_insect_h.h"
#include "ac_structure.h"
#include "ac_animal_logo.h"
#include "ef_effect_control.h"
#ifdef __cplusplus
extern "C" {
@@ -17,7 +18,8 @@ typedef struct clip_s {
/* 0x07C */ aINS_Clip_c* insect_clip;
/* 0x080 */ void* _080[(0x08C - 0x080) / sizeof(void*)];
/* 0x08C */ aSTR_Clip_c* structure_clip;
/* 0x090 */ void* _090[(0x0AC - 0x090) / sizeof(void*)];
/* 0x090 */ eEC_EffectControl_Clip_c* effect_clip;
/* 0x094 */ void* _094[(0x0AC - 0x094) / sizeof(void*)];
/* 0x0AC */ aGYO_Clip_c* gyo_clip;
/* 0x0B0 */ void* _0B0[(0x0DC - 0x0B0) / sizeof(void*)];
/* 0x0DC */ aAL_Clip_c* animal_logo_clip;
include/m_collision_bg.h
+34 -1
View File
@@ -51,14 +51,47 @@ typedef union collision_bg_u {
mCoBG_CollisionData_c data;
} mCoBG_Collision_u;
typedef struct collision_bg_check_result_s {
u32 on_ground:1;
u32 hit_attribute_wall:5;
u32 hit_wall:5;
u32 hit_wall_count:3;
u32 unk_flag0:1;
u32 unit_attribute:6;
u32 is_on_move_bg_obj:1;
u32 is_in_water:1;
u32 unk_flag1:1;
u32 unk_flag2:1;
u32 unk_flag3:1;
u32 unk_flag4:1;
u32 unk_flag5:1;
u32 unk_flag6:4;
} mCoBG_CheckResult_c;
typedef struct wall_info_s {
s16 angleY;
s16 type;
} mCoBG_WallInfo_c;
typedef struct collision_bg_check_s {
mCoBG_Collision_u collision_units[5];
mCoBG_CheckResult_c result;
f32 wall_top_y;
f32 wall_bottom_y;
f32 ground_y;
mCoBG_WallInfo_c wall_info[2];
s16 in_front_wall_angle_y;
} mCoBG_Check_c;
extern u32 mCoBG_Wpos2BgAttribute_Original(xyz_t wpos);
extern u32 mCoBG_Wpos2Attribute(xyz_t wpos, char* is_diggable);
extern int mCoBG_CheckWaterAttribute(u32 attribute);
extern f32 mCoBG_GetBgY_AngleS_FromWpos(s_xyz* angle_to_ground, xyz_t wpos, f32 offset);
extern f32 mCoBG_GetBgY_AngleS_FromWpos(s_xyz* angle_to_ground, xyz_t wpos, f32 offset_y);
extern int mCoBG_CheckWaterAttribute_OutOfSea(u32 attribute);
extern int mCoBG_CheckHole_OrgAttr(u32 attribute);
extern f32 mCoBG_GetBgY_OnlyCenter_FromWpos2(xyz_t wpos, f32 foot_dist);
extern int mCoBG_Attribute2CheckPlant(u32 attribute, const xyz_t* wpos);
extern void mCoBG_BgCheckControll(xyz_t* reverse_pos, ACTOR* actor, f32 check_range, f32 offset_y, s16 wall_attr_check, s16 no_reverse, s16 check_type);
extern f32 mCoBG_GetWaterHeight_File(xyz_t wpos, char* file, int line);
#define mCoBG_GetWaterHeight(wpos) mCoBG_GetWaterHeight_File(wpos, __FILE__, __LINE__)
include/m_lib.h
+8
View File
@@ -24,9 +24,11 @@ extern "C" {
/* radians -> short angle */
#define RAD2SHORT_ANGLE(rad) ((s16)(int)((rad) * (65536.0f / (2.0f * F_PI))))
#define RAD2SHORTANGLE(rad) ((s16)((32768.0f / F_PI) * ((f32)(rad))))
/* short angle -> radians */
#define SHORT2RAD_ANGLE(s) ((((f32)(s)) / (65536.0f / (2.0f * F_PI))))
#define SHORTANGLE2RAD(sangle) ((F_PI / 32768.0f) * ((f32)(sangle)))
/* degrees -> short angle */
#define DEG2SHORT_ANGLE(deg) ((s16)((deg) * (65536.0f / 360.0f)))
@@ -34,6 +36,12 @@ extern "C" {
/* short angle -> degrees */
#define SHORT2DEG_ANGLE(s) ((((f32)(s)) / (65536.0f / 360.0f)))
/* radians -> degrees */
#define RAD2DEG(rad) ((180.0f / F_PI) * (rad))
/* degrees -> radians */
#define DEG2RAD(deg) ((F_PI / 180.0f) * (deg))
typedef struct rgba_t { //can be put in other place
u8 r, g, b, a;
} rgba_t;
include/m_lights.h
+20
View File
@@ -0,0 +1,20 @@
#ifndef M_LIGHTS_H
#define M_LIGHTS_H
#include "types.h"
#include "PR/mbi.h"
#ifdef __cplusplus
extern "C" {
#endif
typedef struct lightsn_s {
u8 diffuse_count;
Lights7 lights;
} LightsN;
#ifdef __cplusplus
}
#endif
#endif
include/m_name_table.h
+3
View File
@@ -472,6 +472,9 @@ extern int mNT_check_unknown(mActor_name_t item_no);
#define TRAIN0 0x580A
#define TRAIN1 0x580B
#define ETC_START 0x8000
#define ETC_AIRPLANE ETC_START
#define MISC_ACTOR_START 0x9000
#define MISC_ACTOR_SAMPLE MISC_ACTOR_START
include/m_player_lib.h
+2
View File
@@ -14,6 +14,8 @@ extern void mPlib_SetData2_controller_data_for_title_demo(mActor_name_t tool);
extern void mPlib_request_main_invade_type1(GAME_PLAY* play);
extern mActor_name_t mPlib_Get_itemNo_forWindow();
extern int mPlib_check_able_change_camera_normal_index();
extern void mPlib_request_main_refuse_type1(GAME_PLAY* play);
extern void mPlib_request_main_wait_type3(GAME_PLAY* play);
#ifdef __cplusplus
}
include/sys_math3d.h
+3
View File
@@ -16,6 +16,9 @@ typedef struct math_3d_pipe_s {
} Math3D_pipe_c;
extern f32 Math3DVecLength(xyz_t* vec);
extern void sMath_RotateX(xyz_t* pos, f32 rad);
extern void sMath_RotateY(xyz_t* pos, f32 rad);
extern void sMath_RotateZ(xyz_t* pos, f32 rad);
extern xyz_t ZeroVec;