mirror of
https://github.com/TwilitRealm/dusklight
synced 2026-06-24 23:53:12 -04:00
Improve some J2DPictureEx matches (#2493)
* Improve some J2DPictureEx matches + other minor debug improvements * Fix JASTrack::channelStart
This commit is contained in:
@@ -64,7 +64,11 @@ public:
|
||||
/* 8030A358 */ virtual ~J2DAnmVtxColor() {}
|
||||
/* 8030363C */ virtual void getColor(u8, u16, _GXColor*) const {}
|
||||
u16 getAnmTableNum(u8 param_0) const { return mAnmTableNum[param_0]; }
|
||||
J3DAnmVtxColorIndexData* getAnmVtxColorIndexData(u8 param_0, u16 param_1) const { return &mVtxColorIndexData[param_0][param_1]; }
|
||||
J3DAnmVtxColorIndexData* getAnmVtxColorIndexData(u8 param_1, u16 param_2) const {
|
||||
J3D_PANIC(344, param_1 < 2, "Error : range over.");
|
||||
J3D_PANIC(345, param_2 < mAnmTableNum[param_1], "Error : range over.");
|
||||
return &mVtxColorIndexData[param_1][param_2];
|
||||
}
|
||||
u16* getVtxColorIndexPointer(u8 param_0) const { return mVtxColorIndexPointer[param_0]; }
|
||||
|
||||
/* 0x10 */ u16 mAnmTableNum[2];
|
||||
|
||||
@@ -11,7 +11,7 @@ class JASBank;
|
||||
*/
|
||||
class JASBankList {
|
||||
public:
|
||||
virtual JASBank* getBank(u32 param_0) const = 0;
|
||||
virtual const JASBank* getBank(u32 param_0) const = 0;
|
||||
};
|
||||
|
||||
#endif /* JASBANKLIST_H */
|
||||
#endif /* JASBANKLIST_H */
|
||||
|
||||
@@ -11,7 +11,7 @@
|
||||
template<size_t N>
|
||||
class JASBankTable : public JASBankList {
|
||||
public:
|
||||
// JASBank* getBank(u32 param_0) { return mArray.get(param_0); }
|
||||
JASBank* getBank(u32 param_0) { return mArray.get(param_0); }
|
||||
virtual JASBank* getBank(u32 param_0) const { return mArray.get(param_0); }
|
||||
void registBank(u32 param_0, JASBank* param_1) { mArray.set(param_0, param_1); }
|
||||
|
||||
@@ -28,4 +28,4 @@ public:
|
||||
JASDefaultBankTable() : JASGlobalInstance(true) {}
|
||||
};
|
||||
|
||||
#endif /* JASBANKTABLE_H */
|
||||
#endif /* JASBANKTABLE_H */
|
||||
|
||||
@@ -196,7 +196,7 @@ struct JASTrack : public JASPoolAllocObject_MultiThreaded<JASTrack> {
|
||||
/* 0x170 */ TChannelMgr* mChannelMgrs[4];
|
||||
/* 0x180 */ TChannelMgr mDefaultChannelMgr;
|
||||
/* 0x1D0 */ int mChannelMgrCount;
|
||||
/* 0x1D4 */ JASDefaultBankTable* mBankTable;
|
||||
/* 0x1D4 */ const JASDefaultBankTable* mBankTable;
|
||||
/* 0x1D8 */ f32 field_0x1d8;
|
||||
/* 0x1DC */ f32 field_0x1dc;
|
||||
/* 0x1E0 */ f32 mVibDepth;
|
||||
|
||||
@@ -16,7 +16,8 @@ public:
|
||||
JAUBankTable(u32 param_0, JASBank** param_1, u32 param_2) : mBankPtrTable(param_1, param_2) {
|
||||
field_0xc = param_0;
|
||||
}
|
||||
/* 802A4AA0 */ JASBank* getBank(u32 bank) const { return mBankPtrTable.get(bank); }
|
||||
/* 802A4AA0 */ const JASBank* getBank(u32 bank) const { return mBankPtrTable.get(bank); }
|
||||
JASBank* getBank(u32 bank) { return mBankPtrTable.get(bank); }
|
||||
|
||||
void registBank(u32 param_0, JASBank* param_1) { mBankPtrTable.set(param_0, param_1); }
|
||||
|
||||
|
||||
@@ -63,8 +63,8 @@ public:
|
||||
/* 802A5D9C */ JAUBankTable* endNewBankTable();
|
||||
/* 802A6468 */ virtual ~JAUSection() {}
|
||||
|
||||
bool isBuilding() { return field_0x2c; }
|
||||
bool isOpen();
|
||||
bool isBuilding() const { return field_0x2c; }
|
||||
bool isOpen() const;
|
||||
JAUSectionHeap* asSectionHeap() { return (JAUSection*)sectionHeap_ == this ? sectionHeap_ : NULL; }
|
||||
JKRHeap* getHeap_();
|
||||
|
||||
@@ -123,7 +123,7 @@ public:
|
||||
};
|
||||
|
||||
inline JKRHeap* JAUSection::getHeap_() { return sectionHeap_->mHeap; }
|
||||
inline bool JAUSection::isOpen() { return this == sectionHeap_->getOpenSection(); }
|
||||
inline bool JAUSection::isOpen() const { return this == sectionHeap_->getOpenSection(); }
|
||||
|
||||
JAUSectionHeap* JAUNewSectionHeap(bool);
|
||||
|
||||
|
||||
@@ -14,6 +14,7 @@
|
||||
(COND) ? (void)0 : (JUTAssertion::showAssert_f(JUTAssertion::getSDevice(), __FILE__, LINE, MSG, __VA_ARGS__), OSPanic(__FILE__, LINE, "Halt"));
|
||||
|
||||
#define J3D_ASSERT(LINE, COND, MSG) JUT_ASSERT_MSG(LINE, (COND) != 0, MSG)
|
||||
#define J3D_PANIC(LINE, COND, MSG) ((COND) != 0 || (OSPanic(__FILE__, LINE, MSG), 0));
|
||||
|
||||
#define JUT_PANIC(LINE, TEXT) \
|
||||
JUTAssertion::showAssert(JUTAssertion::getSDevice(), __FILE__, LINE, TEXT); \
|
||||
@@ -36,6 +37,7 @@
|
||||
#define JUT_ASSERT_MSG(...) (void)0;
|
||||
#define JUT_ASSERT_MSG_F(...) (void)0;
|
||||
#define J3D_ASSERT(...) (void)0;
|
||||
#define J3D_PANIC(...) (void)0;
|
||||
#define JUT_PANIC(...)
|
||||
#define JUT_WARN(...)
|
||||
#define JUT_WARN_DEVICE(...)
|
||||
|
||||
Reference in New Issue
Block a user