mirror/tww
1
0
Fork 0
mirror of https://github.com/zeldaret/tww.git synced 2026-06-28 10:20:52 -04:00
Code Issues Packages Projects Releases Wiki Activity

J3DAnm work

Browse Source
This commit is contained in:
Jasper St. Pierre
2023-12-24 15:22:14 -08:00
parent 790dba270d
commit ee6a21d7dc
3 changed files with 309 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/JSystem/J3DGraphAnimator/J3DAnimation.h
+55 -32
View File
@@ -84,7 +84,9 @@ struct J3DAnmClusterFullTable {
u16 mOffset;
};
struct J3DAnmClusterKeyTable;
struct J3DAnmClusterKeyTable {
/* 0x00 */ J3DAnmKeyTableBase mWeightTable;
};
// same as J3DModelBlock?
struct J3DAnmDataBlockHeader { // actual name unknown
@@ -112,7 +114,8 @@ struct J3DAnmVtxColorFullData {
/* 0x09 */ u8 field_0x9; // padding?
/* 0x0A */ s16 mFrameMax;
/* 0x0C */ u16 mAnmTableNum[2];
/* 0x10 */ u8 field_0x10[0x18 - 0x10];
/* 0x10 */ u16 mIndexNum[2];
/* 0x14 */ u32 field_0x14;
/* 0x18 */ s32 mTableOffsets[2];
/* 0x20 */ s32 mVtxColorIndexDataOffsets[2];
/* 0x28 */ s32 mVtxColorIndexPointerOffsets[2];
@@ -213,14 +216,14 @@ struct J3DAnmVtxColorKeyData {
/* 0x09 */ u8 field_0x9;
/* 0x0A */ s16 mFrameMax;
/* 0x0C */ u16 mAnmTableNum[2];
/* 0x10 */ u8 field_0x10[0x18 - 0x10];
/* 0x10 */ u32 mIndexNum[2];
/* 0x18 */ s32 mTableOffsets[2];
/* 0x20 */ s32 mVtxColoIndexDataOffset[2];
/* 0x28 */ s32 mVtxColoIndexPointerOffset[2];
/* 0x30 */ s32 mRValOffset;
/* 0x34 */ s32 mGValOffset;
/* 0x38 */ s32 mBValOffset;
/* 0x3C */ s32 mAValOffset;
/* 0x20 */ s32 mVtxColorIndexDataOffsets[2];
/* 0x28 */ s32 mVtxColorIndexPointerOffsets[2];
/* 0x30 */ s32 mRValuesOffset;
/* 0x34 */ s32 mGValuesOffset;
/* 0x38 */ s32 mBValuesOffset;
/* 0x3C */ s32 mAValuesOffset;
}; // Size = 0x40
STATIC_ASSERT(sizeof(J3DAnmVtxColorKeyData) == 0x40);
@@ -557,14 +560,14 @@ public:
mKRegDataCount[0] = 0;
mKRegUpdateMaterialID = NULL;
mCRegUpdateMaterialID = NULL;
mAnmCRegData[3] = NULL;
mAnmCRegData[2] = NULL;
mAnmCRegData[1] = NULL;
mAnmCRegData[0] = NULL;
mAnmKRegData[3] = NULL;
mAnmKRegData[2] = NULL;
mAnmKRegData[1] = NULL;
mAnmKRegData[0] = NULL;
mAnmCRegDataA = NULL;
mAnmCRegDataB = NULL;
mAnmCRegDataG = NULL;
mAnmCRegDataR = NULL;
mAnmKRegDataA = NULL;
mAnmKRegDataB = NULL;
mAnmKRegDataG = NULL;
mAnmKRegDataR = NULL;
mKind = 5;
}
void getTevColorReg(u16, GXColorS10*) const;
@@ -597,8 +600,14 @@ private:
/* 0x3C */ JUTNameTab mKRegUpdateMaterialName;
/* 0x4C */ J3DAnmCRegKeyTable* mAnmCRegKeyTable;
/* 0x50 */ J3DAnmKRegKeyTable* mAnmKRegKeyTable;
/* 0x54 */ s16 * mAnmCRegData[4];
/* 0x64 */ s16 * mAnmKRegData[4];
/* 0x54 */ s16 * mAnmCRegDataR;
/* 0x58 */ s16 * mAnmCRegDataG;
/* 0x5C */ s16 * mAnmCRegDataB;
/* 0x60 */ s16 * mAnmCRegDataA;
/* 0x64 */ s16 * mAnmKRegDataR;
/* 0x68 */ s16 * mAnmKRegDataG;
/* 0x6C */ s16 * mAnmKRegDataB;
/* 0x70 */ s16 * mAnmKRegDataA;
}; // Size: 0x74
class J3DAnmColor : public J3DAnmBase {
@@ -689,48 +698,62 @@ public:
mAnmTableNum[i] = 0;
}
for (int i = 0; i < 2; i++) {
mAnmVtxColorIndexData[i] = 0;
mAnmVtxColorIndexData[i] = NULL;
}
}
virtual ~J3DAnmVtxColor();
virtual void getColor(u8, u16, GXColor*) const {}
private:
protected:
/* 0x10 */ s16 mAnmTableNum[2];
/* 0x14 */ int mAnmVtxColorIndexData[2];
/* 0x14 */ void* mAnmVtxColorIndexData[2];
}; // Size: 0x1C
class J3DAnmVtxColorKey : public J3DAnmVtxColor {
public:
friend class J3DAnmKeyLoader_v15;
J3DAnmVtxColorKey() {
for (int i = 0; i < 2; i++) {
field_0x1c[i] = 0;
mpTable[i] = NULL;
}
}
virtual ~J3DAnmVtxColorKey();
virtual void getColor(u8, u16, GXColor*) const;
private:
/* 0x1C */ int field_0x1c[2];
/* 0x24 */ u8 field_0x24[0x34 - 0x24];
J3DAnmColorKeyTable * getAnmTable(u8 idx) const { return mpTable[idx]; }
protected:
/* 0x1C */ J3DAnmColorKeyTable* mpTable[2];
/* 0x24 */ s16* mColorR;
/* 0x28 */ s16* mColorG;
/* 0x2C */ s16* mColorB;
/* 0x30 */ s16* mColorA;
};
class J3DAnmVtxColorFull : public J3DAnmVtxColor {
public:
friend class J3DAnmFullLoader_v15;
J3DAnmVtxColorFull() {
for (int i = 0; i < 2; i++) {
field_0x1c[i] = 0;
mpTable[i] = NULL;
}
}
virtual ~J3DAnmVtxColorFull();
virtual void getColor(u8, u16, GXColor*) const;
private:
/* 0x1C */ int field_0x1c[2];
/* 0x24 */ u8 field_0x24[0x34 - 0x24];
J3DAnmColorFullTable * getAnmTable(u8 idx) const { return mpTable[idx]; }
protected:
/* 0x1C */ J3DAnmColorFullTable* mpTable[2];
/* 0x24 */ u8* mColorR;
/* 0x28 */ u8* mColorG;
/* 0x2C */ u8* mColorB;
/* 0x30 */ u8* mColorA;
};
class J3DAnmCluster : public J3DAnmBase {
@@ -767,13 +790,13 @@ public:
friend class J3DAnmKeyLoader_v15;
J3DAnmClusterKey() : J3DAnmCluster(3, NULL) {
field_0x14 = 0;
mAnmTable = NULL;
}
virtual ~J3DAnmClusterKey() {}
virtual f32 getWeight(u16) const;
private:
/* 0x14 */ J3DAnmClusterKeyTable* field_0x14;
/* 0x14 */ J3DAnmClusterKeyTable* mAnmTable;
};
class J3DFrameCtrl {