f_op_camera seems good

This commit is contained in:
Jasper St. Pierre
2023-09-22 10:58:13 -07:00
parent 54c8c9c4e9
commit f65adb0f97
12 changed files with 203 additions and 62 deletions
+9
View File
@@ -36,6 +36,7 @@ class daAgb_c;
class dTimer_c;
class camera_class;
class J2DOrthoGraph;
class dDemo_actor_c;
class __d_timer_info_c {
public:
@@ -948,6 +949,10 @@ inline void dComIfGp_demo_update() {
g_dComIfG_gameInfo.play.getDemo()->update();
}
inline dDemo_actor_c* dComIfGp_demo_getActor(u8 id) {
return g_dComIfG_gameInfo.play.getDemo()->mDemoObj.getActor(id);
}
inline void dComIfGp_setLkDemoAnmArchive(JKRArchive* i_arc) {
g_dComIfG_gameInfo.play.setLkDemoAnmArchive(i_arc);
}
@@ -1051,6 +1056,10 @@ inline void dComIfGp_event_setItemPartnerId(u32 id) {
return g_dComIfG_gameInfo.play.getEvent().setPtI_Id(id);
}
inline s32 dComIfGp_event_moveApproval(void* actor) {
return g_dComIfG_gameInfo.play.getEvent().moveApproval(actor);
}
inline dEvent_manager_c& dComIfGp_getEventManager() {
return g_dComIfG_gameInfo.play.getEvtManager();
}
+7 -1
View File
@@ -10,6 +10,12 @@ class dDemo_light_c;
class dDemo_system_c;
class TControl;
class dMesg_tControl;
class fopAc_ac_c;
class dDemo_actor_c /* : public JStage::TActor */ {
public:
void setActor(fopAc_ac_c*);
};
class dDemo_object_c {
public:
@@ -17,7 +23,7 @@ public:
~dDemo_object_c();
void appendActor(fopAc_ac_c*);
void getActor(u8);
dDemo_actor_c* getActor(u8);
void createCamera();
void getActiveCamera();
void createAmbient();
+1 -1
View File
@@ -48,7 +48,7 @@ public:
void soundProc();
void check();
void photoCheck();
void moveApproval(void*);
s32 moveApproval(void*);
void compulsory(void*, const char*, u16);
void remove();
void getStageEventDt();
+1 -1
View File
@@ -12,7 +12,7 @@ public:
bool resetGame();
void offReset();
static bool isPause() { return pauseTimer == 0; }
static bool isPause() { return pauseTimer != 0; }
static void setPauseTimer(s8 time) { pauseTimer = time; }
static s8 pauseTimer;
+1 -1
View File
@@ -17,7 +17,7 @@ struct actor_method_class {
enum fopAc_Status_e {
fopAcStts_SHOWMAP_e = 0x00000020,
fopAcStts_NOEXEC_e = 0x00000080,
fopAcStts_CULLSTOP_e = 0x00000100,
fopAcStts_CULL_e = 0x00000100,
fopAcStts_FREEZE_e = 0x00000400,
fopAcStts_CARRY_e = 0x00002000,
fopAcStts_NOPAUSE_e = 0x00020000,
+21 -5
View File
@@ -2,16 +2,32 @@
#define F_F_OP_CAMERA_H_
#include "f_op/f_op_view.h"
#include "SSystem/SComponent/c_sxyz.h"
#include "SSystem/SComponent/c_phase.h"
class camera_class;
class camera_process_class : public view_class {
public:
/* 0x210 */ create_tag_class mDwTg;
/* 0x224 */ leafdraw_method_class* mpMtd;
/* 0x228 */ u8 field_0x228[4];
/* 0x22C */ s8 mPrm1;
/* 0x22D */ s8 mPrm2;
/* 0x22E */ s8 mPrm3;
/* 0x22F */ s8 field_0x22f;
/* 0x230 */ csXyz mAngle;
/* 0x238 */ int field_0x238;
};
class camera_class : public camera_process_class {
public:
/* 0x23C */ int field_0x23c;
/* 0x240 */ request_of_phase_process_class mPhaseReq;
// /* 0x248 */ dCamera_c mCamera;
};
struct camera_process_profile_definition {
/* 0x00 */ view_process_profile_definition mBase;
/* 0x3C */ leafdraw_method_class* mSubMtd; // Subclass methods
};
static s32 fopCam_Draw(camera_class* param_1);
static int fopCam_Execute(camera_class* pCamera);
int fopCam_IsDelete(camera_class* pCamera);
#endif
+4
View File
@@ -62,6 +62,10 @@ inline void mDoAud_seStart(u32 i_sfxID, Vec* i_sePos, u32 param_2, s8 i_reverb)
mDoAud_zelAudio_c::getInterface()->seStart(i_sfxID, i_sePos, param_2, i_reverb, 1.0f, 1.0f, -1.0f, -1.0f, 0);
}
inline void mDoAud_seDeleteObject(Vec* i_sePos) {
mDoAud_zelAudio_c::getInterface()->seDeleteObject(i_sePos);
}
inline void mDoAud_bgmMuteMtDragon() {
mDoAud_zelAudio_c::getInterface()->bgmMuteMtDragon();
}