mirror/tp
1
0
Fork 0
mirror of https://github.com/zeldaret/tp synced 2026-07-11 15:28:38 -04:00
Code Issues Packages Projects Releases Wiki Activity

Work on d_a_mirror

Browse Source
This commit is contained in:
Tal Hayon
2023-06-30 19:29:50 +03:00
parent 7150d8e25d
commit bf7e686ef7
35 changed files with 497 additions and 784 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/JSystem/J3DGraphBase/J3DMatBlock.h
+5 -5
View File
@@ -727,7 +727,7 @@ public:
/* 80317314 */ virtual s32 countDLSize();
virtual u32 getType() = 0;
/* 8000E0A0 */ virtual void setIndTexStageNum(u8);
/* 8000DF7C */ virtual bool getIndTexStageNum() const;
/* 8000DF7C */ virtual u8 getIndTexStageNum() const;
/* 80317410 */ virtual void setIndTexOrder(u32, J3DIndTexOrder);
/* 8031740C */ virtual void setIndTexOrder(u32, J3DIndTexOrder const*);
/* 8000DF74 */ virtual bool getIndTexOrder(u32);
@@ -750,7 +750,7 @@ public:
/* 80317BDC */ virtual s32 countDLSize();
/* 80323390 */ virtual u32 getType();
/* 8032339C */ virtual void setIndTexStageNum(u8);
/* 803233A4 */ virtual bool getIndTexStageNum() const;
/* 803233A4 */ virtual u8 getIndTexStageNum() const;
/* 803233AC */ virtual void setIndTexOrder(u32, J3DIndTexOrder);
/* 803233C0 */ virtual void setIndTexOrder(u32, J3DIndTexOrder const*);
/* 803233D4 */ virtual bool getIndTexOrder(u32);
@@ -820,7 +820,7 @@ public:
/* 8000DFF0 */ virtual bool getAmbColor(u32);
/* 8000E0E0 */ virtual void setColorChanNum(u8);
/* 8031744C */ virtual void setColorChanNum(u8 const*);
/* 8000E008 */ virtual bool getColorChanNum() const;
/* 8000E008 */ virtual u8 getColorChanNum() const;
/* 8000E0D8 */ virtual void setColorChan(u32, J3DColorChan const&);
/* 80317450 */ virtual void setColorChan(u32, J3DColorChan const*);
/* 8000DFF8 */ virtual J3DColorChan* getColorChan(u32);
@@ -860,7 +860,7 @@ public:
/* 80322F50 */ virtual bool getAmbColor(u32);
/* 80322F70 */ virtual void setColorChanNum(u8);
/* 80322F64 */ virtual void setColorChanNum(u8 const*);
/* 80322F78 */ virtual bool getColorChanNum() const;
/* 80322F78 */ virtual u8 getColorChanNum() const;
/* 80322F94 */ virtual void setColorChan(u32, J3DColorChan const&);
/* 80322F80 */ virtual void setColorChan(u32, J3DColorChan const*);
/* 80322FA8 */ virtual J3DColorChan* getColorChan(u32);
@@ -905,7 +905,7 @@ public:
/* 803231B0 */ virtual GXColor* getMatColor(u32);
/* 803231D0 */ virtual void setColorChanNum(u8);
/* 803231C4 */ virtual void setColorChanNum(u8 const*);
/* 803231D8 */ virtual bool getColorChanNum() const;
/* 803231D8 */ virtual u8 getColorChanNum() const;
/* 803231F4 */ virtual void setColorChan(u32, J3DColorChan const&);
/* 803231E0 */ virtual void setColorChan(u32, J3DColorChan const*);
/* 80323208 */ virtual J3DColorChan* getColorChan(u32);
include/JSystem/J3DGraphBase/J3DMaterial.h
+1
View File
@@ -50,6 +50,7 @@ public:
J3DColorBlock* getColorBlock() const { return mColorBlock; }
J3DTexGenBlock* getTexGenBlock() const { return mTexGenBlock; }
J3DDisplayListObj* getSharedDisplayListObj() const { return mSharedDLObj; }
J3DIndBlock* getIndBlock() const { return mIndBlock; }
J3DShape* getShape() { return mShape; }
J3DJoint* getJoint() { return mJoint; }
J3DMaterialAnm* getMaterialAnm() const {
include/d/com/d_com_inf_game.h
+4
View File
@@ -3401,6 +3401,10 @@ inline void dComIfGd_setListBG() {
g_dComIfG_gameInfo.drawlist.setXluListBG();
}
inline J3DDrawBuffer* dComIfGd_getOpaListBG() {
return g_dComIfG_gameInfo.drawlist.getOpaListBG();
}
inline void dComIfGd_init() {
g_dComIfG_gameInfo.drawlist.init();
}
include/d/d_drawlist.h
+1
View File
@@ -308,6 +308,7 @@ public:
J3DDrawBuffer* getOpaListFilter() { return mDrawBuffers[DB_LIST_FILTER]; }
J3DDrawBuffer* getOpaListP0() { return mDrawBuffers[DB_LIST_P0]; }
J3DDrawBuffer* getOpaListPacket() { return mDrawBuffers[DB_OPA_LIST_PACKET]; }
J3DDrawBuffer* getOpaListBG() { return mDrawBuffers[DB_OPA_LIST_BG]; }
void setXluDrawList(J3DDrawBuffer* buffer) { j3dSys.setDrawBuffer(buffer, XLU_BUFFER); }
void setOpaDrawList(J3DDrawBuffer* buffer) { j3dSys.setDrawBuffer(buffer, OPA_BUFFER); }
void setXluListSky() { setXluDrawList(mDrawBuffers[DB_XLU_LIST_SKY]); }
include/dolphin/gf/GFGeometry.h
+3
View File
@@ -2,5 +2,8 @@
#define GFGEOMETRY_H
#include "dolphin/types.h"
#include "dolphin/gx/GX.h"
void GFSetGenMode2(u8 param_0, u8 param_1, u8 param_2, u8 param_3, _GXCullMode param_4);
#endif /* GFGEOMETRY_H */
include/dolphin/gf/GFLight.h
+4
View File
@@ -2,5 +2,9 @@
#define GFLIGHT_H
#include "dolphin/types.h"
#include "dolphin/gx/GXEnum.h"
#include "dolphin/gx/GXStruct.h"
void GFSetChanAmbColor(_GXChannelID param_0, _GXColor param_1);
#endif /* GFLIGHT_H */
include/m_Do/m_Do_mtx.h
+4
View File
@@ -138,6 +138,10 @@ public:
extern Mtx g_mDoMtx_identity;
inline MtxP mDoMtx_getIdentity() {
return g_mDoMtx_identity;
}
class mDoMtx_quatStack_c {
public:
~mDoMtx_quatStack_c(); // inline
include/rel/d/a/d_a_boomerang/d_a_boomerang.h
-1
View File
@@ -57,7 +57,6 @@ private:
/* 0xC8 */ cXyz field_0xc8[6];
}; // Size: 0x110
struct daMirror_c;
class daAlink_c;
class daBoomerang_c : public fopAc_ac_c {
include/rel/d/a/d_a_mirror/d_a_mirror.h
+48
View File
@@ -2,5 +2,53 @@
#define D_A_MIRROR_H
#include "dolphin/types.h"
#include "f_op/f_op_actor.h"
#include "f_op/f_op_actor_mng.h"
struct dMirror_packet_c : public J3DPacket {
/* 80870BD8 */ dMirror_packet_c();
/* 80870C94 */ void reset();
/* 80870CA0 */ void calcMinMax();
/* 80870D58 */ int entryModel(J3DModel*);
/* 80870D88 */ void mirrorZdraw(f32*, f32*, f32, f32, f32, f32, f32, f32);
/* 80871268 */ void modelDraw(J3DModel*, f32 (*)[4]);
/* 8087146C */ void mainDraw();
/* 80871D84 */ virtual void draw();
/* 80871E84 */ virtual ~dMirror_packet_c();
cXyz& getViewScale() { return mViewScale; }
GXTexObj& getTexObj() { return mTexObj; }
cXyz* getQuad() { return mQuad; }
/* 0x10 */ GXTexObj mTexObj;
/* 0x30 */ u8 mModelCount;
/* 0x31 */ u8 field_0x31[3];
/* 0x34 */ J3DModel* mModels[0x40];
/* 0x134 */ cXyz mQuad[4];
/* 0x164 */ cXyz mMinVal;
/* 0x170 */ cXyz mMaxVal;
/* 0x17c */ cXyz mViewScale;
};
struct daMirror_c : public fopAc_ac_c {
/* 80871E24 */ daMirror_c();
/* 80871F08 */ bool createHeap();
/* 80871F78 */ void setModelMtx();
/* 8087206C */ int create();
/* 808723E4 */ int execute();
/* 80872560 */ int entryModel(J3DModel*);
/* 8003194C */ static int entry(J3DModel*);
/* 80031990 */ static int remove();
s32 getType() { return fopAcM_GetParamBit(this, 0, 8); }
s32 getSw() { return fopAcM_GetParamBit(this, 8, 8); }
typedef int (daMirror_c::*entryModelFunc)(J3DModel*);
static entryModelFunc m_entryModel;
static daMirror_c* m_myObj;
/* 0x568 */ request_of_phase_process_class mPhase;
/* 0x570 */ dMirror_packet_c mPacket;
/* 0x6f8 */ J3DModel* field_0x6f8;
};
#endif /* D_A_MIRROR_H */