mirror/tww
1
0
Fork 0
mirror of https://github.com/zeldaret/tww.git synced 2026-07-09 06:03:22 -04:00
Code Issues Packages Projects Releases Wiki Activity

fix inline/member name

Browse Source
This commit is contained in:
Jcw87
2023-12-21 08:51:00 -08:00
parent 8a660c0a67
commit a2e538036f
5 changed files with 7 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/JSystem/J3DGraphAnimator/J3DJointTree.h
+2 -5
View File
@@ -40,7 +40,7 @@ public:
J3DDrawMtxData * getDrawMtxData() { return &mDrawMtxData; }
u16 getWEvlpMtxNum() const { return mWEvlpMtxNum; }
u8 getWEvlpMixMtxNum(u16 idx) const { return mWEvlpMixMtxNum[idx]; }
u16 * getWEvlpMixIndex() const { return mWEvlpMixIndex; }
u16 * getWEvlpMixMtxIndex() const { return mWEvlpMixMtxIndex; }
f32 * getWEvlpMixWeight() { return mWEvlpMixWeight; }
u16 getDrawFullWgtMtxNum() const { return mDrawMtxData.mDrawFullWgtMtxNum; }
u16 getJointNum() const { return mJointNum; }
@@ -60,9 +60,6 @@ public:
bool checkFlag(u32 flag) { return mFlags & flag; }
void setFlag(u32 flag) { mFlags = flag; }
// TODO
void getWEvlpMixMtxIndex() {}
private:
friend class J3DModelLoader;
@@ -75,7 +72,7 @@ private:
/* 0x1C */ J3DJoint** mJointNodePointer;
/* 0x20 */ u16 mWEvlpMtxNum;
/* 0x24 */ u8* mWEvlpMixMtxNum;
/* 0x28 */ u16* mWEvlpMixIndex;
/* 0x28 */ u16* mWEvlpMixMtxIndex;
/* 0x2C */ f32* mWEvlpMixWeight;
/* 0x30 */ Mtx* mInvJointMtx;
/* 0x34 */ J3DDrawMtxData mDrawMtxData;
include/JSystem/J3DGraphAnimator/J3DModelData.h
+1 -1
View File
@@ -65,7 +65,7 @@ public:
bool isLocked() { return mMaterialTable.isLocked(); }
u16 getDrawFullWgtMtxNum() const { return mJointTree.getDrawFullWgtMtxNum(); }
u16 getWEvlpMtxNum() const { return mJointTree.getWEvlpMtxNum(); }
u16* getWEvlpMixMtxIndex() { return mJointTree.getWEvlpMixIndex(); }
u16* getWEvlpMixMtxIndex() { return mJointTree.getWEvlpMixMtxIndex(); }
f32* getWEvlpMixWeight() { return mJointTree.getWEvlpMixWeight(); }
u8 getWEvlpMixMtxNum(u16 idx) const { return mJointTree.getWEvlpMixMtxNum(idx); }
u32 getModelDataType() const { return mJointTree.getModelDataType(); }
include/JSystem/J3DGraphLoader/J3DModelLoader.h
+1 -1
View File
@@ -45,7 +45,7 @@ struct J3DVertexBlock : public J3DModelBlock {
struct J3DEnvelopBlock : public J3DModelBlock {
/* 0x08 */ u16 mWEvlpMtxNum;
/* 0x0C */ void* mpWEvlpMixMtxNum;
/* 0x10 */ void* mpWEvlpMixIndex;
/* 0x10 */ void* mpWEvlpMixMtxIndex;
/* 0x14 */ void* mpWEvlpMixWeight;
/* 0x18 */ void* mpInvJointMtx;
}; // Size: 0x1C
src/JSystem/J3DGraphAnimator/J3DModelData.cpp
+1 -1
View File
@@ -20,7 +20,7 @@ void J3DJointTree::clear() {
field_0x40 = NULL;
mWEvlpMtxNum = 0;
mWEvlpMixMtxNum = NULL;
mWEvlpMixIndex = NULL;
mWEvlpMixMtxIndex = NULL;
mWEvlpMixWeight = NULL;
mInvJointMtx = NULL;
mJointName = NULL;
src/JSystem/J3DGraphLoader/J3DModelLoader.cpp
+2 -2
View File
@@ -339,8 +339,8 @@ void J3DModelLoader::readEnvelop(const J3DEnvelopBlock* i_block) {
mpModelData->getJointTree().mWEvlpMtxNum = i_block->mWEvlpMtxNum;
mpModelData->getJointTree().mWEvlpMixMtxNum =
JSUConvertOffsetToPtr<u8>(i_block, i_block->mpWEvlpMixMtxNum);
mpModelData->getJointTree().mWEvlpMixIndex =
JSUConvertOffsetToPtr<u16>(i_block, i_block->mpWEvlpMixIndex);
mpModelData->getJointTree().mWEvlpMixMtxIndex =
JSUConvertOffsetToPtr<u16>(i_block, i_block->mpWEvlpMixMtxIndex);
mpModelData->getJointTree().mWEvlpMixWeight =
JSUConvertOffsetToPtr<f32>(i_block, i_block->mpWEvlpMixWeight);
mpModelData->getJointTree().mInvJointMtx =