mirror of
https://github.com/zeldaret/tp
synced 2026-07-10 23:22:01 -04:00
project cleanup (#2895)
* some wii OS fixes * remove old dol2asm comments * remove dol2asm.h * remove function address comments * normalize ATTRIBUTE_ALIGN usage * DECL_WEAK macro * fix gcc attribute weak macro * wrap more mwcc specific things in ifdefs * fixes * fix revo sdk version flags * fixes
This commit is contained in:
TakaRikka
@@ -15,8 +15,8 @@ class J3DAnmBase;
|
||||
*
|
||||
*/
|
||||
struct J3DAnmLoaderDataBase {
|
||||
/* 80337B40 */ static J3DAnmBase* load(void const*, J3DAnmLoaderDataBaseFlag);
|
||||
/* 80338134 */ static void setResource(J3DAnmBase*, void const*);
|
||||
static J3DAnmBase* load(void const*, J3DAnmLoaderDataBaseFlag);
|
||||
static void setResource(J3DAnmBase*, void const*);
|
||||
|
||||
static J3DAnmBase* load(void const* param_0) { return load(param_0, J3DLOADER_UNK_FLAG0); }
|
||||
};
|
||||
@@ -25,51 +25,51 @@ class J3DAnmLoader {
|
||||
public:
|
||||
virtual J3DAnmBase* load(const void*) = 0;
|
||||
virtual void setResource(J3DAnmBase*, const void*) = 0;
|
||||
/* 80339800 */ virtual ~J3DAnmLoader() {}
|
||||
virtual ~J3DAnmLoader() {}
|
||||
};
|
||||
|
||||
class J3DAnmKeyLoader_v15 : public J3DAnmLoader {
|
||||
public:
|
||||
/* 803384E0 */ J3DAnmKeyLoader_v15();
|
||||
/* 80338FEC */ void readAnmTransform(J3DAnmTransformKeyData const*);
|
||||
/* 80339014 */ void setAnmTransform(J3DAnmTransformKey*, J3DAnmTransformKeyData const*);
|
||||
/* 803390B0 */ void readAnmTextureSRT(J3DAnmTextureSRTKeyData const*);
|
||||
/* 803390D8 */ void setAnmTextureSRT(J3DAnmTextureSRTKey*, J3DAnmTextureSRTKeyData const*);
|
||||
/* 803392B0 */ void readAnmColor(J3DAnmColorKeyData const*);
|
||||
/* 803392D8 */ void setAnmColor(J3DAnmColorKey*, J3DAnmColorKeyData const*);
|
||||
/* 803393C4 */ void readAnmCluster(J3DAnmClusterKeyData const*);
|
||||
/* 803393EC */ void setAnmCluster(J3DAnmClusterKey*, J3DAnmClusterKeyData const*);
|
||||
/* 80339458 */ void readAnmTevReg(J3DAnmTevRegKeyData const*);
|
||||
/* 80339480 */ void setAnmTevReg(J3DAnmTevRegKey*, J3DAnmTevRegKeyData const*);
|
||||
/* 8033960C */ void readAnmVtxColor(J3DAnmVtxColorKeyData const*);
|
||||
/* 80339634 */ void setAnmVtxColor(J3DAnmVtxColorKey*, J3DAnmVtxColorKeyData const*);
|
||||
J3DAnmKeyLoader_v15();
|
||||
void readAnmTransform(J3DAnmTransformKeyData const*);
|
||||
void setAnmTransform(J3DAnmTransformKey*, J3DAnmTransformKeyData const*);
|
||||
void readAnmTextureSRT(J3DAnmTextureSRTKeyData const*);
|
||||
void setAnmTextureSRT(J3DAnmTextureSRTKey*, J3DAnmTextureSRTKeyData const*);
|
||||
void readAnmColor(J3DAnmColorKeyData const*);
|
||||
void setAnmColor(J3DAnmColorKey*, J3DAnmColorKeyData const*);
|
||||
void readAnmCluster(J3DAnmClusterKeyData const*);
|
||||
void setAnmCluster(J3DAnmClusterKey*, J3DAnmClusterKeyData const*);
|
||||
void readAnmTevReg(J3DAnmTevRegKeyData const*);
|
||||
void setAnmTevReg(J3DAnmTevRegKey*, J3DAnmTevRegKeyData const*);
|
||||
void readAnmVtxColor(J3DAnmVtxColorKeyData const*);
|
||||
void setAnmVtxColor(J3DAnmVtxColorKey*, J3DAnmVtxColorKeyData const*);
|
||||
|
||||
/* 80338D44 */ virtual J3DAnmBase* load(void const*);
|
||||
/* 80338E8C */ virtual void setResource(J3DAnmBase*, void const*);
|
||||
/* 803384FC */ virtual ~J3DAnmKeyLoader_v15();
|
||||
virtual J3DAnmBase* load(void const*);
|
||||
virtual void setResource(J3DAnmBase*, void const*);
|
||||
virtual ~J3DAnmKeyLoader_v15();
|
||||
|
||||
/* 0x4 */ J3DAnmBase* mAnm;
|
||||
};
|
||||
|
||||
class J3DAnmFullLoader_v15 : public J3DAnmLoader {
|
||||
public:
|
||||
/* 80338468 */ J3DAnmFullLoader_v15();
|
||||
/* 80338800 */ void readAnmTransform(J3DAnmTransformFullData const*);
|
||||
/* 80338828 */ void setAnmTransform(J3DAnmTransformFull*, J3DAnmTransformFullData const*);
|
||||
/* 803388BC */ void readAnmColor(J3DAnmColorFullData const*);
|
||||
/* 803388E4 */ void setAnmColor(J3DAnmColorFull*, J3DAnmColorFullData const*);
|
||||
/* 803389B0 */ void readAnmTexPattern(J3DAnmTexPatternFullData const*);
|
||||
/* 803389D8 */ void setAnmTexPattern(J3DAnmTexPattern*, J3DAnmTexPatternFullData const*);
|
||||
/* 80338A7C */ void readAnmVisibility(J3DAnmVisibilityFullData const*);
|
||||
/* 80338AA4 */ void setAnmVisibility(J3DAnmVisibilityFull*, J3DAnmVisibilityFullData const*);
|
||||
/* 80338B20 */ void readAnmCluster(J3DAnmClusterFullData const*);
|
||||
/* 80338B48 */ void setAnmCluster(J3DAnmClusterFull*, J3DAnmClusterFullData const*);
|
||||
/* 80338BB4 */ void readAnmVtxColor(J3DAnmVtxColorFullData const*);
|
||||
/* 80338BDC */ void setAnmVtxColor(J3DAnmVtxColorFull*, J3DAnmVtxColorFullData const*);
|
||||
J3DAnmFullLoader_v15();
|
||||
void readAnmTransform(J3DAnmTransformFullData const*);
|
||||
void setAnmTransform(J3DAnmTransformFull*, J3DAnmTransformFullData const*);
|
||||
void readAnmColor(J3DAnmColorFullData const*);
|
||||
void setAnmColor(J3DAnmColorFull*, J3DAnmColorFullData const*);
|
||||
void readAnmTexPattern(J3DAnmTexPatternFullData const*);
|
||||
void setAnmTexPattern(J3DAnmTexPattern*, J3DAnmTexPatternFullData const*);
|
||||
void readAnmVisibility(J3DAnmVisibilityFullData const*);
|
||||
void setAnmVisibility(J3DAnmVisibilityFull*, J3DAnmVisibilityFullData const*);
|
||||
void readAnmCluster(J3DAnmClusterFullData const*);
|
||||
void setAnmCluster(J3DAnmClusterFull*, J3DAnmClusterFullData const*);
|
||||
void readAnmVtxColor(J3DAnmVtxColorFullData const*);
|
||||
void setAnmVtxColor(J3DAnmVtxColorFull*, J3DAnmVtxColorFullData const*);
|
||||
|
||||
/* 80338558 */ virtual J3DAnmBase* load(void const*);
|
||||
/* 803386A0 */ virtual void setResource(J3DAnmBase*, void const*);
|
||||
/* 80338484 */ virtual ~J3DAnmFullLoader_v15();
|
||||
virtual J3DAnmBase* load(void const*);
|
||||
virtual void setResource(J3DAnmBase*, void const*);
|
||||
virtual ~J3DAnmFullLoader_v15();
|
||||
|
||||
/* 0x4 */ J3DAnmBase* mAnm;
|
||||
};
|
||||
|
||||
@@ -8,7 +8,7 @@
|
||||
*
|
||||
*/
|
||||
struct J3DClusterLoaderDataBase {
|
||||
/* 80334130 */ static void* load(void const*);
|
||||
static void* load(void const*);
|
||||
};
|
||||
|
||||
/**
|
||||
@@ -38,7 +38,7 @@ public:
|
||||
class J3DClusterLoader {
|
||||
public:
|
||||
virtual void* load(const void*) = 0;
|
||||
/* 803345FC */ virtual ~J3DClusterLoader() {}
|
||||
virtual ~J3DClusterLoader() {}
|
||||
};
|
||||
|
||||
class J3DDeformData;
|
||||
@@ -49,11 +49,11 @@ class J3DDeformData;
|
||||
*/
|
||||
class J3DClusterLoader_v15 : public J3DClusterLoader {
|
||||
public:
|
||||
/* 803341CC */ J3DClusterLoader_v15();
|
||||
/* 803342F8 */ void readCluster(J3DClusterBlock const*);
|
||||
J3DClusterLoader_v15();
|
||||
void readCluster(J3DClusterBlock const*);
|
||||
|
||||
/* 80334244 */ virtual void* load(void const*);
|
||||
/* 803341E8 */ virtual ~J3DClusterLoader_v15();
|
||||
virtual void* load(void const*);
|
||||
virtual ~J3DClusterLoader_v15();
|
||||
|
||||
/* 0x04 */ J3DDeformData* mpDeformData;
|
||||
};
|
||||
|
||||
@@ -24,8 +24,8 @@ struct J3DJointInitData {
|
||||
*
|
||||
*/
|
||||
struct J3DJointFactory {
|
||||
/* 80337178 */ J3DJointFactory(J3DJointBlock const&);
|
||||
/* 803371D0 */ J3DJoint* create(int);
|
||||
J3DJointFactory(J3DJointBlock const&);
|
||||
J3DJoint* create(int);
|
||||
|
||||
J3DJointInitData* mJointInitData;
|
||||
u16* mIndexTable;
|
||||
@@ -40,4 +40,4 @@ struct J3DJointFactory {
|
||||
Vec& getMax(int no) const { return mJointInitData[mIndexTable[no]].mMax; }
|
||||
};
|
||||
|
||||
#endif /* J3DJOINTFACTORY_H */
|
||||
#endif /* J3DJOINTFACTORY_H */
|
||||
|
||||
@@ -98,47 +98,47 @@ public:
|
||||
MATERIAL_TYPE_PATCHED = 2,
|
||||
};
|
||||
|
||||
/* 80330234 */ J3DMaterialFactory(J3DMaterialDLBlock const&);
|
||||
/* 8032FFEC */ J3DMaterialFactory(J3DMaterialBlock const&);
|
||||
/* 803302BC */ u16 countUniqueMaterials();
|
||||
/* 80330304 */ u32 countTexGens(int) const;
|
||||
/* 8033033C */ u32 countStages(int) const;
|
||||
/* 803303C4 */ J3DMaterial* create(J3DMaterial*, MaterialType, int, u32) const;
|
||||
/* 80330440 */ J3DMaterial* createNormalMaterial(J3DMaterial*, int, u32) const;
|
||||
/* 80330D84 */ J3DMaterial* createPatchedMaterial(J3DMaterial*, int, u32) const;
|
||||
/* 8033168C */ void modifyPatchedCurrentMtx(J3DMaterial*, int) const;
|
||||
/* 803317D4 */ J3DMaterial* createLockedMaterial(J3DMaterial*, int, u32) const;
|
||||
/* 80331A7C */ u32 calcSize(J3DMaterial*, MaterialType, int, u32) const;
|
||||
/* 80331AFC */ u32 calcSizeNormalMaterial(J3DMaterial*, int, u32) const;
|
||||
/* 80331C30 */ u32 calcSizePatchedMaterial(J3DMaterial*, int, u32) const;
|
||||
/* 80331D00 */ u32 calcSizeLockedMaterial(J3DMaterial*, int, u32) const;
|
||||
/* 80331D18 */ J3DGXColor newMatColor(int, int) const;
|
||||
/* 80331D74 */ u8 newColorChanNum(int) const;
|
||||
/* 80331DAC */ J3DColorChan newColorChan(int, int) const;
|
||||
/* 80331F50 */ J3DGXColor newAmbColor(int, int) const;
|
||||
/* 80331FAC */ u32 newTexGenNum(int) const;
|
||||
/* 80331FE4 */ J3DTexCoord newTexCoord(int, int) const;
|
||||
/* 80332044 */ J3DTexMtx* newTexMtx(int, int) const;
|
||||
/* 803320CC */ u8 newCullMode(int) const;
|
||||
/* 8033210C */ u16 newTexNo(int, int) const;
|
||||
/* 80332154 */ J3DTevOrder newTevOrder(int, int) const;
|
||||
/* 803321A0 */ J3DGXColorS10 newTevColor(int, int) const;
|
||||
/* 80332210 */ J3DGXColor newTevKColor(int, int) const;
|
||||
/* 8033226C */ u8 newTevStageNum(int) const;
|
||||
/* 803322A4 */ J3DTevStage newTevStage(int, int) const;
|
||||
/* 80332304 */ J3DTevSwapModeTable newTevSwapModeTable(int, int) const;
|
||||
/* 803323A0 */ u8 newIndTexStageNum(int) const;
|
||||
/* 803323C8 */ J3DIndTexOrder newIndTexOrder(int, int) const;
|
||||
/* 8033240C */ J3DIndTexMtx newIndTexMtx(int, int) const;
|
||||
/* 803324B4 */ J3DIndTevStage newIndTevStage(int, int) const;
|
||||
/* 80332648 */ J3DIndTexCoordScale newIndTexCoordScale(int, int) const;
|
||||
/* 8033268C */ J3DFog newFog(int) const;
|
||||
/* 80332768 */ J3DAlphaComp newAlphaComp(int) const;
|
||||
/* 803327E8 */ J3DBlend newBlend(int) const;
|
||||
/* 8033282C */ J3DZMode newZMode(int) const;
|
||||
/* 8033288C */ u8 newZCompLoc(int) const;
|
||||
/* 803328C4 */ u8 newDither(int) const;
|
||||
/* 803328FC */ J3DNBTScale newNBTScale(int) const;
|
||||
J3DMaterialFactory(J3DMaterialDLBlock const&);
|
||||
J3DMaterialFactory(J3DMaterialBlock const&);
|
||||
u16 countUniqueMaterials();
|
||||
u32 countTexGens(int) const;
|
||||
u32 countStages(int) const;
|
||||
J3DMaterial* create(J3DMaterial*, MaterialType, int, u32) const;
|
||||
J3DMaterial* createNormalMaterial(J3DMaterial*, int, u32) const;
|
||||
J3DMaterial* createPatchedMaterial(J3DMaterial*, int, u32) const;
|
||||
void modifyPatchedCurrentMtx(J3DMaterial*, int) const;
|
||||
J3DMaterial* createLockedMaterial(J3DMaterial*, int, u32) const;
|
||||
u32 calcSize(J3DMaterial*, MaterialType, int, u32) const;
|
||||
u32 calcSizeNormalMaterial(J3DMaterial*, int, u32) const;
|
||||
u32 calcSizePatchedMaterial(J3DMaterial*, int, u32) const;
|
||||
u32 calcSizeLockedMaterial(J3DMaterial*, int, u32) const;
|
||||
J3DGXColor newMatColor(int, int) const;
|
||||
u8 newColorChanNum(int) const;
|
||||
J3DColorChan newColorChan(int, int) const;
|
||||
J3DGXColor newAmbColor(int, int) const;
|
||||
u32 newTexGenNum(int) const;
|
||||
J3DTexCoord newTexCoord(int, int) const;
|
||||
J3DTexMtx* newTexMtx(int, int) const;
|
||||
u8 newCullMode(int) const;
|
||||
u16 newTexNo(int, int) const;
|
||||
J3DTevOrder newTevOrder(int, int) const;
|
||||
J3DGXColorS10 newTevColor(int, int) const;
|
||||
J3DGXColor newTevKColor(int, int) const;
|
||||
u8 newTevStageNum(int) const;
|
||||
J3DTevStage newTevStage(int, int) const;
|
||||
J3DTevSwapModeTable newTevSwapModeTable(int, int) const;
|
||||
u8 newIndTexStageNum(int) const;
|
||||
J3DIndTexOrder newIndTexOrder(int, int) const;
|
||||
J3DIndTexMtx newIndTexMtx(int, int) const;
|
||||
J3DIndTevStage newIndTevStage(int, int) const;
|
||||
J3DIndTexCoordScale newIndTexCoordScale(int, int) const;
|
||||
J3DFog newFog(int) const;
|
||||
J3DAlphaComp newAlphaComp(int) const;
|
||||
J3DBlend newBlend(int) const;
|
||||
J3DZMode newZMode(int) const;
|
||||
u8 newZCompLoc(int) const;
|
||||
u8 newDither(int) const;
|
||||
J3DNBTScale newNBTScale(int) const;
|
||||
|
||||
u16 getMaterialID(int idx) const { return mpMaterialID[idx]; }
|
||||
u8 getMaterialMode(int idx) const { return mpMaterialInitData[mpMaterialID[idx]].mMaterialMode; }
|
||||
|
||||
@@ -50,32 +50,32 @@ struct J3DMaterialInitData_v21 {
|
||||
*/
|
||||
class J3DMaterialFactory_v21 {
|
||||
public:
|
||||
/* 80332DA4 */ J3DMaterialFactory_v21(J3DMaterialBlock_v21 const&);
|
||||
/* 80332F84 */ u16 countUniqueMaterials();
|
||||
/* 80332FA8 */ u32 countTexGens(int) const;
|
||||
/* 80332FE0 */ u32 countStages(int) const;
|
||||
/* 80333068 */ J3DMaterial* create(J3DMaterial*, int, u32) const;
|
||||
/* 803337D8 */ J3DGXColor newMatColor(int, int) const;
|
||||
/* 80333834 */ u8 newColorChanNum(int) const;
|
||||
/* 8033386C */ J3DColorChan newColorChan(int, int) const;
|
||||
/* 80333A10 */ u32 newTexGenNum(int) const;
|
||||
/* 80333A48 */ J3DTexCoord newTexCoord(int, int) const;
|
||||
/* 80333AA8 */ J3DTexMtx* newTexMtx(int, int) const;
|
||||
/* 80333B30 */ u8 newCullMode(int) const;
|
||||
/* 80333B70 */ u16 newTexNo(int, int) const;
|
||||
/* 80333BB8 */ J3DTevOrder newTevOrder(int, int) const;
|
||||
/* 80333C04 */ J3DGXColorS10 newTevColor(int, int) const;
|
||||
/* 80333C74 */ J3DGXColor newTevKColor(int, int) const;
|
||||
/* 80333CD0 */ u8 newTevStageNum(int) const;
|
||||
/* 80333D08 */ J3DTevStage newTevStage(int, int) const;
|
||||
/* 80333D68 */ J3DTevSwapModeTable newTevSwapModeTable(int, int) const;
|
||||
/* 80333E04 */ J3DFog newFog(int) const;
|
||||
/* 80333EE0 */ J3DAlphaComp newAlphaComp(int) const;
|
||||
/* 80333F60 */ J3DBlend newBlend(int) const;
|
||||
/* 80333FA4 */ J3DZMode newZMode(int) const;
|
||||
/* 80334004 */ u8 newZCompLoc(int) const;
|
||||
/* 8033403C */ u8 newDither(int) const;
|
||||
/* 80334074 */ J3DNBTScale newNBTScale(int) const;
|
||||
J3DMaterialFactory_v21(J3DMaterialBlock_v21 const&);
|
||||
u16 countUniqueMaterials();
|
||||
u32 countTexGens(int) const;
|
||||
u32 countStages(int) const;
|
||||
J3DMaterial* create(J3DMaterial*, int, u32) const;
|
||||
J3DGXColor newMatColor(int, int) const;
|
||||
u8 newColorChanNum(int) const;
|
||||
J3DColorChan newColorChan(int, int) const;
|
||||
u32 newTexGenNum(int) const;
|
||||
J3DTexCoord newTexCoord(int, int) const;
|
||||
J3DTexMtx* newTexMtx(int, int) const;
|
||||
u8 newCullMode(int) const;
|
||||
u16 newTexNo(int, int) const;
|
||||
J3DTevOrder newTevOrder(int, int) const;
|
||||
J3DGXColorS10 newTevColor(int, int) const;
|
||||
J3DGXColor newTevKColor(int, int) const;
|
||||
u8 newTevStageNum(int) const;
|
||||
J3DTevStage newTevStage(int, int) const;
|
||||
J3DTevSwapModeTable newTevSwapModeTable(int, int) const;
|
||||
J3DFog newFog(int) const;
|
||||
J3DAlphaComp newAlphaComp(int) const;
|
||||
J3DBlend newBlend(int) const;
|
||||
J3DZMode newZMode(int) const;
|
||||
u8 newZCompLoc(int) const;
|
||||
u8 newDither(int) const;
|
||||
J3DNBTScale newNBTScale(int) const;
|
||||
|
||||
u16 getMaterialID(u16 idx) { return mpMaterialID[idx]; }
|
||||
u8 getMaterialMode(int idx) const { return mpMaterialInitData[mpMaterialID[idx]].mMaterialMode; }
|
||||
|
||||
@@ -251,45 +251,45 @@ static inline u32 getMdlDataFlag_MtxLoadType(u32 flags) { return flags & 0x10; }
|
||||
*/
|
||||
class J3DModelLoader {
|
||||
public:
|
||||
/* 8033468C */ J3DModelLoader();
|
||||
/* 80335048 */ void readInformation(J3DModelInfoBlock const*, u32);
|
||||
/* 803351D0 */ void readVertex(J3DVertexBlock const*);
|
||||
/* 803353F0 */ void readEnvelop(J3DEnvelopeBlock const*);
|
||||
/* 80335480 */ void readDraw(J3DDrawBlock const*);
|
||||
/* 80335530 */ void readJoint(J3DJointBlock const*);
|
||||
/* 80335AF4 */ void readShape(J3DShapeBlock const*, u32);
|
||||
/* 80335C18 */ void readTexture(J3DTextureBlock const*);
|
||||
/* 80335F5C */ void readTextureTable(J3DTextureBlock const*);
|
||||
/* 80336028 */ void readPatchedMaterial(J3DMaterialBlock const*, u32);
|
||||
/* 80336168 */ void readMaterialDL(J3DMaterialDLBlock const*, u32);
|
||||
/* 8033631C */ void modifyMaterial(u32);
|
||||
J3DModelLoader();
|
||||
void readInformation(J3DModelInfoBlock const*, u32);
|
||||
void readVertex(J3DVertexBlock const*);
|
||||
void readEnvelop(J3DEnvelopeBlock const*);
|
||||
void readDraw(J3DDrawBlock const*);
|
||||
void readJoint(J3DJointBlock const*);
|
||||
void readShape(J3DShapeBlock const*, u32);
|
||||
void readTexture(J3DTextureBlock const*);
|
||||
void readTextureTable(J3DTextureBlock const*);
|
||||
void readPatchedMaterial(J3DMaterialBlock const*, u32);
|
||||
void readMaterialDL(J3DMaterialDLBlock const*, u32);
|
||||
void modifyMaterial(u32);
|
||||
|
||||
/* 80336CD8 */ u32 calcSizeInformation(J3DModelInfoBlock const*, u32);
|
||||
/* 80336D64 */ u32 calcSizeJoint(J3DJointBlock const*);
|
||||
/* 80336D90 */ u32 calcSizeEnvelope(J3DEnvelopeBlock const*);
|
||||
/* 80336DA0 */ u32 calcSizeDraw(J3DDrawBlock const*);
|
||||
/* 80336EA0 */ u32 calcSizeShape(J3DShapeBlock const*, u32);
|
||||
/* 80336F44 */ u32 calcSizeTexture(J3DTextureBlock const*);
|
||||
/* 80336FF0 */ u32 calcSizeTextureTable(J3DTextureBlock const*);
|
||||
/* 80337010 */ u32 calcSizePatchedMaterial(J3DMaterialBlock const*, u32);
|
||||
/* 803370A0 */ u32 calcSizeMaterialDL(J3DMaterialDLBlock const*, u32);
|
||||
u32 calcSizeInformation(J3DModelInfoBlock const*, u32);
|
||||
u32 calcSizeJoint(J3DJointBlock const*);
|
||||
u32 calcSizeEnvelope(J3DEnvelopeBlock const*);
|
||||
u32 calcSizeDraw(J3DDrawBlock const*);
|
||||
u32 calcSizeShape(J3DShapeBlock const*, u32);
|
||||
u32 calcSizeTexture(J3DTextureBlock const*);
|
||||
u32 calcSizeTextureTable(J3DTextureBlock const*);
|
||||
u32 calcSizePatchedMaterial(J3DMaterialBlock const*, u32);
|
||||
u32 calcSizeMaterialDL(J3DMaterialDLBlock const*, u32);
|
||||
|
||||
|
||||
/* 803347E0 */ virtual J3DModelData* load(void const*, u32);
|
||||
/* 80334ABC */ virtual J3DMaterialTable* loadMaterialTable(void const*);
|
||||
/* 80334C20 */ virtual J3DModelData* loadBinaryDisplayList(void const*, u32);
|
||||
/* 803367D4 */ virtual u32 calcLoadSize(void const*, u32);
|
||||
/* 803369A0 */ virtual u32 calcLoadMaterialTableSize(void const*);
|
||||
/* 80336A98 */ virtual u32 calcLoadBinaryDisplayListSize(void const*, u32);
|
||||
/* 80336794 */ virtual u16 countMaterialNum(void const*);
|
||||
/* 80334EE0 */ virtual void setupBBoardInfo();
|
||||
/* 80336450 */ virtual ~J3DModelLoader() {}
|
||||
/* 8033649C */ virtual void readMaterial(J3DMaterialBlock const*, u32) {}
|
||||
/* 80336498 */ virtual void readMaterial_v21(J3DMaterialBlock_v21 const*, u32) {}
|
||||
/* 803364A4 */ virtual void readMaterialTable(J3DMaterialBlock const*, u32) {}
|
||||
/* 803364A0 */ virtual void readMaterialTable_v21(J3DMaterialBlock_v21 const*, u32) {}
|
||||
/* 803364A8 */ virtual u32 calcSizeMaterial(J3DMaterialBlock const*, u32) { return false; }
|
||||
/* 803364B0 */ virtual u32 calcSizeMaterialTable(J3DMaterialBlock const*, u32) { return false; }
|
||||
virtual J3DModelData* load(void const*, u32);
|
||||
virtual J3DMaterialTable* loadMaterialTable(void const*);
|
||||
virtual J3DModelData* loadBinaryDisplayList(void const*, u32);
|
||||
virtual u32 calcLoadSize(void const*, u32);
|
||||
virtual u32 calcLoadMaterialTableSize(void const*);
|
||||
virtual u32 calcLoadBinaryDisplayListSize(void const*, u32);
|
||||
virtual u16 countMaterialNum(void const*);
|
||||
virtual void setupBBoardInfo();
|
||||
virtual ~J3DModelLoader() {}
|
||||
virtual void readMaterial(J3DMaterialBlock const*, u32) {}
|
||||
virtual void readMaterial_v21(J3DMaterialBlock_v21 const*, u32) {}
|
||||
virtual void readMaterialTable(J3DMaterialBlock const*, u32) {}
|
||||
virtual void readMaterialTable_v21(J3DMaterialBlock_v21 const*, u32) {}
|
||||
virtual u32 calcSizeMaterial(J3DMaterialBlock const*, u32) { return false; }
|
||||
virtual u32 calcSizeMaterialTable(J3DMaterialBlock const*, u32) { return false; }
|
||||
|
||||
/* 0x04 */ J3DModelData* mpModelData;
|
||||
/* 0x08 */ J3DMaterialTable* mpMaterialTable;
|
||||
@@ -307,9 +307,9 @@ public:
|
||||
*/
|
||||
class J3DModelLoader_v21 : public J3DModelLoader {
|
||||
public:
|
||||
/* 803363F4 */ ~J3DModelLoader_v21() {}
|
||||
/* 80335890 */ void readMaterial_v21(J3DMaterialBlock_v21 const*, u32);
|
||||
/* 80335E20 */ void readMaterialTable_v21(J3DMaterialBlock_v21 const*, u32);
|
||||
~J3DModelLoader_v21() {}
|
||||
void readMaterial_v21(J3DMaterialBlock_v21 const*, u32);
|
||||
void readMaterialTable_v21(J3DMaterialBlock_v21 const*, u32);
|
||||
};
|
||||
|
||||
/**
|
||||
@@ -318,11 +318,11 @@ public:
|
||||
*/
|
||||
class J3DModelLoader_v26 : public J3DModelLoader {
|
||||
public:
|
||||
/* 80336398 */ ~J3DModelLoader_v26() {}
|
||||
/* 80335614 */ void readMaterial(J3DMaterialBlock const*, u32);
|
||||
/* 80335CE4 */ void readMaterialTable(J3DMaterialBlock const*, u32);
|
||||
/* 80336DB4 */ u32 calcSizeMaterial(J3DMaterialBlock const*, u32);
|
||||
/* 80336F60 */ u32 calcSizeMaterialTable(J3DMaterialBlock const*, u32);
|
||||
~J3DModelLoader_v26() {}
|
||||
void readMaterial(J3DMaterialBlock const*, u32);
|
||||
void readMaterialTable(J3DMaterialBlock const*, u32);
|
||||
u32 calcSizeMaterial(J3DMaterialBlock const*, u32);
|
||||
u32 calcSizeMaterialTable(J3DMaterialBlock const*, u32);
|
||||
};
|
||||
|
||||
/**
|
||||
@@ -331,7 +331,7 @@ public:
|
||||
*/
|
||||
class J3DModelLoaderDataBase {
|
||||
public:
|
||||
/* 803346BC */ static J3DModelData* load(void const* i_data, u32 i_flags);
|
||||
static J3DModelData* load(void const* i_data, u32 i_flags);
|
||||
};
|
||||
|
||||
#endif /* J3DMODELLOADER_H */
|
||||
|
||||
@@ -48,14 +48,14 @@ struct J3DShapeDrawInitData {
|
||||
*
|
||||
*/
|
||||
struct J3DShapeFactory {
|
||||
/* 80337350 */ J3DShapeFactory(J3DShapeBlock const&);
|
||||
/* 80337400 */ J3DShape* create(int, u32, GXVtxDescList*);
|
||||
/* 803375BC */ J3DShapeMtx* newShapeMtx(u32, int, int) const;
|
||||
/* 8033784C */ J3DShapeDraw* newShapeDraw(int, int) const;
|
||||
/* 803378D8 */ void allocVcdVatCmdBuffer(u32);
|
||||
/* 80337944 */ s32 calcSize(int, u32);
|
||||
/* 803379D8 */ s32 calcSizeVcdVatCmdBuffer(u32);
|
||||
/* 803379E8 */ s32 calcSizeShapeMtx(u32, int, int) const;
|
||||
J3DShapeFactory(J3DShapeBlock const&);
|
||||
J3DShape* create(int, u32, GXVtxDescList*);
|
||||
J3DShapeMtx* newShapeMtx(u32, int, int) const;
|
||||
J3DShapeDraw* newShapeDraw(int, int) const;
|
||||
void allocVcdVatCmdBuffer(u32);
|
||||
s32 calcSize(int, u32);
|
||||
s32 calcSizeVcdVatCmdBuffer(u32);
|
||||
s32 calcSizeShapeMtx(u32, int, int) const;
|
||||
|
||||
/* 0x00 */ J3DShapeInitData* mShapeInitData;
|
||||
/* 0x04 */ u16* mIndexTable;
|
||||
|
||||
Reference in New Issue
Block a user