some matches

This commit is contained in:
Jasper St. Pierre
2024-04-14 07:59:39 -07:00
parent 0a1ce59327
commit 3fae1c28c3
10 changed files with 87 additions and 38 deletions
@@ -26,10 +26,7 @@ public:
J3DDeformer* getDeformer() { return mDeformer; }
void setDeformer(J3DDeformer* deformer) { mDeformer = deformer; }
private:
friend class J3DClusterLoader;
friend class J3DClusterLoader_v15;
public:
/* 0x00 */ f32 mMaxAngle;
/* 0x04 */ f32 mMinAngle;
/* 0x08 */ J3DClusterKey* mClusterKey;
@@ -101,7 +101,7 @@ private:
/* 0x00 */ J3DDeformData* mDeformData;
/* 0x04 */ J3DAnmCluster* mAnmCluster;
/* 0x08 */ f32* field_0x8;
/* 0x08 */ f32* mWeightList;
/* 0x0C */ f32* field_0xc;
/* 0x10 */ u32 mFlags;
}; // Size: 0x14
+22 -7
View File
@@ -34,15 +34,15 @@ public:
u32 getNrmNum() const { return mNrmNum; }
u32 getVtxNum() const { return mVtxNum; }
GXVtxAttrFmtList* getVtxAttrFmtList() { return mVtxAttrFmtList; }
u8 getVtxPosFrac() const { return mVtxPosFrac; }
u8 getVtxNrmFrac() const { return mVtxNrmFrac; }
int getVtxPosType() const { return mVtxPosType; }
int getVtxNrmType() const { return mVtxNrmType; }
void setVtxPosFrac(u8 frac) { mVtxPosFrac = frac; }
GXCompType getVtxPosType() const { return mVtxPosType; }
void setVtxPosType(GXCompType type) { mVtxPosType = type; }
void setVtxNrmFrac(u8 frac) { mVtxNrmFrac = frac; }
u8 getVtxPosFrac() const { return mVtxPosFrac; }
void setVtxPosFrac(u8 frac) { mVtxPosFrac = frac; }
GXCompType getVtxNrmType() const { return mVtxNrmType; }
void setVtxNrmType(GXCompType type) { mVtxNrmType = type; }
u8 getVtxNrmFrac() const { return mVtxNrmFrac; }
void setVtxNrmFrac(u8 frac) { mVtxNrmFrac = frac; }
private:
friend class J3DModelLoader;
@@ -78,6 +78,8 @@ public:
s32 allocTransformedVtxPosArray();
s32 allocTransformedVtxNrmArray();
J3DVertexData* getVertexData() { return mVtxData; }
void setCurrentVtxPos(void* pVtxPos) { mCurrentVtxPos = pVtxPos; }
void* getCurrentVtxPos() { return mCurrentVtxPos; }
@@ -94,7 +96,20 @@ public:
void* getTransformedVtxPos(int idx) { return mTransformedVtxPosArray[idx]; }
void* getTransformedVtxNrm(int idx) { return mTransformedVtxNrmArray[idx]; }
J3DVertexData* getVertexData() { return mVtxData; }
void* getVtxPosArrayPointer(int idx) { return mVtxPosArray[idx]; }
void* getVtxNrmArrayPointer(int idx) { return mVtxNrmArray[idx]; }
void swapVtxPosArrayPointer() {
void* tmp = mVtxPosArray[0];
mVtxPosArray[0] = mVtxPosArray[1];
mVtxPosArray[1] = tmp;
}
void swapVtxNrmArrayPointer() {
void* tmp = mVtxNrmArray[0];
mVtxNrmArray[0] = mVtxNrmArray[1];
mVtxNrmArray[1] = tmp;
}
void swapTransformedVtxPos() {
void* tmp = mTransformedVtxPosArray[0];
+1 -1
View File
@@ -15,7 +15,7 @@ namespace JASystem {
namespace JAInter {
class SeqUpdateData;
namespace SystemInterface {
s32 checkFileExsistence(char*);
BOOL checkFileExsistence(char*);
int checkSeqActiveFlag(JASystem::TTrack*);
void trackToSeqp(JAISound*, u8);
void setSeqPortargsF32(JAInter::SeqUpdateData*, u32, u8, f32);
+2 -2
View File
@@ -29,12 +29,12 @@ public:
inline void clear() { mNum = 0; }
inline void push(const char* str) {
mStack[mNum - 1] = str;
mStack[mNum] = str;
mNum++;
}
inline bool IsStorable() const { return mNum < 4; }
inline void pop() { mNum--; }
inline const char* top() const { return mStack[mNum - 2]; }
inline const char* top() const { return mStack[mNum - 1]; }
inline bool empty() const { return mNum == 0; }
/* 0x00 */ const char* mStack[4];
+5
View File
@@ -42,6 +42,11 @@ public:
bool init(ResTIMG*, ResTIMG*, ResTIMG*, ResTIMG*);
void setRotate(float);
void draw();
public:
/* 0x04 */ J2DPicture* mPicture[3];
/* 0x10 */ J2DPicture* mNum[3][2];
/* 0x28 */ f32 field_0x28[14];
};
class dDlst_2DObject_c : public dDlst_base_c {