mirror/tww
1
0
Fork 0
mirror of https://github.com/zeldaret/tww.git synced 2026-08-07 02:05:35 -04:00
Code Issues Packages Projects Releases Wiki Activity

J3DModelData 99%

Browse Source 
just one regswap
This commit is contained in:
Jasper St. Pierre
2023-09-24 00:30:34 -07:00
parent 2f918f337e
commit 2d719328f6
11 changed files with 202 additions and 133 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/JSystem/J3DGraphAnimator/J3DJoint.h
+1
View File
@@ -46,6 +46,7 @@ public:
J3DJoint();
void entryIn();
void recursiveCalc();
void addMesh(J3DMaterial*);
J3DMaterial* getMesh() { return mMesh; }
u16 getJntNo() const { return mJntNo; }
include/JSystem/J3DGraphAnimator/J3DJointTree.h
+6 -4
View File
@@ -25,16 +25,18 @@ struct J3DDrawMtxData {
}; // Size: 0xC
class J3DShapeTable;
class J3DShape;
class J3DJointTree {
public:
J3DJointTree();
void makeHierarchy(J3DJoint*, J3DModelHierarchy const**, J3DMaterialTable*, J3DShapeTable*);
J3DJointTree() { clear(); }
void clear();
void makeHierarchy(J3DNode*, const J3DModelHierarchy**, J3DMaterialTable*, J3DShape**);
void findImportantMtxIndex();
virtual void calc(J3DMtxBuffer*, Vec const&, f32 const (&)[3][4]);
virtual ~J3DJointTree();
virtual ~J3DJointTree() {}
J3DDrawMtxData * getDrawMtxData() { return &mDrawMtxData; }
u16 getWEvlpMtxNum() const { return mWEvlpMtxNum; }
u8 getWEvlpMixMtxNum(u16 idx) const { return mWEvlpMixMtxNum[idx]; }
u16 * getWEvlpMixIndex() const { return mWEvlpMixIndex; }
include/JSystem/J3DGraphAnimator/J3DMaterialAttach.h
+4
View File
@@ -39,12 +39,16 @@ public:
J3DTexture* getTexture() const { return mTexture; }
JUTNameTab* getTextureName() const { return mTextureName; }
void setTexture(J3DTexture* pTexture) { mTexture = pTexture; }
void setTextureName(JUTNameTab* pTextureName) { mTextureName = pTextureName; }
JUTNameTab* getMaterialName() const { return mMaterialName; }
u16 getMaterialNum() const { return mMaterialNum; }
private:
friend class J3DJointTree;
/* 0x04 */ u16 mMaterialNum;
/* 0x06 */ u16 mUniqueMatNum;
/* 0x08 */ J3DMaterial** mMaterialNodePointer;
include/JSystem/J3DGraphAnimator/J3DModelData.h
+13 -7
View File
@@ -11,22 +11,29 @@
typedef struct _GXColor GXColor;
class JUTNameTab;
enum J3DMaterialCopyFlag {
J3DMatCopyFlag_Material = 0x01,
J3DMatCopyFlag_Texture = 0x02,
};
class J3DModelData {
public:
void clear();
J3DModelData();
s32 newSharedDisplayList(u32);
bool isDeformablePositionFormat() const;
void indexToPtr();
void makeSharedDL();
void simpleCalcMaterial(u16, f32 (*)[4]);
void syncJ3DSysPointers() const;
void syncJ3DSysFlags() const;
void initShapeNodes();
void sortVcdVatCmd();
void setMaterialTable(J3DMaterialTable*, J3DMaterialCopyFlag);
virtual ~J3DModelData();
J3DMaterialTable& getMaterialTable() { return mMaterialTable; }
JUTNameTab* getMaterialName() const { return mMaterialTable.getMaterialName(); }
J3DVertexData& getVertexData() { return mVertexData; }
GXVtxAttrFmtList* getVtxAttrFmtList() const { return ((J3DVertexData*)&mVertexData)->getVtxAttrFmtList(); }
u16 getShapeNum() const { return mShapeTable.getShapeNum(); }
u16 getMaterialNum() const { return mMaterialTable.getMaterialNum(); }
u16 getJointNum() const { return mJointTree.getJointNum(); }
@@ -36,6 +43,7 @@ public:
}
u32 getVtxNum() const { return mVertexData.getVtxNum(); }
u32 getNrmNum() const { return mVertexData.getNrmNum(); }
J3DDrawMtxData * getDrawMtxData() { return mJointTree.getDrawMtxData(); }
u8 getDrawMtxFlag(u16 idx) const { return mJointTree.getDrawMtxFlag(idx); }
u16 getDrawMtxIndex(u16 idx) const { return mJointTree.getDrawMtxIndex(idx); }
J3DShape* getShapeNodePointer(u16 idx) const { return mShapeTable.getShapeNodePointer(idx); }
@@ -45,6 +53,8 @@ public:
Mtx& getInvJointMtx(s32 idx) const { return mJointTree.getInvJointMtx(idx); }
J3DTexture* getTexture() const { return mMaterialTable.getTexture(); }
JUTNameTab* getTextureName() const { return mMaterialTable.getTextureName(); }
void setTexture(J3DTexture* pTexture) { mMaterialTable.setTexture(pTexture); }
void setTextureName(JUTNameTab* pTextureName) { mMaterialTable.setTextureName(pTextureName); }
u16 getWEvlpMtxNum() const { return mJointTree.getWEvlpMtxNum(); }
u16* getWEvlpMixMtxIndex() const { return mJointTree.getWEvlpMixIndex(); }
f32* getWEvlpMixWeight() const { return mJointTree.getWEvlpMixWeight(); }
@@ -74,10 +84,6 @@ public:
int removeMatColorAnimator(J3DAnmColor* anm) {
return mMaterialTable.removeMatColorAnimator(anm);
}
void syncJ3DSys() {
syncJ3DSysFlags();
syncJ3DSysPointers();
}
private:
/* 0x04 */ void* mpRawData;
include/JSystem/J3DGraphAnimator/J3DNode.h
+2 -1
View File
@@ -11,7 +11,8 @@ public:
virtual void init(Vec const& param_0, Mtx*);
virtual void entryIn();
virtual void calcIn();
virtual u32 getType();
virtual void calcOut();
virtual u32 getType() const;
virtual ~J3DNode();
J3DNode();
include/JSystem/J3DGraphAnimator/J3DShapeTable.h
+2 -8
View File
@@ -8,22 +8,16 @@ class JUTNameTab;
class J3DShapeTable {
public:
J3DShapeTable() {
inline void clear() {
mShapeNum = 0;
mShapeNodePointer = NULL;
}
void hide();
void show();
void initShapeNodes(J3DDrawMtxData*, J3DVertexData*);
void sortVcdVatCmd();
virtual ~J3DShapeTable();
u16 getShapeNum() const { return mShapeNum; }
J3DShape* getShapeNodePointer(u16 idx) const { return mShapeNodePointer[idx]; }
private:
/* 0x0 */ void *field_0x0;
/* 0x4 */ u16 mShapeNum;
/* 0x8 */ J3DShape** mShapeNodePointer;
}; // Size: 0x0C
include/JSystem/J3DGraphBase/J3DShapeDraw.h
+3 -5
View File
@@ -5,12 +5,10 @@
class J3DShapeDraw {
public:
/* 80314924 */ u32 countVertex(u32);
/* 80314974 */ void addTexMtxIndexInDL(u32, u32, u32);
/* 80314ABC */ J3DShapeDraw(u8 const*, u32);
/* 80314AD4 */ void draw() const;
J3DShapeDraw(u8 const*, u32);
void draw() const;
/* 80314B00 */ virtual ~J3DShapeDraw();
virtual ~J3DShapeDraw() {}
u8* getDisplayList() const { return (u8*)mDisplayList; }
u32 getDisplayListSize() const { return mDisplayListSize; }
include/JSystem/J3DGraphBase/J3DShapeMtx.h
+12 -12
View File
@@ -39,7 +39,7 @@ public:
void loadMtxIndx_NCPU(int, u16) const;
void loadMtxIndx_PNCPU(int, u16) const;
virtual ~J3DShapeMtx();
virtual ~J3DShapeMtx() {}
virtual u32 getType() const;
virtual u32 getUseMtxNum() const;
virtual u32 getUseMtxIndex(u16) const;
@@ -64,7 +64,7 @@ public:
J3DShapeMtxImm(u16 useMtxIndex) : J3DShapeMtx(useMtxIndex) {}
virtual ~J3DShapeMtxImm();
virtual ~J3DShapeMtxImm() {}
virtual u32 getType() const;
virtual void load() const;
virtual void loadNrmMtx(int, u16) const;
@@ -82,7 +82,7 @@ class J3DShapeMtxMultiImm : public J3DShapeMtxImm {
public:
J3DShapeMtxMultiImm(u16 useMtxIndex) : J3DShapeMtxImm(useMtxIndex) {}
virtual ~J3DShapeMtxMultiImm();
virtual ~J3DShapeMtxMultiImm() {}
virtual u32 getType() const;
virtual u32 getUseMtxNum() const;
virtual u32 getUseMtxIndex(u16) const;
@@ -94,13 +94,13 @@ private:
/* 0x8 */ u16* mUseMtxIndexTable;
};
class J3DShapeMtxConcatView : public J3DShapeMtx {
class J3DShapeMtxConcatView : public J3DShapeMtxImm {
public:
typedef void (J3DShapeMtxConcatView::*MtxLoadConcatView)(int mtxNo, u16 index) const;
J3DShapeMtxConcatView(u16 useMtxIndex) : J3DShapeMtx(useMtxIndex) {}
J3DShapeMtxConcatView(u16 useMtxIndex) : J3DShapeMtxImm(useMtxIndex) {}
virtual ~J3DShapeMtxConcatView();
virtual ~J3DShapeMtxConcatView() {}
virtual u32 getType() const;
virtual void load() const;
virtual void loadNrmMtx(int, u16) const;
@@ -120,7 +120,7 @@ class J3DShapeMtxBBoardImm : public J3DShapeMtxImm {
public:
J3DShapeMtxBBoardImm(u16 useMtxIndex) : J3DShapeMtxImm(useMtxIndex) {}
virtual ~J3DShapeMtxBBoardImm();
virtual ~J3DShapeMtxBBoardImm() {}
virtual u32 getType() const;
virtual void load() const;
};
@@ -129,7 +129,7 @@ class J3DShapeMtxYBBoardImm : public J3DShapeMtxImm {
public:
J3DShapeMtxYBBoardImm(u16 useMtxIndex) : J3DShapeMtxImm(useMtxIndex) {}
virtual ~J3DShapeMtxYBBoardImm();
virtual ~J3DShapeMtxYBBoardImm() {}
virtual u32 getType() const;
virtual void load() const;
};
@@ -138,7 +138,7 @@ class J3DShapeMtxYBBoardConcatView : public J3DShapeMtxConcatView {
public:
J3DShapeMtxYBBoardConcatView(u16 useMtxIndex) : J3DShapeMtxConcatView(useMtxIndex) {}
virtual ~J3DShapeMtxYBBoardConcatView();
virtual ~J3DShapeMtxYBBoardConcatView() {}
virtual u32 getType() const;
virtual void load() const;
};
@@ -147,7 +147,7 @@ class J3DShapeMtxBBoardConcatView : public J3DShapeMtxConcatView {
public:
J3DShapeMtxBBoardConcatView(u16 useMtxIndex) : J3DShapeMtxConcatView(useMtxIndex) {}
virtual ~J3DShapeMtxBBoardConcatView();
virtual ~J3DShapeMtxBBoardConcatView() {}
virtual u32 getType() const;
virtual void load() const;
};
@@ -157,7 +157,7 @@ public:
J3DShapeMtxMulti(u16 useMtxIndex, u16 useMtxNum, u16* useMtxIndexTable)
: J3DShapeMtx(useMtxIndex), mUseMtxNum(useMtxNum), mUseMtxIndexTable(useMtxIndexTable) {}
virtual ~J3DShapeMtxMulti();
virtual ~J3DShapeMtxMulti() {}
virtual u32 getType() const;
virtual u32 getUseMtxNum() const;
virtual u32 getUseMtxIndex(u16) const;
@@ -175,7 +175,7 @@ public:
: J3DShapeMtxConcatView(useMtxIndex), mUseMtxNum(useMtxNum),
mUseMtxIndexTable(useMtxIndexTable) {}
virtual ~J3DShapeMtxMultiConcatView();
virtual ~J3DShapeMtxMultiConcatView() {}
virtual u32 getType() const;
virtual u32 getUseMtxNum() const;
virtual u32 getUseMtxIndex(u16) const;
include/JSystem/J3DGraphBase/J3DVertex.h
+2
View File
@@ -24,6 +24,8 @@ public:
J3DVertexData();
~J3DVertexData();
inline void clear() { mPacketNum = 0; }
void* getVtxPosArray() const { return mVtxPosArray; }
void* getVtxNrmArray() const { return mVtxNrmArray; }
GXColor* getVtxColorArray(u8 idx) const { return mVtxColorArray[idx]; }