encounter/tp
0
0
Fork 0
mirror of https://github.com/encounter/tp.git synced 2026-07-11 06:18:46 -07:00
Code Issues Packages Projects Releases Wiki Activity

move some of d_com_inf_game (#128)

Browse Source 
* move most d_com_inf_game

* remove temp
This commit is contained in:
TakaRikka
2021-05-02 20:04:42 -04:00
committed by GitHub
parent 8fd9f2ab5d
commit a83a461e54
42 changed files with 1045 additions and 832 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/d/a/d_a_player.h
+1 -5
View File
@@ -2,15 +2,11 @@
#define D_A_D_A_PLAYER_H
#include "JSystem/J3DGraphAnimator/J3DAnimation.h"
#include "d/d_resorce.h"
#include "d/save/d_save.h"
#include "dolphin/types.h"
#include "f_op/f_op_actor.h"
// todo: remove after moving JKernel
struct JKRHeap {
/* 802CE5CC */ void freeAll();
};
class daPy_anmHeap_c {
public:
enum daAlinkHEAP_TYPE {};
include/d/bg/d_bg_w.h
+1 -17
View File
@@ -4,6 +4,7 @@
#include "SSystem/SComponent/c_bg_s_gnd_chk.h"
#include "SSystem/SComponent/c_bg_s_lin_chk.h"
#include "SSystem/SComponent/c_bg_s_poly_info.h"
#include "SSystem/SComponent/c_m3d_g_tri.h"
#include "d/bg/d_bg_s_acch.h"
#include "d/bg/d_bg_s_grp_pass_chk.h"
#include "d/bg/d_bg_s_poly_pass_chk.h"
@@ -14,23 +15,6 @@ struct dBgS_CaptPoly {};
struct dBgS_SphChk {};
struct cM3dGTri {
/* 8007A344 */ ~cM3dGTri();
/* 8026F85C */ void setBg(Vec const*, Vec const*, Vec const*, cM3dGPla const*);
};
struct cM3dGSph {};
struct cM3dGAab {
/* 8026EC88 */ void CrossY(cXyz const*) const;
/* 8026ECD0 */ void UnderPlaneYUnder(f32) const;
/* 8026ECE4 */ void TopPlaneYUnder(f32) const;
/* 8026ECF8 */ void ClearForMinMax();
/* 8026ED1C */ void SetMinMax(cXyz const&);
/* 8026EDA4 */ void SetMin(cXyz const&);
/* 8026EDE4 */ void SetMax(cXyz const&);
};
struct cBgW_TriElm {
/* 800796F8 */ ~cBgW_TriElm();
/* 80079754 */ cBgW_TriElm();
include/d/cc/d_cc_mass_s.h
+4
View File
@@ -6,6 +6,9 @@
class dCcMassS_Obj {
public:
dCcMassS_Obj();
~dCcMassS_Obj();
private:
u8 field_0x0[12];
cCcD_DivideInfo cccd_divideinfo;
@@ -15,6 +18,7 @@ private:
class dCcMassS_Mng {
public:
dCcMassS_Mng(void);
~dCcMassS_Mng();
private:
/* 0x0000 */ cCcD_DivideArea cccd_dividearea;
include/d/cc/d_cc_s.h
+3 -2
View File
@@ -1,6 +1,7 @@
#ifndef D_CC_D_CC_S_H
#define D_CC_D_CC_S_H
#include "SSystem/SComponent/c_cc_s.h"
#include "d/cc/d_cc_d.h"
#include "d/cc/d_cc_mass_s.h"
#include "dolphin/types.h"
@@ -42,9 +43,9 @@ public:
static u8 m_mtrl_hit_tbl[64];
private:
/* 0x0000 */ cCcS cccs;
/* 0x0000 */ cCcS mCCcS;
/* 0x2834 */ u8 field_0x2834[0x18];
/* 0x284C */ dCcMassS_Mng dccmass_mng;
/* 0x284C */ dCcMassS_Mng mMass_Mng;
};
#endif /* D_CC_D_CC_S_H */
include/d/com/d_com_inf_game.h
+661
View File
File diff suppressed because it is too large Load Diff
include/d/d_drawlist.h
+91
View File
@@ -1,6 +1,97 @@
#ifndef D_D_DRAWLIST_H
#define D_D_DRAWLIST_H
#include "SSystem/SComponent/c_xyz.h"
#include "dolphin/types.h"
struct J3DPacket {};
struct _GXColor;
struct J3DDrawBuffer {
/* 80324F08 */ void initialize();
/* 80324F70 */ void allocBuffer(u32);
/* 80325008 */ ~J3DDrawBuffer();
/* 80325068 */ void frameInit();
/* 8032548C */ void entryImm(J3DPacket*, u16);
/* 803254AC */ void draw() const;
};
class dDlst_FileInfo_c {
public:
void draw(void);
~dDlst_FileInfo_c();
private:
};
#pragma pack(push, 1)
class dDlst_peekZ_c {
public:
/* 80056018 */ void newData(s16, s16, u32*);
/* 80056080 */ void peekData();
u8 unk[7];
}; // actual size unknown!!!
#pragma pack(pop)
#pragma pack(push, 1)
class dDlst_window_c {
public:
dDlst_window_c(void);
~dDlst_window_c();
/* 80051AC0 */ void setViewPort(f32, f32, f32, f32, f32, f32);
/* 80051ADC */ void setScissor(f32, f32, f32, f32);
private:
float view_port1;
float view_port2;
float view_port3;
float view_port4;
float view_port5;
float view_port6;
float scissor1;
float scissor2;
float scissor3;
float scissor4;
int camera_id;
};
#pragma pack(pop)
class dDlst_base_c {
public:
virtual void draw();
};
#pragma pack(push, 1)
class dDlst_list_c {
public:
/* 800560F0 */ dDlst_list_c();
/* 80056390 */ void init();
/* 8005648C */ ~dDlst_list_c();
/* 80056538 */ void reset();
/* 800565EC */ void entryZSortXluDrawList(J3DDrawBuffer*, J3DPacket*, cXyz&);
/* 800566D4 */ void drawOpaDrawList(J3DDrawBuffer*);
/* 80056710 */ void drawXluDrawList(J3DDrawBuffer*);
/* 8005674C */ void drawOpaListItem3d();
/* 80056770 */ void drawXluListItem3d();
/* 80056794 */ void set(dDlst_base_c**&, dDlst_base_c**&, dDlst_base_c*);
/* 800567C4 */ void draw(dDlst_base_c**, dDlst_base_c**);
/* 8005681C */ void wipeIn(f32, _GXColor&);
/* 800568D8 */ void wipeIn(f32);
/* 80056900 */ void calcWipe();
static u8 mWipeDlst[72];
static u8 mWipeColor[4];
static f32 mWipeRate;
static f32 mWipeSpeed[1 + 1 /* padding */];
// private:
/* 0x00000 */ u8 field_0x00[0x1C];
/* 0x0001C */ J3DPacket* mpPacket;
/* 0x00020 */ u8 field_0x20[0x16170];
/* 0x16180 */ dDlst_peekZ_c dlstPeekZ;
/* 0x16184 */ u8 unk_0x16194[0x1F];
}; // Size: 0x161A0
#pragma pack(pop)
#endif /* D_D_DRAWLIST_H */
include/d/d_resorce.h
+56
View File
@@ -1,6 +1,62 @@
#ifndef D_D_RESORCE_H
#define D_D_RESORCE_H
#include "SSystem/SComponent/c_xyz.h"
#include "dolphin/types.h"
#include "m_Do/m_Do_ext.h"
struct JKRHeap {
/* 802CE6B0 */ void getSize(void*, JKRHeap*);
/* 802CE784 */ void getTotalFreeSize();
/* 802CE5CC */ void freeAll();
/* 802CE83C */ void findFromRoot(void*);
static u8 sCurrentHeap[4];
};
struct JKRArchive {
/* 802D5CE4 */ void getIdxResource(u32);
/* 802D625C */ void getFileAttribute(u32) const;
/* 802D6684 */ void findIdxResource(u32) const;
/* 802D66AC */ void findNameResource(char const*) const;
/* 802D5ECC */ void readIdxResource(void*, u32, u32);
/* 802D5B38 */ void getGlbResource(u32, char const*, JKRArchive*);
};
#pragma pack(push, 1)
class dRes_info_c {
public:
/* 8003A260 */ dRes_info_c();
/* 8003A280 */ ~dRes_info_c();
/* 8003A348 */ void set(char const*, char const*, u8, JKRHeap*);
/* 8003AB30 */ void onWarpMaterial(J3DModelData*);
/* 8003AC1C */ void offWarpMaterial(J3DModelData*);
/* 8003AD08 */ void setWarpSRT(J3DModelData*, cXyz const&, f32, f32);
/* 8003AE14 */ void loaderBasicBmd(u32, void*);
/* 8003B30C */ void loadResource();
/* 8003B998 */ void deleteArchiveRes();
/* 8003BAC4 */ void setRes(JKRArchive*, JKRHeap*);
/* 8003BAF8 */ void setRes();
/* 8003BD2C */ void dump_long(dRes_info_c*, int);
/* 8003BE38 */ void dump(dRes_info_c*, int);
private:
u8 unk[0x24];
// u8* name;
// u32 unk4;
// u32 unk8;
// s16 reference_count;
// u8 padding[2];
// mDoDVDThd_command_c* command;
// JKRArchive* archive;
// JKRHeap* heap;
// JKRSolidHeap* solid_heap;
// void** resource_buffer;
};
#pragma pack(pop)
struct J3DAnmBase {
/* 8003C734 */ ~J3DAnmBase();
};
#endif /* D_D_RESORCE_H */
include/d/d_stage.h
+9
View File
@@ -4,6 +4,7 @@
#include "d/save/d_save.h"
#include "dolphin/types.h"
#include "f_op/f_op_actor.h"
#include "msl_c/string.h"
struct stage_vrboxcol_info_class {};
@@ -408,6 +409,14 @@ class dStage_startStage_c {
public:
void set(const char*, s8, s16, s8);
inline char* getName() { return mStage; }
s8 getLayer() { return mLayer; }
void operator=(const dStage_startStage_c& other) {
strcpy(mStage, other.mStage);
mPoint = other.mPoint;
mRoomNo = other.mRoomNo;
mLayer = other.mLayer;
mDarkArea = other.mDarkArea;
}
private:
/* 0x0 */ char mStage[8];
include/d/d_vibration.h
+61
View File
@@ -1,6 +1,67 @@
#ifndef D_D_VIBRATION_H
#define D_D_VIBRATION_H
#include "d/save/d_save.h"
#include "dolphin/types.h"
#pragma pack(push, 1)
class dVibration_c {
public:
/* 8006F268 */ void Run();
/* 8006FA24 */ void StartShock(int, int, cXyz);
/* 8006FC0C */ void StartQuake(u8 const*, int, int, cXyz);
/* 8006FB10 */ void StartQuake(int, int, cXyz);
/* 8006FD94 */ void StopQuake(int);
/* 8006FE00 */ void Kill();
/* 8006FE5C */ void CheckQuake();
/* 8006FE84 */ void setDefault();
/* 8006FF04 */ void Init();
/* 8006FF38 */ void Pause();
/* 8006FFF8 */ void Remove();
static u8 const MS_patt[88];
static u8 const CS_patt[88];
static u8 const MQ_patt[80];
static u8 const CQ_patt[80];
private:
u32 field_0x0;
u32 field_0x4;
u32 field_0x8;
u32 field_0xc;
u32 field_0x10;
u32 field_0x14;
float field_0x18;
float field_0x1c;
float field_0x20;
u32 field_0x24;
u32 field_0x28;
u32 field_0x2c;
u32 field_0x30;
u32 field_0x34;
u32 field_0x38;
u32 field_0x3c;
float field_0x40;
float field_0x44;
float field_0x48;
u32 field_0x4c;
u32 field_0x50;
u32 field_0x54;
u32 field_0x58;
u32 field_0x5c;
u32 field_0x60;
u32 field_0x64;
u32 field_0x68;
u32 field_0x6c;
u32 field_0x70;
u32 field_0x74;
u32 field_0x78;
u32 field_0x7c;
u32 field_0x80;
u32 field_0x84;
u32 field_0x88;
u32 field_0x8c;
};
#pragma pack(pop)
#endif /* D_D_VIBRATION_H */
include/d/event/d_event_data.h
+1
View File
@@ -41,6 +41,7 @@ private:
class dEvDtBase_c {
public:
dEvDtBase_c();
~dEvDtBase_c();
/* 80046138 */ void init();
/* 8004616C */ void init(char*, int);
/* 8004628C */ void advanceCut(dEvDtEvent_c*);
include/d/meter/d_meter2_info.h
+5 -5
View File
@@ -1,6 +1,7 @@
#ifndef D_METER_D_METER2_INFO_H
#define D_METER_D_METER2_INFO_H
#include "d/d_resorce.h"
#include "dolphin/types.h"
#include "f_op/f_op_actor.h"
//#include "JSystem/JUtility/JUTFont.h"
@@ -52,11 +53,6 @@ class dMw_c {};
struct ResTIMG {};
struct JKRArchive {
/* 802D5B38 */ void getGlbResource(u32, char const*, JKRArchive*);
/* 802D5ECC */ void readIdxResource(void*, u32, u32);
};
class dMeter2Info_c {
public:
class WarpInfo_c {
@@ -201,4 +197,8 @@ inline dMeterMap_c* dMeter2Info_getMeterMapClass() {
return g_meter2_info.getMeterMapClass();
}
inline void dMeter2Info_Initialize() {
g_meter2_info.init();
}
#endif /* D_METER_D_METER2_INFO_H */