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

Various inline cleanup

Browse Source
This commit is contained in:
LagoLunatic
2025-06-19 19:03:11 -04:00
parent b295d48d1d
commit efc33c5fc4
24 changed files with 341 additions and 278 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/JSystem/J3DGraphAnimator/J3DAnimation.h
+16 -4
View File
@@ -424,7 +424,10 @@ public:
calcTransform(getFrame(), idx, pSRTInfo);
}
u16 getUpdateMaterialID(u16 idx) const { return mUpdateMaterialID[idx]; }
u16 getUpdateMaterialID(u16 idx) const {
J3D_ASSERT(1029, idx < mTrackNum / 3, "Error : range over.");
return mUpdateMaterialID[idx];
}
u16 getUpdateMaterialNum() const { return mTrackNum / 3; }
JUTNameTab * getUpdateMaterialName() { return &mUpdateMaterialName; }
u16 getUpdateTexMtxID(u16 idx) const {
@@ -515,7 +518,10 @@ public:
void searchUpdateMaterialID(J3DMaterialTable*);
void searchUpdateMaterialID(J3DModelData*);
u16 getUpdateMaterialID(u16 idx) const { return mUpdateMaterialID[idx]; }
u16 getUpdateMaterialID(u16 idx) const {
J3D_ASSERT(2288, idx < mUpdateMaterialNum, "Error : range over.");
return mUpdateMaterialID[idx];
}
u16 getUpdateMaterialNum() const { return mUpdateMaterialNum; }
JUTNameTab * getUpdateMaterialName() { return &mUpdateMaterialName; }
@@ -570,8 +576,14 @@ public:
u16 getCRegUpdateMaterialNum() const { return mCRegUpdateMaterialNum; }
u16 getKRegUpdateMaterialNum() const { return mKRegUpdateMaterialNum; }
u16 getCRegUpdateMaterialID(u16 idx) const { return mCRegUpdateMaterialID[idx]; }
u16 getKRegUpdateMaterialID(u16 idx) const { return mKRegUpdateMaterialID[idx]; }
u16 getCRegUpdateMaterialID(u16 idx) const {
J3D_ASSERT(2100, idx < mCRegUpdateMaterialNum, "Error : range over.");
return mCRegUpdateMaterialID[idx];
}
u16 getKRegUpdateMaterialID(u16 idx) const {
J3D_ASSERT(2140, idx < mKRegUpdateMaterialNum, "Error : range over.");
return mKRegUpdateMaterialID[idx];
}
JUTNameTab * getCRegUpdateMaterialName() { return &mCRegUpdateMaterialName; }
JUTNameTab * getKRegUpdateMaterialName() { return &mKRegUpdateMaterialName; }
include/JSystem/J3DGraphAnimator/J3DCluster.h
+5 -2
View File
@@ -71,10 +71,13 @@ public:
u16 getClusterNum() const { return mClusterNum; }
u16 getClusterKeyNum() const { return mClusterKeyNum; }
J3DCluster* getClusterPointer(u16 index) {
J3D_ASSERT(186, (index < mClusterNum),"Error : range over.");
J3D_ASSERT(186, (index < mClusterNum), "Error : range over.");
return &mClusterPointer[index];
}
J3DClusterKey* getClusterKeyPointer(u16 i) { return &mClusterKeyPointer[i]; }
J3DClusterKey* getClusterKeyPointer(u16 i) {
J3D_ASSERT(199, (i < mClusterKeyNum), "Error : range over.");
return &mClusterKeyPointer[i];
}
f32* getVtxPos() { return mVtxPos; }
f32* getVtxNrm() { return mVtxNrm; }
include/JSystem/J3DGraphAnimator/J3DShapeTable.h
+1
View File
@@ -6,6 +6,7 @@
class JUTNameTab;
// TODO: This class doesn't seem to exist in the debug maps, probably copied from TP. Remove?
class J3DShapeTable {
public:
inline void clear() {