mirror
/
tp
mirror of https://github.com/zeldaret/tp
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

project cleanup (#2895) 

* some wii OS fixes

* remove old dol2asm comments

* remove dol2asm.h

* remove function address comments

* normalize ATTRIBUTE_ALIGN usage

* DECL_WEAK macro

* fix gcc attribute weak macro

* wrap more mwcc specific things in ifdefs

* fixes

* fix revo sdk version flags

* fixes
This commit is contained in:
TakaRikka 2025-11-30 14:23:42 -08:00 committed by GitHub
parent 434415337d
commit a6e76c0841
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2375 changed files with 24683 additions and 71069 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
configure.py
View File

@ -392,14 +392,12 @@ cflags_revolution_base = [
cflags_revolution_retail = [
*cflags_revolution_base,
"-O4,p",
"-DSDK_SEP2006",
]
cflags_revolution_debug = [
*cflags_revolution_base,
"-opt off",
"-DDEBUG=1",
"-DSDK_AUG2010",
]
# Framework flags
@ -475,7 +473,15 @@ def RevolutionLib(lib_name: str, objects: List[Object]) -> Dict[str, Any]:
return {
"lib": lib_name,
"mw_version": "Wii/1.0",
"cflags": cflags_revolution_debug,
"cflags": [*cflags_revolution_debug, "-DSDK_AUG2010"],
"progress_category": "sdk",
"objects": objects,
}
elif config.version == "Shield":
return {
"lib": lib_name,
"mw_version": "Wii/1.0",
"cflags": [*cflags_revolution_retail, "-DSDK_AUG2010"],
"progress_category": "sdk",
"objects": objects,
}
@ -483,7 +489,7 @@ def RevolutionLib(lib_name: str, objects: List[Object]) -> Dict[str, Any]:
return {
"lib": lib_name,
"mw_version": "GC/3.0a3",
"cflags": cflags_revolution_retail,
"cflags": [*cflags_revolution_retail, "-DSDK_SEP2006"],
"progress_category": "sdk",
"objects": objects,
}
@ -1458,29 +1464,29 @@ config.libs = [
Object(MatchingFor("ShieldD"), "revolution/os/OS.c"),
Object(MatchingFor("ShieldD"), "revolution/os/OSAddress.c"),
Object(MatchingFor("ShieldD"), "revolution/os/OSAlarm.c"),
Object(MatchingFor("ShieldD"), "revolution/os/OSAlloc.c"),
Object(MatchingFor("ShieldD"), "revolution/os/OSArena.c"),
Object(MatchingFor("ShieldD"), "revolution/os/OSAudioSystem.c"),
Object(MatchingFor("ShieldD"), "revolution/os/OSCache.c"),
Object(MatchingFor("ShieldD", "RZDE01_00"), "revolution/os/OSAlloc.c"),
Object(MatchingFor("ShieldD", "RZDE01_00"), "revolution/os/OSArena.c"),
Object(MatchingFor("ShieldD", "RZDE01_00"), "revolution/os/OSAudioSystem.c"),
Object(MatchingFor("ShieldD", "RZDE01_00"), "revolution/os/OSCache.c"),
Object(MatchingFor("ShieldD"), "revolution/os/OSContext.c"),
Object(NonMatching, "revolution/os/OSError.c"),
Object(NonMatching, "revolution/os/OSExec.c"),
Object(NonMatching, "revolution/os/OSFatal.c"),
Object(MatchingFor("ShieldD"), "revolution/os/OSFont.c"),
Object(MatchingFor("ShieldD"), "revolution/os/OSInterrupt.c"),
Object(MatchingFor("ShieldD"), "revolution/os/OSLink.c"),
Object(MatchingFor("ShieldD"), "revolution/os/OSMessage.c"),
Object(MatchingFor("ShieldD", "RZDE01_00"), "revolution/os/OSFont.c"),
Object(MatchingFor("ShieldD", "RZDE01_00"), "revolution/os/OSInterrupt.c"),
Object(MatchingFor("ShieldD", "RZDE01_00"), "revolution/os/OSLink.c"),
Object(MatchingFor("ShieldD", "RZDE01_00"), "revolution/os/OSMessage.c"),
Object(MatchingFor("ShieldD"), "revolution/os/OSMemory.c"),
Object(MatchingFor("ShieldD"), "revolution/os/OSMutex.c"),
Object(MatchingFor("ShieldD", "RZDE01_00"), "revolution/os/OSMutex.c"),
Object(MatchingFor("ShieldD"), "revolution/os/OSReboot.c"),
Object(MatchingFor("ShieldD"), "revolution/os/OSReset.c"),
Object(MatchingFor("ShieldD"), "revolution/os/OSRtc.c"),
Object(MatchingFor("ShieldD", "RZDE01_00"), "revolution/os/OSRtc.c"),
Object(MatchingFor("ShieldD"), "revolution/os/OSStopwatch.c"),
Object(MatchingFor("ShieldD"), "revolution/os/OSSync.c"),
Object(MatchingFor("ShieldD", "RZDE01_00"), "revolution/os/OSSync.c"),
Object(NonMatching, "revolution/os/OSThread.c"),
Object(MatchingFor("ShieldD"), "revolution/os/OSTime.c"),
Object(MatchingFor("ShieldD"), "revolution/os/OSUtf.c"),
Object(MatchingFor("ShieldD"), "revolution/os/OSIpc.c"),
Object(MatchingFor("ShieldD", "RZDE01_00"), "revolution/os/OSTime.c"),
Object(MatchingFor("ShieldD", "RZDE01_00"), "revolution/os/OSUtf.c"),
Object(MatchingFor("ShieldD", "RZDE01_00"), "revolution/os/OSIpc.c"),
Object(NonMatching, "revolution/os/OSStateTM.c"),
Object(NonMatching, "revolution/os/OSPlayRecord.c"),
Object(MatchingFor("ShieldD"), "revolution/os/OSStateFlags.c"),

60
include/DynamicLink.h
View File

@ -16,28 +16,28 @@ struct DynamicModuleControlBase {
/* 0x08 */ DynamicModuleControlBase* mNext;
/* 0x0C */ /*vtable*/
/* 802621CC */ virtual ~DynamicModuleControlBase();
/* 800188DC */ virtual const char* getModuleName() const { return NULL; };
/* 80263210 */ virtual int getModuleSize() const { return 0; };
/* 80263200 */ virtual const char* getModuleTypeString() const {return "Base";};
virtual ~DynamicModuleControlBase();
virtual const char* getModuleName() const { return NULL; };
virtual int getModuleSize() const { return 0; };
virtual const char* getModuleTypeString() const {return "Base";};
#if __MWERKS__ && __MWERKS__ < 0x4200
// This is illegal function overloading, but MWCC for GC allows it. MWCC for Wii does not.
virtual void dump();
#endif
/* 80262470 */ static void dump();
static void dump();
static void dump(char*);
/* 802631FC */ virtual void dump2() {};
/* 802631DC */ virtual bool do_load() {return true;};
/* 802631F4 */ virtual BOOL do_load_async() {return true;};
/* 802631E4 */ virtual bool do_unload() {return true;};
/* 802631D4 */ virtual BOOL do_link() {return TRUE;};
/* 802631EC */ virtual bool do_unlink() {return true; };
/* 80262284 */ DynamicModuleControlBase();
/* 802622D0 */ BOOL link();
/* 80262364 */ BOOL unlink();
/* 802623EC */ BOOL load_async();
/* 8026242C */ bool force_unlink();
virtual void dump2() {};
virtual bool do_load() {return true;};
virtual BOOL do_load_async() {return true;};
virtual bool do_unload() {return true;};
virtual BOOL do_link() {return TRUE;};
virtual bool do_unlink() {return true; };
DynamicModuleControlBase();
BOOL link();
BOOL unlink();
BOOL load_async();
bool force_unlink();
static JKRHeap* createHeap(u32, JKRHeap*);
static inline DynamicModuleControlBase* getFirstClass() { return mFirst; }
@ -64,21 +64,21 @@ struct DynamicModuleControlBase {
};
struct DynamicModuleControl : DynamicModuleControlBase {
/* 80263218 */ virtual const char* getModuleName() const { return mName; };
/* 800188E4 */ virtual ~DynamicModuleControl() {}
/* 80263000 */ virtual int getModuleSize() const;
/* 80263070 */ virtual const char* getModuleTypeString() const;
virtual const char* getModuleName() const { return mName; };
virtual ~DynamicModuleControl() {}
virtual int getModuleSize() const;
virtual const char* getModuleTypeString() const;
// virtual void dump();
/* 80262C0C */ virtual void dump2();
/* 802627E8 */ virtual bool do_load();
/* 80262AFC */ virtual BOOL do_load_async();
/* 80262BC4 */ virtual bool do_unload();
/* 80262C5C */ virtual BOOL do_link();
/* 80262F28 */ virtual bool do_unlink();
/* 80262660 */ DynamicModuleControl(char const*);
/* 802626D0 */ static JKRArchive* mountCallback(void*);
/* 8026275C */ static bool initialize();
/* 80262794 */ static bool callback(void*);
virtual void dump2();
virtual bool do_load();
virtual BOOL do_load_async();
virtual bool do_unload();
virtual BOOL do_link();
virtual bool do_unlink();
DynamicModuleControl(char const*);
static JKRArchive* mountCallback(void*);
static bool initialize();
static bool callback(void*);
/* 0x10 */ OSModuleHeader* mModule;
/* 0x14 */ void* mBss;

80
include/JSystem/J2DGraph/J2DAnimation.h
View File

@ -30,8 +30,8 @@ public:
mFrame = 0;
mFrameMax = 0;
}
/* 80053C94 */ virtual ~J2DAnmBase() {}
/* 800569B0 */ virtual void searchUpdateMaterialID(J2DScreen*) {}
virtual ~J2DAnmBase() {}
virtual void searchUpdateMaterialID(J2DScreen*) {}
s16 getFrameMax() const { return mFrameMax; }
void setFrame(f32 frame) { mFrame = frame; }
@ -61,8 +61,8 @@ public:
mVtxColorIndexData[i] = NULL;
}
}
/* 8030A358 */ virtual ~J2DAnmVtxColor() {}
/* 8030363C */ virtual void getColor(u8, u16, _GXColor*) const {}
virtual ~J2DAnmVtxColor() {}
virtual void getColor(u8, u16, _GXColor*) const {}
u16 getAnmTableNum(u8 param_0) const { return mAnmTableNum[param_0]; }
J3DAnmVtxColorIndexData* getAnmVtxColorIndexData(u8 param_1, u16 param_2) const {
J3D_PANIC(344, param_1 < 2, "Error : range over.");
@ -90,8 +90,8 @@ public:
mInfoTable[i] = NULL;
}
}
/* 8030CC20 */ virtual ~J2DAnmVtxColorKey() {}
/* 8030B704 */ virtual void getColor(u8, u16, _GXColor*) const;
virtual ~J2DAnmVtxColorKey() {}
virtual void getColor(u8, u16, _GXColor*) const;
/* 0x24 */ J3DAnmColorKeyTable* mInfoTable[2];
/* 0x2C */ s16* mRValues;
@ -111,8 +111,8 @@ public:
mInfoTable[i] = NULL;
}
}
/* 8030CC8C */ virtual ~J2DAnmVtxColorFull() {}
/* 8030B4C4 */ virtual void getColor(u8, u16, _GXColor*) const;
virtual ~J2DAnmVtxColorFull() {}
virtual void getColor(u8, u16, _GXColor*) const;
/* 0x24 */ J3DAnmColorFullTable* mInfoTable[2];
/* 0x2C */ u8* mRValues;
@ -134,8 +134,8 @@ public:
mValues = NULL;
mKind = KIND_VISIBILITY;
}
/* 8030A3B4 */ virtual ~J2DAnmVisibilityFull() {}
/* 8030C048 */ void getVisibility(u16, u8*) const;
virtual ~J2DAnmVisibilityFull() {}
void getVisibility(u16, u8*) const;
/* 0x10 */ u16 field_0x10;
/* 0x12 */ u16 field_0x12;
@ -155,8 +155,8 @@ public:
mTranslateValues = pTranslateValues;
mKind = KIND_TRANSFORM;
}
/* 80184370 */ virtual ~J2DAnmTransform() {}
/* 80191130 */ virtual void getTransform(u16, J3DTransformInfo*) const {}
virtual ~J2DAnmTransform() {}
virtual void getTransform(u16, J3DTransformInfo*) const {}
/* 0x10 */ f32* mScaleValues;
/* 0x14 */ s16* mRotationValues;
@ -173,11 +173,11 @@ public:
field_0x24 = 0;
mInfoTable = NULL;
}
/* 801959C0 */ virtual ~J2DAnmTransformKey() {}
/* 8030CD7C */ virtual void getTransform(u16 p1, J3DTransformInfo* pInfo) const {
virtual ~J2DAnmTransformKey() {}
virtual void getTransform(u16 p1, J3DTransformInfo* pInfo) const {
this->calcTransform(getFrame(), p1, pInfo);
}
/* 8030AAFC */ virtual void calcTransform(f32, u16, J3DTransformInfo*) const;
virtual void calcTransform(f32, u16, J3DTransformInfo*) const;
/* 0x1C */ u8 field_0x1c[6];
/* 0x22 */ s16 field_0x22;
@ -192,8 +192,8 @@ public:
class J2DAnmTransformFull : public J2DAnmTransform {
public:
J2DAnmTransformFull() : J2DAnmTransform(NULL, NULL, NULL) { mTableInfo = NULL; }
/* 8030CDAC */ virtual ~J2DAnmTransformFull() {}
/* 8030A590 */ virtual void getTransform(u16, J3DTransformInfo*) const;
virtual ~J2DAnmTransformFull() {}
virtual void getTransform(u16, J3DTransformInfo*) const;
/* 0x1C */ u8 field_0x1c[6];
/* 0x22 */ u16 field_0x22;
@ -227,10 +227,10 @@ public:
field_0x7c = 0;
mKind = KIND_TEXTURE_SRT;
}
/* 8030B9F0 */ void calcTransform(f32, u16, J3DTextureSRTInfo*) const;
void calcTransform(f32, u16, J3DTextureSRTInfo*) const;
/* 80184274 */ virtual ~J2DAnmTextureSRTKey() {}
/* 8030BC60 */ virtual void searchUpdateMaterialID(J2DScreen*);
virtual ~J2DAnmTextureSRTKey() {}
virtual void searchUpdateMaterialID(J2DScreen*);
u16 getUpdateMaterialNum() const { return mUpdateMaterialNum / 3; }
u16 getUpdateMaterialID(u16 i) const { return mUpdateMaterialID[i]; }
u8 getUpdateTexMtxID(u16 i) const { return mUpdateTexMtxID[i]; }
@ -273,8 +273,8 @@ public:
class J2DAnmTexPattern : public J2DAnmBase {
public:
struct J2DAnmTexPatternTIMGPointer {
/* 8030CB2C */ J2DAnmTexPatternTIMGPointer();
/* 8030CB3C */ ~J2DAnmTexPatternTIMGPointer();
J2DAnmTexPatternTIMGPointer();
~J2DAnmTexPatternTIMGPointer();
/* 0x0 */ ResTIMG* mRes;
/* 0x4 */ JUTPalette* mPalette;
@ -289,12 +289,12 @@ public:
mTIMGPtrArray = NULL;
}
/* 8030BEE8 */ void getTexNo(u16, u16*) const;
/* 8030BF9C */ ResTIMG* getResTIMG(u16) const;
/* 8030BFF0 */ JUTPalette* getPalette(u16) const;
void getTexNo(u16, u16*) const;
ResTIMG* getResTIMG(u16) const;
JUTPalette* getPalette(u16) const;
/* 8030CB90 */ virtual ~J2DAnmTexPattern() { delete[] mTIMGPtrArray; }
/* 8030BD10 */ virtual void searchUpdateMaterialID(J2DScreen*);
virtual ~J2DAnmTexPattern() { delete[] mTIMGPtrArray; }
virtual void searchUpdateMaterialID(J2DScreen*);
u16 getUpdateMaterialNum() const { return mUpdateMaterialNum; }
u16 getUpdateMaterialID(u16 i) const { return mUpdateMaterialID[i]; }
J3DAnmTexPatternFullTable* getAnmTable() const { return mAnmTable; }
@ -337,11 +337,11 @@ public:
mKRValues = NULL;
mKind = KIND_TEV_REG;
}
/* 8030C0F0 */ void getTevColorReg(u16, _GXColorS10*) const;
/* 8030C3B4 */ void getTevKonstReg(u16, _GXColor*) const;
void getTevColorReg(u16, _GXColorS10*) const;
void getTevKonstReg(u16, _GXColor*) const;
/* 801841EC */ virtual ~J2DAnmTevRegKey() {}
/* 8030C678 */ virtual void searchUpdateMaterialID(J2DScreen* pScreen);
virtual ~J2DAnmTevRegKey() {}
virtual void searchUpdateMaterialID(J2DScreen* pScreen);
u16 getCRegUpdateMaterialNum() const { return mCRegUpdateMaterialNum; }
u16 getCRegUpdateMaterialID(u16 i) const { return mCRegUpdateMaterialID[i]; }
@ -393,9 +393,9 @@ public:
mUpdateMaterialID = NULL;
mKind = KIND_COLOR;
}
/* 801842FC */ virtual ~J2DAnmColor() {}
/* 8030AF24 */ virtual void searchUpdateMaterialID(J2DScreen*);
/* 802EB390 */ virtual void getColor(u16, _GXColor*) const {}
virtual ~J2DAnmColor() {}
virtual void searchUpdateMaterialID(J2DScreen*);
virtual void getColor(u16, _GXColor*) const {}
u16 getUpdateMaterialNum() const { return mUpdateMaterialNum; }
u16 getUpdateMaterialID(u16 i) const { return mUpdateMaterialID[i]; }
@ -421,8 +421,8 @@ public:
mAValues = NULL;
mInfoTable = NULL;
}
/* 80239BE0 */ virtual ~J2DAnmColorKey() {}
/* 8030B200 */ virtual void getColor(u16, _GXColor*) const;
virtual ~J2DAnmColorKey() {}
virtual void getColor(u16, _GXColor*) const;
/* 0x30 */ s16* mRValues;
/* 0x34 */ s16* mGValues;
@ -459,8 +459,8 @@ public:
mAValues = NULL;
mInfoTable = NULL;
}
/* 8030CCF8 */ virtual ~J2DAnmColorFull() {}
/* 8030AFC8 */ virtual void getColor(u16, _GXColor*) const;
virtual ~J2DAnmColorFull() {}
virtual void getColor(u16, _GXColor*) const;
/* 0x30 */ u8* mRValues;
/* 0x34 */ u8* mGValues;
@ -482,6 +482,7 @@ template <>
inline f32 J2DHermiteInterpolation<s16>(register f32 pp1, register s16* pp2, register s16* pp3,
register s16* pp4, register s16* pp5, register s16* pp6,
register s16* pp7) {
#ifdef __MWERKS__
register f32 p1 = pp1;
register f32 ff8;
register f32 ff7;
@ -499,7 +500,6 @@ inline f32 J2DHermiteInterpolation<s16>(register f32 pp1, register s16* pp2, reg
register s16* p6 = pp6;
register s16* p7 = pp7;
// clang-format off
#ifdef __MWERKS__
asm {
psq_l ff2, 0(p2), 0x1, 5
psq_l ff0, 0(p5), 0x1, 5
@ -522,9 +522,9 @@ inline f32 J2DHermiteInterpolation<s16>(register f32 pp1, register s16* pp2, reg
fmadds fout, ff4, ff2, fout
fsubs fout, fout, ff0
}
#endif
// clang-format on
return fout;
#endif
}
#endif /* J2DANIMATION_H */

60
include/JSystem/J2DGraph/J2DAnmLoader.h
View File

@ -8,7 +8,7 @@
*
*/
struct J2DAnmLoaderDataBase {
/* 80308A6C */ static J2DAnmBase* load(void const*);
static J2DAnmBase* load(void const*);
};
/**
@ -19,7 +19,7 @@ class J2DAnmLoader {
public:
virtual void* load(void const*) = 0;
virtual void setResource(J2DAnmBase*, void const*) = 0;
/* 8030A410 */ virtual ~J2DAnmLoader() {}
virtual ~J2DAnmLoader() {}
void* mpResource;
};
@ -41,21 +41,21 @@ struct J3DAnmTransformKeyData;
*/
class J2DAnmKeyLoader_v15 : public J2DAnmLoader {
public:
/* 80309290 */ J2DAnmKeyLoader_v15();
/* 80309570 */ void readAnmTransform(J3DAnmTransformKeyData const*);
/* 80309598 */ void setAnmTransform(J2DAnmTransformKey*, J3DAnmTransformKeyData const*);
/* 80309634 */ void readAnmTextureSRT(J3DAnmTextureSRTKeyData const*);
/* 8030965C */ void setAnmTextureSRT(J2DAnmTextureSRTKey*, J3DAnmTextureSRTKeyData const*);
/* 80309848 */ void readAnmColor(J3DAnmColorKeyData const*);
/* 80309870 */ void setAnmColor(J2DAnmColorKey*, J3DAnmColorKeyData const*);
/* 8030995C */ void readAnmVtxColor(J3DAnmVtxColorKeyData const*);
/* 80309984 */ void setAnmVtxColor(J2DAnmVtxColorKey*, J3DAnmVtxColorKeyData const*);
/* 80309FDC */ void readAnmTevReg(J3DAnmTevRegKeyData const*);
/* 8030A004 */ void setAnmTevReg(J2DAnmTevRegKey*, J3DAnmTevRegKeyData const*);
J2DAnmKeyLoader_v15();
void readAnmTransform(J3DAnmTransformKeyData const*);
void setAnmTransform(J2DAnmTransformKey*, J3DAnmTransformKeyData const*);
void readAnmTextureSRT(J3DAnmTextureSRTKeyData const*);
void setAnmTextureSRT(J2DAnmTextureSRTKey*, J3DAnmTextureSRTKeyData const*);
void readAnmColor(J3DAnmColorKeyData const*);
void setAnmColor(J2DAnmColorKey*, J3DAnmColorKeyData const*);
void readAnmVtxColor(J3DAnmVtxColorKeyData const*);
void setAnmVtxColor(J2DAnmVtxColorKey*, J3DAnmVtxColorKeyData const*);
void readAnmTevReg(J3DAnmTevRegKeyData const*);
void setAnmTevReg(J2DAnmTevRegKey*, J3DAnmTevRegKeyData const*);
/* 80309308 */ virtual void* load(void const*);
/* 80309414 */ virtual void setResource(J2DAnmBase*, void const*);
/* 803092AC */ virtual ~J2DAnmKeyLoader_v15();
virtual void* load(void const*);
virtual void setResource(J2DAnmBase*, void const*);
virtual ~J2DAnmKeyLoader_v15();
// /* 0x04 */ void* _4;
};
@ -66,21 +66,21 @@ public:
*/
class J2DAnmFullLoader_v15 : public J2DAnmLoader {
public:
/* 80309CE8 */ J2DAnmFullLoader_v15();
/* 80309D60 */ void readAnmTransform(J3DAnmTransformFullData const*);
/* 80309D88 */ void setAnmTransform(J2DAnmTransformFull*, J3DAnmTransformFullData const*);
/* 80309E1C */ void readAnmColor(J3DAnmColorFullData const*);
/* 80309E44 */ void setAnmColor(J2DAnmColorFull*, J3DAnmColorFullData const*);
/* 80309F10 */ void readAnmTexPattern(J3DAnmTexPatternFullData const*);
/* 80309F38 */ void setAnmTexPattern(J2DAnmTexPattern*, J3DAnmTexPatternFullData const*);
/* 8030A190 */ void readAnmVisibility(J3DAnmVisibilityFullData const*);
/* 8030A1B8 */ void setAnmVisibility(J2DAnmVisibilityFull*, J3DAnmVisibilityFullData const*);
/* 8030A234 */ void readAnmVtxColor(J3DAnmVtxColorFullData const*);
/* 8030A25C */ void setAnmVtxColor(J2DAnmVtxColorFull*, J3DAnmVtxColorFullData const*);
J2DAnmFullLoader_v15();
void readAnmTransform(J3DAnmTransformFullData const*);
void setAnmTransform(J2DAnmTransformFull*, J3DAnmTransformFullData const*);
void readAnmColor(J3DAnmColorFullData const*);
void setAnmColor(J2DAnmColorFull*, J3DAnmColorFullData const*);
void readAnmTexPattern(J3DAnmTexPatternFullData const*);
void setAnmTexPattern(J2DAnmTexPattern*, J3DAnmTexPatternFullData const*);
void readAnmVisibility(J3DAnmVisibilityFullData const*);
void setAnmVisibility(J2DAnmVisibilityFull*, J3DAnmVisibilityFullData const*);
void readAnmVtxColor(J3DAnmVtxColorFullData const*);
void setAnmVtxColor(J2DAnmVtxColorFull*, J3DAnmVtxColorFullData const*);
/* 80309A80 */ virtual void* load(void const*);
/* 80309B8C */ virtual void setResource(J2DAnmBase*, void const*);
/* 80309D04 */ virtual ~J2DAnmFullLoader_v15();
virtual void* load(void const*);
virtual void setResource(J2DAnmBase*, void const*);
virtual ~J2DAnmFullLoader_v15();
// void* _4;
};

32
include/JSystem/J2DGraph/J2DGrafContext.h
View File

@ -18,36 +18,36 @@ public:
};
/* 802E8B08 */ J2DGrafContext(f32 x, f32 y, f32 width, f32 height);
/* 802E90C0 */ void scissor(JGeometry::TBox2<f32> const& bounds);
J2DGrafContext(f32 x, f32 y, f32 width, f32 height);
void scissor(JGeometry::TBox2<f32> const& bounds);
void scissor(f32 x, f32 y, f32 width, f32 height) {
scissor(JGeometry::TBox2<f32>(x, y, x + width, y + height));
}
void setColor(JUtility::TColor c) { this->setColor(c, c, c, c); }
/* 802E9118 */ void setColor(JUtility::TColor colorTL, JUtility::TColor colorTR,
void setColor(JUtility::TColor colorTL, JUtility::TColor colorTR,
JUtility::TColor colorBR, JUtility::TColor colorBL);
/* 802E9234 */ void setLineWidth(u8);
/* 802E9260 */ void fillBox(JGeometry::TBox2<f32> const& box);
/* 802E9368 */ void drawFrame(JGeometry::TBox2<f32> const& box);
/* 802E9488 */ void line(JGeometry::TVec2<f32> start, JGeometry::TVec2<f32> end);
/* 802E9564 */ void lineTo(JGeometry::TVec2<f32> pos);
void setLineWidth(u8);
void fillBox(JGeometry::TBox2<f32> const& box);
void drawFrame(JGeometry::TBox2<f32> const& box);
void line(JGeometry::TVec2<f32> start, JGeometry::TVec2<f32> end);
void lineTo(JGeometry::TVec2<f32> pos);
void lineTo(f32 x, f32 y) { this->lineTo(JGeometry::TVec2<f32>(x, y)); }
void moveTo(f32 x, f32 y) { this->moveTo(JGeometry::TVec2<f32>(x, y)); }
void moveTo(JGeometry::TVec2<f32> pos) { mPrevPos = pos; }
/* 802E95D4 */ virtual ~J2DGrafContext() {}
/* 802E90E4 */ virtual void place(JGeometry::TBox2<f32> const& bounds);
/* 802E961C */ virtual void place(f32 x, f32 y, f32 width, f32 height) {
virtual ~J2DGrafContext() {}
virtual void place(JGeometry::TBox2<f32> const& bounds);
virtual void place(f32 x, f32 y, f32 width, f32 height) {
JGeometry::TBox2<f32> box(x, y, x + width, y + height);
this->place(box);
}
/* 802E8BB4 */ virtual void setPort();
/* 802E8C44 */ virtual void setup2D();
/* 802E8E20 */ virtual void setScissor();
/* 802E9664 */ virtual s32 getGrafType() const { return 0; }
/* 802E966C */ virtual void setLookat() {}
virtual void setPort();
virtual void setup2D();
virtual void setScissor();
virtual s32 getGrafType() const { return 0; }
virtual void setLookat() {}
public:
/* 0x04 */ JGeometry::TBox2<f32> mBounds;

8
include/JSystem/J2DGraph/J2DManage.h
View File

@ -13,8 +13,8 @@ struct J2DResReference {
/* 0x00 */ u16 mCount;
/* 0x02 */ u16 mOffsets[1];
/* 8030CF10 */ s8* getResReference(u16) const;
/* 8030CF44 */ char* getName(u16) const;
s8* getResReference(u16) const;
char* getName(u16) const;
};
/**
@ -36,8 +36,8 @@ private:
/* 0x00 */ J2DataManageLink* mList;
public:
/* 8030CE18 */ void* get(char const*);
/* 8030CE7C */ void* get(JSUInputStream*);
void* get(char const*);
void* get(JSUInputStream*);
};
#endif /* J2DMANAGE_H */

620
include/JSystem/J2DGraph/J2DMatBlock.h
View File

@ -17,7 +17,7 @@ struct ResTLUT;
*
*/
struct J2DGXColorS10 : public GXColorS10 {
/* 802F1B90 */ J2DGXColorS10() {}
J2DGXColorS10() {}
J2DGXColorS10(const J2DGXColorS10& other) {
r = other.r;
g = other.g;
@ -48,51 +48,51 @@ struct J2DTevSwapModeInfo;
*/
class J2DTevBlock {
public:
/* 802F2A40 */ virtual void initialize() {}
/* 802EB1D0 */ virtual void setGX() {}
/* 802F2A44 */ virtual void loadTexture(_GXTexMapID, u32) {}
virtual void initialize() {}
virtual void setGX() {}
virtual void loadTexture(_GXTexMapID, u32) {}
virtual u32 getType() = 0;
virtual u8 getMaxStage() = 0;
/* 802EB1DC */ virtual void setTexNo(u32, u16) {}
/* 802EA170 */ virtual u32 getTexNo(u32) const { return 0xFFFF; }
/* 802F2A48 */ virtual void setFontNo(u16) {}
/* 802EA164 */ virtual u16 getFontNo() const { return 0xFFFF; }
/* 802F2A4C */ virtual void setTevOrder(u32, J2DTevOrder) {}
/* 802EA144 */ virtual J2DTevOrder* getTevOrder(u32) { return NULL; }
/* 802EB1D8 */ virtual void setTevColor(u32, J2DGXColorS10) {}
/* 802EA13C */ virtual J2DGXColorS10* getTevColor(u32) { return NULL; }
/* 802EB1D4 */ virtual void setTevKColor(u32, JUtility::TColor) {}
/* 802EA15C */ virtual JUtility::TColor* getTevKColor(u32) { return NULL; }
/* 802F2A50 */ virtual void setTevKColorSel(u32, u8) {}
/* 802EA154 */ virtual u8 getTevKColorSel(u32) { return 0; }
/* 802F2A54 */ virtual void setTevKAlphaSel(u32, u8) {}
/* 802EA14C */ virtual u8 getTevKAlphaSel(u32) { return 0; }
/* 802F2A58 */ virtual void setTevStageNum(u8) {}
/* 802EA17C */ virtual u8 getTevStageNum() const { return 1; }
/* 802F2A5C */ virtual void setTevStage(u32, J2DTevStage) {}
/* 802EA134 */ virtual J2DTevStage* getTevStage(u32) { return NULL; }
/* 802F2A60 */ virtual void setTevSwapModeInfo(u32, J2DTevSwapModeInfo) {}
/* 802F2A64 */ virtual void setTevSwapModeTable(u32, J2DTevSwapModeTable) {}
/* 802EA12C */ virtual J2DTevSwapModeTable* getTevSwapModeTable(u32) { return NULL; }
/* 802F2A68 */ virtual void setIndTevStage(u32, J2DIndTevStage) {}
/* 802EA184 */ virtual J2DIndTevStage* getIndTevStage(u32) { return NULL; }
/* 802F2A7C */ virtual bool insertTexture(u32, ResTIMG const*) { return false; }
/* 802F2A74 */ virtual bool insertTexture(u32, ResTIMG const*, JUTPalette*) { return false; }
/* 802F2A6C */ virtual bool insertTexture(u32, JUTTexture*) { return false; }
/* 802F2A8C */ virtual bool setTexture(u32, ResTIMG const*) { return false; }
/* 802F2A84 */ virtual bool setTexture(u32, JUTTexture*) { return false; }
/* 802F2A94 */ virtual bool removeTexture(u32) { return false; }
/* 802F2AA4 */ virtual bool setFont(ResFONT*) { return false; }
/* 802F2A9C */ virtual bool setFont(JUTFont*) { return false; }
/* 802F2AAC */ virtual bool setPalette(u32, ResTLUT const*) { return false; }
/* 802F2AB4 */ virtual bool prepareTexture(u8) { return false; }
/* 802EB87C */ virtual JUTTexture* getTexture(u32);
/* 802EB884 */ virtual JUTPalette* getPalette(u32);
/* 802F2ABC */ virtual JUTFont* getFont() { return NULL; }
/* 802F2AC4 */ virtual void shiftDeleteFlag(u8, bool) {}
/* 802F2AC8 */ virtual void setUndeleteFlag(u8) {}
/* 802F2ACC */ virtual void setFontUndeleteFlag() {}
/* 802EB184 */ virtual ~J2DTevBlock() {}
virtual void setTexNo(u32, u16) {}
virtual u32 getTexNo(u32) const { return 0xFFFF; }
virtual void setFontNo(u16) {}
virtual u16 getFontNo() const { return 0xFFFF; }
virtual void setTevOrder(u32, J2DTevOrder) {}
virtual J2DTevOrder* getTevOrder(u32) { return NULL; }
virtual void setTevColor(u32, J2DGXColorS10) {}
virtual J2DGXColorS10* getTevColor(u32) { return NULL; }
virtual void setTevKColor(u32, JUtility::TColor) {}
virtual JUtility::TColor* getTevKColor(u32) { return NULL; }
virtual void setTevKColorSel(u32, u8) {}
virtual u8 getTevKColorSel(u32) { return 0; }
virtual void setTevKAlphaSel(u32, u8) {}
virtual u8 getTevKAlphaSel(u32) { return 0; }
virtual void setTevStageNum(u8) {}
virtual u8 getTevStageNum() const { return 1; }
virtual void setTevStage(u32, J2DTevStage) {}
virtual J2DTevStage* getTevStage(u32) { return NULL; }
virtual void setTevSwapModeInfo(u32, J2DTevSwapModeInfo) {}
virtual void setTevSwapModeTable(u32, J2DTevSwapModeTable) {}
virtual J2DTevSwapModeTable* getTevSwapModeTable(u32) { return NULL; }
virtual void setIndTevStage(u32, J2DIndTevStage) {}
virtual J2DIndTevStage* getIndTevStage(u32) { return NULL; }
virtual bool insertTexture(u32, ResTIMG const*) { return false; }
virtual bool insertTexture(u32, ResTIMG const*, JUTPalette*) { return false; }
virtual bool insertTexture(u32, JUTTexture*) { return false; }
virtual bool setTexture(u32, ResTIMG const*) { return false; }
virtual bool setTexture(u32, JUTTexture*) { return false; }
virtual bool removeTexture(u32) { return false; }
virtual bool setFont(ResFONT*) { return false; }
virtual bool setFont(JUTFont*) { return false; }
virtual bool setPalette(u32, ResTLUT const*) { return false; }
virtual bool prepareTexture(u8) { return false; }
virtual JUTTexture* getTexture(u32);
virtual JUTPalette* getPalette(u32);
virtual JUTFont* getFont() { return NULL; }
virtual void shiftDeleteFlag(u8, bool) {}
virtual void setUndeleteFlag(u8) {}
virtual void setFontUndeleteFlag() {}
virtual ~J2DTevBlock() {}
};
/**
@ -101,77 +101,77 @@ public:
*/
class J2DTevBlock1 : public J2DTevBlock {
public:
/* 802EB88C */ J2DTevBlock1();
J2DTevBlock1();
/* 802EBA50 */ virtual void initialize();
/* 802EC328 */ virtual void setGX();
/* 802EC570 */ virtual void loadTexture(_GXTexMapID, u32);
/* 802F27A0 */ virtual u32 getType() { return 'TVB1'; }
/* 802F27AC */ virtual u8 getMaxStage() { return 1; }
/* 802F27B4 */ virtual void setTexNo(u32 index, u16 texNo) { mTexNo[index] = texNo; }
/* 802F27C4 */ virtual u32 getTexNo(u32 index) const { return mTexNo[index]; }
/* 802F27D4 */ virtual void setFontNo(u16 fontNo) { mFontNo = fontNo; }
/* 802F27DC */ virtual u16 getFontNo() const { return mFontNo; }
/* 802F27E4 */ virtual void setTevOrder(u32 index, J2DTevOrder order) {
virtual void initialize();
virtual void setGX();
virtual void loadTexture(_GXTexMapID, u32);
virtual u32 getType() { return 'TVB1'; }
virtual u8 getMaxStage() { return 1; }
virtual void setTexNo(u32 index, u16 texNo) { mTexNo[index] = texNo; }
virtual u32 getTexNo(u32 index) const { return mTexNo[index]; }
virtual void setFontNo(u16 fontNo) { mFontNo = fontNo; }
virtual u16 getFontNo() const { return mFontNo; }
virtual void setTevOrder(u32 index, J2DTevOrder order) {
mTevOrder[index] = order;
}
/* 802F2808 */ virtual J2DTevOrder* getTevOrder(u32 index) { return &mTevOrder[index]; }
/* 802F281C */ virtual void setTevColor(u32 index, J2DGXColorS10 color) {
virtual J2DTevOrder* getTevOrder(u32 index) { return &mTevOrder[index]; }
virtual void setTevColor(u32 index, J2DGXColorS10 color) {
mTevColor[index] = color;
}
/* 802F2848 */ virtual J2DGXColorS10* getTevColor(u32 index) { return &mTevColor[index]; }
/* 802F285C */ virtual void setTevKColor(u32 index, JUtility::TColor color) {
virtual J2DGXColorS10* getTevColor(u32 index) { return &mTevColor[index]; }
virtual void setTevKColor(u32 index, JUtility::TColor color) {
mTevKColor[index] = color;
}
/* 802F2888 */ virtual JUtility::TColor* getTevKColor(u32 index) { return &mTevKColor[index]; }
/* 802F289C */ virtual void setTevKColorSel(u32 index, u8 sel) { mTevKColorSel[index] = sel; }
/* 802F28A8 */ virtual u8 getTevKColorSel(u32 index) { return mTevKColorSel[index]; }
/* 802F28B4 */ virtual void setTevKAlphaSel(u32 index, u8 sel) { mTevKAlphaSel[index] = sel; }
/* 802F28C0 */ virtual u8 getTevKAlphaSel(u32 index) { return mTevKAlphaSel[index]; }
/* 802F28CC */ virtual void setTevStageNum(u8 num) {}
/* 802F28D0 */ virtual u8 getTevStageNum() const { return 1; }
/* 802F28D8 */ virtual void setTevStage(u32 index, J2DTevStage stage) {
virtual JUtility::TColor* getTevKColor(u32 index) { return &mTevKColor[index]; }
virtual void setTevKColorSel(u32 index, u8 sel) { mTevKColorSel[index] = sel; }
virtual u8 getTevKColorSel(u32 index) { return mTevKColorSel[index]; }
virtual void setTevKAlphaSel(u32 index, u8 sel) { mTevKAlphaSel[index] = sel; }
virtual u8 getTevKAlphaSel(u32 index) { return mTevKAlphaSel[index]; }
virtual void setTevStageNum(u8 num) {}
virtual u8 getTevStageNum() const { return 1; }
virtual void setTevStage(u32 index, J2DTevStage stage) {
mTevStage[index] = stage;
}
/* 802F2914 */ virtual J2DTevStage* getTevStage(u32 index) { return &mTevStage[index]; }
/* 802F2928 */ virtual void setTevSwapModeInfo(u32 index, J2DTevSwapModeInfo info) {
virtual J2DTevStage* getTevStage(u32 index) { return &mTevStage[index]; }
virtual void setTevSwapModeInfo(u32 index, J2DTevSwapModeInfo info) {
mTevStage[index].setTevSwapModeInfo(info);
}
/* 802F2960 */ virtual void setTevSwapModeTable(u32 index, J2DTevSwapModeTable table) {
virtual void setTevSwapModeTable(u32 index, J2DTevSwapModeTable table) {
mTevSwapModeTable[index] = table;
}
/* 802F2970 */ virtual J2DTevSwapModeTable* getTevSwapModeTable(u32 index) {
virtual J2DTevSwapModeTable* getTevSwapModeTable(u32 index) {
return &mTevSwapModeTable[index];
}
/* 802F2980 */ virtual void setIndTevStage(u32 index, J2DIndTevStage stage) {
virtual void setIndTevStage(u32 index, J2DIndTevStage stage) {
mIndTevStage[index] = stage;
}
/* 802F2994 */ virtual J2DIndTevStage* getIndTevStage(u32 index) {
virtual J2DIndTevStage* getIndTevStage(u32 index) {
return &mIndTevStage[index];
}
/* 802F29A8 */ virtual bool insertTexture(u32 index, ResTIMG const* p_timg) {
virtual bool insertTexture(u32 index, ResTIMG const* p_timg) {
return insertTexture(index, p_timg, NULL);
}
/* 802EBCC0 */ virtual bool insertTexture(u32, ResTIMG const*, JUTPalette*);
/* 802EBDE4 */ virtual bool insertTexture(u32, JUTTexture*);
/* 802EBE8C */ virtual bool setTexture(u32, ResTIMG const*);
/* 802EC01C */ virtual bool setTexture(u32, JUTTexture*);
/* 802EC0A8 */ virtual bool removeTexture(u32);
/* 802EC124 */ virtual bool setFont(ResFONT*);
/* 802EC1D8 */ virtual bool setFont(JUTFont*);
/* 802EC258 */ virtual bool setPalette(u32, ResTLUT const*);
/* 802EBC0C */ virtual bool prepareTexture(u8);
/* 802F29D8 */ virtual JUTTexture* getTexture(u32 index) {
virtual bool insertTexture(u32, ResTIMG const*, JUTPalette*);
virtual bool insertTexture(u32, JUTTexture*);
virtual bool setTexture(u32, ResTIMG const*);
virtual bool setTexture(u32, JUTTexture*);
virtual bool removeTexture(u32);
virtual bool setFont(ResFONT*);
virtual bool setFont(JUTFont*);
virtual bool setPalette(u32, ResTLUT const*);
virtual bool prepareTexture(u8);
virtual JUTTexture* getTexture(u32 index) {
return index >= 1 ? NULL : mTexture[index];
}
/* 802F29F8 */ virtual JUTPalette* getPalette(u32 index) {
virtual JUTPalette* getPalette(u32 index) {
return index >= 1 ? NULL : mPalette[index];
}
/* 802F2A18 */ virtual JUTFont* getFont() { return mFont; }
/* 802EC318 */ virtual void shiftDeleteFlag(u8, bool);
/* 802F2A20 */ virtual void setUndeleteFlag(u8 flag) { mUndeleteFlag &= flag; }
/* 802F2A30 */ virtual void setFontUndeleteFlag() { mUndeleteFlag &= 0x7F; }
/* 802EB998 */ virtual ~J2DTevBlock1();
virtual JUTFont* getFont() { return mFont; }
virtual void shiftDeleteFlag(u8, bool);
virtual void setUndeleteFlag(u8 flag) { mUndeleteFlag &= flag; }
virtual void setFontUndeleteFlag() { mUndeleteFlag &= 0x7F; }
virtual ~J2DTevBlock1();
private:
/* 0x004 */ u16 mTexNo[1];
@ -196,77 +196,77 @@ private:
*/
class J2DTevBlock2 : public J2DTevBlock {
public:
/* 802EC5B8 */ J2DTevBlock2();
J2DTevBlock2();
/* 802EC7A0 */ virtual void initialize();
/* 802ED584 */ virtual void setGX();
/* 802ED874 */ virtual void loadTexture(_GXTexMapID, u32);
/* 802F24FC */ virtual u32 getType() { return 'TVB2'; }
/* 802F2508 */ virtual u8 getMaxStage() { return 2; }
/* 802F2510 */ virtual void setTexNo(u32 index, u16 texNo) { mTexNo[index] = texNo; }
/* 802F2520 */ virtual u32 getTexNo(u32 index) const { return mTexNo[index]; }
/* 802F2530 */ virtual void setFontNo(u16 fontNo) { mFontNo = fontNo; }
/* 802F2538 */ virtual u16 getFontNo() const { return mFontNo; }
/* 802F2540 */ virtual void setTevOrder(u32 index, J2DTevOrder order) {
virtual void initialize();
virtual void setGX();
virtual void loadTexture(_GXTexMapID, u32);
virtual u32 getType() { return 'TVB2'; }
virtual u8 getMaxStage() { return 2; }
virtual void setTexNo(u32 index, u16 texNo) { mTexNo[index] = texNo; }
virtual u32 getTexNo(u32 index) const { return mTexNo[index]; }
virtual void setFontNo(u16 fontNo) { mFontNo = fontNo; }
virtual u16 getFontNo() const { return mFontNo; }
virtual void setTevOrder(u32 index, J2DTevOrder order) {
mTevOrder[index] = order;
}
/* 802F2564 */ virtual J2DTevOrder* getTevOrder(u32 index) { return &mTevOrder[index]; }
/* 802F2578 */ virtual void setTevColor(u32 index, J2DGXColorS10 color) {
virtual J2DTevOrder* getTevOrder(u32 index) { return &mTevOrder[index]; }
virtual void setTevColor(u32 index, J2DGXColorS10 color) {
mTevColor[index] = color;
}
/* 802F25A4 */ virtual J2DGXColorS10* getTevColor(u32 index) { return &mTevColor[index]; }
/* 802F25B8 */ virtual void setTevKColor(u32 index, JUtility::TColor color) {
virtual J2DGXColorS10* getTevColor(u32 index) { return &mTevColor[index]; }
virtual void setTevKColor(u32 index, JUtility::TColor color) {
mTevKColor[index] = color;
}
/* 802F25E4 */ virtual JUtility::TColor* getTevKColor(u32 index) { return &mTevKColor[index]; }
/* 802F25F8 */ virtual void setTevKColorSel(u32 index, u8 sel) { mTevKColorSel[index] = sel; }
/* 802F2604 */ virtual u8 getTevKColorSel(u32 index) { return mTevKColorSel[index]; }
/* 802F2610 */ virtual void setTevKAlphaSel(u32 index, u8 sel) { mTevKAlphaSel[index] = sel; }
/* 802F261C */ virtual u8 getTevKAlphaSel(u32 index) { return mTevKAlphaSel[index]; }
/* 802F2628 */ virtual void setTevStageNum(u8 num) { mTevStageNum = num; }
/* 802F2630 */ virtual u8 getTevStageNum() const { return mTevStageNum; }
/* 802F2638 */ virtual void setTevStage(u32 index, J2DTevStage stage) {
virtual JUtility::TColor* getTevKColor(u32 index) { return &mTevKColor[index]; }
virtual void setTevKColorSel(u32 index, u8 sel) { mTevKColorSel[index] = sel; }
virtual u8 getTevKColorSel(u32 index) { return mTevKColorSel[index]; }
virtual void setTevKAlphaSel(u32 index, u8 sel) { mTevKAlphaSel[index] = sel; }
virtual u8 getTevKAlphaSel(u32 index) { return mTevKAlphaSel[index]; }
virtual void setTevStageNum(u8 num) { mTevStageNum = num; }
virtual u8 getTevStageNum() const { return mTevStageNum; }
virtual void setTevStage(u32 index, J2DTevStage stage) {
mTevStage[index] = stage;
}
/* 802F2674 */ virtual J2DTevStage* getTevStage(u32 index) { return &mTevStage[index]; }
/* 802F2688 */ virtual void setTevSwapModeInfo(u32 index, J2DTevSwapModeInfo info) {
virtual J2DTevStage* getTevStage(u32 index) { return &mTevStage[index]; }
virtual void setTevSwapModeInfo(u32 index, J2DTevSwapModeInfo info) {
mTevStage[index].setTevSwapModeInfo(info);
}
/* 802F26C0 */ virtual void setTevSwapModeTable(u32 index, J2DTevSwapModeTable table) {
virtual void setTevSwapModeTable(u32 index, J2DTevSwapModeTable table) {
mTevSwapModeTable[index] = table;
}
/* 802F26D0 */ virtual J2DTevSwapModeTable* getTevSwapModeTable(u32 index) {
virtual J2DTevSwapModeTable* getTevSwapModeTable(u32 index) {
return &mTevSwapModeTable[index];
}
/* 802F26E0 */ virtual void setIndTevStage(u32 index, J2DIndTevStage stage) {
virtual void setIndTevStage(u32 index, J2DIndTevStage stage) {
mIndTevStage[index] = stage;
}
/* 802F26F4 */ virtual J2DIndTevStage* getIndTevStage(u32 index) {
virtual J2DIndTevStage* getIndTevStage(u32 index) {
return &mIndTevStage[index];
}
/* 802F2708 */ virtual bool insertTexture(u32 index, ResTIMG const* p_timg) {
virtual bool insertTexture(u32 index, ResTIMG const* p_timg) {
return insertTexture(index, p_timg, NULL);
}
/* 802ECAE8 */ virtual bool insertTexture(u32, ResTIMG const*, JUTPalette*);
/* 802ECDE8 */ virtual bool insertTexture(u32, JUTTexture*);
/* 802ECF48 */ virtual bool setTexture(u32, ResTIMG const*);
/* 802ED16C */ virtual bool setTexture(u32, JUTTexture*);
/* 802ED21C */ virtual bool removeTexture(u32);
/* 802ED2F0 */ virtual bool setFont(ResFONT*);
/* 802ED3A4 */ virtual bool setFont(JUTFont*);
/* 802ED424 */ virtual bool setPalette(u32, ResTLUT const*);
/* 802ECA18 */ virtual bool prepareTexture(u8);
/* 802F2738 */ virtual JUTTexture* getTexture(u32 index) {
virtual bool insertTexture(u32, ResTIMG const*, JUTPalette*);
virtual bool insertTexture(u32, JUTTexture*);
virtual bool setTexture(u32, ResTIMG const*);
virtual bool setTexture(u32, JUTTexture*);
virtual bool removeTexture(u32);
virtual bool setFont(ResFONT*);
virtual bool setFont(JUTFont*);
virtual bool setPalette(u32, ResTLUT const*);
virtual bool prepareTexture(u8);
virtual JUTTexture* getTexture(u32 index) {
return index >= 2 ? NULL : mTexture[index];
}
/* 802F2758 */ virtual JUTPalette* getPalette(u32 index) {
virtual JUTPalette* getPalette(u32 index) {
return index >= 2 ? NULL : mPalette[index];
}
/* 802F2778 */ virtual JUTFont* getFont() { return mFont; }
/* 802ED4FC */ virtual void shiftDeleteFlag(u8, bool);
/* 802F2780 */ virtual void setUndeleteFlag(u8 flag) { mUndeleteFlag &= flag; }
/* 802F2790 */ virtual void setFontUndeleteFlag() { mUndeleteFlag &= 0x7F; }
/* 802EC6C8 */ virtual ~J2DTevBlock2();
virtual JUTFont* getFont() { return mFont; }
virtual void shiftDeleteFlag(u8, bool);
virtual void setUndeleteFlag(u8 flag) { mUndeleteFlag &= flag; }
virtual void setFontUndeleteFlag() { mUndeleteFlag &= 0x7F; }
virtual ~J2DTevBlock2();
private:
/* 0x004 */ u16 mTexNo[2];
@ -293,77 +293,77 @@ private:
*/
class J2DTevBlock4 : public J2DTevBlock {
public:
/* 802ED8BC */ J2DTevBlock4();
J2DTevBlock4();
/* 802EDAC4 */ virtual void initialize();
/* 802EEA2C */ virtual void setGX();
/* 802EED1C */ virtual void loadTexture(_GXTexMapID, u32);
/* 802F2258 */ virtual u32 getType() { return 'TVB4'; }
/* 802F2264 */ virtual u8 getMaxStage() { return 4; }
/* 802F226C */ virtual void setTexNo(u32 index, u16 texNo) { mTexNo[index] = texNo; }
/* 802F227C */ virtual u32 getTexNo(u32 index) const { return mTexNo[index]; }
/* 802F228C */ virtual void setFontNo(u16 fontNo) { mFontNo = fontNo; }
/* 802F2294 */ virtual u16 getFontNo() const { return mFontNo; }
/* 802F229C */ virtual void setTevOrder(u32 index, J2DTevOrder order) {
virtual void initialize();
virtual void setGX();
virtual void loadTexture(_GXTexMapID, u32);
virtual u32 getType() { return 'TVB4'; }
virtual u8 getMaxStage() { return 4; }
virtual void setTexNo(u32 index, u16 texNo) { mTexNo[index] = texNo; }
virtual u32 getTexNo(u32 index) const { return mTexNo[index]; }
virtual void setFontNo(u16 fontNo) { mFontNo = fontNo; }
virtual u16 getFontNo() const { return mFontNo; }
virtual void setTevOrder(u32 index, J2DTevOrder order) {
mTevOrder[index] = order;
}
/* 802F22C0 */ virtual J2DTevOrder* getTevOrder(u32 index) { return &mTevOrder[index]; }
/* 802F22D4 */ virtual void setTevColor(u32 index, J2DGXColorS10 color) {
virtual J2DTevOrder* getTevOrder(u32 index) { return &mTevOrder[index]; }
virtual void setTevColor(u32 index, J2DGXColorS10 color) {
mTevColor[index] = color;
}
/* 802F2300 */ virtual J2DGXColorS10* getTevColor(u32 index) { return &mTevColor[index]; }
/* 802F2314 */ virtual void setTevKColor(u32 index, JUtility::TColor color) {
virtual J2DGXColorS10* getTevColor(u32 index) { return &mTevColor[index]; }
virtual void setTevKColor(u32 index, JUtility::TColor color) {
mTevKColor[index] = color;
}
/* 802F2340 */ virtual JUtility::TColor* getTevKColor(u32 index) { return &mTevKColor[index]; }
/* 802F2354 */ virtual void setTevKColorSel(u32 index, u8 sel) { mTevKColorSel[index] = sel; }
/* 802F2360 */ virtual u8 getTevKColorSel(u32 index) { return mTevKColorSel[index]; }
/* 802F236C */ virtual void setTevKAlphaSel(u32 index, u8 sel) { mTevKAlphaSel[index] = sel; }
/* 802F2378 */ virtual u8 getTevKAlphaSel(u32 index) { return mTevKAlphaSel[index]; }
/* 802F2384 */ virtual void setTevStageNum(u8 num) { mTevStageNum = num; }
/* 802F238C */ virtual u8 getTevStageNum() const { return mTevStageNum; }
/* 802F2394 */ virtual void setTevStage(u32 index, J2DTevStage stage) {
virtual JUtility::TColor* getTevKColor(u32 index) { return &mTevKColor[index]; }
virtual void setTevKColorSel(u32 index, u8 sel) { mTevKColorSel[index] = sel; }
virtual u8 getTevKColorSel(u32 index) { return mTevKColorSel[index]; }
virtual void setTevKAlphaSel(u32 index, u8 sel) { mTevKAlphaSel[index] = sel; }
virtual u8 getTevKAlphaSel(u32 index) { return mTevKAlphaSel[index]; }
virtual void setTevStageNum(u8 num) { mTevStageNum = num; }
virtual u8 getTevStageNum() const { return mTevStageNum; }
virtual void setTevStage(u32 index, J2DTevStage stage) {
mTevStage[index] = stage;
}
/* 802F23D0 */ virtual J2DTevStage* getTevStage(u32 index) { return &mTevStage[index]; }
/* 802F23E4 */ virtual void setTevSwapModeInfo(u32 index, J2DTevSwapModeInfo info) {
virtual J2DTevStage* getTevStage(u32 index) { return &mTevStage[index]; }
virtual void setTevSwapModeInfo(u32 index, J2DTevSwapModeInfo info) {
mTevStage[index].setTevSwapModeInfo(info);
}
/* 802F241C */ virtual void setTevSwapModeTable(u32 index, J2DTevSwapModeTable table) {
virtual void setTevSwapModeTable(u32 index, J2DTevSwapModeTable table) {
mTevSwapModeTable[index] = table;
}
/* 802F242C */ virtual J2DTevSwapModeTable* getTevSwapModeTable(u32 index) {
virtual J2DTevSwapModeTable* getTevSwapModeTable(u32 index) {
return &mTevSwapModeTable[index];
}
/* 802F243C */ virtual void setIndTevStage(u32 index, J2DIndTevStage stage) {
virtual void setIndTevStage(u32 index, J2DIndTevStage stage) {
mIndTevStage[index] = stage;
}
/* 802F2450 */ virtual J2DIndTevStage* getIndTevStage(u32 index) {
virtual J2DIndTevStage* getIndTevStage(u32 index) {
return &mIndTevStage[index];
}
/* 802F2464 */ virtual bool insertTexture(u32 index, ResTIMG const* p_timg) {
virtual bool insertTexture(u32 index, ResTIMG const* p_timg) {
return insertTexture(index, p_timg, NULL);
}
/* 802EDE04 */ virtual bool insertTexture(u32, ResTIMG const*, JUTPalette*);
/* 802EE1D4 */ virtual bool insertTexture(u32, JUTTexture*);
/* 802EE364 */ virtual bool setTexture(u32, ResTIMG const*);
/* 802EE5F0 */ virtual bool setTexture(u32, JUTTexture*);
/* 802EE6A0 */ virtual bool removeTexture(u32);
/* 802EE798 */ virtual bool setFont(ResFONT*);
/* 802EE84C */ virtual bool setFont(JUTFont*);
/* 802EE8CC */ virtual bool setPalette(u32, ResTLUT const*);
/* 802EDD34 */ virtual bool prepareTexture(u8);
/* 802F2494 */ virtual JUTTexture* getTexture(u32 index) {
virtual bool insertTexture(u32, ResTIMG const*, JUTPalette*);
virtual bool insertTexture(u32, JUTTexture*);
virtual bool setTexture(u32, ResTIMG const*);
virtual bool setTexture(u32, JUTTexture*);
virtual bool removeTexture(u32);
virtual bool setFont(ResFONT*);
virtual bool setFont(JUTFont*);
virtual bool setPalette(u32, ResTLUT const*);
virtual bool prepareTexture(u8);
virtual JUTTexture* getTexture(u32 index) {
return index >= 4 ? NULL : mTexture[index];
}
/* 802F24B4 */ virtual JUTPalette* getPalette(u32 index) {
virtual JUTPalette* getPalette(u32 index) {
return index >= 4 ? NULL : mPalette[index];
}
/* 802F24D4 */ virtual JUTFont* getFont() { return mFont; }
/* 802EE9A4 */ virtual void shiftDeleteFlag(u8, bool);
/* 802F24DC */ virtual void setUndeleteFlag(u8 flag) { mUndeleteFlag &= flag; }
/* 802F24EC */ virtual void setFontUndeleteFlag() { mUndeleteFlag &= 0x7F; }
/* 802ED9E4 */ virtual ~J2DTevBlock4();
virtual JUTFont* getFont() { return mFont; }
virtual void shiftDeleteFlag(u8, bool);
virtual void setUndeleteFlag(u8 flag) { mUndeleteFlag &= flag; }
virtual void setFontUndeleteFlag() { mUndeleteFlag &= 0x7F; }
virtual ~J2DTevBlock4();
private:
/* 0x004 */ u16 mTexNo[4];
@ -390,77 +390,77 @@ private:
*/
class J2DTevBlock8 : public J2DTevBlock {
public:
/* 802EED64 */ J2DTevBlock8();
J2DTevBlock8();
/* 802EEF6C */ virtual void initialize();
/* 802EFEAC */ virtual void setGX();
/* 802F019C */ virtual void loadTexture(_GXTexMapID, u32);
/* 802F1FB8 */ virtual u32 getType() { return 'TVB8'; }
/* 802F1FC4 */ virtual u8 getMaxStage() { return 8; }
/* 802F1FCC */ virtual void setTexNo(u32 index, u16 texNo) { mTexNo[index] = texNo; }
/* 802F1FDC */ virtual u32 getTexNo(u32 index) const { return mTexNo[index]; }
/* 802F1FEC */ virtual void setFontNo(u16 fontNo) { mFontNo = fontNo; }
/* 802F1FF4 */ virtual u16 getFontNo() const { return mFontNo; }
/* 802F1FFC */ virtual void setTevOrder(u32 index, J2DTevOrder order) {
virtual void initialize();
virtual void setGX();
virtual void loadTexture(_GXTexMapID, u32);
virtual u32 getType() { return 'TVB8'; }
virtual u8 getMaxStage() { return 8; }
virtual void setTexNo(u32 index, u16 texNo) { mTexNo[index] = texNo; }
virtual u32 getTexNo(u32 index) const { return mTexNo[index]; }
virtual void setFontNo(u16 fontNo) { mFontNo = fontNo; }
virtual u16 getFontNo() const { return mFontNo; }
virtual void setTevOrder(u32 index, J2DTevOrder order) {
mTevOrder[index] = order;
}
/* 802F2020 */ virtual J2DTevOrder* getTevOrder(u32 index) { return &mTevOrder[index]; }
/* 802F2034 */ virtual void setTevColor(u32 index, J2DGXColorS10 color) {
virtual J2DTevOrder* getTevOrder(u32 index) { return &mTevOrder[index]; }
virtual void setTevColor(u32 index, J2DGXColorS10 color) {
mTevColor[index] = color;
}
/* 802F2060 */ virtual J2DGXColorS10* getTevColor(u32 index) { return &mTevColor[index]; }
/* 802F2074 */ virtual void setTevKColor(u32 index, JUtility::TColor color) {
virtual J2DGXColorS10* getTevColor(u32 index) { return &mTevColor[index]; }
virtual void setTevKColor(u32 index, JUtility::TColor color) {
mTevKColor[index] = color;
}
/* 802F20A0 */ virtual JUtility::TColor* getTevKColor(u32 index) { return &mTevKColor[index]; }
/* 802F20B4 */ virtual void setTevKColorSel(u32 index, u8 sel) { mTevKColorSel[index] = sel; }
/* 802F20C0 */ virtual u8 getTevKColorSel(u32 index) { return mTevKColorSel[index]; }
/* 802F20CC */ virtual void setTevKAlphaSel(u32 index, u8 sel) { mTevKAlphaSel[index] = sel; }
/* 802F20D8 */ virtual u8 getTevKAlphaSel(u32 index) { return mTevKAlphaSel[index]; }
/* 802F20E4 */ virtual void setTevStageNum(u8 num) { mTevStageNum = num; }
/* 802F20EC */ virtual u8 getTevStageNum() const { return mTevStageNum; }
/* 802F20F4 */ virtual void setTevStage(u32 index, J2DTevStage stage) {
virtual JUtility::TColor* getTevKColor(u32 index) { return &mTevKColor[index]; }
virtual void setTevKColorSel(u32 index, u8 sel) { mTevKColorSel[index] = sel; }
virtual u8 getTevKColorSel(u32 index) { return mTevKColorSel[index]; }
virtual void setTevKAlphaSel(u32 index, u8 sel) { mTevKAlphaSel[index] = sel; }
virtual u8 getTevKAlphaSel(u32 index) { return mTevKAlphaSel[index]; }
virtual void setTevStageNum(u8 num) { mTevStageNum = num; }
virtual u8 getTevStageNum() const { return mTevStageNum; }
virtual void setTevStage(u32 index, J2DTevStage stage) {
mTevStage[index] = stage;
}
/* 802F2130 */ virtual J2DTevStage* getTevStage(u32 index) { return &mTevStage[index]; }
/* 802F2144 */ virtual void setTevSwapModeInfo(u32 index, J2DTevSwapModeInfo info) {
virtual J2DTevStage* getTevStage(u32 index) { return &mTevStage[index]; }
virtual void setTevSwapModeInfo(u32 index, J2DTevSwapModeInfo info) {
mTevStage[index].setTevSwapModeInfo(info);
}
/* 802F217C */ virtual void setTevSwapModeTable(u32 index, J2DTevSwapModeTable table) {
virtual void setTevSwapModeTable(u32 index, J2DTevSwapModeTable table) {
mTevSwapModeTable[index] = table;
}
/* 802F218C */ virtual J2DTevSwapModeTable* getTevSwapModeTable(u32 index) {
virtual J2DTevSwapModeTable* getTevSwapModeTable(u32 index) {
return &mTevSwapModeTable[index];
}
/* 802F219C */ virtual void setIndTevStage(u32 index, J2DIndTevStage stage) {
virtual void setIndTevStage(u32 index, J2DIndTevStage stage) {
mIndTevStage[index] = stage;
}
/* 802F21B0 */ virtual J2DIndTevStage* getIndTevStage(u32 index) {
virtual J2DIndTevStage* getIndTevStage(u32 index) {
return &mIndTevStage[index];
}
/* 802F21C4 */ virtual bool insertTexture(u32 index, ResTIMG const* p_timg) {
virtual bool insertTexture(u32 index, ResTIMG const* p_timg) {
return insertTexture(index, p_timg, NULL);
}
/* 802EF2B0 */ virtual bool insertTexture(u32, ResTIMG const*, JUTPalette*);
/* 802EF67C */ virtual bool insertTexture(u32, JUTTexture*);
/* 802EF80C */ virtual bool setTexture(u32, ResTIMG const*);
/* 802EFA98 */ virtual bool setTexture(u32, JUTTexture*);
/* 802EFB48 */ virtual bool removeTexture(u32);
/* 802EFC40 */ virtual bool setFont(ResFONT*);
/* 802EFCEC */ virtual bool setFont(JUTFont*);
/* 802EFD68 */ virtual bool setPalette(u32, ResTLUT const*);
/* 802EF1E0 */ virtual bool prepareTexture(u8);
/* 802F21F4 */ virtual JUTTexture* getTexture(u32 index) {
virtual bool insertTexture(u32, ResTIMG const*, JUTPalette*);
virtual bool insertTexture(u32, JUTTexture*);
virtual bool setTexture(u32, ResTIMG const*);
virtual bool setTexture(u32, JUTTexture*);
virtual bool removeTexture(u32);
virtual bool setFont(ResFONT*);
virtual bool setFont(JUTFont*);
virtual bool setPalette(u32, ResTLUT const*);
virtual bool prepareTexture(u8);
virtual JUTTexture* getTexture(u32 index) {
return index >= 8 ? NULL : mTexture[index];
}
/* 802F2214 */ virtual JUTPalette* getPalette(u32 index) {
virtual JUTPalette* getPalette(u32 index) {
return index >= 8 ? NULL : mPalette[index];
}
/* 802F2234 */ virtual JUTFont* getFont() { return mFont; }
/* 802EFE40 */ virtual void shiftDeleteFlag(u8, bool);
/* 802F223C */ virtual void setUndeleteFlag(u8 flag) { mUndeleteFlag &= flag; }
/* 802F224C */ virtual void setFontUndeleteFlag() { mFontUndeleteFlag = false; }
/* 802EEE8C */ virtual ~J2DTevBlock8();
virtual JUTFont* getFont() { return mFont; }
virtual void shiftDeleteFlag(u8, bool);
virtual void setUndeleteFlag(u8 flag) { mUndeleteFlag &= flag; }
virtual void setFontUndeleteFlag() { mFontUndeleteFlag = false; }
virtual ~J2DTevBlock8();
private:
/* 0x004 */ u16 mTexNo[8];
@ -488,77 +488,77 @@ private:
*/
class J2DTevBlock16 : public J2DTevBlock {
public:
/* 802F01E4 */ J2DTevBlock16();
J2DTevBlock16();
/* 802F03EC */ virtual void initialize();
/* 802F132C */ virtual void setGX();
/* 802F161C */ virtual void loadTexture(_GXTexMapID, u32);
/* 802F1D18 */ virtual u32 getType() { return 'TV16'; }
/* 802F1D24 */ virtual u8 getMaxStage() { return 16; }
/* 802F1D2C */ virtual void setTexNo(u32 index, u16 texNo) { mTexNo[index] = texNo; }
/* 802F1D3C */ virtual u32 getTexNo(u32 index) const { return mTexNo[index]; }
/* 802F1D4C */ virtual void setFontNo(u16 fontNo) { mFontNo = fontNo; }
/* 802F1D54 */ virtual u16 getFontNo() const { return mFontNo; }
/* 802F1D5C */ virtual void setTevOrder(u32 index, J2DTevOrder order) {
virtual void initialize();
virtual void setGX();
virtual void loadTexture(_GXTexMapID, u32);
virtual u32 getType() { return 'TV16'; }
virtual u8 getMaxStage() { return 16; }
virtual void setTexNo(u32 index, u16 texNo) { mTexNo[index] = texNo; }
virtual u32 getTexNo(u32 index) const { return mTexNo[index]; }
virtual void setFontNo(u16 fontNo) { mFontNo = fontNo; }
virtual u16 getFontNo() const { return mFontNo; }
virtual void setTevOrder(u32 index, J2DTevOrder order) {
mTevOrder[index] = order;
}
/* 802F1D80 */ virtual J2DTevOrder* getTevOrder(u32 index) { return &mTevOrder[index]; }
/* 802F1D94 */ virtual void setTevColor(u32 index, J2DGXColorS10 color) {
virtual J2DTevOrder* getTevOrder(u32 index) { return &mTevOrder[index]; }
virtual void setTevColor(u32 index, J2DGXColorS10 color) {
mTevColor[index] = color;
}
/* 802F1DC0 */ virtual J2DGXColorS10* getTevColor(u32 index) { return &mTevColor[index]; }
/* 802F1DD4 */ virtual void setTevKColor(u32 index, JUtility::TColor color) {
virtual J2DGXColorS10* getTevColor(u32 index) { return &mTevColor[index]; }
virtual void setTevKColor(u32 index, JUtility::TColor color) {
mTevKColor[index] = color;
}
/* 802F1E00 */ virtual JUtility::TColor* getTevKColor(u32 index) { return &mTevKColor[index]; }
/* 802F1E14 */ virtual void setTevKColorSel(u32 index, u8 sel) { mTevKColorSel[index] = sel; }
/* 802F1E20 */ virtual u8 getTevKColorSel(u32 index) { return mTevKColorSel[index]; }
/* 802F1E2C */ virtual void setTevKAlphaSel(u32 index, u8 sel) { mTevKAlphaSel[index] = sel; }
/* 802F1E38 */ virtual u8 getTevKAlphaSel(u32 index) { return mTevKAlphaSel[index]; }
/* 802F1E44 */ virtual void setTevStageNum(u8 num) { mTevStageNum = num; }
/* 802F1E4C */ virtual u8 getTevStageNum() const { return mTevStageNum; }
/* 802F1E54 */ virtual void setTevStage(u32 index, J2DTevStage stage) {
virtual JUtility::TColor* getTevKColor(u32 index) { return &mTevKColor[index]; }
virtual void setTevKColorSel(u32 index, u8 sel) { mTevKColorSel[index] = sel; }
virtual u8 getTevKColorSel(u32 index) { return mTevKColorSel[index]; }
virtual void setTevKAlphaSel(u32 index, u8 sel) { mTevKAlphaSel[index] = sel; }
virtual u8 getTevKAlphaSel(u32 index) { return mTevKAlphaSel[index]; }
virtual void setTevStageNum(u8 num) { mTevStageNum = num; }
virtual u8 getTevStageNum() const { return mTevStageNum; }
virtual void setTevStage(u32 index, J2DTevStage stage) {
mTevStage[index] = stage;
}
/* 802F1E90 */ virtual J2DTevStage* getTevStage(u32 index) { return &mTevStage[index]; }
/* 802F1EA4 */ virtual void setTevSwapModeInfo(u32 index, J2DTevSwapModeInfo info) {
virtual J2DTevStage* getTevStage(u32 index) { return &mTevStage[index]; }
virtual void setTevSwapModeInfo(u32 index, J2DTevSwapModeInfo info) {
mTevStage[index].setTevSwapModeInfo(info);
}
/* 802F1EDC */ virtual void setTevSwapModeTable(u32 index, J2DTevSwapModeTable table) {
virtual void setTevSwapModeTable(u32 index, J2DTevSwapModeTable table) {
mTevSwapModeTable[index] = table;
}
/* 802F1EEC */ virtual J2DTevSwapModeTable* getTevSwapModeTable(u32 index) {
virtual J2DTevSwapModeTable* getTevSwapModeTable(u32 index) {
return &mTevSwapModeTable[index];
}
/* 802F1EFC */ virtual void setIndTevStage(u32 index, J2DIndTevStage stage) {
virtual void setIndTevStage(u32 index, J2DIndTevStage stage) {
mIndTevStage[index] = stage;
}
/* 802F1F10 */ virtual J2DIndTevStage* getIndTevStage(u32 index) {
virtual J2DIndTevStage* getIndTevStage(u32 index) {
return &mIndTevStage[index];
}
/* 802F1F24 */ virtual bool insertTexture(u32 index, ResTIMG const* p_timg) {
virtual bool insertTexture(u32 index, ResTIMG const* p_timg) {
return insertTexture(index, p_timg, NULL);
}
/* 802F0730 */ virtual bool insertTexture(u32, ResTIMG const*, JUTPalette*);
/* 802F0AFC */ virtual bool insertTexture(u32, JUTTexture*);
/* 802F0C8C */ virtual bool setTexture(u32, ResTIMG const*);
/* 802F0F18 */ virtual bool setTexture(u32, JUTTexture*);
/* 802F0FC8 */ virtual bool removeTexture(u32);
/* 802F10C0 */ virtual bool setFont(ResFONT*);
/* 802F116C */ virtual bool setFont(JUTFont*);
/* 802F11E8 */ virtual bool setPalette(u32, ResTLUT const*);
/* 802F0660 */ virtual bool prepareTexture(u8);
/* 802F1F54 */ virtual JUTTexture* getTexture(u32 index) {
virtual bool insertTexture(u32, ResTIMG const*, JUTPalette*);
virtual bool insertTexture(u32, JUTTexture*);
virtual bool setTexture(u32, ResTIMG const*);
virtual bool setTexture(u32, JUTTexture*);
virtual bool removeTexture(u32);
virtual bool setFont(ResFONT*);
virtual bool setFont(JUTFont*);
virtual bool setPalette(u32, ResTLUT const*);
virtual bool prepareTexture(u8);
virtual JUTTexture* getTexture(u32 index) {
return index >= 8 ? NULL : mTexture[index];
}
/* 802F1F74 */ virtual JUTPalette* getPalette(u32 index) {
virtual JUTPalette* getPalette(u32 index) {
return index >= 8 ? NULL : mPalette[index];
}
/* 802F1F94 */ virtual JUTFont* getFont() { return mFont; }
/* 802F12C0 */ virtual void shiftDeleteFlag(u8, bool);
/* 802F1F9C */ virtual void setUndeleteFlag(u8 flag) { mUndeleteFlag &= flag; }
/* 802F1FAC */ virtual void setFontUndeleteFlag() { mFontUndeleteFlag = false; }
/* 802F030C */ virtual ~J2DTevBlock16();
virtual JUTFont* getFont() { return mFont; }
virtual void shiftDeleteFlag(u8, bool);
virtual void setUndeleteFlag(u8 flag) { mUndeleteFlag &= flag; }
virtual void setFontUndeleteFlag() { mFontUndeleteFlag = false; }
virtual ~J2DTevBlock16();
public:
/* 0x004 */ u16 mTexNo[8];
@ -669,8 +669,8 @@ class J2DPEBlock {
public:
J2DPEBlock() { initialize(); }
/* 802F17FC */ void initialize();
/* 802F1840 */ void setGX();
void initialize();
void setGX();
void setAlphaComp(J2DAlphaComp comp) { mAlphaComp = comp; }
void setBlend(J2DBlend blend) { mBlend = blend; }
void setDither(u8 dither) { mDither = dither; }
@ -687,18 +687,18 @@ private:
*/
class J2DIndBlock {
public:
/* 802EB24C */ virtual void initialize() {}
/* 802EB1CC */ virtual void setGX() {}
virtual void initialize() {}
virtual void setGX() {}
virtual u32 getType() = 0;
/* 802EB250 */ virtual void setIndTexStageNum(u8) {}
/* 802EA1A4 */ virtual u8 getIndTexStageNum() const { return 0; }
/* 802EB254 */ virtual void setIndTexOrder(u32, J2DIndTexOrder) {}
/* 802EA19C */ virtual J2DIndTexOrder* getIndTexOrder(u32) { return NULL; }
/* 802EB258 */ virtual void setIndTexMtx(u32, J2DIndTexMtx) {}
/* 802EA194 */ virtual J2DIndTexMtx* getIndTexMtx(u32) { return NULL; }
/* 802EB25C */ virtual void setIndTexCoordScale(u32, J2DIndTexCoordScale) {}
/* 802EA18C */ virtual J2DIndTexCoordScale* getIndTexCoordScale(u32) { return NULL; }
/* 802EB13C */ virtual ~J2DIndBlock() {}
virtual void setIndTexStageNum(u8) {}
virtual u8 getIndTexStageNum() const { return 0; }
virtual void setIndTexOrder(u32, J2DIndTexOrder) {}
virtual J2DIndTexOrder* getIndTexOrder(u32) { return NULL; }
virtual void setIndTexMtx(u32, J2DIndTexMtx) {}
virtual J2DIndTexMtx* getIndTexMtx(u32) { return NULL; }
virtual void setIndTexCoordScale(u32, J2DIndTexCoordScale) {}
virtual J2DIndTexCoordScale* getIndTexCoordScale(u32) { return NULL; }
virtual ~J2DIndBlock() {}
};
/**
@ -709,28 +709,28 @@ class J2DIndBlockFull : public J2DIndBlock {
public:
J2DIndBlockFull() { initialize(); }
/* 802F1664 */ virtual void initialize();
/* 802F1730 */ virtual void setGX();
/* 802F1B94 */ virtual u32 getType() { return 'IBLF'; }
/* 802F1BA0 */ virtual void setIndTexStageNum(u8 num) { mIndTexStageNum = num; }
/* 802F1BA8 */ virtual u8 getIndTexStageNum() const { return mIndTexStageNum; }
/* 802F1BB0 */ virtual void setIndTexOrder(u32 index, J2DIndTexOrder order) {
virtual void initialize();
virtual void setGX();
virtual u32 getType() { return 'IBLF'; }
virtual void setIndTexStageNum(u8 num) { mIndTexStageNum = num; }
virtual u8 getIndTexStageNum() const { return mIndTexStageNum; }
virtual void setIndTexOrder(u32 index, J2DIndTexOrder order) {
mIndTexOrder[index] = order;
}
/* 802F1BCC */ virtual J2DIndTexOrder* getIndTexOrder(u32 index) {
virtual J2DIndTexOrder* getIndTexOrder(u32 index) {
return &mIndTexOrder[index];
}
/* 802F1BE0 */ virtual void setIndTexMtx(u32 index, J2DIndTexMtx mtx) {
virtual void setIndTexMtx(u32 index, J2DIndTexMtx mtx) {
mIndTexMtx[index] = mtx;
}
/* 802F1C38 */ virtual J2DIndTexMtx* getIndTexMtx(u32 index) { return &mIndTexMtx[index]; }
/* 802F1C4C */ virtual void setIndTexCoordScale(u32 index, J2DIndTexCoordScale scale) {
virtual J2DIndTexMtx* getIndTexMtx(u32 index) { return &mIndTexMtx[index]; }
virtual void setIndTexCoordScale(u32 index, J2DIndTexCoordScale scale) {
mTexCoordScale[index] = scale;
}
/* 802F1C68 */ virtual J2DIndTexCoordScale* getIndTexCoordScale(u32 index) {
virtual J2DIndTexCoordScale* getIndTexCoordScale(u32 index) {
return &mTexCoordScale[index];
}
/* 802F1C7C */ virtual ~J2DIndBlockFull() {}
virtual ~J2DIndBlockFull() {}
private:
/* 0x04 */ u8 mIndTexStageNum;
@ -747,9 +747,9 @@ class J2DIndBlockNull : public J2DIndBlock {
public:
J2DIndBlockNull() {}
/* 802EB1E0 */ virtual void setGX() {}
/* 802EB1E4 */ virtual u32 getType() { return 'IBLN'; }
/* 802EB1F0 */ virtual ~J2DIndBlockNull() {}
virtual void setGX() {}
virtual u32 getType() { return 'IBLN'; }
virtual ~J2DIndBlockNull() {}
};
/**
@ -765,10 +765,10 @@ private:
public:
J2DTexGenBlock() { initialize(); }
/* 802EB510 */ void initialize();
/* 802EB570 */ void setGX();
/* 802EB6A4 */ void setTexMtx(u32, J2DTexMtx&);
/* 802EB7E0 */ void getTexMtx(u32, J2DTexMtx&);
void initialize();
void setGX();
void setTexMtx(u32, J2DTexMtx&);
void getTexMtx(u32, J2DTexMtx&);
u32 getTexGenNum() const { return mTexGenNum; }
void setTexGenNum(u32 num) { mTexGenNum = num; }
@ -778,7 +778,7 @@ public:
J2DTexMtx& getTexMtx(u32 i) { return *mTexMtx[i]; }
J2DTexCoord& getTexCoord(u32 i) { return mTexGenCoord[i]; }
/* 802EB620 */ virtual ~J2DTexGenBlock();
virtual ~J2DTexGenBlock();
}; // Size: 0x48
/**
@ -795,10 +795,10 @@ private:
public:
J2DColorBlock() { initialize(); }
/* 802EB394 */ void initialize();
/* 802EB424 */ void setGX();
void initialize();
void setGX();
/* 802EB0F4 */ virtual ~J2DColorBlock() {}
virtual ~J2DColorBlock() {}
JUtility::TColor* getMatColor(u32 i) { return &mMatColor[i]; }
J2DColorChan* getColorChan(u32 i) { return &mColorChan[i]; }

24
include/JSystem/J2DGraph/J2DMaterial.h
View File

@ -11,7 +11,7 @@
class J2DMaterial {
public:
struct J2DMaterialAnmPointer {
/* 802EA79C */ J2DMaterialAnmPointer();
J2DMaterialAnmPointer();
/* 0x00 */ J2DAnmColor* mColorAnm;
/* 0x04 */ J2DAnmTextureSRTKey* mSRTAnm;
@ -24,18 +24,18 @@ public:
/* 0x3A */ u16 mTevKRegIds[4];
}; // Size: 0x44
/* 802EA1AC */ J2DMaterial();
/* 802EA38C */ void setGX();
/* 802EA410 */ static J2DTevBlock* createTevBlock(int, bool);
/* 802EA5C4 */ static J2DIndBlock* createIndBlock(int, bool);
/* 802EA84C */ void makeAnmPointer();
/* 802EA94C */ void setAnimation(J2DAnmTextureSRTKey*);
/* 802EAA2C */ void setAnimation(J2DAnmTexPattern*);
/* 802EAB0C */ void setAnimation(J2DAnmTevRegKey*);
/* 802EA89C */ void setAnimation(J2DAnmColor*);
/* 802EAC78 */ void animation();
J2DMaterial();
void setGX();
static J2DTevBlock* createTevBlock(int, bool);
static J2DIndBlock* createIndBlock(int, bool);
void makeAnmPointer();
void setAnimation(J2DAnmTextureSRTKey*);
void setAnimation(J2DAnmTexPattern*);
void setAnimation(J2DAnmTevRegKey*);
void setAnimation(J2DAnmColor*);
void animation();
/* 802EA2CC */ virtual ~J2DMaterial();
virtual ~J2DMaterial();
u16 getIndex() const { return mIndex; }
J2DColorBlock* getColorBlock() { return &mColorBlock; }

52
include/JSystem/J2DGraph/J2DMaterialFactory.h
View File

@ -105,33 +105,33 @@ class JKRArchive;
*/
class J2DMaterialFactory {
public:
/* 802F2AD0 */ J2DMaterialFactory(J2DMaterialBlock const&);
/* 802F2C94 */ u32 countStages(int) const;
/* 802F2D1C */ J2DMaterial* create(J2DMaterial*, int, u32, J2DResReference*, J2DResReference*,
J2DMaterialFactory(J2DMaterialBlock const&);
u32 countStages(int) const;
J2DMaterial* create(J2DMaterial*, int, u32, J2DResReference*, J2DResReference*,
JKRArchive*) const;
/* 802F362C */ JUtility::TColor newMatColor(int, int) const;
/* 802F36CC */ u8 newColorChanNum(int) const;
/* 802F3704 */ J2DColorChan newColorChan(int, int) const;
/* 802F3758 */ u32 newTexGenNum(int) const;
/* 802F3790 */ J2DTexCoord newTexCoord(int, int) const;
/* 802F3804 */ J2DTexMtx* newTexMtx(int, int) const;
/* 802F38E0 */ u8 newCullMode(int) const;
/* 802F3920 */ u16 newTexNo(int, int) const;
/* 802F3968 */ u16 newFontNo(int) const;
/* 802F39A8 */ J2DTevOrder newTevOrder(int, int) const;
/* 802F3A1C */ J2DGXColorS10 newTevColor(int, int) const;
/* 802F3AB4 */ JUtility::TColor newTevKColor(int, int) const;
/* 802F3B54 */ u8 newTevStageNum(int) const;
/* 802F3B8C */ J2DTevStage newTevStage(int, int) const;
/* 802F3BEC */ J2DTevSwapModeTable newTevSwapModeTable(int, int) const;
/* 802F3C88 */ u8 newIndTexStageNum(int) const;
/* 802F3CB8 */ J2DIndTexOrder newIndTexOrder(int, int) const;
/* 802F3D20 */ J2DIndTexMtx newIndTexMtx(int, int) const;
/* 802F3E24 */ J2DIndTevStage newIndTevStage(int, int) const;
/* 802F3F78 */ J2DIndTexCoordScale newIndTexCoordScale(int, int) const;
/* 802F3FE0 */ J2DAlphaComp newAlphaComp(int) const;
/* 802F405C */ J2DBlend newBlend(int) const;
/* 802F40D8 */ u8 newDither(int) const;
JUtility::TColor newMatColor(int, int) const;
u8 newColorChanNum(int) const;
J2DColorChan newColorChan(int, int) const;
u32 newTexGenNum(int) const;
J2DTexCoord newTexCoord(int, int) const;
J2DTexMtx* newTexMtx(int, int) const;
u8 newCullMode(int) const;
u16 newTexNo(int, int) const;
u16 newFontNo(int) const;
J2DTevOrder newTevOrder(int, int) const;
J2DGXColorS10 newTevColor(int, int) const;
JUtility::TColor newTevKColor(int, int) const;
u8 newTevStageNum(int) const;
J2DTevStage newTevStage(int, int) const;
J2DTevSwapModeTable newTevSwapModeTable(int, int) const;
u8 newIndTexStageNum(int) const;
J2DIndTexOrder newIndTexOrder(int, int) const;
J2DIndTexMtx newIndTexMtx(int, int) const;
J2DIndTevStage newIndTevStage(int, int) const;
J2DIndTexCoordScale newIndTexCoordScale(int, int) const;
J2DAlphaComp newAlphaComp(int) const;
J2DBlend newBlend(int) const;
u8 newDither(int) const;
u32 getMaterialMode(int idx) const {
return field_0x4[field_0x8[idx]].field_0x0;

16
include/JSystem/J2DGraph/J2DOrthoGraph.h
View File

@ -9,15 +9,15 @@
*/
class J2DOrthoGraph : public J2DGrafContext {
public:
/* 802E9670 */ J2DOrthoGraph();
/* 802E96D0 */ J2DOrthoGraph(f32 x, f32 y, f32 width, f32 height, f32 far, f32 near);
/* 802E980C */ void setOrtho(JGeometry::TBox2<f32> const& bounds, f32 far, f32 near);
/* 802E987C */ void scissorBounds(JGeometry::TBox2<f32>*, JGeometry::TBox2<f32> const*);
J2DOrthoGraph();
J2DOrthoGraph(f32 x, f32 y, f32 width, f32 height, f32 far, f32 near);
void setOrtho(JGeometry::TBox2<f32> const& bounds, f32 far, f32 near);
void scissorBounds(JGeometry::TBox2<f32>*, JGeometry::TBox2<f32> const*);
/* 8000B118 */ virtual ~J2DOrthoGraph() {}
/* 802E97B4 */ virtual void setPort();
/* 802E9C88 */ virtual s32 getGrafType() const { return 1; }
/* 802E9840 */ virtual void setLookat();
virtual ~J2DOrthoGraph() {}
virtual void setPort();
virtual s32 getGrafType() const { return 1; }
virtual void setLookat();
f32 getWidthPower() const { return mBounds.getWidth() / mOrtho.getWidth(); }
f32 getHeightPower() const { return mBounds.getHeight() / mOrtho.getHeight(); }

138
include/JSystem/J2DGraph/J2DPicture.h
View File

@ -54,67 +54,67 @@ struct J2DScrnBlockPictureParameter {
*/
class J2DPicture : public J2DPane {
public:
/* 802FCFF0 */ virtual ~J2DPicture();
/* 802FF2E8 */ virtual u16 getTypeID() const { return 18; }
/* 802FDB28 */ virtual void drawSelf(f32, f32);
/* 802FDB90 */ virtual void drawSelf(f32, f32, Mtx*);
/* 802FCCDC */ virtual void initiate(ResTIMG const*, ResTLUT const*);
/* 802FD098 */ virtual bool prepareTexture(u8);
/* 801BDD40 */ virtual bool append(ResTIMG const* param_0, f32 param_1) {
virtual ~J2DPicture();
virtual u16 getTypeID() const { return 18; }
virtual void drawSelf(f32, f32);
virtual void drawSelf(f32, f32, Mtx*);
virtual void initiate(ResTIMG const*, ResTLUT const*);
virtual bool prepareTexture(u8);
virtual bool append(ResTIMG const* param_0, f32 param_1) {
return insert(param_0, mTextureNum, param_1);
}
/* 802FF238 */ virtual bool append(ResTIMG const* param_0, JUTPalette* param_1, f32 param_2) {
virtual bool append(ResTIMG const* param_0, JUTPalette* param_1, f32 param_2) {
return insert(param_0, param_1, mTextureNum, param_2);
}
/* 80020338 */ virtual bool append(char const* param_0, f32 param_1) {
virtual bool append(char const* param_0, f32 param_1) {
return insert(param_0, mTextureNum, param_1);
}
/* 802FF2F0 */ virtual bool append(char const* param_0, JUTPalette* param_1, f32 param_2) {
virtual bool append(char const* param_0, JUTPalette* param_1, f32 param_2) {
return insert(param_0, param_1, mTextureNum, param_2);
}
/* 802FF208 */ virtual bool append(JUTTexture* param_0, f32 param_1) {
virtual bool append(JUTTexture* param_0, f32 param_1) {
return insert(param_0, mTextureNum, param_1);
}
/* 802FF3E0 */ virtual void prepend(ResTIMG const* param_0, f32 param_1) {
virtual void prepend(ResTIMG const* param_0, f32 param_1) {
insert(param_0, 0, param_1);
}
/* 802FF3B0 */ virtual void prepend(ResTIMG const* param_0, JUTPalette* param_1, f32 param_2) {
virtual void prepend(ResTIMG const* param_0, JUTPalette* param_1, f32 param_2) {
insert(param_0, param_1, 0, param_2);
}
/* 802FF380 */ virtual void prepend(char const* param_0, f32 param_1) {
virtual void prepend(char const* param_0, f32 param_1) {
insert(param_0, 0, param_1);
}
/* 802FF350 */ virtual void prepend(char const* param_0, JUTPalette* param_1, f32 param_2) {
virtual void prepend(char const* param_0, JUTPalette* param_1, f32 param_2) {
insert(param_0, param_1, 0, param_2);
}
/* 802FF320 */ virtual void prepend(JUTTexture* param_0, f32 param_1) {
virtual void prepend(JUTTexture* param_0, f32 param_1) {
insert(param_0, 0, param_1);
}
/* 801BDD70 */ virtual bool insert(ResTIMG const* param_0, u8 param_1, f32 param_2) {
virtual bool insert(ResTIMG const* param_0, u8 param_1, f32 param_2) {
return insert(param_0, NULL, param_1, param_2);
}
/* 802FD168 */ virtual bool insert(ResTIMG const*, JUTPalette*, u8, f32);
/* 80020368 */ virtual bool insert(char const* param_0, u8 param_1, f32 param_2) {
virtual bool insert(ResTIMG const*, JUTPalette*, u8, f32);
virtual bool insert(char const* param_0, u8 param_1, f32 param_2) {
return insert(param_0, NULL, param_1, param_2);
}
/* 802FD4B4 */ virtual bool insert(char const*, JUTPalette*, u8, f32);
/* 802FD524 */ virtual bool insert(JUTTexture*, u8, f32);
/* 802FD6F4 */ virtual bool remove(u8);
/* 802FF410 */ virtual bool remove() { return remove(mTextureNum - 1); }
/* 802FD814 */ virtual bool remove(JUTTexture*);
/* 802FF4E0 */ virtual void draw(f32 param_0, f32 param_1, bool param_2, bool param_3,
virtual bool insert(char const*, JUTPalette*, u8, f32);
virtual bool insert(JUTTexture*, u8, f32);
virtual bool remove(u8);
virtual bool remove() { return remove(mTextureNum - 1); }
virtual bool remove(JUTTexture*);
virtual void draw(f32 param_0, f32 param_1, bool param_2, bool param_3,
bool param_4) {
draw(param_0, param_1, 0, param_2, param_3, param_4);
}
/* 802FF448 */ virtual void draw(f32 param_0, f32 param_1, u8 param_2, bool param_3,
virtual void draw(f32 param_0, f32 param_1, u8 param_2, bool param_3,
bool param_4, bool param_5) {
if (param_2 < mTextureNum && mTexture[param_2] != NULL) {
draw(param_0, param_1, mTexture[param_2]->getWidth(), mTexture[param_2]->getHeight(),
param_3, param_4, param_5);
}
}
/* 802FDC70 */ virtual void draw(f32, f32, f32, f32, bool, bool, bool);
/* 802FF588 */ virtual void drawOut(f32 param_0, f32 param_1, f32 param_2, f32 param_3,
virtual void draw(f32, f32, f32, f32, bool, bool, bool);
virtual void drawOut(f32 param_0, f32 param_1, f32 param_2, f32 param_3,
f32 param_4, f32 param_5) {
if (mTexture[0] != NULL) {
drawOut(JGeometry::TBox2<f32>(param_0, param_1, param_0 + param_2, param_1 + param_3),
@ -122,80 +122,80 @@ public:
param_5 + mTexture[0]->getHeight()));
}
}
/* 802FF524 */ virtual void drawOut(f32 param_0, f32 param_1, f32 param_2, f32 param_3,
virtual void drawOut(f32 param_0, f32 param_1, f32 param_2, f32 param_3,
f32 param_4, f32 param_5, f32 param_6, f32 param_7) {
drawOut(JGeometry::TBox2<f32>(param_0, param_1, param_0 + param_2, param_1 + param_3),
JGeometry::TBox2<f32>(param_4, param_5, param_4 + param_6, param_5 + param_7));
}
/* 802FDF88 */ virtual void drawOut(JGeometry::TBox2<f32> const&, JGeometry::TBox2<f32> const&);
/* 802FF29C */ virtual void load(_GXTexMapID param_0, u8 param_1) {
virtual void drawOut(JGeometry::TBox2<f32> const&, JGeometry::TBox2<f32> const&);
virtual void load(_GXTexMapID param_0, u8 param_1) {
if (param_1 < mTextureNum && param_1 < 2 && mTexture[param_1] != NULL) {
mTexture[param_1]->load(param_0);
}
}
/* 802FF268 */ virtual void load(u8 param_0) { load((_GXTexMapID)param_0, param_0); }
/* 800202CC */ virtual void setBlendRatio(f32 param_0, f32 param_1) {
virtual void load(u8 param_0) { load((_GXTexMapID)param_0, param_0); }
virtual void setBlendRatio(f32 param_0, f32 param_1) {
setBlendColorRatio(param_0, param_1);
setBlendAlphaRatio(param_0, param_1);
}
/* 802FEA74 */ virtual void setBlendColorRatio(f32, f32);
/* 802FEA9C */ virtual void setBlendAlphaRatio(f32, f32);
/* 802FD874 */ virtual const ResTIMG* changeTexture(ResTIMG const*, u8);
/* 802FD964 */ virtual const ResTIMG* changeTexture(char const*, u8);
/* 802FD9BC */ virtual const ResTIMG* changeTexture(ResTIMG const*, u8, JUTPalette*);
/* 802FDAC8 */ virtual const ResTIMG* changeTexture(char const*, u8, JUTPalette*);
/* 800539DC */ virtual JUTTexture* getTexture(u8 param_0) const {
virtual void setBlendColorRatio(f32, f32);
virtual void setBlendAlphaRatio(f32, f32);
virtual const ResTIMG* changeTexture(ResTIMG const*, u8);
virtual const ResTIMG* changeTexture(char const*, u8);
virtual const ResTIMG* changeTexture(ResTIMG const*, u8, JUTPalette*);
virtual const ResTIMG* changeTexture(char const*, u8, JUTPalette*);
virtual JUTTexture* getTexture(u8 param_0) const {
if (param_0 < 2) {
return mTexture[param_0];
}
return NULL;
}
/* 802FF634 */ virtual u8 getTextureCount() const { return mTextureNum; }
/* 80053C6C */ virtual bool setBlack(JUtility::TColor i_black) {
virtual u8 getTextureCount() const { return mTextureNum; }
virtual bool setBlack(JUtility::TColor i_black) {
mBlack = i_black;
return true;
}
/* 80053C44 */ virtual bool setWhite(JUtility::TColor i_white) {
virtual bool setWhite(JUtility::TColor i_white) {
mWhite = i_white;
return true;
}
/* 8018BEE0 */ virtual bool setBlackWhite(JUtility::TColor i_black, JUtility::TColor i_white) {
virtual bool setBlackWhite(JUtility::TColor i_black, JUtility::TColor i_white) {
mBlack = i_black;
mWhite = i_white;
return true;
}
/* 801DFA4C */ virtual JUtility::TColor getBlack() const {
virtual JUtility::TColor getBlack() const {
return mBlack;
}
/* 801DFA40 */ virtual JUtility::TColor getWhite() const {
virtual JUtility::TColor getWhite() const {
return mWhite;
}
/* 8025603C */ virtual J2DMaterial* getMaterial() const { return NULL; }
/* 802FDBFC */ virtual void drawFullSet(f32, f32, f32, f32, Mtx*);
/* 802FE380 */ virtual void drawTexCoord(f32, f32, f32, f32, s16, s16, s16, s16, s16, s16, s16,
virtual J2DMaterial* getMaterial() const { return NULL; }
virtual void drawFullSet(f32, f32, f32, f32, Mtx*);
virtual void drawTexCoord(f32, f32, f32, f32, s16, s16, s16, s16, s16, s16, s16,
s16, Mtx*);
/* 802FF100 */ virtual u8 getUsableTlut(u8);
/* 802FF09C */ virtual bool isUsed(ResTIMG const*);
/* 802FF63C */ virtual bool isUsed(ResFONT const* param_0) { return J2DPane::isUsed(param_0); }
/* 802FF65C */ virtual void rewriteAlpha() {}
virtual u8 getUsableTlut(u8);
virtual bool isUsed(ResTIMG const*);
virtual bool isUsed(ResFONT const* param_0) { return J2DPane::isUsed(param_0); }
virtual void rewriteAlpha() {}
/* 802FC800 */ J2DPicture(u64, JGeometry::TBox2<f32> const&, ResTIMG const*, ResTLUT const*);
/* 802FC708 */ J2DPicture(ResTIMG const*);
/* 802FC118 */ J2DPicture(J2DPane*, JSURandomInputStream*, JKRArchive*);
/* 802FC050 */ J2DPicture();
/* 802FC1D4 */ J2DPicture(J2DPane*, JSURandomInputStream*, J2DMaterial*);
/* 802FC8E8 */ void private_readStream(J2DPane*, JSURandomInputStream*, JKRArchive*);
/* 802FCD70 */ void private_initiate(ResTIMG const*, ResTLUT const*);
/* 802FCE9C */ void initinfo();
/* 802FE5D0 */ void setTevMode();
/* 802FEA60 */ static void swap(f32&, f32&);
/* 802FEAC4 */ void setBlendKonstColor();
/* 802FEB94 */ void setBlendKonstAlpha();
/* 802FEC64 */ void getNewColor(JUtility::TColor*);
/* 802FED84 */ void setTexCoord(JGeometry::TVec2<s16>*, JUTTexture const*, J2DBinding,
J2DPicture(u64, JGeometry::TBox2<f32> const&, ResTIMG const*, ResTLUT const*);
J2DPicture(ResTIMG const*);
J2DPicture(J2DPane*, JSURandomInputStream*, JKRArchive*);
J2DPicture();
J2DPicture(J2DPane*, JSURandomInputStream*, J2DMaterial*);
void private_readStream(J2DPane*, JSURandomInputStream*, JKRArchive*);
void private_initiate(ResTIMG const*, ResTLUT const*);
void initinfo();
void setTevMode();
static void swap(f32&, f32&);
void setBlendKonstColor();
void setBlendKonstAlpha();
void getNewColor(JUtility::TColor*);
void setTexCoord(JGeometry::TVec2<s16>*, JUTTexture const*, J2DBinding,
J2DMirror, bool);
/* 802FED44 */ void setTexCoord(JUTTexture const*, J2DBinding, J2DMirror, bool);
/* 802FF1D0 */ GXTlut getTlutID(ResTIMG const*, u8);
void setTexCoord(JUTTexture const*, J2DBinding, J2DMirror, bool);
GXTlut getTlutID(ResTIMG const*, u8);
void setCornerColor(JUtility::TColor c0, JUtility::TColor c1, JUtility::TColor c2,
JUtility::TColor c3) {

150
include/JSystem/J2DGraph/J2DPictureEx.h
View File

@ -23,83 +23,83 @@ public:
STAGE_7,
};
/* 803036EC */ J2DPictureEx(J2DPane*, JSURandomInputStream*, u32, J2DMaterial*);
/* 803040E4 */ void insertCommon(u8, f32);
/* 8030437C */ bool isInsert(u8) const;
/* 80304728 */ bool isRemove(u8) const;
/* 803052AC */ void setTevOrder(u8, u8, bool);
/* 803053E0 */ void setTevStage(u8, u8, bool);
/* 80305688 */ void setStage(J2DTevStage*, J2DPictureEx::stage_enum);
/* 80305928 */ void setTevKColor(u8);
/* 80305C70 */ void setTevKColorSel(u8);
/* 80305D18 */ void setTevKAlphaSel(u8);
/* 80305DC0 */ void shiftSetBlendRatio(u8, f32, bool, bool);
/* 80306664 */ bool getBlackWhite(JUtility::TColor*, JUtility::TColor*) const;
/* 80306824 */ bool isSetBlackWhite(JUtility::TColor, JUtility::TColor) const;
J2DPictureEx(J2DPane*, JSURandomInputStream*, u32, J2DMaterial*);
void insertCommon(u8, f32);
bool isInsert(u8) const;
bool isRemove(u8) const;
void setTevOrder(u8, u8, bool);
void setTevStage(u8, u8, bool);
void setStage(J2DTevStage*, J2DPictureEx::stage_enum);
void setTevKColor(u8);
void setTevKColorSel(u8);
void setTevKAlphaSel(u8);
void shiftSetBlendRatio(u8, f32, bool, bool);
bool getBlackWhite(JUtility::TColor*, JUtility::TColor*) const;
bool isSetBlackWhite(JUtility::TColor, JUtility::TColor) const;
/* 8030393C */ virtual ~J2DPictureEx();
/* 80307168 */ virtual void setCullBack(bool);
/* 803069D8 */ virtual void setCullBack(_GXCullMode);
/* 803069B8 */ virtual void setAlpha(u8);
/* 80303AB4 */ virtual void drawSelf(f32, f32, f32 (*)[3][4]);
/* 80306A24 */ virtual bool isUsed(ResTIMG const*);
/* 803071A4 */ virtual bool isUsed(ResFONT const*);
/* 80306A0C */ virtual void rewriteAlpha();
/* 803071C4 */ virtual void setAnimation(J2DAnmBase*);
/* 80256064 */ virtual void setAnimation(J2DAnmTransform* transform) { J2DPane::setAnimation(transform); }
/* 80306AC4 */ virtual void setAnimation(J2DAnmColor*);
/* 80306B1C */ virtual void setAnimation(J2DAnmTexPattern*);
/* 80306AF0 */ virtual void setAnimation(J2DAnmTextureSRTKey*);
/* 80306B48 */ virtual void setAnimation(J2DAnmTevRegKey*);
/* 80306B74 */ virtual void setAnimation(J2DAnmVisibilityFull*);
/* 80306B7C */ virtual void setAnimation(J2DAnmVtxColor*);
/* 80306C70 */ virtual const J2DAnmTransform* animationPane(J2DAnmTransform const*);
/* 80303640 */ virtual void initiate(ResTIMG const*, ResTLUT const*);
/* 803039CC */ virtual bool prepareTexture(u8);
/* 80306ED4 */ virtual bool append(ResTIMG const*, f32);
/* 80303E5C */ virtual bool append(ResTIMG const*, JUTPalette*, f32);
/* 80306F04 */ virtual bool append(char const*, f32);
/* 80303EA4 */ virtual bool append(char const*, JUTPalette*, f32);
/* 80303EEC */ virtual bool append(JUTTexture*, f32);
/* 80306FF4 */ virtual void prepend(ResTIMG const*, f32);
/* 80306FC4 */ virtual void prepend(ResTIMG const*, JUTPalette*, f32);
/* 80306F94 */ virtual void prepend(char const*, f32);
/* 80306F64 */ virtual void prepend(char const*, JUTPalette*, f32);
/* 80306F34 */ virtual void prepend(JUTTexture*, f32);
/* 80307058 */ virtual bool insert(ResTIMG const*, u8, f32);
/* 80303F34 */ virtual bool insert(ResTIMG const*, JUTPalette*, u8, f32);
/* 80307024 */ virtual bool insert(char const*, u8, f32);
/* 80303FD8 */ virtual bool insert(char const*, JUTPalette*, u8, f32);
/* 80304048 */ virtual bool insert(JUTTexture*, u8, f32);
/* 8030446C */ virtual bool remove(u8);
/* 80304608 */ virtual bool remove();
/* 8030466C */ virtual bool remove(JUTTexture*);
/* 8030708C */ virtual void draw(f32, f32, bool, bool, bool);
/* 8030477C */ virtual void draw(f32, f32, u8, bool, bool, bool);
/* 80304890 */ virtual void draw(f32, f32, f32, f32, bool, bool, bool);
/* 80304D88 */ virtual void drawOut(f32, f32, f32, f32, f32, f32);
/* 803070D0 */ virtual void drawOut(f32, f32, f32, f32, f32, f32, f32, f32);
/* 80304EF0 */ virtual void drawOut(JGeometry::TBox2<f32> const&, JGeometry::TBox2<f32> const&);
/* 80305264 */ virtual void load(_GXTexMapID, u8);
/* 80307134 */ virtual void load(u8);
/* 80305ED4 */ virtual void setBlendColorRatio(f32, f32);
/* 80305F34 */ virtual void setBlendAlphaRatio(f32, f32);
/* 80305F94 */ virtual const ResTIMG* changeTexture(ResTIMG const*, u8);
/* 803060DC */ virtual const ResTIMG* changeTexture(char const*, u8);
/* 80306134 */ virtual const ResTIMG* changeTexture(ResTIMG const*, u8, JUTPalette*);
/* 80306298 */ virtual const ResTIMG* changeTexture(char const*, u8, JUTPalette*);
/* 803062F8 */ virtual JUTTexture* getTexture(u8) const;
/* 80306350 */ virtual u8 getTextureCount() const;
/* 80306370 */ virtual bool setBlack(JUtility::TColor);
/* 803063F8 */ virtual bool setWhite(JUtility::TColor);
/* 80306480 */ virtual bool setBlackWhite(JUtility::TColor, JUtility::TColor);
/* 803068F8 */ virtual JUtility::TColor getBlack() const;
/* 80306958 */ virtual JUtility::TColor getWhite() const;
/* 80256034 */ virtual J2DMaterial* getMaterial() const { return mMaterial; }
/* 80303B80 */ virtual void drawFullSet(f32, f32, f32, f32, f32 (*)[3][4]);
/* 80303BDC */ virtual void drawTexCoord(f32, f32, f32, f32, s16, s16, s16, s16, s16, s16, s16,
virtual ~J2DPictureEx();
virtual void setCullBack(bool);
virtual void setCullBack(_GXCullMode);
virtual void setAlpha(u8);
virtual void drawSelf(f32, f32, f32 (*)[3][4]);
virtual bool isUsed(ResTIMG const*);
virtual bool isUsed(ResFONT const*);
virtual void rewriteAlpha();
virtual void setAnimation(J2DAnmBase*);
virtual void setAnimation(J2DAnmTransform* transform) { J2DPane::setAnimation(transform); }
virtual void setAnimation(J2DAnmColor*);
virtual void setAnimation(J2DAnmTexPattern*);
virtual void setAnimation(J2DAnmTextureSRTKey*);
virtual void setAnimation(J2DAnmTevRegKey*);
virtual void setAnimation(J2DAnmVisibilityFull*);
virtual void setAnimation(J2DAnmVtxColor*);
virtual const J2DAnmTransform* animationPane(J2DAnmTransform const*);
virtual void initiate(ResTIMG const*, ResTLUT const*);
virtual bool prepareTexture(u8);
virtual bool append(ResTIMG const*, f32);
virtual bool append(ResTIMG const*, JUTPalette*, f32);
virtual bool append(char const*, f32);
virtual bool append(char const*, JUTPalette*, f32);
virtual bool append(JUTTexture*, f32);
virtual void prepend(ResTIMG const*, f32);
virtual void prepend(ResTIMG const*, JUTPalette*, f32);
virtual void prepend(char const*, f32);
virtual void prepend(char const*, JUTPalette*, f32);
virtual void prepend(JUTTexture*, f32);
virtual bool insert(ResTIMG const*, u8, f32);
virtual bool insert(ResTIMG const*, JUTPalette*, u8, f32);
virtual bool insert(char const*, u8, f32);
virtual bool insert(char const*, JUTPalette*, u8, f32);
virtual bool insert(JUTTexture*, u8, f32);
virtual bool remove(u8);
virtual bool remove();
virtual bool remove(JUTTexture*);
virtual void draw(f32, f32, bool, bool, bool);
virtual void draw(f32, f32, u8, bool, bool, bool);
virtual void draw(f32, f32, f32, f32, bool, bool, bool);
virtual void drawOut(f32, f32, f32, f32, f32, f32);
virtual void drawOut(f32, f32, f32, f32, f32, f32, f32, f32);
virtual void drawOut(JGeometry::TBox2<f32> const&, JGeometry::TBox2<f32> const&);
virtual void load(_GXTexMapID, u8);
virtual void load(u8);
virtual void setBlendColorRatio(f32, f32);
virtual void setBlendAlphaRatio(f32, f32);
virtual const ResTIMG* changeTexture(ResTIMG const*, u8);
virtual const ResTIMG* changeTexture(char const*, u8);
virtual const ResTIMG* changeTexture(ResTIMG const*, u8, JUTPalette*);
virtual const ResTIMG* changeTexture(char const*, u8, JUTPalette*);
virtual JUTTexture* getTexture(u8) const;
virtual u8 getTextureCount() const;
virtual bool setBlack(JUtility::TColor);
virtual bool setWhite(JUtility::TColor);
virtual bool setBlackWhite(JUtility::TColor, JUtility::TColor);
virtual JUtility::TColor getBlack() const;
virtual JUtility::TColor getWhite() const;
virtual J2DMaterial* getMaterial() const { return mMaterial; }
virtual void drawFullSet(f32, f32, f32, f32, f32 (*)[3][4]);
virtual void drawTexCoord(f32, f32, f32, f32, s16, s16, s16, s16, s16, s16, s16,
s16, f32 (*)[3][4]);
/* 80306DC8 */ virtual u8 getUsableTlut(u8);
virtual u8 getUsableTlut(u8);
private:
/* 0x150 */ J2DMaterial* mMaterial;

28
include/JSystem/J2DGraph/J2DPrint.h
View File

@ -24,21 +24,21 @@ public:
void initiate();
/* 802F4394 */ J2DPrint(JUTFont*, f32, f32, JUtility::TColor, JUtility::TColor, JUtility::TColor, JUtility::TColor);
/* 802F4658 */ static u8* setBuffer(size_t);
/* 802F46C4 */ void setFontSize();
/* 802F475C */ void locate(f32, f32);
/* 802F4778 */ f32 print(f32, f32, u8, char const*, ...);
/* 802F4828 */ void printReturn(char const*, f32, f32, J2DTextBoxHBinding, J2DTextBoxVBinding,
J2DPrint(JUTFont*, f32, f32, JUtility::TColor, JUtility::TColor, JUtility::TColor, JUtility::TColor);
static u8* setBuffer(size_t);
void setFontSize();
void locate(f32, f32);
f32 print(f32, f32, u8, char const*, ...);
void printReturn(char const*, f32, f32, J2DTextBoxHBinding, J2DTextBoxVBinding,
f32, f32, u8);
/* 802F4B4C */ f32 parse(u8 const*, int, int, u16*, J2DPrint::TSize&, u8, bool);
/* 802F52E8 */ void doCtrlCode(int);
/* 802F5410 */ u16 doEscapeCode(u8 const**, u8);
/* 802F594C */ void initchar();
/* 802F59C0 */ s32 getNumberS32(u8 const**, s32, s32, int);
/* 802F5AC4 */ f32 getNumberF32(u8 const**, f32, f32, int);
f32 parse(u8 const*, int, int, u16*, J2DPrint::TSize&, u8, bool);
void doCtrlCode(int);
u16 doEscapeCode(u8 const**, u8);
void initchar();
s32 getNumberS32(u8 const**, s32, s32, int);
f32 getNumberF32(u8 const**, f32, f32, int);
/* 802F4420 */ virtual ~J2DPrint();
virtual ~J2DPrint();
f32 print_va(u8 alpha, const char* fmt, va_list args) {
return J2DPrint_print_alpha_va(this, alpha, fmt, args);
@ -66,7 +66,7 @@ public:
static size_t mStrBuffSize;
private:
/* 802F4468 */ void private_initiate(JUTFont*, f32, f32, JUtility::TColor, JUtility::TColor,
void private_initiate(JUTFont*, f32, f32, JUtility::TColor, JUtility::TColor,
JUtility::TColor, JUtility::TColor, bool);
/* 0x04 */ JUTFont* mFont;

68
include/JSystem/J2DGraph/J2DScreen.h
View File

@ -47,43 +47,43 @@ struct J2DScrnBlockHeader {
*/
class J2DScreen : public J2DPane {
public:
/* 802F8540 */ virtual ~J2DScreen();
/* 802F9A18 */ virtual u16 getTypeID() const;
/* 802F9A20 */ virtual void calcMtx();
/* 802F9120 */ virtual void drawSelf(f32, f32, Mtx*);
/* 802F90A0 */ virtual J2DPane* search(u64);
/* 802F90E0 */ virtual J2DPane* searchUserInfo(u64);
/* 802F9600 */ virtual bool isUsed(ResTIMG const*);
/* 802F9620 */ virtual bool isUsed(ResFONT const*);
/* 80053BA0 */ virtual void clearAnmTransform() { J2DPane::clearAnmTransform(); }
/* 802F9704 */ virtual void setAnimation(J2DAnmColor*);
/* 80192414 */ virtual void setAnimation(J2DAnmTransform* i_bck) { J2DPane::setAnimation(i_bck); }
/* 802F9798 */ virtual void setAnimation(J2DAnmTextureSRTKey*);
/* 802F99A8 */ virtual void setAnimation(J2DAnmVtxColor*);
/* 802F9838 */ virtual void setAnimation(J2DAnmTexPattern*);
/* 802F99C8 */ virtual void setAnimation(J2DAnmVisibilityFull*);
/* 802F98CC */ virtual void setAnimation(J2DAnmTevRegKey*);
/* 802F9A54 */ virtual void setAnimation(J2DAnmBase*);
/* 802F9A74 */ virtual void setAnimationVF(J2DAnmVisibilityFull*);
/* 802F9A78 */ virtual void setAnimationVC(J2DAnmVtxColor*);
/* 802F99E8 */ virtual J2DPane* createPane(J2DScrnBlockHeader const&, JSURandomInputStream*,
virtual ~J2DScreen();
virtual u16 getTypeID() const;
virtual void calcMtx();
virtual void drawSelf(f32, f32, Mtx*);
virtual J2DPane* search(u64);
virtual J2DPane* searchUserInfo(u64);
virtual bool isUsed(ResTIMG const*);
virtual bool isUsed(ResFONT const*);
virtual void clearAnmTransform() { J2DPane::clearAnmTransform(); }
virtual void setAnimation(J2DAnmColor*);
virtual void setAnimation(J2DAnmTransform* i_bck) { J2DPane::setAnimation(i_bck); }
virtual void setAnimation(J2DAnmTextureSRTKey*);
virtual void setAnimation(J2DAnmVtxColor*);
virtual void setAnimation(J2DAnmTexPattern*);
virtual void setAnimation(J2DAnmVisibilityFull*);
virtual void setAnimation(J2DAnmTevRegKey*);
virtual void setAnimation(J2DAnmBase*);
virtual void setAnimationVF(J2DAnmVisibilityFull*);
virtual void setAnimationVC(J2DAnmVtxColor*);
virtual J2DPane* createPane(J2DScrnBlockHeader const&, JSURandomInputStream*,
J2DPane*, u32);
/* 802F8B98 */ virtual J2DPane* createPane(J2DScrnBlockHeader const&, JSURandomInputStream*,
virtual J2DPane* createPane(J2DScrnBlockHeader const&, JSURandomInputStream*,
J2DPane*, u32, JKRArchive*);
/* 802F8498 */ J2DScreen();
/* 802F85A8 */ void clean();
/* 802F8648 */ bool setPriority(char const*, u32, JKRArchive*);
/* 802F8748 */ bool setPriority(JSURandomInputStream*, u32, JKRArchive*);
/* 802F8778 */ bool private_set(JSURandomInputStream*, u32, JKRArchive*);
/* 802F8834 */ bool checkSignature(JSURandomInputStream*);
/* 802F8894 */ bool getScreenInformation(JSURandomInputStream*);
/* 802F8990 */ s32 makeHierarchyPanes(J2DPane*, JSURandomInputStream*, u32, JKRArchive*);
/* 802F8ED4 */ void draw(f32, f32, J2DGrafContext const*);
/* 802F9280 */ J2DResReference* getResReference(JSURandomInputStream*, u32);
/* 802F937C */ bool createMaterial(JSURandomInputStream*, u32, JKRArchive*);
/* 802F9640 */ static void* getNameResource(char const*);
/* 802F9690 */ void animation();
J2DScreen();
void clean();
bool setPriority(char const*, u32, JKRArchive*);
bool setPriority(JSURandomInputStream*, u32, JKRArchive*);
bool private_set(JSURandomInputStream*, u32, JKRArchive*);
bool checkSignature(JSURandomInputStream*);
bool getScreenInformation(JSURandomInputStream*);
s32 makeHierarchyPanes(J2DPane*, JSURandomInputStream*, u32, JKRArchive*);
void draw(f32, f32, J2DGrafContext const*);
J2DResReference* getResReference(JSURandomInputStream*, u32);
bool createMaterial(JSURandomInputStream*, u32, JKRArchive*);
static void* getNameResource(char const*);
void animation();
void setScissor(bool i_scissor) { mScissor = i_scissor; }

46
include/JSystem/J2DGraph/J2DTevs.h
View File

@ -55,10 +55,10 @@ public:
J2DTexMtx() { mInfo = j2dDefaultTexMtxInfo; }
~J2DTexMtx() {}
J2DTexMtx(const J2DTexMtxInfo& info) { mInfo = info; }
/* 802E9C90 */ void load(u32);
/* 802E9CC4 */ void calc();
/* 802E9D2C */ void getTextureMtx(J2DTextureSRTInfo const&, Vec, Mtx);
/* 802E9EBC */ void getTextureMtxMaya(J2DTextureSRTInfo const&, Mtx);
void load(u32);
void calc();
void getTextureMtx(J2DTextureSRTInfo const&, Vec, Mtx);
void getTextureMtxMaya(J2DTextureSRTInfo const&, Mtx);
J2DTexMtxInfo& getTexMtxInfo() { return mInfo; }
void setTexMtxInfo(J2DTexMtxInfo info) { mInfo = info; }
@ -92,7 +92,7 @@ extern const J2DIndTexOrderInfo j2dDefaultIndTexOrderNull;
*/
class J2DIndTexOrder {
public:
/* 802EB378 */ J2DIndTexOrder() {
J2DIndTexOrder() {
mInfo = j2dDefaultIndTexOrderNull;
}
J2DIndTexOrder(const J2DIndTexOrderInfo& info) {
@ -102,7 +102,7 @@ public:
mInfo = info;
return *this;
}
/* 802EA0FC */ void load(u8);
void load(u8);
private:
/* 0x0 */ J2DIndTexOrderInfo mInfo;
@ -135,8 +135,8 @@ extern J2DIndTexMtxInfo const j2dDefaultIndTexMtxInfo;
*/
class J2DIndTexMtx {
public:
/* 802EB2E4 */ ~J2DIndTexMtx() {}
/* 802EB320 */ J2DIndTexMtx() {
~J2DIndTexMtx() {}
J2DIndTexMtx() {
mIndTexMtxInfo = j2dDefaultIndTexMtxInfo;
}
J2DIndTexMtx(const J2DIndTexMtxInfo& info) {
@ -146,9 +146,9 @@ public:
mIndTexMtxInfo = info;
return *this;
}
/* 802EA098 */ void load(u8);
/* 802E9C90 */ void load(u32);
/* 802E9CC4 */ void calc();
void load(u8);
void load(u32);
void calc();
private:
/* 0x0 */ J2DIndTexMtxInfo mIndTexMtxInfo;
@ -179,8 +179,8 @@ extern const J2DIndTexCoordScaleInfo j2dDefaultIndTexCoordScaleInfo;
*/
class J2DIndTexCoordScale {
public:
/* 802EB290 */ ~J2DIndTexCoordScale() {}
/* 802EB2CC */ J2DIndTexCoordScale() {
~J2DIndTexCoordScale() {}
J2DIndTexCoordScale() {
mInfo = j2dDefaultIndTexCoordScaleInfo;
}
J2DIndTexCoordScale(const J2DIndTexCoordScaleInfo& info) {
@ -190,7 +190,7 @@ public:
mInfo = info;
return *this;
}
/* 802EA0CC */ void load(u8);
void load(u8);
private:
/* 0x0 */ J2DIndTexCoordScaleInfo mInfo;
@ -229,8 +229,8 @@ extern const J2DIndTevStageInfo j2dDefaultIndTevStageInfo;
*/
class J2DIndTevStage {
public:
/* 802EA044 */ void load(u8);
/* 802F18A0 */ J2DIndTevStage() {
void load(u8);
J2DIndTevStage() {
mFlags = J2DCalcIndTevStage(j2dDefaultIndTevStageInfo);
}
J2DIndTevStage(const J2DIndTevStageInfo& info) {
@ -279,7 +279,7 @@ extern J2DTexCoordInfo const j2dDefaultTexCoordInfo[8];
*/
class J2DTexCoord {
public:
/* 802EB260 */ inline J2DTexCoord() {
inline J2DTexCoord() {
mTexCoordInfo = j2dDefaultTexCoordInfo[0];
}
@ -322,7 +322,7 @@ extern const J2DTevOrderInfo j2dDefaultTevOrderInfoNull;
*/
class J2DTevOrder {
public:
/* 802F1B70 */ J2DTevOrder() {
J2DTevOrder() {
mTevOrderInfo = j2dDefaultTevOrderInfoNull;
}
@ -386,9 +386,9 @@ extern const J2DTevSwapModeInfo j2dDefaultTevSwapMode;
*/
class J2DTevStage {
public:
/* 802F4110 */ J2DTevStage(J2DTevStageInfo const&);
/* 802F1940 */ J2DTevStage();
/* 802F19A8 */ void setTevStageInfo(J2DTevStageInfo const&);
J2DTevStage(J2DTevStageInfo const&);
J2DTevStage();
void setTevStageInfo(J2DTevStageInfo const&);
void setStageNo(u32 param_0) {
field_0x0 = (param_0 << 1) + 0xc0;
@ -538,7 +538,7 @@ extern const u8 data_804561AC;
class J2DTevSwapModeTable {
public:
/* 802F1934 */ J2DTevSwapModeTable() { field_0x0 = data_804561AC; }
J2DTevSwapModeTable() { field_0x0 = data_804561AC; }
J2DTevSwapModeTable(const J2DTevSwapModeTableInfo& info) {
field_0x0 = J2DCalcTevSwapTable(info.field_0x0, info.field_0x1, info.field_0x2, info.field_0x3);
}
@ -575,7 +575,7 @@ extern const J2DColorChanInfo j2dDefaultColorChanInfo;
*/
class J2DColorChan {
public:
/* 802EB280 */ J2DColorChan() {
J2DColorChan() {
setColorChanInfo(j2dDefaultColorChanInfo);
}
J2DColorChan(const J2DColorChanInfo& info) {

56
include/JSystem/J2DGraph/J2DTextBox.h
View File

@ -61,45 +61,45 @@ public:
/* 0x4 */ f32 mSizeY;
};
/* 803001E0 */ virtual ~J2DTextBox();
/* 80300C68 */ virtual u16 getTypeID() const;
/* 80300AF8 */ virtual void resize(f32, f32);
/* 80300870 */ virtual bool setConnectParent(bool);
/* 80300950 */ virtual void drawSelf(f32, f32, Mtx*);
/* 803008E8 */ virtual void drawSelf(f32, f32);
/* 80300C70 */ virtual bool isUsed(ResTIMG const*);
/* 80300BFC */ virtual bool isUsed(ResFONT const*);
/* 80300C90 */ virtual void rewriteAlpha();
/* 803002E8 */ virtual void draw(f32, f32);
/* 80300490 */ virtual void draw(f32, f32, f32, J2DTextBoxHBinding);
/* 80300278 */ virtual void setFont(JUTFont*);
/* 8021C7F4 */ virtual JUTFont* getFont() const { return mFont; }
/* 80254408 */ virtual bool setBlack(JUtility::TColor);
/* 80186C84 */ virtual bool setWhite(JUtility::TColor white) { mWhiteColor = white; return true; }
/* 8019230C */ virtual bool setBlackWhite(JUtility::TColor black, JUtility::TColor white) {
virtual ~J2DTextBox();
virtual u16 getTypeID() const;
virtual void resize(f32, f32);
virtual bool setConnectParent(bool);
virtual void drawSelf(f32, f32, Mtx*);
virtual void drawSelf(f32, f32);
virtual bool isUsed(ResTIMG const*);
virtual bool isUsed(ResFONT const*);
virtual void rewriteAlpha();
virtual void draw(f32, f32);
virtual void draw(f32, f32, f32, J2DTextBoxHBinding);
virtual void setFont(JUTFont*);
virtual JUTFont* getFont() const { return mFont; }
virtual bool setBlack(JUtility::TColor);
virtual bool setWhite(JUtility::TColor white) { mWhiteColor = white; return true; }
virtual bool setBlackWhite(JUtility::TColor black, JUtility::TColor white) {
mBlackColor = black;
mWhiteColor = white;
return true;
}
/* 801DFA34 */ virtual JUtility::TColor getBlack() const {
virtual JUtility::TColor getBlack() const {
return mBlackColor;
}
/* 801DFA28 */ virtual JUtility::TColor getWhite() const {
virtual JUtility::TColor getWhite() const {
return mWhiteColor;
}
/* 8025602C */ virtual J2DMaterial* getMaterial() const { return NULL; }
virtual J2DMaterial* getMaterial() const { return NULL; }
/* 802FFBC4 */ J2DTextBox(u64, JGeometry::TBox2<f32> const&, ResFONT const*, char const*, s16,
J2DTextBox(u64, JGeometry::TBox2<f32> const&, ResFONT const*, char const*, s16,
J2DTextBoxHBinding, J2DTextBoxVBinding);
/* 802FF6D8 */ J2DTextBox(J2DPane*, JSURandomInputStream*, JKRArchive*);
/* 802FF75C */ J2DTextBox(J2DPane*, JSURandomInputStream*, u32, J2DMaterial*);
/* 802FF660 */ J2DTextBox();
/* 802FFC58 */ void initiate(ResFONT const*, char const*, s16, J2DTextBoxHBinding,
J2DTextBox(J2DPane*, JSURandomInputStream*, JKRArchive*);
J2DTextBox(J2DPane*, JSURandomInputStream*, u32, J2DMaterial*);
J2DTextBox();
void initiate(ResFONT const*, char const*, s16, J2DTextBoxHBinding,
J2DTextBoxVBinding);
/* 802FFE88 */ void private_readStream(J2DPane*, JSURandomInputStream*, JKRArchive*);
/* 80300658 */ char* getStringPtr() const;
/* 8030074C */ s32 setString(s16, char const*, ...);
/* 80300660 */ s32 setString(char const*, ...);
void private_readStream(J2DPane*, JSURandomInputStream*, JKRArchive*);
char* getStringPtr() const;
s32 setString(s16, char const*, ...);
s32 setString(char const*, ...);
void setFontSize(f32 sizeX, f32 sizeY) {
f32 x;

66
include/JSystem/J2DGraph/J2DTextBoxEx.h
View File

@ -17,40 +17,40 @@ public:
STAGE_2,
};
/* 803071E4 */ J2DTextBoxEx(J2DPane*, JSURandomInputStream*, u32, J2DMaterial*);
/* 80307E0C */ void setTevOrder(bool);
/* 80307EF0 */ void setTevStage(bool);
/* 80307F94 */ void setStage(J2DTevStage*, J2DTextBoxEx::stage_enum);
/* 803084CC */ bool getBlackWhite(JUtility::TColor*, JUtility::TColor*) const;
/* 80308668 */ bool isSetBlackWhite(JUtility::TColor, JUtility::TColor) const;
J2DTextBoxEx(J2DPane*, JSURandomInputStream*, u32, J2DMaterial*);
void setTevOrder(bool);
void setTevStage(bool);
void setStage(J2DTevStage*, J2DTextBoxEx::stage_enum);
bool getBlackWhite(JUtility::TColor*, JUtility::TColor*) const;
bool isSetBlackWhite(JUtility::TColor, JUtility::TColor) const;
/* 8030751C */ virtual ~J2DTextBoxEx();
/* 803089EC */ virtual void setCullBack(bool);
/* 803087DC */ virtual void setCullBack(_GXCullMode);
/* 803087BC */ virtual void setAlpha(u8);
/* 803075AC */ virtual void drawSelf(f32, f32, f32 (*)[3][4]);
/* 80308A28 */ virtual bool isUsed(ResTIMG const*);
/* 80308828 */ virtual bool isUsed(ResFONT const*);
/* 80308810 */ virtual void rewriteAlpha();
/* 80308A4C */ virtual void setAnimation(J2DAnmBase*);
/* 80256044 */ virtual void setAnimation(J2DAnmTransform* transform) { J2DPane::setAnimation(transform); }
/* 803088B4 */ virtual void setAnimation(J2DAnmColor*);
/* 8030890C */ virtual void setAnimation(J2DAnmTexPattern*);
/* 803088E0 */ virtual void setAnimation(J2DAnmTextureSRTKey*);
/* 80308938 */ virtual void setAnimation(J2DAnmTevRegKey*);
/* 80308964 */ virtual void setAnimation(J2DAnmVisibilityFull*);
/* 80308A48 */ virtual void setAnimation(J2DAnmVtxColor*);
/* 8030896C */ virtual const J2DAnmTransform* animationPane(J2DAnmTransform const*);
/* 803078AC */ virtual void draw(f32, f32);
/* 80307AF0 */ virtual void draw(f32, f32, f32, J2DTextBoxHBinding);
/* 80307D5C */ virtual void setFont(JUTFont*);
/* 80307DC0 */ virtual JUTFont* getFont() const;
/* 8030823C */ virtual bool setBlack(JUtility::TColor);
/* 803082C4 */ virtual bool setWhite(JUtility::TColor);
/* 8030834C */ virtual bool setBlackWhite(JUtility::TColor, JUtility::TColor);
/* 803086FC */ virtual JUtility::TColor getBlack() const;
/* 8030875C */ virtual JUtility::TColor getWhite() const;
/* 80256024 */ virtual J2DMaterial* getMaterial() const { return mMaterial; }
virtual ~J2DTextBoxEx();
virtual void setCullBack(bool);
virtual void setCullBack(_GXCullMode);
virtual void setAlpha(u8);
virtual void drawSelf(f32, f32, f32 (*)[3][4]);
virtual bool isUsed(ResTIMG const*);
virtual bool isUsed(ResFONT const*);
virtual void rewriteAlpha();
virtual void setAnimation(J2DAnmBase*);
virtual void setAnimation(J2DAnmTransform* transform) { J2DPane::setAnimation(transform); }
virtual void setAnimation(J2DAnmColor*);
virtual void setAnimation(J2DAnmTexPattern*);
virtual void setAnimation(J2DAnmTextureSRTKey*);
virtual void setAnimation(J2DAnmTevRegKey*);
virtual void setAnimation(J2DAnmVisibilityFull*);
virtual void setAnimation(J2DAnmVtxColor*);
virtual const J2DAnmTransform* animationPane(J2DAnmTransform const*);
virtual void draw(f32, f32);
virtual void draw(f32, f32, f32, J2DTextBoxHBinding);
virtual void setFont(JUTFont*);
virtual JUTFont* getFont() const;
virtual bool setBlack(JUtility::TColor);
virtual bool setWhite(JUtility::TColor);
virtual bool setBlackWhite(JUtility::TColor, JUtility::TColor);
virtual JUtility::TColor getBlack() const;
virtual JUtility::TColor getWhite() const;
virtual J2DMaterial* getMaterial() const { return mMaterial; }
private:
/* 0x138 */ J2DMaterial* mMaterial;

66
include/JSystem/J2DGraph/J2DWindow.h
View File

@ -29,41 +29,41 @@ public:
/* 0xC */ JUtility::TColor field_0xc;
}; // Size: 0x10
/* 802F9C10 */ J2DWindow(J2DPane*, JSURandomInputStream*, J2DMaterial*);
/* 802F9B74 */ J2DWindow(J2DPane*, JSURandomInputStream*, JKRArchive*);
/* 802F9A7C */ J2DWindow();
/* 802FA118 */ void private_readStream(J2DPane*, JSURandomInputStream*, JKRArchive*);
/* 802FA604 */ void initinfo2();
/* 802FAA5C */ void draw_private(JGeometry::TBox2<f32> const&, JGeometry::TBox2<f32> const&);
/* 802FB12C */ void setContentsColor(JUtility::TColor, JUtility::TColor, JUtility::TColor,
J2DWindow(J2DPane*, JSURandomInputStream*, J2DMaterial*);
J2DWindow(J2DPane*, JSURandomInputStream*, JKRArchive*);
J2DWindow();
void private_readStream(J2DPane*, JSURandomInputStream*, JKRArchive*);
void initinfo2();
void draw_private(JGeometry::TBox2<f32> const&, JGeometry::TBox2<f32> const&);
void setContentsColor(JUtility::TColor, JUtility::TColor, JUtility::TColor,
JUtility::TColor);
/* 802FB634 */ void drawFrameTexture(JUTTexture*, f32, f32, f32, f32, u16, u16, u16, u16, bool);
/* 802FB7C8 */ void drawFrameTexture(JUTTexture*, f32, f32, bool, bool, bool);
/* 802FB868 */ void drawContentsTexture(f32, f32, f32, f32);
/* 802FBB90 */ void setTevMode(JUTTexture*, JUtility::TColor, JUtility::TColor);
void drawFrameTexture(JUTTexture*, f32, f32, f32, f32, u16, u16, u16, u16, bool);
void drawFrameTexture(JUTTexture*, f32, f32, bool, bool, bool);
void drawContentsTexture(f32, f32, f32, f32);
void setTevMode(JUTTexture*, JUtility::TColor, JUtility::TColor);
/* 802FA880 */ virtual ~J2DWindow();
/* 802FBF98 */ virtual u16 getTypeID() const;
/* 802FB000 */ virtual void resize(f32, f32);
/* 802FB1D8 */ virtual void drawSelf(f32, f32);
/* 802FB240 */ virtual void drawSelf(f32, f32, Mtx*);
/* 802FBEDC */ virtual bool isUsed(ResTIMG const*);
/* 802FC02C */ virtual bool isUsed(ResFONT const*);
/* 802FC04C */ virtual void rewriteAlpha();
/* 802FA928 */ virtual void draw(JGeometry::TBox2<f32> const&);
/* 802FAED0 */ virtual void draw(JGeometry::TBox2<f32> const&, JGeometry::TBox2<f32> const&);
/* 802FBFA0 */ virtual void draw(f32, f32, f32, f32);
/* 80254430 */ virtual bool setBlack(JUtility::TColor);
/* 802543E0 */ virtual bool setWhite(JUtility::TColor);
/* 80254568 */ virtual bool setBlackWhite(JUtility::TColor, JUtility::TColor);
/* 80254000 */ virtual JUtility::TColor getBlack() const;
/* 8025400C */ virtual JUtility::TColor getWhite() const;
/* 802FBE60 */ virtual JUTTexture* getFrameTexture(u8, u8) const;
/* 802FBFE8 */ virtual JUTTexture* getContentsTexture(u8) const;
/* 802FC000 */ virtual void getMaterial(J2DWindow::TMaterial&) const;
/* 802FC01C */ virtual J2DMaterial* getFrameMaterial(u8) const;
/* 802FC024 */ virtual J2DMaterial* getContentsMaterial() const;
/* 802FB338 */ virtual void drawContents(JGeometry::TBox2<f32> const&);
virtual ~J2DWindow();
virtual u16 getTypeID() const;
virtual void resize(f32, f32);
virtual void drawSelf(f32, f32);
virtual void drawSelf(f32, f32, Mtx*);
virtual bool isUsed(ResTIMG const*);
virtual bool isUsed(ResFONT const*);
virtual void rewriteAlpha();
virtual void draw(JGeometry::TBox2<f32> const&);
virtual void draw(JGeometry::TBox2<f32> const&, JGeometry::TBox2<f32> const&);
virtual void draw(f32, f32, f32, f32);
virtual bool setBlack(JUtility::TColor);
virtual bool setWhite(JUtility::TColor);
virtual bool setBlackWhite(JUtility::TColor, JUtility::TColor);
virtual JUtility::TColor getBlack() const;
virtual JUtility::TColor getWhite() const;
virtual JUTTexture* getFrameTexture(u8, u8) const;
virtual JUTTexture* getContentsTexture(u8) const;
virtual void getMaterial(J2DWindow::TMaterial&) const;
virtual J2DMaterial* getFrameMaterial(u8) const;
virtual J2DMaterial* getContentsMaterial() const;
virtual void drawContents(JGeometry::TBox2<f32> const&);
bool isField0x145Set(u8 flag) { return field_0x145 & flag; }

82
include/JSystem/J2DGraph/J2DWindowEx.h
View File

@ -17,49 +17,49 @@ public:
STAGE_ENUM_4,
};
/* 80300C94 */ J2DWindowEx(J2DPane*, JSURandomInputStream*, u32, J2DMaterial*);
/* 80300F80 */ void setMinSize();
/* 803012CC */ void draw_private(JGeometry::TBox2<f32> const&, JGeometry::TBox2<f32> const&);
/* 80301D74 */ void drawFrameTexture(f32, f32, f32, f32, u16, u16, u16, u16, J2DMaterial*,
J2DWindowEx(J2DPane*, JSURandomInputStream*, u32, J2DMaterial*);
void setMinSize();
void draw_private(JGeometry::TBox2<f32> const&, JGeometry::TBox2<f32> const&);
void drawFrameTexture(f32, f32, f32, f32, u16, u16, u16, u16, J2DMaterial*,
bool);
/* 80302284 */ void setTevOrder(bool);
/* 80302388 */ void setTevStage(bool);
/* 803024B4 */ void setStage(J2DTevStage*, J2DWindowEx::stage_enum);
/* 80302A4C */ bool getBlackWhite(JUtility::TColor*, JUtility::TColor*) const;
/* 80302BE8 */ bool isSetBlackWhite(JUtility::TColor, JUtility::TColor) const;
/* 8030321C */ bool isNeedSetAnm(u8);
void setTevOrder(bool);
void setTevStage(bool);
void setStage(J2DTevStage*, J2DWindowEx::stage_enum);
bool getBlackWhite(JUtility::TColor*, JUtility::TColor*) const;
bool isSetBlackWhite(JUtility::TColor, JUtility::TColor) const;
bool isNeedSetAnm(u8);
/* 80301144 */ virtual ~J2DWindowEx();
/* 803035C0 */ virtual void setCullBack(bool);
/* 80302D98 */ virtual void setCullBack(_GXCullMode);
/* 80302D48 */ virtual void setAlpha(u8);
/* 8030122C */ virtual void drawSelf(f32, f32, f32 (*)[3][4]);
/* 80302EDC */ virtual bool isUsed(ResTIMG const*);
/* 803035FC */ virtual bool isUsed(ResFONT const*);
/* 80302DF4 */ virtual void rewriteAlpha();
/* 8030361C */ virtual void setAnimation(J2DAnmBase*);
/* 80256084 */ virtual void setAnimation(J2DAnmTransform* transform) { J2DPane::setAnimation(transform); }
/* 80302FFC */ virtual void setAnimation(J2DAnmColor*);
/* 8030310C */ virtual void setAnimation(J2DAnmTexPattern*);
/* 80303084 */ virtual void setAnimation(J2DAnmTextureSRTKey*);
/* 80303194 */ virtual void setAnimation(J2DAnmTevRegKey*);
/* 80303274 */ virtual void setAnimation(J2DAnmVisibilityFull*);
/* 8030327C */ virtual void setAnimation(J2DAnmVtxColor*);
/* 80303370 */ virtual const J2DAnmTransform* animationPane(J2DAnmTransform const*);
/* 80301FC8 */ virtual void draw(JGeometry::TBox2<f32> const&);
/* 80302164 */ virtual void draw(JGeometry::TBox2<f32> const&, JGeometry::TBox2<f32> const&);
/* 80303568 */ virtual void draw(f32, f32, f32, f32);
/* 80302764 */ virtual bool setBlack(JUtility::TColor);
/* 803027EC */ virtual bool setWhite(JUtility::TColor);
/* 80302874 */ virtual bool setBlackWhite(JUtility::TColor, JUtility::TColor);
/* 80302C88 */ virtual JUtility::TColor getBlack() const;
/* 80302CE8 */ virtual JUtility::TColor getWhite() const;
/* 80302E0C */ virtual JUTTexture* getFrameTexture(u8, u8) const;
/* 80302E74 */ virtual JUTTexture* getContentsTexture(u8) const;
/* 8030353C */ virtual void getMaterial(J2DWindow::TMaterial&) const;
/* 80303510 */ virtual J2DMaterial* getFrameMaterial(u8) const;
/* 80303534 */ virtual J2DMaterial* getContentsMaterial() const;
/* 80301994 */ virtual void drawContents(JGeometry::TBox2<f32> const&);
virtual ~J2DWindowEx();
virtual void setCullBack(bool);
virtual void setCullBack(_GXCullMode);
virtual void setAlpha(u8);
virtual void drawSelf(f32, f32, f32 (*)[3][4]);
virtual bool isUsed(ResTIMG const*);
virtual bool isUsed(ResFONT const*);
virtual void rewriteAlpha();
virtual void setAnimation(J2DAnmBase*);
virtual void setAnimation(J2DAnmTransform* transform) { J2DPane::setAnimation(transform); }
virtual void setAnimation(J2DAnmColor*);
virtual void setAnimation(J2DAnmTexPattern*);
virtual void setAnimation(J2DAnmTextureSRTKey*);
virtual void setAnimation(J2DAnmTevRegKey*);
virtual void setAnimation(J2DAnmVisibilityFull*);
virtual void setAnimation(J2DAnmVtxColor*);
virtual const J2DAnmTransform* animationPane(J2DAnmTransform const*);
virtual void draw(JGeometry::TBox2<f32> const&);
virtual void draw(JGeometry::TBox2<f32> const&, JGeometry::TBox2<f32> const&);
virtual void draw(f32, f32, f32, f32);
virtual bool setBlack(JUtility::TColor);
virtual bool setWhite(JUtility::TColor);
virtual bool setBlackWhite(JUtility::TColor, JUtility::TColor);
virtual JUtility::TColor getBlack() const;
virtual JUtility::TColor getWhite() const;
virtual JUTTexture* getFrameTexture(u8, u8) const;
virtual JUTTexture* getContentsTexture(u8) const;
virtual void getMaterial(J2DWindow::TMaterial&) const;
virtual J2DMaterial* getFrameMaterial(u8) const;
virtual J2DMaterial* getContentsMaterial() const;
virtual void drawContents(JGeometry::TBox2<f32> const&);
private:
/* 0x148 */ J2DMaterial* mFrameMaterial[4];

134
include/JSystem/J3DGraphAnimator/J3DAnimation.h
View File

@ -503,10 +503,10 @@ public:
*/
class J3DAnmTransform : public J3DAnmBase {
public:
/* 80328E40 */ J3DAnmTransform(s16, f32*, s16*, f32*);
J3DAnmTransform(s16, f32*, s16*, f32*);
/* 8003B93C */ virtual ~J3DAnmTransform() {}
/* 8003C77C */ virtual s32 getKind() const { return 0; }
virtual ~J3DAnmTransform() {}
virtual s32 getKind() const { return 0; }
virtual void getTransform(u16, J3DTransformInfo*) const = 0;
/* 0x0C */ f32* mScaleData;
@ -529,11 +529,11 @@ public:
mAnmTable = 0;
}
/* 80329A34 */ void calcTransform(f32, u16, J3DTransformInfo*) const;
void calcTransform(f32, u16, J3DTransformInfo*) const;
/* 8003B8D0 */ virtual ~J3DAnmTransformKey() {}
/* 8003C800 */ virtual s32 getKind() const { return 8; }
/* 8003C808 */ virtual void getTransform(u16 jointNo, J3DTransformInfo* pTransform) const {
virtual ~J3DAnmTransformKey() {}
virtual s32 getKind() const { return 8; }
virtual void getTransform(u16 jointNo, J3DTransformInfo* pTransform) const {
calcTransform(mFrame, jointNo, pTransform);
}
@ -549,9 +549,9 @@ class J3DAnmTransformFull : public J3DAnmTransform {
public:
J3DAnmTransformFull() : J3DAnmTransform(0, NULL, NULL, NULL) { mAnmTable = NULL; }
/* 8032C2AC */ virtual ~J3DAnmTransformFull() {}
/* 8032C318 */ virtual s32 getKind() const { return 9; }
/* 80328E90 */ virtual void getTransform(u16, J3DTransformInfo*) const;
virtual ~J3DAnmTransformFull() {}
virtual s32 getKind() const { return 9; }
virtual void getTransform(u16, J3DTransformInfo*) const;
/* 0x20 */ J3DAnmTransformFullTable* mAnmTable;
}; // Size: 0x24
@ -562,9 +562,9 @@ public:
*/
class J3DAnmTransformFullWithLerp : public J3DAnmTransformFull {
public:
/* 8032C228 */ virtual ~J3DAnmTransformFullWithLerp() {}
/* 8032C2A4 */ virtual s32 getKind() const { return 16; }
/* 803291F0 */ virtual void getTransform(u16, J3DTransformInfo*) const;
virtual ~J3DAnmTransformFullWithLerp() {}
virtual s32 getKind() const { return 16; }
virtual void getTransform(u16, J3DTransformInfo*) const;
}; // Size: 0x24
struct J3DTextureSRTInfo;
@ -577,13 +577,13 @@ class J3DMaterialTable;
*/
class J3DAnmTextureSRTKey : public J3DAnmBase {
public:
/* 80329E5C */ J3DAnmTextureSRTKey();
/* 80329F14 */ void calcTransform(f32, u16, J3DTextureSRTInfo*) const;
/* 8032B0C0 */ void searchUpdateMaterialID(J3DMaterialTable*);
/* 8032B1D4 */ void searchUpdateMaterialID(J3DModelData*);
J3DAnmTextureSRTKey();
void calcTransform(f32, u16, J3DTextureSRTInfo*) const;
void searchUpdateMaterialID(J3DMaterialTable*);
void searchUpdateMaterialID(J3DModelData*);
/* 8032C198 */ virtual ~J3DAnmTextureSRTKey() {}
/* 8032C220 */ virtual s32 getKind() const { return 4; }
virtual ~J3DAnmTextureSRTKey() {}
virtual s32 getKind() const { return 4; }
void getTransform(u16 jointNo, J3DTextureSRTInfo* pSRTInfo) const {
calcTransform(getFrame(), jointNo, pSRTInfo);
@ -641,13 +641,13 @@ public:
*/
class J3DAnmTexPattern : public J3DAnmBase {
public:
/* 8032AED8 */ J3DAnmTexPattern();
/* 8032AF50 */ void getTexNo(u16, u16*) const;
/* 8032B004 */ void searchUpdateMaterialID(J3DMaterialTable*);
/* 8032B09C */ void searchUpdateMaterialID(J3DModelData*);
J3DAnmTexPattern();
void getTexNo(u16, u16*) const;
void searchUpdateMaterialID(J3DMaterialTable*);
void searchUpdateMaterialID(J3DModelData*);
/* 8032BD20 */ virtual ~J3DAnmTexPattern() {}
/* 8032BD94 */ virtual s32 getKind() const { return 2; }
virtual ~J3DAnmTexPattern() {}
virtual s32 getKind() const { return 2; }
u16 getUpdateMaterialID(u16 idx) const {
J3D_ASSERT_RANGE(2288, idx < mUpdateMaterialNum);
@ -671,14 +671,14 @@ public:
*/
class J3DAnmTevRegKey : public J3DAnmBase {
public:
/* 8032AE18 */ J3DAnmTevRegKey();
/* 8032B1F8 */ void getTevColorReg(u16, _GXColorS10*) const;
/* 8032B4BC */ void getTevKonstReg(u16, _GXColor*) const;
/* 8032B780 */ void searchUpdateMaterialID(J3DMaterialTable*);
/* 8032B87C */ void searchUpdateMaterialID(J3DModelData*);
J3DAnmTevRegKey();
void getTevColorReg(u16, _GXColorS10*) const;
void getTevKonstReg(u16, _GXColor*) const;
void searchUpdateMaterialID(J3DMaterialTable*);
void searchUpdateMaterialID(J3DModelData*);
/* 8032BD9C */ virtual ~J3DAnmTevRegKey() {}
/* 8032BE24 */ virtual s32 getKind() const { return 5; }
virtual ~J3DAnmTevRegKey() {}
virtual s32 getKind() const { return 5; }
u16 getCRegUpdateMaterialNum() const { return mCRegUpdateMaterialNum; }
u16 getKRegUpdateMaterialNum() const { return mKRegUpdateMaterialNum; }
@ -730,12 +730,12 @@ public:
*/
class J3DAnmColor : public J3DAnmBase {
public:
/* 8032A828 */ J3DAnmColor();
/* 8032A8A4 */ void searchUpdateMaterialID(J3DMaterialTable*);
J3DAnmColor();
void searchUpdateMaterialID(J3DMaterialTable*);
/* 8032BCAC */ virtual ~J3DAnmColor() {}
/* 8032BF44 */ virtual s32 getKind() const { return 1; }
/* 8032BF4C */ virtual void getColor(u16, GXColor*) const {}
virtual ~J3DAnmColor() {}
virtual s32 getKind() const { return 1; }
virtual void getColor(u16, GXColor*) const {}
u16 getUpdateMaterialNum() const { return mUpdateMaterialNum; }
bool isValidUpdateMaterialID(u16 id) const { return mUpdateMaterialID[id] != 0xFFFF; }
@ -759,11 +759,11 @@ public:
*/
class J3DAnmColorKey : public J3DAnmColor {
public:
/* 8032AB00 */ J3DAnmColorKey();
J3DAnmColorKey();
/* 8032BE2C */ virtual ~J3DAnmColorKey() {}
/* 8032BEB0 */ virtual s32 getKind() const { return 11; }
/* 8032AB54 */ virtual void getColor(u16, GXColor*) const;
virtual ~J3DAnmColorKey() {}
virtual s32 getKind() const { return 11; }
virtual void getColor(u16, GXColor*) const;
/* 0x2C */ s16* mColorR;
/* 0x30 */ s16* mColorG;
@ -778,11 +778,11 @@ public:
*/
class J3DAnmColorFull : public J3DAnmColor {
public:
/* 8032AB00 */ J3DAnmColorFull();
J3DAnmColorFull();
/* 8032BE2C */ virtual ~J3DAnmColorFull() {}
/* 8032BEB0 */ virtual s32 getKind() const { return 10; }
/* 8032AB54 */ virtual void getColor(u16, GXColor*) const;
virtual ~J3DAnmColorFull() {}
virtual s32 getKind() const { return 10; }
virtual void getColor(u16, GXColor*) const;
/* 0x2C */ u8* mColorR;
/* 0x30 */ u8* mColorG;
@ -813,11 +813,11 @@ public:
*/
class J3DAnmVtxColorKey : public J3DAnmVtxColor {
public:
/* 8032A4E0 */ J3DAnmVtxColorKey();
J3DAnmVtxColorKey();
/* 8032BF50 */ virtual ~J3DAnmVtxColorKey() {}
/* 8032BFBC */ virtual s32 getKind() const { return 15; }
/* 8032A53C */ virtual void getColor(u8, u16, GXColor*) const;
virtual ~J3DAnmVtxColorKey() {}
virtual s32 getKind() const { return 15; }
virtual void getColor(u8, u16, GXColor*) const;
/* 0x18 */ J3DAnmColorKeyTable* mpTable[2];
/* 0x20 */ s16* mColorR;
@ -832,11 +832,11 @@ public:
*/
class J3DAnmVtxColorFull : public J3DAnmVtxColor {
public:
/* 8032A30C */ J3DAnmVtxColorFull();
J3DAnmVtxColorFull();
/* 8032BFC4 */ virtual ~J3DAnmVtxColorFull() {}
/* 8032C030 */ virtual s32 getKind() const { return 14; }
/* 8032A368 */ virtual void getColor(u8, u16, GXColor*) const;
virtual ~J3DAnmVtxColorFull() {}
virtual s32 getKind() const { return 14; }
virtual void getColor(u8, u16, GXColor*) const;
/* 0x18 */ J3DAnmColorFullTable* mpTable[2];
/* 0x20 */ u8* mColorR;
@ -853,9 +853,9 @@ class J3DAnmCluster : public J3DAnmBase {
public:
J3DAnmCluster(s16 frameMax, f32* pWeight) : J3DAnmBase(frameMax) { mWeight = pWeight; }
/* 8032BCAC */ virtual ~J3DAnmCluster() {}
/* 8032BF44 */ virtual s32 getKind() const { return 3; }
/* 8032BF4C */ virtual f32 getWeight(u16) const { return 1.0f; }
virtual ~J3DAnmCluster() {}
virtual s32 getKind() const { return 3; }
virtual f32 getWeight(u16) const { return 1.0f; }
/* 0x0C */ f32* mWeight;
}; // Size: 0x10
@ -868,9 +868,9 @@ class J3DAnmClusterFull : public J3DAnmCluster {
public:
J3DAnmClusterFull() : J3DAnmCluster(0, NULL) { mAnmTable = NULL; }
/* 8032BCAC */ virtual ~J3DAnmClusterFull() {}
/* 8032BF44 */ virtual s32 getKind() const { return 12; }
/* 8032BF4C */ virtual f32 getWeight(u16) const;
virtual ~J3DAnmClusterFull() {}
virtual s32 getKind() const { return 12; }
virtual f32 getWeight(u16) const;
/* 0x10 */ J3DAnmClusterFullTable* mAnmTable;
};
@ -883,9 +883,9 @@ class J3DAnmClusterKey : public J3DAnmCluster {
public:
J3DAnmClusterKey() : J3DAnmCluster(0, NULL) { mAnmTable = NULL; }
/* 8032C044 */ virtual ~J3DAnmClusterKey() {}
/* 8032C0B0 */ virtual s32 getKind() const { return 13; }
/* 8032A218 */ virtual f32 getWeight(u16) const;
virtual ~J3DAnmClusterKey() {}
virtual s32 getKind() const { return 13; }
virtual f32 getWeight(u16) const;
/* 0x10 */ J3DAnmClusterKeyTable* mAnmTable;
};
@ -903,8 +903,8 @@ public:
mVisibility = NULL;
}
/* 8033979C */ virtual ~J3DAnmVisibilityFull() {}
/* 803397F8 */ virtual s32 getKind() const { return 6; }
virtual ~J3DAnmVisibilityFull() {}
virtual s32 getKind() const { return 6; }
/* 0x0C */ u16 mUpdateMaterialNum;
/* 0x0E */ u16 field_0xe;
@ -968,9 +968,9 @@ public:
struct J3DMtxCalcAnmBase: public J3DMtxCalc {
J3DMtxCalcAnmBase(J3DAnmTransform* pAnmTransform) { mAnmTransform = pAnmTransform; }
/* 8000D8EC */ ~J3DMtxCalcAnmBase() {}
/* 80014FB8 */ J3DAnmTransform* getAnmTransform() { return mAnmTransform; }
/* 80014FC0 */ void setAnmTransform(J3DAnmTransform* pAnmTransform) { mAnmTransform = pAnmTransform; }
~J3DMtxCalcAnmBase() {}
J3DAnmTransform* getAnmTransform() { return mAnmTransform; }
void setAnmTransform(J3DAnmTransform* pAnmTransform) { mAnmTransform = pAnmTransform; }
J3DAnmTransform* mAnmTransform;
};

10
include/JSystem/J3DGraphAnimator/J3DCluster.h
View File

@ -73,11 +73,11 @@ public:
*/
class J3DDeformData {
public:
/* 8032E1F8 */ J3DDeformData();
/* 8032E230 */ void offAllFlag(u32);
/* 8032E298 */ void deform(J3DVertexBuffer*);
/* 8032E274 */ void deform(J3DModel*);
/* 8032E364 */ void setAnm(J3DAnmCluster*);
J3DDeformData();
void offAllFlag(u32);
void deform(J3DVertexBuffer*);
void deform(J3DModel*);
void setAnm(J3DAnmCluster*);
J3DCluster* getClusterPointer(u16 index) {
J3D_ASSERT_RANGE(186, (index < mClusterNum));

38
include/JSystem/J3DGraphAnimator/J3DJoint.h
View File

@ -16,27 +16,27 @@ class J3DMtxBuffer;
*/
class J3DMtxCalc {
public:
/* 80325D1C */ static void setMtxBuffer(J3DMtxBuffer*);
static void setMtxBuffer(J3DMtxBuffer*);
/* 8000D948 */ virtual ~J3DMtxCalc() {}
/* 80014E90 */ virtual void setAnmTransform(J3DAnmTransform*) {
virtual ~J3DMtxCalc() {}
virtual void setAnmTransform(J3DAnmTransform*) {
JUT_ASSERT_MSG(127, FALSE, "You cannot use this method");
}
/* 80014E9C */ virtual J3DAnmTransform* getAnmTransform() {
virtual J3DAnmTransform* getAnmTransform() {
JUT_ASSERT_MSG(131, FALSE, "You cannot use this method");
return NULL;
}
/* 80014E8C */ virtual void setAnmTransform(u8, J3DAnmTransform*) {
virtual void setAnmTransform(u8, J3DAnmTransform*) {
JUT_ASSERT_MSG(137, FALSE, "You cannot use this method");
}
/* 80014E94 */ virtual J3DAnmTransform* getAnmTransform(u8) {
virtual J3DAnmTransform* getAnmTransform(u8) {
JUT_ASSERT_MSG(141, FALSE, "You cannot use this method");
return NULL;
}
/* 80014EA4 */ virtual void setWeight(u8, f32) {
virtual void setWeight(u8, f32) {
JUT_ASSERT_MSG(147, FALSE, "You cannot use this method");
}
/* 80014EA8 */ virtual f32 getWeight(u8) const {
virtual f32 getWeight(u8) const {
JUT_ASSERT_MSG(152, FALSE, "You cannot use this method");
return 0.0f;
}
@ -62,10 +62,10 @@ typedef int (*J3DJointCallBack)(J3DJoint*, int);
*/
class J3DJoint {
public:
/* 8032F13C */ void appendChild(J3DJoint*);
/* 8032F170 */ J3DJoint();
/* 8032F254 */ void entryIn();
/* 8032F3F8 */ void recursiveCalc();
void appendChild(J3DJoint*);
J3DJoint();
void entryIn();
void recursiveCalc();
u32 getType() const { return 'NJNT'; }
@ -127,7 +127,7 @@ private:
*/
class J3DMtxCalcNoAnmBase : public J3DMtxCalc {
public:
/* 8000FA8C */ virtual ~J3DMtxCalcNoAnmBase() {}
virtual ~J3DMtxCalcNoAnmBase() {}
};
/**
@ -151,7 +151,7 @@ public:
*
*/
struct J3DMtxCalcJ3DSysInitSoftimage {
/* 8032ECAC */ static void init(const Vec& param_0, const Mtx& param_1) {
static void init(const Vec& param_0, const Mtx& param_1) {
J3DSys::mCurrentS = param_0;
MTXCopy(param_1, J3DSys::mCurrentMtx);
}
@ -162,7 +162,7 @@ struct J3DMtxCalcJ3DSysInitSoftimage {
*
*/
struct J3DMtxCalcJ3DSysInitMaya {
/* 8032ECAC */ static void init(const Vec&, const Mtx& param_1);
static void init(const Vec&, const Mtx& param_1);
};
/**
@ -170,7 +170,7 @@ struct J3DMtxCalcJ3DSysInitMaya {
*
*/
struct J3DMtxCalcJ3DSysInitBasic {
/* 8032EC28 */ static void init(const Vec&, const Mtx& param_1);
static void init(const Vec&, const Mtx& param_1);
};
/**
@ -178,7 +178,7 @@ struct J3DMtxCalcJ3DSysInitBasic {
*
*/
struct J3DMtxCalcCalcTransformSoftimage {
/* 8032EE50 */ static void calcTransform(J3DTransformInfo const&);
static void calcTransform(J3DTransformInfo const&);
};
/**
@ -186,7 +186,7 @@ struct J3DMtxCalcCalcTransformSoftimage {
*
*/
struct J3DMtxCalcCalcTransformMaya {
/* 8032EFBC */ static void calcTransform(J3DTransformInfo const&);
static void calcTransform(J3DTransformInfo const&);
};
/**
@ -194,7 +194,7 @@ struct J3DMtxCalcCalcTransformMaya {
*
*/
struct J3DMtxCalcCalcTransformBasic {
/* 8032ED30 */ static void calcTransform(J3DTransformInfo const&);
static void calcTransform(J3DTransformInfo const&);
};
#endif /* J3DJOINT_H */

14
include/JSystem/J3DGraphAnimator/J3DJointTree.h
View File

@ -21,8 +21,8 @@ class J3DMaterialTable;
*
*/
struct J3DDrawMtxData {
/* 803115E0 */ J3DDrawMtxData();
/* 803115F4 */ ~J3DDrawMtxData();
J3DDrawMtxData();
~J3DDrawMtxData();
/* 0x0 */ u16 mEntryNum;
/* 0x2 */ u16 mDrawFullWgtMtxNum;
@ -38,13 +38,13 @@ class J3DShapeTable;
*/
class J3DJointTree {
public:
/* 80325A18 */ J3DJointTree();
/* 80325A9C */ void makeHierarchy(J3DJoint*, J3DModelHierarchy const**, J3DMaterialTable*,
J3DJointTree();
void makeHierarchy(J3DJoint*, J3DModelHierarchy const**, J3DMaterialTable*,
J3DShapeTable*);
/* 80325C00 */ void findImportantMtxIndex();
void findImportantMtxIndex();
/* 80325CAC */ virtual void calc(J3DMtxBuffer*, Vec const&, f32 const (&)[3][4]);
/* 80325D24 */ virtual ~J3DJointTree() {}
virtual void calc(J3DMtxBuffer*, Vec const&, f32 const (&)[3][4]);
virtual ~J3DJointTree() {}
J3DModelHierarchy const* getHierarchy() { return mHierarchy; }
void setHierarchy(J3DModelHierarchy* hierarchy) { mHierarchy = hierarchy; }

38
include/JSystem/J3DGraphAnimator/J3DMaterialAnm.h
View File

@ -9,9 +9,9 @@
*/
class J3DMatColorAnm {
public:
/* 8003B2B8 */ ~J3DMatColorAnm() {}
~J3DMatColorAnm() {}
/* 8003B2F4 */ J3DMatColorAnm() : field_0x0(0), mAnmFlag(1), mAnmColor(NULL) {}
J3DMatColorAnm() : field_0x0(0), mAnmFlag(1), mAnmColor(NULL) {}
J3DMatColorAnm(u16 param_1, J3DAnmColor* pAnmColor) {
field_0x0 = param_1;
@ -46,8 +46,8 @@ private:
*/
class J3DTexMtxAnm {
public:
/* 8003B264 */ ~J3DTexMtxAnm() {}
/* 8003B2A0 */ J3DTexMtxAnm() : field_0x0(0), mAnmFlag(1), mAnmTransform(NULL) {}
~J3DTexMtxAnm() {}
J3DTexMtxAnm() : field_0x0(0), mAnmFlag(1), mAnmTransform(NULL) {}
J3DTexMtxAnm(u16 param_1, J3DAnmTextureSRTKey* pSRTKey) {
field_0x0 = param_1;
@ -83,8 +83,8 @@ private:
*/
class J3DTexNoAnm {
public:
/* 8003B1F8 */ ~J3DTexNoAnm() {}
/* 8003B240 */ J3DTexNoAnm() : field_0x4(0), mAnmFlag(1), mAnmTexPattern(NULL) {}
~J3DTexNoAnm() {}
J3DTexNoAnm() : field_0x4(0), mAnmFlag(1), mAnmTexPattern(NULL) {}
J3DTexNoAnm(u16 param_1, J3DAnmTexPattern* pAnmTexPattern) {
field_0x4 = param_1;
@ -93,7 +93,7 @@ public:
J3D_ASSERT_NULLPTR(214, pAnmTexPattern != NULL);
}
/* 8003C82C */ virtual void calc(u16* param_0) const { mAnmTexPattern->getTexNo(field_0x4, param_0); }
virtual void calc(u16* param_0) const { mAnmTexPattern->getTexNo(field_0x4, param_0); }
void operator=(J3DTexNoAnm const& other) {
mAnmTexPattern = other.mAnmTexPattern;
@ -117,8 +117,8 @@ private:
*/
class J3DTevColorAnm {
public:
/* 8003B1A4 */ ~J3DTevColorAnm() {}
/* 8003B1E0 */ J3DTevColorAnm() : field_0x0(0), mAnmFlag(1), mAnmTevReg(NULL) {}
~J3DTevColorAnm() {}
J3DTevColorAnm() : field_0x0(0), mAnmFlag(1), mAnmTevReg(NULL) {}
J3DTevColorAnm(u16 param_1, J3DAnmTevRegKey* pTevRegKey) {
field_0x0 = param_1;
@ -153,8 +153,8 @@ private:
*/
class J3DTevKColorAnm {
public:
/* 8003B150 */ ~J3DTevKColorAnm() {}
/* 8003B18C */ J3DTevKColorAnm() : field_0x0(0), mAnmFlag(1), mAnmTevReg(NULL) {}
~J3DTevKColorAnm() {}
J3DTevKColorAnm() : field_0x0(0), mAnmFlag(1), mAnmTevReg(NULL) {}
J3DTevKColorAnm(u16 param_1, J3DAnmTevRegKey* pTevRegKey) {
field_0x0 = param_1;
@ -191,15 +191,15 @@ class J3DMaterialAnm {
public:
J3DMaterialAnm() { initialize(); }
/* 8032C320 */ void initialize();
/* 8032C5A4 */ void setMatColorAnm(int, J3DMatColorAnm*);
/* 8032C5E4 */ void setTexMtxAnm(int, J3DTexMtxAnm*);
/* 8032C624 */ void setTexNoAnm(int, J3DTexNoAnm*);
/* 8032C664 */ void setTevColorAnm(int, J3DTevColorAnm*);
/* 8032C6A4 */ void setTevKColorAnm(int, J3DTevKColorAnm*);
void initialize();
void setMatColorAnm(int, J3DMatColorAnm*);
void setTexMtxAnm(int, J3DTexMtxAnm*);
void setTexNoAnm(int, J3DTexNoAnm*);
void setTevColorAnm(int, J3DTevColorAnm*);
void setTevKColorAnm(int, J3DTevKColorAnm*);
/* 800A4820 */ virtual ~J3DMaterialAnm() {}
/* 8032C3C4 */ virtual void calc(J3DMaterial*) const;
virtual ~J3DMaterialAnm() {}
virtual void calc(J3DMaterial*) const;
const J3DTexMtxAnm& getTexMtxAnm(int i) const { return mTexMtxAnm[i]; }

24
include/JSystem/J3DGraphAnimator/J3DMaterialAttach.h
View File

@ -17,19 +17,19 @@ class JUTNameTab;
*/
class J3DMaterialTable {
public:
/* 8032F5A8 */ void clear();
/* 8032F5D0 */ J3DMaterialTable();
/* 8032F64C */ int removeMatColorAnimator(J3DAnmColor*);
/* 8032F6F8 */ int removeTexNoAnimator(J3DAnmTexPattern*);
/* 8032F7B4 */ int removeTexMtxAnimator(J3DAnmTextureSRTKey*);
/* 8032F880 */ int removeTevRegAnimator(J3DAnmTevRegKey*);
/* 8032F9C0 */ int createTexMtxForAnimator(J3DAnmTextureSRTKey*);
/* 8032FAF4 */ int entryMatColorAnimator(J3DAnmColor*);
/* 8032FBC8 */ int entryTexNoAnimator(J3DAnmTexPattern*);
/* 8032FCC4 */ int entryTexMtxAnimator(J3DAnmTextureSRTKey*);
/* 8032FE70 */ int entryTevRegAnimator(J3DAnmTevRegKey*);
void clear();
J3DMaterialTable();
int removeMatColorAnimator(J3DAnmColor*);
int removeTexNoAnimator(J3DAnmTexPattern*);
int removeTexMtxAnimator(J3DAnmTextureSRTKey*);
int removeTevRegAnimator(J3DAnmTevRegKey*);
int createTexMtxForAnimator(J3DAnmTextureSRTKey*);
int entryMatColorAnimator(J3DAnmColor*);
int entryTexNoAnimator(J3DAnmTexPattern*);
int entryTexMtxAnimator(J3DAnmTextureSRTKey*);
int entryTevRegAnimator(J3DAnmTevRegKey*);
/* 8032F604 */ virtual ~J3DMaterialTable();
virtual ~J3DMaterialTable();
J3DMaterial* getMaterialNodePointer(u16 idx) const {
J3D_ASSERT_RANGE(92, idx < mMaterialNum);

46
include/JSystem/J3DGraphAnimator/J3DModel.h
View File

@ -51,32 +51,32 @@ public:
entryModelData(pModelData, mdlFlags, mtxBufferFlag);
}
/* 80327100 */ void initialize();
/* 80327184 */ s32 entryModelData(J3DModelData*, u32, u32);
/* 80327300 */ s32 createShapePacket(J3DModelData*);
/* 803273CC */ s32 createMatPacket(J3DModelData*, u32);
/* 803275FC */ s32 newDifferedDisplayList(u32);
/* 8032767C */ void lock();
/* 803276B4 */ void unlock();
/* 803279A0 */ void diff();
/* 80327A2C */ s32 setDeformData(J3DDeformData*, u32);
/* 80327AA0 */ s32 setSkinDeform(J3DSkinDeform*, u32);
/* 80327BD4 */ void calcAnmMtx();
/* 80327C58 */ void calcWeightEnvelopeMtx();
/* 80328190 */ void calcNrmMtx();
/* 803281B4 */ void calcBumpMtx();
/* 803282B8 */ void calcBBoardMtx();
/* 803282EC */ void prepareShapePackets();
void initialize();
s32 entryModelData(J3DModelData*, u32, u32);
s32 createShapePacket(J3DModelData*);
s32 createMatPacket(J3DModelData*, u32);
s32 newDifferedDisplayList(u32);
void lock();
void unlock();
void diff();
s32 setDeformData(J3DDeformData*, u32);
s32 setSkinDeform(J3DSkinDeform*, u32);
void calcAnmMtx();
void calcWeightEnvelopeMtx();
void calcNrmMtx();
void calcBumpMtx();
void calcBBoardMtx();
void prepareShapePackets();
void ptrToIndex();
void makeDL();
/* 80327CA4 */ virtual void update();
/* 80327E4C */ virtual void entry();
/* 80327CF0 */ virtual void calc();
/* 803276EC */ virtual void calcMaterial();
/* 80327858 */ virtual void calcDiffTexMtx();
/* 80327F40 */ virtual void viewCalc();
/* 80328350 */ virtual ~J3DModel() {}
virtual void update();
virtual void entry();
virtual void calc();
virtual void calcMaterial();
virtual void calcDiffTexMtx();
virtual void viewCalc();
virtual ~J3DModel() {}
J3DModelData* getModelData() { return mModelData; }

18
include/JSystem/J3DGraphAnimator/J3DModelData.h
View File

@ -16,16 +16,16 @@ class JUTNameTab;
*/
class J3DModelData {
public:
/* 80325D88 */ void clear();
/* 80325DA0 */ J3DModelData();
/* 80325E14 */ s32 newSharedDisplayList(u32);
/* 80325EC8 */ void indexToPtr();
/* 80325F94 */ void makeSharedDL();
/* 8032600C */ void simpleCalcMaterial(u16, Mtx);
/* 803260CC */ void syncJ3DSysPointers() const;
/* 803260F8 */ void syncJ3DSysFlags() const;
void clear();
J3DModelData();
s32 newSharedDisplayList(u32);
void indexToPtr();
void makeSharedDL();
void simpleCalcMaterial(u16, Mtx);
void syncJ3DSysPointers() const;
void syncJ3DSysFlags() const;
/* 8032617C */ virtual ~J3DModelData() {}
virtual ~J3DModelData() {}
void simpleCalcMaterial(Mtx mtx) { simpleCalcMaterial(0, mtx); }
J3DMaterialTable& getMaterialTable() { return mMaterialTable; }

24
include/JSystem/J3DGraphAnimator/J3DMtxBuffer.h
View File

@ -13,17 +13,17 @@ class J3DMtxBuffer {
public:
J3DMtxBuffer() { initialize(); }
/* 80326214 */ void initialize();
/* 80326258 */ s32 create(J3DModelData*, u32);
/* 80326364 */ J3DError createAnmMtx(J3DModelData*);
/* 803263F0 */ s32 createWeightEnvelopeMtx(J3DModelData*);
/* 8032648C */ s32 setNoUseDrawMtx();
/* 803264B8 */ s32 createDoubleDrawMtx(J3DModelData*, u32);
/* 80326664 */ s32 createBumpMtxArray(J3DModelData*, u32);
/* 803268D4 */ void calcWeightEnvelopeMtx();
/* 80326ACC */ void calcDrawMtx(u32, Vec const&, f32 const (&)[3][4]);
/* 80326D3C */ void calcNrmMtx();
/* 80326EF0 */ void calcBBoardMtx();
void initialize();
s32 create(J3DModelData*, u32);
J3DError createAnmMtx(J3DModelData*);
s32 createWeightEnvelopeMtx(J3DModelData*);
s32 setNoUseDrawMtx();
s32 createDoubleDrawMtx(J3DModelData*, u32);
s32 createBumpMtxArray(J3DModelData*, u32);
void calcWeightEnvelopeMtx();
void calcDrawMtx(u32, Vec const&, f32 const (&)[3][4]);
void calcNrmMtx();
void calcBBoardMtx();
MtxP getAnmMtx(int idx) { return mpAnmMtx[idx]; }
void setAnmMtx(int i, Mtx m) { MTXCopy(m, (MtxP)mpAnmMtx[i]); }
@ -79,7 +79,7 @@ public:
/* 0x34 */ Mtx* mpUserAnmMtx;
public:
/* 803283B4 */ virtual ~J3DMtxBuffer() {}
virtual ~J3DMtxBuffer() {}
};
void J3DCalcViewBaseMtx(f32 (*param_0)[4], Vec const& param_1, f32 const (&param_2)[3][4],

8
include/JSystem/J3DGraphAnimator/J3DShapeTable.h
View File

@ -18,10 +18,10 @@ public:
mShapeName = NULL;
}
/* 803258A0 */ void hide();
/* 803258D8 */ void show();
/* 80325910 */ void initShapeNodes(J3DDrawMtxData*, J3DVertexData*);
/* 8032597C */ void sortVcdVatCmd();
void hide();
void show();
void initShapeNodes(J3DDrawMtxData*, J3DVertexData*);
void sortVcdVatCmd();
virtual ~J3DShapeTable() {}

50
include/JSystem/J3DGraphAnimator/J3DSkinDeform.h
View File

@ -15,9 +15,9 @@ class JUTNameTab;
*
*/
struct J3DSkinNList {
/* 8032C6E4 */ J3DSkinNList();
/* 8032C85C */ void calcSkin_VtxPosF32(f32 (*)[4], void*, void*);
/* 8032C8E4 */ void calcSkin_VtxNrmF32(f32 (*)[4], void*, void*);
J3DSkinNList();
void calcSkin_VtxPosF32(f32 (*)[4], void*, void*);
void calcSkin_VtxNrmF32(f32 (*)[4], void*, void*);
/* 0x00 */ u16* field_0x0;
/* 0x04 */ u16* field_0x4;
@ -33,20 +33,20 @@ struct J3DSkinNList {
*/
class J3DSkinDeform {
public:
/* 8032C96C */ J3DSkinDeform();
/* 8032C9B0 */ void initSkinInfo(J3DModelData*);
/* 8032CF44 */ int initMtxIndexArray(J3DModelData*);
/* 8032D378 */ void changeFastSkinDL(J3DModelData*);
/* 8032D5C4 */ void calcNrmMtx(J3DMtxBuffer*);
/* 8032D738 */ void transformVtxPosNrm(J3DModelData*);
/* 8032D87C */ void calcAnmInvJointMtx(J3DMtxBuffer*);
/* 8032D8F4 */ void deformFastVtxPos_F32(J3DVertexBuffer*, J3DMtxBuffer*) const;
/* 8032DA1C */ void deformFastVtxNrm_F32(J3DVertexBuffer*, J3DMtxBuffer*) const;
/* 8032DB50 */ void deformVtxPos_F32(J3DVertexBuffer*, J3DMtxBuffer*) const;
/* 8032DC74 */ void deformVtxPos_S16(J3DVertexBuffer*, J3DMtxBuffer*) const;
/* 8032DDB8 */ void deformVtxNrm_F32(J3DVertexBuffer*) const;
/* 8032DEBC */ void deformVtxNrm_S16(J3DVertexBuffer*) const;
/* 8032DFDC */ void deform(J3DModel*);
J3DSkinDeform();
void initSkinInfo(J3DModelData*);
int initMtxIndexArray(J3DModelData*);
void changeFastSkinDL(J3DModelData*);
void calcNrmMtx(J3DMtxBuffer*);
void transformVtxPosNrm(J3DModelData*);
void calcAnmInvJointMtx(J3DMtxBuffer*);
void deformFastVtxPos_F32(J3DVertexBuffer*, J3DMtxBuffer*) const;
void deformFastVtxNrm_F32(J3DVertexBuffer*, J3DMtxBuffer*) const;
void deformVtxPos_F32(J3DVertexBuffer*, J3DMtxBuffer*) const;
void deformVtxPos_S16(J3DVertexBuffer*, J3DMtxBuffer*) const;
void deformVtxNrm_F32(J3DVertexBuffer*) const;
void deformVtxNrm_S16(J3DVertexBuffer*) const;
void deform(J3DModel*);
void setNrmMtx(int i, MtxP mtx) {
J3DPSMtx33CopyFrom34(mtx, (Mtx3P)mNrmMtx[i]);
}
@ -55,8 +55,8 @@ public:
void offFlag(u32 flag) { mFlags &= ~flag; }
bool checkFlag(u32 flag) { return mFlags & flag ? true : false; }
/* 8032E064 */ virtual void deform(J3DVertexBuffer*, J3DMtxBuffer*);
/* 8032E1B0 */ virtual ~J3DSkinDeform();
virtual void deform(J3DVertexBuffer*, J3DMtxBuffer*);
virtual ~J3DSkinDeform();
static u16* sWorkArea_WEvlpMixMtx[1024];
static f32* sWorkArea_WEvlpMixWeight[1024];
@ -81,12 +81,12 @@ private:
*/
class J3DDeformer {
public:
/* 8032E39C */ J3DDeformer(J3DDeformData*);
/* 8032EAB4 */ void deform(J3DVertexBuffer*, u16, f32*);
/* 8032E3BC */ void deform(J3DVertexBuffer*, u16);
/* 8032E4A4 */ void deform_VtxPosF32(J3DVertexBuffer*, J3DCluster*, J3DClusterKey*, f32*);
/* 8032E60C */ void deform_VtxNrmF32(J3DVertexBuffer*, J3DCluster*, J3DClusterKey*, f32*);
/* 8032EBCC */ void normalizeWeight(int, f32*);
J3DDeformer(J3DDeformData*);
void deform(J3DVertexBuffer*, u16, f32*);
void deform(J3DVertexBuffer*, u16);
void deform_VtxPosF32(J3DVertexBuffer*, J3DCluster*, J3DClusterKey*, f32*);
void deform_VtxNrmF32(J3DVertexBuffer*, J3DCluster*, J3DClusterKey*, f32*);
void normalizeWeight(int, f32*);
void offFlag(u32 i_flag) { mFlags &= ~i_flag; }
bool checkFlag(u32 i_flag) { return mFlags & i_flag ? true : false; }

4
include/JSystem/J3DGraphBase/J3DDrawBuffer.h
View File

@ -5,13 +5,13 @@
// matches debug
inline f32 J3DCalcZValue(register MtxP m, register Vec v) {
#ifdef __MWERKS__
register f32 temp_f4;
register f32 out;
register f32 temp_f0;
register f32 temp_f2;
register f32 temp_f1 = 1.0f;
#ifdef __MWERKS__
// clang-format off
asm {
psq_l temp_f0, 0(v), 0, 0 /* qr0 */
@ -24,9 +24,9 @@ inline f32 J3DCalcZValue(register MtxP m, register Vec v) {
ps_sum0 out, out, out, out
}
// clang-format on
#endif
return out;
#endif
}
class J3DDrawBuffer;

1212
include/JSystem/J3DGraphBase/J3DMatBlock.h
View File

File diff suppressed because it is too large Load Diff

90
include/JSystem/J3DGraphBase/J3DMaterial.h
View File

@ -15,35 +15,35 @@ class J3DMaterialAnm;
*/
class J3DMaterial {
public:
/* 803157A0 */ static J3DColorBlock* createColorBlock(u32);
/* 803159A0 */ static J3DTexGenBlock* createTexGenBlock(u32);
/* 80315B04 */ static J3DTevBlock* createTevBlock(int);
/* 80315E78 */ static J3DIndBlock* createIndBlock(int);
/* 80315F60 */ static J3DPEBlock* createPEBlock(u32, u32);
/* 80316100 */ static u32 calcSizeColorBlock(u32);
/* 80316150 */ static u32 calcSizeTexGenBlock(u32);
/* 8031617C */ static u32 calcSizeTevBlock(int);
/* 803161C4 */ static u32 calcSizeIndBlock(int);
/* 803161D8 */ static u32 calcSizePEBlock(u32, u32);
/* 80316240 */ void initialize();
/* 80316290 */ u32 countDLSize();
/* 80316344 */ void makeDisplayList_private(J3DDisplayListObj*);
/* 80316AB0 */ void setCurrentMtx();
/* 80316AC8 */ void calcCurrentMtx();
/* 80316D68 */ void copy(J3DMaterial*);
/* 80316E90 */ s32 newSharedDisplayList(u32);
/* 80316F24 */ s32 newSingleSharedDisplayList(u32);
static J3DColorBlock* createColorBlock(u32);
static J3DTexGenBlock* createTexGenBlock(u32);
static J3DTevBlock* createTevBlock(int);
static J3DIndBlock* createIndBlock(int);
static J3DPEBlock* createPEBlock(u32, u32);
static u32 calcSizeColorBlock(u32);
static u32 calcSizeTexGenBlock(u32);
static u32 calcSizeTevBlock(int);
static u32 calcSizeIndBlock(int);
static u32 calcSizePEBlock(u32, u32);
void initialize();
u32 countDLSize();
void makeDisplayList_private(J3DDisplayListObj*);
void setCurrentMtx();
void calcCurrentMtx();
void copy(J3DMaterial*);
s32 newSharedDisplayList(u32);
s32 newSingleSharedDisplayList(u32);
/* 803169DC */ virtual void calc(f32 const (*)[4]);
/* 80316A54 */ virtual void calcDiffTexMtx(f32 const (*)[4]);
/* 80316620 */ virtual void makeDisplayList();
/* 80316668 */ virtual void makeSharedDisplayList();
/* 8031668C */ virtual void load();
/* 803166DC */ virtual void loadSharedDL();
/* 80316740 */ virtual void patch();
/* 803167D8 */ virtual void diff(u32);
/* 80316E14 */ virtual void reset();
/* 80316E70 */ virtual void change();
virtual void calc(f32 const (*)[4]);
virtual void calcDiffTexMtx(f32 const (*)[4]);
virtual void makeDisplayList();
virtual void makeSharedDisplayList();
virtual void load();
virtual void loadSharedDL();
virtual void patch();
virtual void diff(u32);
virtual void reset();
virtual void change();
J3DMaterial() { initialize(); }
~J3DMaterial() {}
@ -132,14 +132,14 @@ public:
class J3DPatchedMaterial : public J3DMaterial {
public:
J3DPatchedMaterial() { initialize(); }
/* 80316FB8 */ void initialize();
void initialize();
/* 80316FD8 */ virtual void makeDisplayList();
/* 80316FDC */ virtual void makeSharedDisplayList();
/* 80316FE0 */ virtual void load();
/* 80316FFC */ virtual void loadSharedDL();
/* 8031703C */ virtual void reset();
/* 80317040 */ virtual void change();
virtual void makeDisplayList();
virtual void makeSharedDisplayList();
virtual void load();
virtual void loadSharedDL();
virtual void reset();
virtual void change();
};
/**
@ -149,17 +149,17 @@ public:
class J3DLockedMaterial : public J3DMaterial {
public:
J3DLockedMaterial() { initialize(); }
/* 80317044 */ void initialize();
void initialize();
/* 803170D0 */ virtual void calc(f32 const (*)[4]);
/* 80317064 */ virtual void makeDisplayList();
/* 80317068 */ virtual void makeSharedDisplayList();
/* 8031706C */ virtual void load();
/* 80317088 */ virtual void loadSharedDL();
/* 803170C8 */ virtual void patch();
/* 803170CC */ virtual void diff(u32);
/* 803170D4 */ virtual void reset();
/* 803170D8 */ virtual void change();
virtual void calc(f32 const (*)[4]);
virtual void makeDisplayList();
virtual void makeSharedDisplayList();
virtual void load();
virtual void loadSharedDL();
virtual void patch();
virtual void diff(u32);
virtual void reset();
virtual void change();
};
#endif /* J3DMATERIAL_H */

50
include/JSystem/J3DGraphBase/J3DShape.h
View File

@ -65,17 +65,17 @@ public:
: mUseMtxIndex(useMtxIndex)
{}
/* 803130E4 */ void loadMtxIndx_PNGP(int, u16) const;
/* 80313128 */ void loadMtxIndx_PCPU(int, u16) const;
/* 80313188 */ void loadMtxIndx_NCPU(int, u16) const;
/* 803131D4 */ void loadMtxIndx_PNCPU(int, u16) const;
void loadMtxIndx_PNGP(int, u16) const;
void loadMtxIndx_PCPU(int, u16) const;
void loadMtxIndx_NCPU(int, u16) const;
void loadMtxIndx_PNCPU(int, u16) const;
/* 80314798 */ virtual ~J3DShapeMtx() {}
/* 803147E0 */ virtual u32 getType() const { return 'SMTX'; }
/* 80273E08 */ virtual u16 getUseMtxNum() const { return 1; }
/* 8031459C */ virtual u16 getUseMtxIndex(u16) const { return mUseMtxIndex; }
/* 80313B94 */ virtual void load() const;
/* 80313BF0 */ virtual void calcNBTScale(Vec const&, f32 (*)[3][3], f32 (*)[3][3]);
virtual ~J3DShapeMtx() {}
virtual u32 getType() const { return 'SMTX'; }
virtual u16 getUseMtxNum() const { return 1; }
virtual u16 getUseMtxIndex(u16) const { return mUseMtxIndex; }
virtual void load() const;
virtual void calcNBTScale(Vec const&, f32 (*)[3][3], f32 (*)[3][3]);
static J3DShapeMtx_LoadFunc sMtxLoadPipeline[4];
static u16 sMtxLoadCache[10];
@ -123,22 +123,22 @@ public:
static const int kVcdVatDLSize = 0xC0;
/* 80314B48 */ void initialize();
/* 80314BB8 */ void addTexMtxIndexInDL(_GXAttr, u32);
/* 80314CBC */ void addTexMtxIndexInVcd(_GXAttr);
/* 80314DA8 */ void calcNBTScale(Vec const&, f32 (*)[3][3], f32 (*)[3][3]);
/* 80314E28 */ u16 countBumpMtxNum() const;
/* 80314EEC */ void loadVtxArray() const;
/* 80314F5C */ bool isSameVcdVatCmd(J3DShape*);
/* 80314F98 */ void makeVtxArrayCmd();
/* 80315260 */ void makeVcdVatCmd();
/* 80315300 */ void loadPreDrawSetting() const;
/* 80315398 */ void setArrayAndBindPipeline() const;
void initialize();
void addTexMtxIndexInDL(_GXAttr, u32);
void addTexMtxIndexInVcd(_GXAttr);
void calcNBTScale(Vec const&, f32 (*)[3][3], f32 (*)[3][3]);
u16 countBumpMtxNum() const;
void loadVtxArray() const;
bool isSameVcdVatCmd(J3DShape*);
void makeVtxArrayCmd();
void makeVcdVatCmd();
void loadPreDrawSetting() const;
void setArrayAndBindPipeline() const;
/* 803155E0 */ virtual void draw() const;
/* 8031544C */ virtual void drawFast() const;
/* 80315628 */ virtual void simpleDraw() const;
/* 803156AC */ virtual void simpleDrawCache() const;
virtual void draw() const;
virtual void drawFast() const;
virtual void simpleDraw() const;
virtual void simpleDrawCache() const;
void loadCurrentMtx() const;

10
include/JSystem/J3DGraphBase/J3DShapeDraw.h
View File

@ -9,12 +9,12 @@
*/
class J3DShapeDraw {
public:
/* 80314924 */ u32 countVertex(u32);
/* 80314974 */ void addTexMtxIndexInDL(u32, u32, u32);
/* 80314ABC */ J3DShapeDraw(u8 const*, u32);
/* 80314AD4 */ void draw() const;
u32 countVertex(u32);
void addTexMtxIndexInDL(u32, u32, u32);
J3DShapeDraw(u8 const*, u32);
void draw() const;
/* 80314B00 */ virtual ~J3DShapeDraw();
virtual ~J3DShapeDraw();
u8* getDisplayList() const { return (u8*)mDisplayList; }
u32 getDisplayListSize() const { return mDisplayListSize; }

60
include/JSystem/J3DGraphBase/J3DShapeMtx.h
View File

@ -42,7 +42,7 @@ public:
*/
class J3DDifferedTexMtx {
public:
/* 8031322C */ static void loadExecute(f32 const (*)[4]);
static void loadExecute(f32 const (*)[4]);
static inline void load(const Mtx m) {
if (sTexGenBlock != NULL)
@ -66,17 +66,17 @@ public:
: J3DShapeMtx(useMtxIndex)
{}
/* 80314730 */ virtual ~J3DShapeMtxConcatView() {}
/* 803147E0 */ virtual u32 getType() const { return 'SMCV'; }
/* 80313C54 */ virtual void load() const;
/* 80314598 */ virtual void loadNrmMtx(int, u16) const {}
/* 80313D28 */ virtual void loadNrmMtx(int, u16, f32 (*)[4]) const;
virtual ~J3DShapeMtxConcatView() {}
virtual u32 getType() const { return 'SMCV'; }
virtual void load() const;
virtual void loadNrmMtx(int, u16) const {}
virtual void loadNrmMtx(int, u16, f32 (*)[4]) const;
/* 80313828 */ void loadMtxConcatView_PNGP(int, u16) const;
/* 803138C8 */ void loadMtxConcatView_PCPU(int, u16) const;
/* 8031396C */ void loadMtxConcatView_NCPU(int, u16) const;
/* 80313A14 */ void loadMtxConcatView_PNCPU(int, u16) const;
/* 80313AC8 */ void loadMtxConcatView_PNGP_LOD(int, u16) const;
void loadMtxConcatView_PNGP(int, u16) const;
void loadMtxConcatView_PCPU(int, u16) const;
void loadMtxConcatView_NCPU(int, u16) const;
void loadMtxConcatView_PNCPU(int, u16) const;
void loadMtxConcatView_PNGP_LOD(int, u16) const;
static J3DShapeMtxConcatView_LoadFunc sMtxLoadPipeline[4];
static J3DShapeMtxConcatView_LoadFunc sMtxLoadLODPipeline[4];
@ -93,9 +93,9 @@ public:
: J3DShapeMtxConcatView(useMtxIndex)
{}
/* 80314520 */ virtual ~J3DShapeMtxYBBoardConcatView() {}
/* 803147E0 */ virtual u32 getType() const { return 'SMYB'; }
/* 803143E4 */ virtual void load() const;
virtual ~J3DShapeMtxYBBoardConcatView() {}
virtual u32 getType() const { return 'SMYB'; }
virtual void load() const;
};
/**
@ -108,9 +108,9 @@ public:
: J3DShapeMtxConcatView(useMtxIndex)
{}
/* 803145A4 */ virtual ~J3DShapeMtxBBoardConcatView() {}
/* 803147E0 */ virtual u32 getType() const { return 'SMBB'; }
/* 803142D4 */ virtual void load() const;
virtual ~J3DShapeMtxBBoardConcatView() {}
virtual u32 getType() const { return 'SMBB'; }
virtual void load() const;
};
/**
@ -125,12 +125,12 @@ public:
, mUseMtxIndexTable(useMtxIndexTable)
{}
/* 803146B0 */ virtual ~J3DShapeMtxMulti() {}
/* 803147E0 */ virtual u32 getType() const { return 'SMML'; }
/* 80273E08 */ virtual u16 getUseMtxNum() const { return mUseMtxNum; }
/* 8031459C */ virtual u16 getUseMtxIndex(u16 no) const { return mUseMtxIndexTable[no]; }
/* 80313E4C */ virtual void load() const;
/* 80313EEC */ virtual void calcNBTScale(Vec const&, f32 (*)[3][3], f32 (*)[3][3]);
virtual ~J3DShapeMtxMulti() {}
virtual u32 getType() const { return 'SMML'; }
virtual u16 getUseMtxNum() const { return mUseMtxNum; }
virtual u16 getUseMtxIndex(u16 no) const { return mUseMtxIndexTable[no]; }
virtual void load() const;
virtual void calcNBTScale(Vec const&, f32 (*)[3][3], f32 (*)[3][3]);
private:
/* 0x8 */ u16 mUseMtxNum;
@ -149,13 +149,13 @@ public:
, mUseMtxIndexTable(useMtxIndexTable)
{}
/* 8031461C */ virtual ~J3DShapeMtxMultiConcatView() {}
/* 803147E0 */ virtual u32 getType() const { return 'SMMC'; }
/* 80273E08 */ virtual u16 getUseMtxNum() const { return mUseMtxNum; }
/* 8031459C */ virtual u16 getUseMtxIndex(u16 no) const { return mUseMtxIndexTable[no]; }
/* 80313FA4 */ virtual void load() const;
/* 803146AC */ virtual void loadNrmMtx(int, u16) const {}
/* 8031419C */ virtual void loadNrmMtx(int, u16, f32 (*)[4]) const;
virtual ~J3DShapeMtxMultiConcatView() {}
virtual u32 getType() const { return 'SMMC'; }
virtual u16 getUseMtxNum() const { return mUseMtxNum; }
virtual u16 getUseMtxIndex(u16 no) const { return mUseMtxIndexTable[no]; }
virtual void load() const;
virtual void loadNrmMtx(int, u16) const {}
virtual void loadNrmMtx(int, u16, f32 (*)[4]) const;
private:
/* 0x8 */ u16 mUseMtxNum;

20
include/JSystem/J3DGraphBase/J3DStruct.h
View File

@ -11,7 +11,7 @@
*/
class J3DLightInfo {
public:
/* 803256C4 */ J3DLightInfo& operator=(J3DLightInfo const&);
J3DLightInfo& operator=(J3DLightInfo const&);
/* 0x00 */ Vec mLightPosition;
/* 0x0C */ Vec mLightDirection;
@ -28,8 +28,8 @@ extern "C" extern J3DLightInfo const j3dDefaultLightInfo;
*/
class J3DLightObj {
public:
/* 80018C0C */ J3DLightObj() { mInfo = j3dDefaultLightInfo; }
/* 80323590 */ void load(u32) const;
J3DLightObj() { mInfo = j3dDefaultLightInfo; }
void load(u32) const;
J3DLightInfo& getLightInfo() { return mInfo; }
J3DLightObj& operator=(J3DLightObj const& other) {
@ -53,20 +53,20 @@ struct J3DTextureSRTInfo {
/* 0x10 */ f32 mTranslationY;
inline void operator=(J3DTextureSRTInfo const& other) {
#ifdef __MWERKS__
register const f32* src = &other.mScaleX;
register f32* dst = &mScaleX;
register f32 xy;
#ifdef __MWERKS__
asm {
psq_l xy, 0(src), 0, 0
psq_st xy, 0(dst), 0, 0
};
#endif
// Unclear why there's a 4 byte copy here.
*(u32*)&mRotation = *(u32*)&other.mRotation;
src = &other.mTranslationX;
dst = &mTranslationX;
#ifdef __MWERKS__
asm {
psq_l xy, 0(src), 0, 0
psq_st xy, 0(dst), 0, 0
@ -95,8 +95,8 @@ enum J3DTexMtxMode {
*
*/
struct J3DTexMtxInfo {
/* 80325718 */ J3DTexMtxInfo& operator=(J3DTexMtxInfo const&);
/* 80325794 */ void setEffectMtx(Mtx);
J3DTexMtxInfo& operator=(J3DTexMtxInfo const&);
void setEffectMtx(Mtx);
/* 0x00 */ u8 mProjection;
/* 0x01 */ u8 mInfo;
@ -122,7 +122,7 @@ struct J3DIndTexMtxInfo {
*
*/
struct J3DFogInfo {
/* 80325800 */ J3DFogInfo& operator=(J3DFogInfo const&);
J3DFogInfo& operator=(J3DFogInfo const&);
/* 0x00 */ u8 mType;
/* 0x01 */ u8 mAdjEnable;
@ -140,7 +140,7 @@ struct J3DFogInfo {
*
*/
struct J3DNBTScaleInfo {
/* 8032587C */ J3DNBTScaleInfo& operator=(J3DNBTScaleInfo const&);
J3DNBTScaleInfo& operator=(J3DNBTScaleInfo const&);
/* 0x0 */ u8 mbHasScale;
/* 0x4 */ Vec mScale;

26
include/JSystem/J3DGraphBase/J3DSys.h
View File

@ -70,19 +70,19 @@ struct J3DSys {
/* 0x114 */ GXColor* mVtxCol;
/* 0x118 */ Vec* mNBTScale;
/* 8030FDE8 */ J3DSys();
/* 8030FEC0 */ void loadPosMtxIndx(int, u16) const;
/* 8030FEE4 */ void loadNrmMtxIndx(int, u16) const;
/* 8030FF0C */ void setTexCacheRegion(GXTexCacheSize);
/* 803100BC */ void drawInit();
/* 8031073C */ void reinitGX();
/* 8031079C */ void reinitGenMode();
/* 803107E8 */ void reinitLighting();
/* 80310894 */ void reinitTransform();
/* 80310998 */ void reinitTexture();
/* 80310A3C */ void reinitTevStages();
/* 80310D44 */ void reinitIndStages();
/* 80310E3C */ void reinitPixelProc();
J3DSys();
void loadPosMtxIndx(int, u16) const;
void loadNrmMtxIndx(int, u16) const;
void setTexCacheRegion(GXTexCacheSize);
void drawInit();
void reinitGX();
void reinitGenMode();
void reinitLighting();
void reinitTransform();
void reinitTexture();
void reinitTevStages();
void reinitIndStages();
void reinitPixelProc();
enum J3DSysDrawMode {
J3DSysDrawMode_OpaTexEdge = 3,

10
include/JSystem/J3DGraphBase/J3DTevs.h
View File

@ -65,7 +65,7 @@ extern J3DTevSwapModeInfo const j3dDefaultTevSwapMode;
*
*/
struct J3DTevStage {
/* 8000E230 */ J3DTevStage() {
J3DTevStage() {
setTevStageInfo(j3dDefaultTevStageInfo);
setTevSwapModeInfo(j3dDefaultTevSwapMode);
}
@ -120,7 +120,7 @@ struct J3DTevStage {
setTevAlphaOp(info.field_0xe, info.field_0xf, info.field_0x10, info.field_0x11, info.field_0x12);
}
/* 8003AACC */ J3DTevStage(J3DTevStageInfo const& param_0) {
J3DTevStage(J3DTevStageInfo const& param_0) {
setTevStageInfo(param_0);
setTevSwapModeInfo(j3dDefaultTevSwapMode);
}
@ -197,7 +197,7 @@ extern J3DIndTevStageInfo const j3dDefaultIndTevStageInfo;
*
*/
struct J3DIndTevStage {
/* 8000E14C */ J3DIndTevStage() : mInfo(0) { setIndTevStageInfo(j3dDefaultIndTevStageInfo); }
J3DIndTevStage() : mInfo(0) { setIndTevStageInfo(j3dDefaultIndTevStageInfo); }
J3DIndTevStage(J3DIndTevStageInfo const& info) : mInfo(0) { setIndTevStageInfo(info); }
void setIndTevStageInfo(J3DIndTevStageInfo const& info) {
setIndStage(info.mIndStage);
@ -259,7 +259,7 @@ extern const J3DTevOrderInfo j3dDefaultTevOrderInfoNull;
*
*/
struct J3DTevOrder : public J3DTevOrderInfo {
/* 8000E140 */ J3DTevOrder() : J3DTevOrderInfo(j3dDefaultTevOrderInfoNull) {}
J3DTevOrder() : J3DTevOrderInfo(j3dDefaultTevOrderInfoNull) {}
J3DTevOrder(const J3DTevOrderInfo& info) : J3DTevOrderInfo(info) {}
J3DTevOrderInfo& getTevOrderInfo() { return *this; }
@ -274,7 +274,7 @@ extern u8 const j3dDefaultTevSwapTableID;
*
*/
struct J3DTevSwapModeTable {
/* 8000E134 */ J3DTevSwapModeTable() { mIdx = j3dDefaultTevSwapTableID; }
J3DTevSwapModeTable() { mIdx = j3dDefaultTevSwapTableID; }
J3DTevSwapModeTable(J3DTevSwapModeTableInfo const& info) {
mIdx = calcTevSwapTableID(info.field_0x0, info.field_0x1, info.field_0x2, info.field_0x3);
}

22
include/JSystem/J3DGraphBase/J3DTexture.h
View File

@ -19,10 +19,10 @@ private:
public:
J3DTexture(u16 num, ResTIMG* res) : mNum(num), unk_0x2(0), mpRes(res) {}
/* 8031204C */ void loadGX(u16, GXTexMapID) const;
/* 803121A4 */ void entryNum(u16);
/* 8031221C */ void addResTIMG(u16, ResTIMG const*);
/* 803366A4 */ virtual ~J3DTexture() {}
void loadGX(u16, GXTexMapID) const;
void entryNum(u16);
void addResTIMG(u16, ResTIMG const*);
virtual ~J3DTexture() {}
u16 getNum() const { return mNum; }
@ -54,12 +54,12 @@ public:
mTexMtxInfo = info;
}
/* 803238C4 */ void load(u32) const;
/* 80323900 */ void calc(const Mtx);
/* 80323920 */ void calcTexMtx(const Mtx);
/* 80323C0C */ void calcPostTexMtx(const Mtx);
/* 80324358 */ void loadTexMtx(u32) const;
/* 803243BC */ void loadPostTexMtx(u32) const;
void load(u32) const;
void calc(const Mtx);
void calcTexMtx(const Mtx);
void calcPostTexMtx(const Mtx);
void loadTexMtx(u32) const;
void loadPostTexMtx(u32) const;
J3DTexMtxInfo& getTexMtxInfo() { return mTexMtxInfo; }
Mtx& getMtx() { return mMtx; }
@ -88,7 +88,7 @@ extern J3DTexCoordInfo const j3dDefaultTexCoordInfo[8];
*
*/
struct J3DTexCoord : public J3DTexCoordInfo {
/* 8000E464 */ J3DTexCoord() {
J3DTexCoord() {
setTexCoordInfo(j3dDefaultTexCoordInfo[0]);
resetTexMtxReg();
}

5
include/JSystem/J3DGraphBase/J3DTransform.h
View File

@ -65,12 +65,13 @@ void J3DMtxProjConcat(f32 (*)[4], f32 (*)[4], f32 (*)[4]);
void J3DPSMtxArrayConcat(f32 (*)[4], f32 (*)[4], f32 (*)[4], u32);
inline void J3DPSMtx33Copy(register Mtx3P src, register Mtx3P dst) {
#ifdef __MWERKS__
register f32 fr4;
register f32 fr3;
register f32 fr2;
register f32 fr1;
register f32 fr0;
#ifdef __MWERKS__
asm {
psq_l fr4, 0(src), 0, 0
psq_l fr3, 8(src), 0, 0
@ -87,13 +88,13 @@ inline void J3DPSMtx33Copy(register Mtx3P src, register Mtx3P dst) {
}
inline void J3DPSMtx33CopyFrom34(register MtxP src, register Mtx3P dst) {
#ifdef __MWERKS__
register f32 x_y1;
register f32 z1;
register f32 x_y2;
register f32 z2;
register f32 x_y3;
register f32 z3;
#ifdef __MWERKS__
asm {
psq_l x_y1, 0(src), 0, 0
lfs z1, 8(src)

20
include/JSystem/J3DGraphBase/J3DVertex.h
View File

@ -14,7 +14,7 @@ class J3DVertexBuffer;
*
*/
struct J3DVtxColorCalc {
/* 8032E180 */ void calc(J3DModel*);
void calc(J3DModel*);
virtual void calc(J3DVertexBuffer*);
/* 0x0 */ void* vtable; // inlined vtable?
@ -77,15 +77,15 @@ class J3DVertexBuffer {
public:
J3DVertexBuffer() { init(); }
/* 80310F78 */ void setVertexData(J3DVertexData*);
/* 80310FD8 */ void init();
/* 80311030 */ ~J3DVertexBuffer();
/* 8031106C */ void setArray() const;
/* 80311090 */ s32 copyLocalVtxPosArray(u32);
/* 803111B0 */ s32 copyLocalVtxNrmArray(u32);
/* 803112D0 */ s32 copyLocalVtxArray(u32);
/* 80311478 */ s32 allocTransformedVtxPosArray();
/* 8031152C */ s32 allocTransformedVtxNrmArray();
void setVertexData(J3DVertexData*);
void init();
~J3DVertexBuffer();
void setArray() const;
s32 copyLocalVtxPosArray(u32);
s32 copyLocalVtxNrmArray(u32);
s32 copyLocalVtxArray(u32);
s32 allocTransformedVtxPosArray();
s32 allocTransformedVtxNrmArray();
void setCurrentVtxPos(void* pVtxPos) { mCurrentVtxPos = pVtxPos; }
void* getCurrentVtxPos() { return mCurrentVtxPos; }

70
include/JSystem/J3DGraphLoader/J3DAnmLoader.h
View File

@ -15,8 +15,8 @@ class J3DAnmBase;
*
*/
struct J3DAnmLoaderDataBase {
/* 80337B40 */ static J3DAnmBase* load(void const*, J3DAnmLoaderDataBaseFlag);
/* 80338134 */ static void setResource(J3DAnmBase*, void const*);
static J3DAnmBase* load(void const*, J3DAnmLoaderDataBaseFlag);
static void setResource(J3DAnmBase*, void const*);
static J3DAnmBase* load(void const* param_0) { return load(param_0, J3DLOADER_UNK_FLAG0); }
};
@ -25,51 +25,51 @@ class J3DAnmLoader {
public:
virtual J3DAnmBase* load(const void*) = 0;
virtual void setResource(J3DAnmBase*, const void*) = 0;
/* 80339800 */ virtual ~J3DAnmLoader() {}
virtual ~J3DAnmLoader() {}
};
class J3DAnmKeyLoader_v15 : public J3DAnmLoader {
public:
/* 803384E0 */ J3DAnmKeyLoader_v15();
/* 80338FEC */ void readAnmTransform(J3DAnmTransformKeyData const*);
/* 80339014 */ void setAnmTransform(J3DAnmTransformKey*, J3DAnmTransformKeyData const*);
/* 803390B0 */ void readAnmTextureSRT(J3DAnmTextureSRTKeyData const*);
/* 803390D8 */ void setAnmTextureSRT(J3DAnmTextureSRTKey*, J3DAnmTextureSRTKeyData const*);
/* 803392B0 */ void readAnmColor(J3DAnmColorKeyData const*);
/* 803392D8 */ void setAnmColor(J3DAnmColorKey*, J3DAnmColorKeyData const*);
/* 803393C4 */ void readAnmCluster(J3DAnmClusterKeyData const*);
/* 803393EC */ void setAnmCluster(J3DAnmClusterKey*, J3DAnmClusterKeyData const*);
/* 80339458 */ void readAnmTevReg(J3DAnmTevRegKeyData const*);
/* 80339480 */ void setAnmTevReg(J3DAnmTevRegKey*, J3DAnmTevRegKeyData const*);
/* 8033960C */ void readAnmVtxColor(J3DAnmVtxColorKeyData const*);
/* 80339634 */ void setAnmVtxColor(J3DAnmVtxColorKey*, J3DAnmVtxColorKeyData const*);
J3DAnmKeyLoader_v15();
void readAnmTransform(J3DAnmTransformKeyData const*);
void setAnmTransform(J3DAnmTransformKey*, J3DAnmTransformKeyData const*);
void readAnmTextureSRT(J3DAnmTextureSRTKeyData const*);
void setAnmTextureSRT(J3DAnmTextureSRTKey*, J3DAnmTextureSRTKeyData const*);
void readAnmColor(J3DAnmColorKeyData const*);
void setAnmColor(J3DAnmColorKey*, J3DAnmColorKeyData const*);
void readAnmCluster(J3DAnmClusterKeyData const*);
void setAnmCluster(J3DAnmClusterKey*, J3DAnmClusterKeyData const*);
void readAnmTevReg(J3DAnmTevRegKeyData const*);
void setAnmTevReg(J3DAnmTevRegKey*, J3DAnmTevRegKeyData const*);
void readAnmVtxColor(J3DAnmVtxColorKeyData const*);
void setAnmVtxColor(J3DAnmVtxColorKey*, J3DAnmVtxColorKeyData const*);
/* 80338D44 */ virtual J3DAnmBase* load(void const*);
/* 80338E8C */ virtual void setResource(J3DAnmBase*, void const*);
/* 803384FC */ virtual ~J3DAnmKeyLoader_v15();
virtual J3DAnmBase* load(void const*);
virtual void setResource(J3DAnmBase*, void const*);
virtual ~J3DAnmKeyLoader_v15();
/* 0x4 */ J3DAnmBase* mAnm;
};
class J3DAnmFullLoader_v15 : public J3DAnmLoader {
public:
/* 80338468 */ J3DAnmFullLoader_v15();
/* 80338800 */ void readAnmTransform(J3DAnmTransformFullData const*);
/* 80338828 */ void setAnmTransform(J3DAnmTransformFull*, J3DAnmTransformFullData const*);
/* 803388BC */ void readAnmColor(J3DAnmColorFullData const*);
/* 803388E4 */ void setAnmColor(J3DAnmColorFull*, J3DAnmColorFullData const*);
/* 803389B0 */ void readAnmTexPattern(J3DAnmTexPatternFullData const*);
/* 803389D8 */ void setAnmTexPattern(J3DAnmTexPattern*, J3DAnmTexPatternFullData const*);
/* 80338A7C */ void readAnmVisibility(J3DAnmVisibilityFullData const*);
/* 80338AA4 */ void setAnmVisibility(J3DAnmVisibilityFull*, J3DAnmVisibilityFullData const*);
/* 80338B20 */ void readAnmCluster(J3DAnmClusterFullData const*);
/* 80338B48 */ void setAnmCluster(J3DAnmClusterFull*, J3DAnmClusterFullData const*);
/* 80338BB4 */ void readAnmVtxColor(J3DAnmVtxColorFullData const*);
/* 80338BDC */ void setAnmVtxColor(J3DAnmVtxColorFull*, J3DAnmVtxColorFullData const*);
J3DAnmFullLoader_v15();
void readAnmTransform(J3DAnmTransformFullData const*);
void setAnmTransform(J3DAnmTransformFull*, J3DAnmTransformFullData const*);
void readAnmColor(J3DAnmColorFullData const*);
void setAnmColor(J3DAnmColorFull*, J3DAnmColorFullData const*);
void readAnmTexPattern(J3DAnmTexPatternFullData const*);
void setAnmTexPattern(J3DAnmTexPattern*, J3DAnmTexPatternFullData const*);
void readAnmVisibility(J3DAnmVisibilityFullData const*);
void setAnmVisibility(J3DAnmVisibilityFull*, J3DAnmVisibilityFullData const*);
void readAnmCluster(J3DAnmClusterFullData const*);
void setAnmCluster(J3DAnmClusterFull*, J3DAnmClusterFullData const*);
void readAnmVtxColor(J3DAnmVtxColorFullData const*);
void setAnmVtxColor(J3DAnmVtxColorFull*, J3DAnmVtxColorFullData const*);
/* 80338558 */ virtual J3DAnmBase* load(void const*);
/* 803386A0 */ virtual void setResource(J3DAnmBase*, void const*);
/* 80338484 */ virtual ~J3DAnmFullLoader_v15();
virtual J3DAnmBase* load(void const*);
virtual void setResource(J3DAnmBase*, void const*);
virtual ~J3DAnmFullLoader_v15();
/* 0x4 */ J3DAnmBase* mAnm;
};

12
include/JSystem/J3DGraphLoader/J3DClusterLoader.h
View File

@ -8,7 +8,7 @@
*
*/
struct J3DClusterLoaderDataBase {
/* 80334130 */ static void* load(void const*);
static void* load(void const*);
};
/**
@ -38,7 +38,7 @@ public:
class J3DClusterLoader {
public:
virtual void* load(const void*) = 0;
/* 803345FC */ virtual ~J3DClusterLoader() {}
virtual ~J3DClusterLoader() {}
};
class J3DDeformData;
@ -49,11 +49,11 @@ class J3DDeformData;
*/
class J3DClusterLoader_v15 : public J3DClusterLoader {
public:
/* 803341CC */ J3DClusterLoader_v15();
/* 803342F8 */ void readCluster(J3DClusterBlock const*);
J3DClusterLoader_v15();
void readCluster(J3DClusterBlock const*);
/* 80334244 */ virtual void* load(void const*);
/* 803341E8 */ virtual ~J3DClusterLoader_v15();
virtual void* load(void const*);
virtual ~J3DClusterLoader_v15();
/* 0x04 */ J3DDeformData* mpDeformData;
};

4
include/JSystem/J3DGraphLoader/J3DJointFactory.h
View File

@ -24,8 +24,8 @@ struct J3DJointInitData {
*
*/
struct J3DJointFactory {
/* 80337178 */ J3DJointFactory(J3DJointBlock const&);
/* 803371D0 */ J3DJoint* create(int);
J3DJointFactory(J3DJointBlock const&);
J3DJoint* create(int);
J3DJointInitData* mJointInitData;
u16* mIndexTable;

82
include/JSystem/J3DGraphLoader/J3DMaterialFactory.h
View File

@ -98,47 +98,47 @@ public:
MATERIAL_TYPE_PATCHED = 2,
};
/* 80330234 */ J3DMaterialFactory(J3DMaterialDLBlock const&);
/* 8032FFEC */ J3DMaterialFactory(J3DMaterialBlock const&);
/* 803302BC */ u16 countUniqueMaterials();
/* 80330304 */ u32 countTexGens(int) const;
/* 8033033C */ u32 countStages(int) const;
/* 803303C4 */ J3DMaterial* create(J3DMaterial*, MaterialType, int, u32) const;
/* 80330440 */ J3DMaterial* createNormalMaterial(J3DMaterial*, int, u32) const;
/* 80330D84 */ J3DMaterial* createPatchedMaterial(J3DMaterial*, int, u32) const;
/* 8033168C */ void modifyPatchedCurrentMtx(J3DMaterial*, int) const;
/* 803317D4 */ J3DMaterial* createLockedMaterial(J3DMaterial*, int, u32) const;
/* 80331A7C */ u32 calcSize(J3DMaterial*, MaterialType, int, u32) const;
/* 80331AFC */ u32 calcSizeNormalMaterial(J3DMaterial*, int, u32) const;
/* 80331C30 */ u32 calcSizePatchedMaterial(J3DMaterial*, int, u32) const;
/* 80331D00 */ u32 calcSizeLockedMaterial(J3DMaterial*, int, u32) const;
/* 80331D18 */ J3DGXColor newMatColor(int, int) const;
/* 80331D74 */ u8 newColorChanNum(int) const;
/* 80331DAC */ J3DColorChan newColorChan(int, int) const;
/* 80331F50 */ J3DGXColor newAmbColor(int, int) const;
/* 80331FAC */ u32 newTexGenNum(int) const;
/* 80331FE4 */ J3DTexCoord newTexCoord(int, int) const;
/* 80332044 */ J3DTexMtx* newTexMtx(int, int) const;
/* 803320CC */ u8 newCullMode(int) const;
/* 8033210C */ u16 newTexNo(int, int) const;
/* 80332154 */ J3DTevOrder newTevOrder(int, int) const;
/* 803321A0 */ J3DGXColorS10 newTevColor(int, int) const;
/* 80332210 */ J3DGXColor newTevKColor(int, int) const;
/* 8033226C */ u8 newTevStageNum(int) const;
/* 803322A4 */ J3DTevStage newTevStage(int, int) const;
/* 80332304 */ J3DTevSwapModeTable newTevSwapModeTable(int, int) const;
/* 803323A0 */ u8 newIndTexStageNum(int) const;
/* 803323C8 */ J3DIndTexOrder newIndTexOrder(int, int) const;
/* 8033240C */ J3DIndTexMtx newIndTexMtx(int, int) const;
/* 803324B4 */ J3DIndTevStage newIndTevStage(int, int) const;
/* 80332648 */ J3DIndTexCoordScale newIndTexCoordScale(int, int) const;
/* 8033268C */ J3DFog newFog(int) const;
/* 80332768 */ J3DAlphaComp newAlphaComp(int) const;
/* 803327E8 */ J3DBlend newBlend(int) const;
/* 8033282C */ J3DZMode newZMode(int) const;
/* 8033288C */ u8 newZCompLoc(int) const;
/* 803328C4 */ u8 newDither(int) const;
/* 803328FC */ J3DNBTScale newNBTScale(int) const;
J3DMaterialFactory(J3DMaterialDLBlock const&);
J3DMaterialFactory(J3DMaterialBlock const&);
u16 countUniqueMaterials();
u32 countTexGens(int) const;
u32 countStages(int) const;
J3DMaterial* create(J3DMaterial*, MaterialType, int, u32) const;
J3DMaterial* createNormalMaterial(J3DMaterial*, int, u32) const;
J3DMaterial* createPatchedMaterial(J3DMaterial*, int, u32) const;
void modifyPatchedCurrentMtx(J3DMaterial*, int) const;
J3DMaterial* createLockedMaterial(J3DMaterial*, int, u32) const;
u32 calcSize(J3DMaterial*, MaterialType, int, u32) const;
u32 calcSizeNormalMaterial(J3DMaterial*, int, u32) const;
u32 calcSizePatchedMaterial(J3DMaterial*, int, u32) const;
u32 calcSizeLockedMaterial(J3DMaterial*, int, u32) const;
J3DGXColor newMatColor(int, int) const;
u8 newColorChanNum(int) const;
J3DColorChan newColorChan(int, int) const;
J3DGXColor newAmbColor(int, int) const;
u32 newTexGenNum(int) const;
J3DTexCoord newTexCoord(int, int) const;
J3DTexMtx* newTexMtx(int, int) const;
u8 newCullMode(int) const;
u16 newTexNo(int, int) const;
J3DTevOrder newTevOrder(int, int) const;
J3DGXColorS10 newTevColor(int, int) const;
J3DGXColor newTevKColor(int, int) const;
u8 newTevStageNum(int) const;
J3DTevStage newTevStage(int, int) const;
J3DTevSwapModeTable newTevSwapModeTable(int, int) const;
u8 newIndTexStageNum(int) const;
J3DIndTexOrder newIndTexOrder(int, int) const;
J3DIndTexMtx newIndTexMtx(int, int) const;
J3DIndTevStage newIndTevStage(int, int) const;
J3DIndTexCoordScale newIndTexCoordScale(int, int) const;
J3DFog newFog(int) const;
J3DAlphaComp newAlphaComp(int) const;
J3DBlend newBlend(int) const;
J3DZMode newZMode(int) const;
u8 newZCompLoc(int) const;
u8 newDither(int) const;
J3DNBTScale newNBTScale(int) const;
u16 getMaterialID(int idx) const { return mpMaterialID[idx]; }
u8 getMaterialMode(int idx) const { return mpMaterialInitData[mpMaterialID[idx]].mMaterialMode; }

52
include/JSystem/J3DGraphLoader/J3DMaterialFactory_v21.h
View File

@ -50,32 +50,32 @@ struct J3DMaterialInitData_v21 {
*/
class J3DMaterialFactory_v21 {
public:
/* 80332DA4 */ J3DMaterialFactory_v21(J3DMaterialBlock_v21 const&);
/* 80332F84 */ u16 countUniqueMaterials();
/* 80332FA8 */ u32 countTexGens(int) const;
/* 80332FE0 */ u32 countStages(int) const;
/* 80333068 */ J3DMaterial* create(J3DMaterial*, int, u32) const;
/* 803337D8 */ J3DGXColor newMatColor(int, int) const;
/* 80333834 */ u8 newColorChanNum(int) const;
/* 8033386C */ J3DColorChan newColorChan(int, int) const;
/* 80333A10 */ u32 newTexGenNum(int) const;
/* 80333A48 */ J3DTexCoord newTexCoord(int, int) const;
/* 80333AA8 */ J3DTexMtx* newTexMtx(int, int) const;
/* 80333B30 */ u8 newCullMode(int) const;
/* 80333B70 */ u16 newTexNo(int, int) const;
/* 80333BB8 */ J3DTevOrder newTevOrder(int, int) const;
/* 80333C04 */ J3DGXColorS10 newTevColor(int, int) const;
/* 80333C74 */ J3DGXColor newTevKColor(int, int) const;
/* 80333CD0 */ u8 newTevStageNum(int) const;
/* 80333D08 */ J3DTevStage newTevStage(int, int) const;
/* 80333D68 */ J3DTevSwapModeTable newTevSwapModeTable(int, int) const;
/* 80333E04 */ J3DFog newFog(int) const;
/* 80333EE0 */ J3DAlphaComp newAlphaComp(int) const;
/* 80333F60 */ J3DBlend newBlend(int) const;
/* 80333FA4 */ J3DZMode newZMode(int) const;
/* 80334004 */ u8 newZCompLoc(int) const;
/* 8033403C */ u8 newDither(int) const;
/* 80334074 */ J3DNBTScale newNBTScale(int) const;
J3DMaterialFactory_v21(J3DMaterialBlock_v21 const&);
u16 countUniqueMaterials();
u32 countTexGens(int) const;
u32 countStages(int) const;
J3DMaterial* create(J3DMaterial*, int, u32) const;
J3DGXColor newMatColor(int, int) const;
u8 newColorChanNum(int) const;
J3DColorChan newColorChan(int, int) const;
u32 newTexGenNum(int) const;
J3DTexCoord newTexCoord(int, int) const;
J3DTexMtx* newTexMtx(int, int) const;
u8 newCullMode(int) const;
u16 newTexNo(int, int) const;
J3DTevOrder newTevOrder(int, int) const;
J3DGXColorS10 newTevColor(int, int) const;
J3DGXColor newTevKColor(int, int) const;
u8 newTevStageNum(int) const;
J3DTevStage newTevStage(int, int) const;
J3DTevSwapModeTable newTevSwapModeTable(int, int) const;
J3DFog newFog(int) const;
J3DAlphaComp newAlphaComp(int) const;
J3DBlend newBlend(int) const;
J3DZMode newZMode(int) const;
u8 newZCompLoc(int) const;
u8 newDither(int) const;
J3DNBTScale newNBTScale(int) const;
u16 getMaterialID(u16 idx) { return mpMaterialID[idx]; }
u8 getMaterialMode(int idx) const { return mpMaterialInitData[mpMaterialID[idx]].mMaterialMode; }

90
include/JSystem/J3DGraphLoader/J3DModelLoader.h
View File

@ -251,45 +251,45 @@ static inline u32 getMdlDataFlag_MtxLoadType(u32 flags) { return flags & 0x10; }
*/
class J3DModelLoader {
public:
/* 8033468C */ J3DModelLoader();
/* 80335048 */ void readInformation(J3DModelInfoBlock const*, u32);
/* 803351D0 */ void readVertex(J3DVertexBlock const*);
/* 803353F0 */ void readEnvelop(J3DEnvelopeBlock const*);
/* 80335480 */ void readDraw(J3DDrawBlock const*);
/* 80335530 */ void readJoint(J3DJointBlock const*);
/* 80335AF4 */ void readShape(J3DShapeBlock const*, u32);
/* 80335C18 */ void readTexture(J3DTextureBlock const*);
/* 80335F5C */ void readTextureTable(J3DTextureBlock const*);
/* 80336028 */ void readPatchedMaterial(J3DMaterialBlock const*, u32);
/* 80336168 */ void readMaterialDL(J3DMaterialDLBlock const*, u32);
/* 8033631C */ void modifyMaterial(u32);
J3DModelLoader();
void readInformation(J3DModelInfoBlock const*, u32);
void readVertex(J3DVertexBlock const*);
void readEnvelop(J3DEnvelopeBlock const*);
void readDraw(J3DDrawBlock const*);
void readJoint(J3DJointBlock const*);
void readShape(J3DShapeBlock const*, u32);
void readTexture(J3DTextureBlock const*);
void readTextureTable(J3DTextureBlock const*);
void readPatchedMaterial(J3DMaterialBlock const*, u32);
void readMaterialDL(J3DMaterialDLBlock const*, u32);
void modifyMaterial(u32);
/* 80336CD8 */ u32 calcSizeInformation(J3DModelInfoBlock const*, u32);
/* 80336D64 */ u32 calcSizeJoint(J3DJointBlock const*);
/* 80336D90 */ u32 calcSizeEnvelope(J3DEnvelopeBlock const*);
/* 80336DA0 */ u32 calcSizeDraw(J3DDrawBlock const*);
/* 80336EA0 */ u32 calcSizeShape(J3DShapeBlock const*, u32);
/* 80336F44 */ u32 calcSizeTexture(J3DTextureBlock const*);
/* 80336FF0 */ u32 calcSizeTextureTable(J3DTextureBlock const*);
/* 80337010 */ u32 calcSizePatchedMaterial(J3DMaterialBlock const*, u32);
/* 803370A0 */ u32 calcSizeMaterialDL(J3DMaterialDLBlock const*, u32);
u32 calcSizeInformation(J3DModelInfoBlock const*, u32);
u32 calcSizeJoint(J3DJointBlock const*);
u32 calcSizeEnvelope(J3DEnvelopeBlock const*);
u32 calcSizeDraw(J3DDrawBlock const*);
u32 calcSizeShape(J3DShapeBlock const*, u32);
u32 calcSizeTexture(J3DTextureBlock const*);
u32 calcSizeTextureTable(J3DTextureBlock const*);
u32 calcSizePatchedMaterial(J3DMaterialBlock const*, u32);
u32 calcSizeMaterialDL(J3DMaterialDLBlock const*, u32);
/* 803347E0 */ virtual J3DModelData* load(void const*, u32);
/* 80334ABC */ virtual J3DMaterialTable* loadMaterialTable(void const*);
/* 80334C20 */ virtual J3DModelData* loadBinaryDisplayList(void const*, u32);
/* 803367D4 */ virtual u32 calcLoadSize(void const*, u32);
/* 803369A0 */ virtual u32 calcLoadMaterialTableSize(void const*);
/* 80336A98 */ virtual u32 calcLoadBinaryDisplayListSize(void const*, u32);
/* 80336794 */ virtual u16 countMaterialNum(void const*);
/* 80334EE0 */ virtual void setupBBoardInfo();
/* 80336450 */ virtual ~J3DModelLoader() {}
/* 8033649C */ virtual void readMaterial(J3DMaterialBlock const*, u32) {}
/* 80336498 */ virtual void readMaterial_v21(J3DMaterialBlock_v21 const*, u32) {}
/* 803364A4 */ virtual void readMaterialTable(J3DMaterialBlock const*, u32) {}
/* 803364A0 */ virtual void readMaterialTable_v21(J3DMaterialBlock_v21 const*, u32) {}
/* 803364A8 */ virtual u32 calcSizeMaterial(J3DMaterialBlock const*, u32) { return false; }
/* 803364B0 */ virtual u32 calcSizeMaterialTable(J3DMaterialBlock const*, u32) { return false; }
virtual J3DModelData* load(void const*, u32);
virtual J3DMaterialTable* loadMaterialTable(void const*);
virtual J3DModelData* loadBinaryDisplayList(void const*, u32);
virtual u32 calcLoadSize(void const*, u32);
virtual u32 calcLoadMaterialTableSize(void const*);
virtual u32 calcLoadBinaryDisplayListSize(void const*, u32);
virtual u16 countMaterialNum(void const*);
virtual void setupBBoardInfo();
virtual ~J3DModelLoader() {}
virtual void readMaterial(J3DMaterialBlock const*, u32) {}
virtual void readMaterial_v21(J3DMaterialBlock_v21 const*, u32) {}
virtual void readMaterialTable(J3DMaterialBlock const*, u32) {}
virtual void readMaterialTable_v21(J3DMaterialBlock_v21 const*, u32) {}
virtual u32 calcSizeMaterial(J3DMaterialBlock const*, u32) { return false; }
virtual u32 calcSizeMaterialTable(J3DMaterialBlock const*, u32) { return false; }
/* 0x04 */ J3DModelData* mpModelData;
/* 0x08 */ J3DMaterialTable* mpMaterialTable;
@ -307,9 +307,9 @@ public:
*/
class J3DModelLoader_v21 : public J3DModelLoader {
public:
/* 803363F4 */ ~J3DModelLoader_v21() {}
/* 80335890 */ void readMaterial_v21(J3DMaterialBlock_v21 const*, u32);
/* 80335E20 */ void readMaterialTable_v21(J3DMaterialBlock_v21 const*, u32);
~J3DModelLoader_v21() {}
void readMaterial_v21(J3DMaterialBlock_v21 const*, u32);
void readMaterialTable_v21(J3DMaterialBlock_v21 const*, u32);
};
/**
@ -318,11 +318,11 @@ public:
*/
class J3DModelLoader_v26 : public J3DModelLoader {
public:
/* 80336398 */ ~J3DModelLoader_v26() {}
/* 80335614 */ void readMaterial(J3DMaterialBlock const*, u32);
/* 80335CE4 */ void readMaterialTable(J3DMaterialBlock const*, u32);
/* 80336DB4 */ u32 calcSizeMaterial(J3DMaterialBlock const*, u32);
/* 80336F60 */ u32 calcSizeMaterialTable(J3DMaterialBlock const*, u32);
~J3DModelLoader_v26() {}
void readMaterial(J3DMaterialBlock const*, u32);
void readMaterialTable(J3DMaterialBlock const*, u32);
u32 calcSizeMaterial(J3DMaterialBlock const*, u32);
u32 calcSizeMaterialTable(J3DMaterialBlock const*, u32);
};
/**
@ -331,7 +331,7 @@ public:
*/
class J3DModelLoaderDataBase {
public:
/* 803346BC */ static J3DModelData* load(void const* i_data, u32 i_flags);
static J3DModelData* load(void const* i_data, u32 i_flags);
};
#endif /* J3DMODELLOADER_H */

16
include/JSystem/J3DGraphLoader/J3DShapeFactory.h
View File

@ -48,14 +48,14 @@ struct J3DShapeDrawInitData {
*
*/
struct J3DShapeFactory {
/* 80337350 */ J3DShapeFactory(J3DShapeBlock const&);
/* 80337400 */ J3DShape* create(int, u32, GXVtxDescList*);
/* 803375BC */ J3DShapeMtx* newShapeMtx(u32, int, int) const;
/* 8033784C */ J3DShapeDraw* newShapeDraw(int, int) const;
/* 803378D8 */ void allocVcdVatCmdBuffer(u32);
/* 80337944 */ s32 calcSize(int, u32);
/* 803379D8 */ s32 calcSizeVcdVatCmdBuffer(u32);
/* 803379E8 */ s32 calcSizeShapeMtx(u32, int, int) const;
J3DShapeFactory(J3DShapeBlock const&);
J3DShape* create(int, u32, GXVtxDescList*);
J3DShapeMtx* newShapeMtx(u32, int, int) const;
J3DShapeDraw* newShapeDraw(int, int) const;
void allocVcdVatCmdBuffer(u32);
s32 calcSize(int, u32);
s32 calcSizeVcdVatCmdBuffer(u32);
s32 calcSizeShapeMtx(u32, int, int) const;
/* 0x00 */ J3DShapeInitData* mShapeInitData;
/* 0x04 */ u16* mIndexTable;

8
include/JSystem/J3DU/J3DUClipper.h
View File

@ -11,10 +11,10 @@ class J3DUClipper {
public:
J3DUClipper() { init(); }
virtual ~J3DUClipper() {}
/* 80273778 */ void init();
/* 8027378C */ void calcViewFrustum();
/* 802738FC */ int clip(f32 const (*)[4], Vec, f32) const;
/* 80273A44 */ int clip(f32 const (*)[4], Vec*, Vec*) const;
void init();
void calcViewFrustum();
int clip(f32 const (*)[4], Vec, f32) const;
int clip(f32 const (*)[4], Vec*, Vec*) const;
void setFovy(f32 fovy) { mFovY = fovy; }
void setAspect(f32 aspect) { mAspect = aspect; }

2
include/JSystem/J3DU/J3DUD.h
View File

@ -5,7 +5,9 @@
namespace J3DUD {
inline f32 JMAAbs(f32 x) {
#ifdef __MWERKS__
return __fabsf(x);
#endif
}
}

34
include/JSystem/JAudio2/JAISe.h
View File

@ -28,24 +28,24 @@ public:
/* 0x27c */ JAITempoMgr mTempoMgr;
};
/* 8029F6D8 */ virtual s32 getNumChild() const;
/* 8029F6E0 */ virtual JAISoundChild* getChild(int);
/* 8029F6E8 */ virtual void releaseChild(int);
/* 8029F84C */ virtual JASTrack* getTrack();
/* 8029F854 */ virtual JASTrack* getChildTrack(int);
/* 8029F864 */ virtual JAISe* asSe();
/* 8029F868 */ virtual JAITempoMgr* getTempoMgr();
/* 8029F5C8 */ virtual bool JAISound_tryDie_();
virtual s32 getNumChild() const;
virtual JAISoundChild* getChild(int);
virtual void releaseChild(int);
virtual JASTrack* getTrack();
virtual JASTrack* getChildTrack(int);
virtual JAISe* asSe();
virtual JAITempoMgr* getTempoMgr();
virtual bool JAISound_tryDie_();
/* 8029F03C */ JAISe(JAISeMgr* seMgr, JAISoundStrategyMgr<JAISe>* soundStrategyMgr, u32 priority);
/* 8029F0F8 */ void mixOut_(const JASSoundParams& params);
/* 8029F214 */ void stopTrack_();
/* 8029F250 */ void startTrack_(const JASSoundParams& params);
/* 8029F304 */ void JAISeCategoryMgr_mixOut_(bool, const JASSoundParams& params, JAISoundActivity activity);
/* 8029F4CC */ void JAISeCategoryMgr_calc_();
/* 8029F650 */ void JAISeMgr_startID_(JAISoundID id, const JGeometry::TVec3<f32>* posPtr, JAIAudience* audience);
/* 8029F6EC */ bool prepare_getSeqData_();
/* 8029F78C */ void prepare_();
JAISe(JAISeMgr* seMgr, JAISoundStrategyMgr<JAISe>* soundStrategyMgr, u32 priority);
void mixOut_(const JASSoundParams& params);
void stopTrack_();
void startTrack_(const JASSoundParams& params);
void JAISeCategoryMgr_mixOut_(bool, const JASSoundParams& params, JAISoundActivity activity);
void JAISeCategoryMgr_calc_();
void JAISeMgr_startID_(JAISoundID id, const JGeometry::TVec3<f32>* posPtr, JAIAudience* audience);
bool prepare_getSeqData_();
void prepare_();
const JAISeqData* getSeqData() const { return &inner_.mSeqData; }
u32 JAISeCategoryMgr_getProperPriority_() const { return inner_.mProperPriority; }

54
include/JSystem/JAudio2/JAISeMgr.h
View File

@ -42,24 +42,24 @@ class JAISeMgr;
*/
class JAISeCategoryMgr : public JAISeqDataUser, public JASNonCopyable {
public:
/* 8029F9C4 */ void JAISeMgr_calc_();
/* 8029FB30 */ void JAISeMgr_freeDeadSe_();
/* 8029FC88 */ bool JAISeMgr_acceptsNewSe_(u32 priority) const;
/* 8029FD40 */ void sortByPriority_();
/* 8029FDE0 */ void stop(u32 fadeTime);
/* 8029FE34 */ void stop();
/* 8029FE78 */ void stopSoundID(JAISoundID id);
/* 8029FEEC */ void pause(bool);
/* 8029FF18 */ void JAISeMgr_mixOut_(const JAISoundParamsMove& params, JAISoundActivity activity);
/* 802A0994 */ JAISeCategoryMgr() {
void JAISeMgr_calc_();
void JAISeMgr_freeDeadSe_();
bool JAISeMgr_acceptsNewSe_(u32 priority) const;
void sortByPriority_();
void stop(u32 fadeTime);
void stop();
void stopSoundID(JAISoundID id);
void pause(bool);
void JAISeMgr_mixOut_(const JAISoundParamsMove& params, JAISoundActivity activity);
JAISeCategoryMgr() {
mParams.init();
mMaxActiveSe = 0;
mMaxInactiveSe = 0;
field_0x0 = 0;
}
/* 8029F8B0 */ virtual bool isUsingSeqData(const JAISeqDataRegion& seqDataRegion);
/* 8029F91C */ virtual int releaseSeqData(const JAISeqDataRegion& seqDataRegion);
virtual bool isUsingSeqData(const JAISeqDataRegion& seqDataRegion);
virtual int releaseSeqData(const JAISeqDataRegion& seqDataRegion);
JAISoundParamsMove* getParams() { return &mParams; }
int getMaxSe() const {
@ -91,22 +91,22 @@ class JAISeMgr : public JASGlobalInstance<JAISeMgr>,
public JAISeqDataUser,
public JAISoundActivity {
public:
/* 802A0074 */ JAISeMgr(bool setInstance);
/* 802A0268 */ void setCategoryArrangement(const JAISeCategoryArrangement& arrangement);
/* 802A02A0 */ void stop();
/* 802A02F4 */ void stopSoundID(JAISoundID id);
/* 802A0358 */ void initParams();
/* 802A03D8 */ void setAudience(JAIAudience* audience);
/* 802A03E0 */ void setSeqDataMgr(JAISeqDataMgr* seqDataMgr);
/* 802A0434 */ void resetSeqDataMgr();
/* 802A0484 */ JAISe* newSe_(int category, u32 priority);
/* 802A0574 */ void calc();
/* 802A0704 */ void mixOut();
/* 802A0768 */ bool startSound(JAISoundID id, JAISoundHandle* handle, const JGeometry::TVec3<f32>* posPtr);
/* 802A08D0 */ int getNumActiveSe() const;
JAISeMgr(bool setInstance);
void setCategoryArrangement(const JAISeCategoryArrangement& arrangement);
void stop();
void stopSoundID(JAISoundID id);
void initParams();
void setAudience(JAIAudience* audience);
void setSeqDataMgr(JAISeqDataMgr* seqDataMgr);
void resetSeqDataMgr();
JAISe* newSe_(int category, u32 priority);
void calc();
void mixOut();
bool startSound(JAISoundID id, JAISoundHandle* handle, const JGeometry::TVec3<f32>* posPtr);
int getNumActiveSe() const;
/* 802A0168 */ virtual bool isUsingSeqData(const JAISeqDataRegion& seqDataRegion);
/* 802A01D8 */ virtual int releaseSeqData(const JAISeqDataRegion& seqDataRegion);
virtual bool isUsingSeqData(const JAISeqDataRegion& seqDataRegion);
virtual int releaseSeqData(const JAISeqDataRegion& seqDataRegion);
JAISeCategoryMgr* getCategory(int index) { return &mCategoryMgrs[index]; }
JAIAudience* getAudience() { return mAudience; }

38
include/JSystem/JAudio2/JAISeq.h
View File

@ -30,27 +30,27 @@ public:
/* 0x2FC */ JAISoundStrategyMgr<JAISeq>* strategyMgr;
};
/* 802A1570 */ virtual s32 getNumChild() const;
/* 802A1578 */ virtual JAISoundChild* getChild(int index);
/* 802A165C */ virtual void releaseChild(int index);
/* 802A1768 */ virtual JAISeq* asSeq();
/* 802A1728 */ virtual JASTrack* getTrack();
/* 802A1730 */ virtual JASTrack* getChildTrack(int);
/* 802A176C */ virtual JAITempoMgr* getTempoMgr();
/* 802A12BC */ virtual bool JAISound_tryDie_();
virtual s32 getNumChild() const;
virtual JAISoundChild* getChild(int index);
virtual void releaseChild(int index);
virtual JAISeq* asSeq();
virtual JASTrack* getTrack();
virtual JASTrack* getChildTrack(int);
virtual JAITempoMgr* getTempoMgr();
virtual bool JAISound_tryDie_();
/* 802A0A8C */ JAISeq(JAISeqMgr* seqMgr, JAISoundStrategyMgr<JAISeq>* soundStrategyMgr);
/* 802A0B64 */ void JAISeqMgr_startID_(JAISoundID id, const JGeometry::TVec3<f32>* posPtr, JAIAudience* audience,
JAISeq(JAISeqMgr* seqMgr, JAISoundStrategyMgr<JAISeq>* soundStrategyMgr);
void JAISeqMgr_startID_(JAISoundID id, const JGeometry::TVec3<f32>* posPtr, JAIAudience* audience,
int category, int);
/* 802A0C04 */ void playSeqData_(const JASSoundParams& params, JAISoundActivity activity);
/* 802A0CA4 */ void reserveChildTracks_(int);
/* 802A0E48 */ void releaseChildTracks_();
/* 802A0EDC */ bool prepare_getSeqData_();
/* 802A0F90 */ bool prepare_(const JASSoundParams& params, JAISoundActivity activity);
/* 802A108C */ void JAISeqMgr_calc_();
/* 802A1180 */ void die_();
/* 802A1348 */ void mixOut_(const JASSoundParams& params, JAISoundActivity activity);
/* 802A14FC */ void JAISeqMgr_mixOut_(const JASSoundParams& params, JAISoundActivity activity);
void playSeqData_(const JASSoundParams& params, JAISoundActivity activity);
void reserveChildTracks_(int);
void releaseChildTracks_();
bool prepare_getSeqData_();
bool prepare_(const JASSoundParams& params, JAISoundActivity activity);
void JAISeqMgr_calc_();
void die_();
void mixOut_(const JASSoundParams& params, JAISoundActivity activity);
void JAISeqMgr_mixOut_(const JASSoundParams& params, JAISoundActivity activity);
JAISeqData& getSeqData() { return inner_.mSeqData; }

26
include/JSystem/JAudio2/JAISeqMgr.h
View File

@ -18,20 +18,20 @@ public:
RELEASE_SEQ_1 = 1,
RELEASE_SEQ_2 = 2,
};
/* 802A1914 */ JAISeqMgr(bool setInstance);
/* 802A1A08 */ void freeDeadSeq_();
/* 802A1B48 */ bool startSound(JAISoundID id, JAISoundHandle* handle, const JGeometry::TVec3<f32>* posPtr);
/* 802A1C90 */ void calc();
/* 802A1DFC */ void stop();
/* 802A1E3C */ void stop(u32 fadeTime);
/* 802A1E8C */ void stopSoundID(JAISoundID id);
/* 802A1EFC */ void mixOut();
/* 802A1F58 */ JAISeq* beginStartSeq_();
/* 802A1FE8 */ bool endStartSeq_(JAISeq* seq, JAISoundHandle* handle);
JAISeqMgr(bool setInstance);
void freeDeadSeq_();
bool startSound(JAISoundID id, JAISoundHandle* handle, const JGeometry::TVec3<f32>* posPtr);
void calc();
void stop();
void stop(u32 fadeTime);
void stopSoundID(JAISoundID id);
void mixOut();
JAISeq* beginStartSeq_();
bool endStartSeq_(JAISeq* seq, JAISoundHandle* handle);
/* 802A20F0 */ virtual ~JAISeqMgr() {}
/* 802A1804 */ virtual bool isUsingSeqData(const JAISeqDataRegion& seqDataRegion);
/* 802A1870 */ virtual int releaseSeqData(const JAISeqDataRegion& seqDataRegion);
virtual ~JAISeqMgr() {}
virtual bool isUsingSeqData(const JAISeqDataRegion& seqDataRegion);
virtual int releaseSeqData(const JAISeqDataRegion& seqDataRegion);
void setAudience(JAIAudience* audience) { mAudience = audience; }
JAIAudience* getAudience() { return mAudience; }

34
include/JSystem/JAudio2/JAISound.h
View File

@ -45,8 +45,8 @@ class JASTrack;
*
*/
struct JAISoundStatus_ {
/* 802A2220 */ s32 lockWhenPrepared();
/* 802A2244 */ s32 unlockIfLocked();
s32 lockWhenPrepared();
s32 unlockIfLocked();
void init() {
field_0x0.value = 0;
@ -233,26 +233,26 @@ class JAITempoMgr;
*/
class JAISound {
public:
/* 802A21A0 */ void releaseHandle();
/* 802A21BC */ void attachHandle(JAISoundHandle* handle);
/* 802A22F8 */ JAISound();
/* 802A2328 */ void start_JAISound_(JAISoundID id, const JGeometry::TVec3<f32>* posPtr, JAIAudience* audience);
/* 802A244C */ bool acceptsNewAudible() const;
/* 802A2474 */ void newAudible(const JGeometry::TVec3<f32>&, JGeometry::TVec3<f32> const*, u32,
void releaseHandle();
void attachHandle(JAISoundHandle* handle);
JAISound();
void start_JAISound_(JAISoundID id, const JGeometry::TVec3<f32>* posPtr, JAIAudience* audience);
bool acceptsNewAudible() const;
void newAudible(const JGeometry::TVec3<f32>&, JGeometry::TVec3<f32> const*, u32,
JAIAudience*);
/* 802A2598 */ void stop();
/* 802A24DC */ void stop(u32 fadeTime);
/* 802A25F0 */ void die_JAISound_();
/* 802A266C */ void increasePrepareCount_JAISound_();
/* 802A26B8 */ bool calc_JAISound_();
/* 802A29DC */ void initTrack_JAISound_(JASTrack* track);
void stop();
void stop(u32 fadeTime);
void die_JAISound_();
void increasePrepareCount_JAISound_();
bool calc_JAISound_();
void initTrack_JAISound_(JASTrack* track);
virtual s32 getNumChild() const = 0;
virtual JAISoundChild* getChild(int) = 0;
virtual void releaseChild(int) = 0;
/* 802A25D8 */ virtual JAISe* asSe();
/* 802A25E0 */ virtual JAISeq* asSeq();
/* 802A25E8 */ virtual JAIStream* asStream();
virtual JAISe* asSe();
virtual JAISeq* asSeq();
virtual JAIStream* asStream();
virtual JASTrack* getTrack() = 0;
virtual JASTrack* getChildTrack(int) = 0;
virtual JAITempoMgr* getTempoMgr() = 0;

6
include/JSystem/JAudio2/JAISoundChild.h
View File

@ -11,9 +11,9 @@ struct JASTrack;
*
*/
struct JAISoundChild : JASPoolAllocObject<JAISoundChild> {
/* 802A2AB0 */ void init();
/* 802A2B28 */ void mixOut(JASTrack*);
/* 802A2B7C */ void calc();
void init();
void mixOut(JASTrack*);
void calc();
JAISoundChild() { init(); }

4
include/JSystem/JAudio2/JAISoundInfo.h
View File

@ -9,14 +9,14 @@
*
*/
struct JAISoundInfo : public JASGlobalInstance<JAISoundInfo> {
/* 802A2D34 */ JAISoundInfo(bool);
JAISoundInfo(bool);
virtual int getSoundType(JAISoundID) const = 0;
virtual int getCategory(JAISoundID) const = 0;
virtual u32 getPriority(JAISoundID) const = 0;
virtual void getSeInfo(JAISoundID, JAISe*) const = 0;
virtual void getSeqInfo(JAISoundID, JAISeq*) const = 0;
virtual void getStreamInfo(JAISoundID, JAIStream*) const = 0;
/* 802A2D50 */ virtual ~JAISoundInfo();
virtual ~JAISoundInfo();
};
#endif /* JAISOUNDINFO_H */

10
include/JSystem/JAudio2/JAISoundParams.h
View File

@ -92,11 +92,11 @@ struct JAISoundParamsMove {
void calc() { transition_.apply(&params_); }
/* 802A2DB4 */ void moveVolume(f32 newValue, u32 maxSteps);
/* 802A2E0C */ void movePitch(f32 newValue, u32 maxSteps);
/* 802A2E64 */ void moveFxMix(f32 newValue, u32 maxSteps);
/* 802A2EBC */ void movePan(f32 newValue, u32 maxSteps);
/* 802A2F14 */ void moveDolby(f32 newValue, u32 maxSteps);
void moveVolume(f32 newValue, u32 maxSteps);
void movePitch(f32 newValue, u32 maxSteps);
void moveFxMix(f32 newValue, u32 maxSteps);
void movePan(f32 newValue, u32 maxSteps);
void moveDolby(f32 newValue, u32 maxSteps);
/* 0x00 */ JASSoundParams params_;
/* 0x14 */ JAISoundParamsTransition transition_;

4
include/JSystem/JAudio2/JAISoundStarter.h
View File

@ -9,11 +9,11 @@
*
*/
struct JAISoundStarter : public JASGlobalInstance<JAISoundStarter> {
/* 802A2F6C */ JAISoundStarter(bool setInstance);
JAISoundStarter(bool setInstance);
virtual ~JAISoundStarter();
virtual bool startSound(JAISoundID id, JAISoundHandle* handlePtr, const JGeometry::TVec3<f32>* posPtr) = 0;
/* 802A2FEC */ bool startLevelSound(JAISoundID id, JAISoundHandle* handlePtr, const JGeometry::TVec3<f32>* posPtr);
bool startLevelSound(JAISoundID id, JAISoundHandle* handlePtr, const JGeometry::TVec3<f32>* posPtr);
};
#endif /* JAISOUNDSTARTER_H */

32
include/JSystem/JAudio2/JAIStream.h
View File

@ -17,24 +17,24 @@ public:
JASAramStream aramStream_;
};
/* 802A3104 */ JAIStream(JAIStreamMgr* streamMgr, JAISoundStrategyMgr<JAIStream>* soundStrategyMgr);
/* 802A319C */ void JAIStreamMgr_startID_(JAISoundID id, s32 streamFileEntry,
JAIStream(JAIStreamMgr* streamMgr, JAISoundStrategyMgr<JAIStream>* soundStrategyMgr);
void JAIStreamMgr_startID_(JAISoundID id, s32 streamFileEntry,
const JGeometry::TVec3<f32>* posPtr, JAIAudience* audience,
int category);
/* 802A3230 */ bool prepare_prepareStream_();
/* 802A33F4 */ void prepare_();
/* 802A3498 */ void prepare_startStream_();
/* 802A34E4 */ void JAIStreamMgr_mixOut_(const JASSoundParams& inParams, JAISoundActivity activity);
/* 802A3720 */ void die_JAIStream_();
/* 802A37FC */ bool JAISound_tryDie_();
/* 802A388C */ void JAIStreamMgr_calc_();
/* 802A3948 */ s32 getNumChild() const;
/* 802A3950 */ JAISoundChild* getChild(int index);
/* 802A3A24 */ void releaseChild(int index);
/* 802A3ABC */ JASTrack* getTrack();
/* 802A3AC4 */ JASTrack* getChildTrack(int);
/* 802A3ACC */ JAIStream* asStream();
/* 802A3AD0 */ JAITempoMgr* getTempoMgr();
bool prepare_prepareStream_();
void prepare_();
void prepare_startStream_();
void JAIStreamMgr_mixOut_(const JASSoundParams& inParams, JAISoundActivity activity);
void die_JAIStream_();
bool JAISound_tryDie_();
void JAIStreamMgr_calc_();
s32 getNumChild() const;
JAISoundChild* getChild(int index);
void releaseChild(int index);
JASTrack* getTrack();
JASTrack* getChildTrack(int);
JAIStream* asStream();
JAITempoMgr* getTempoMgr();
void* JAIStreamMgr_getAramAddr_() const { return streamAramAddr_; }

20
include/JSystem/JAudio2/JAIStreamMgr.h
View File

@ -14,16 +14,16 @@ class JAIStreamDataMgr;
*/
class JAIStreamMgr : public JASGlobalInstance<JAIStreamMgr> {
public:
/* 802A3B68 */ JAIStreamMgr(bool setInstance);
/* 802A3C3C */ bool startSound(JAISoundID id, JAISoundHandle* handle, const JGeometry::TVec3<f32>* posPtr);
/* 802A3D70 */ void freeDeadStream_();
/* 802A3EBC */ void calc();
/* 802A4028 */ void stop();
/* 802A4068 */ void stop(u32 fadeTime);
/* 802A40B8 */ void stopSoundID(JAISoundID id);
/* 802A4118 */ void mixOut();
/* 802A4174 */ JAIStream* newStream_();
/* 802B9978 */ bool isActive() const { return mStreamList.getNumLinks() != 0; }
JAIStreamMgr(bool setInstance);
bool startSound(JAISoundID id, JAISoundHandle* handle, const JGeometry::TVec3<f32>* posPtr);
void freeDeadStream_();
void calc();
void stop();
void stop(u32 fadeTime);
void stopSoundID(JAISoundID id);
void mixOut();
JAIStream* newStream_();
bool isActive() const { return mStreamList.getNumLinks() != 0; }
JAIAudience* getAudience() { return mAudience; }
JAISoundParamsMove* getParams() { return &mParams; }

40
include/JSystem/JAudio2/JASAiCtrl.h
View File

@ -18,26 +18,26 @@ namespace JASDriver {
typedef s16* (*MixCallback)(s32);
typedef void (*MixFunc)(s16*, u32, MixCallback);
/* 8029C388 */ void initAI(void (*)(void));
/* 8029C4E4 */ void startDMA();
/* 8029C504 */ void stopDMA();
/* 8029C524 */ void setOutputRate(JASOutputRate);
/* 8029C568 */ void updateDac();
/* 8029C6C4 */ void updateDSP();
/* 8029C7E0 */ void readDspBuffer(s16*, u32);
/* 8029C900 */ void finishDSPFrame();
/* 8029C9DC */ void registerMixCallback(MixCallback, JASMixMode);
/* 8029C9E8 */ f32 getDacRate();
/* 8029C9F0 */ u32 getSubFrames();
/* 8029C9F8 */ u32 getDacSize();
/* 8029CA04 */ u32 getFrameSamples();
/* 8029CA10 */ void mixMonoTrack(s16*, u32, MixCallback);
/* 8029CAC0 */ void mixMonoTrackWide(s16*, u32, MixCallback);
/* 8029CB70 */ void mixExtraTrack(s16*, u32, MixCallback);
/* 8029CC50 */ void mixInterleaveTrack(s16*, u32, MixCallback);
/* 8029CCD4 */ u32 getSubFrameCounter();
/* 8029E2A8 */ void subframeCallback();
/* 8029E2D0 */ void DSPSyncCallback();
void initAI(void (*)(void));
void startDMA();
void stopDMA();
void setOutputRate(JASOutputRate);
void updateDac();
void updateDSP();
void readDspBuffer(s16*, u32);
void finishDSPFrame();
void registerMixCallback(MixCallback, JASMixMode);
f32 getDacRate();
u32 getSubFrames();
u32 getDacSize();
u32 getFrameSamples();
void mixMonoTrack(s16*, u32, MixCallback);
void mixMonoTrackWide(s16*, u32, MixCallback);
void mixExtraTrack(s16*, u32, MixCallback);
void mixInterleaveTrack(s16*, u32, MixCallback);
u32 getSubFrameCounter();
void subframeCallback();
void DSPSyncCallback();
extern const MixFunc sMixFuncs[4];
extern s16* sDmaDacBuffer[3];

46
include/JSystem/JAudio2/JASAramStream.h
View File

@ -59,29 +59,29 @@ public:
} field_0x8[6];
}; // Size: 0x20
/* 8029631C */ static void initSystem(u32, u32);
/* 802963A8 */ JASAramStream();
/* 8029649C */ void init(u32, u32, StreamCallback, void*);
/* 8029655C */ bool prepare(s32, int);
/* 80296618 */ bool start();
/* 8029664C */ bool stop(u16);
/* 80296684 */ bool pause(bool);
/* 802966CC */ bool cancel();
/* 80296710 */ u32 getBlockSamples() const;
/* 8029673C */ static void headerLoadTask(void*);
/* 8029676C */ static void firstLoadTask(void*);
/* 80296848 */ static void loadToAramTask(void*);
/* 80296868 */ static void finishTask(void*);
/* 802968C8 */ static void prepareFinishTask(void*);
/* 80296920 */ bool headerLoad(u32, int);
/* 80296AE8 */ bool load();
/* 80296D74 */ static s32 channelProcCallback(void*);
/* 80296D94 */ static s32 dvdErrorCheck(void*);
/* 80296DF0 */ static void channelCallback(u32, JASChannel*, JASDsp::TChannel*, void*);
/* 80296E2C */ void updateChannel(u32, JASChannel*, JASDsp::TChannel*);
/* 802974AC */ s32 channelProc();
/* 80297658 */ void channelStart();
/* 80297870 */ void channelStop(u16);
static void initSystem(u32, u32);
JASAramStream();
void init(u32, u32, StreamCallback, void*);
bool prepare(s32, int);
bool start();
bool stop(u16);
bool pause(bool);
bool cancel();
u32 getBlockSamples() const;
static void headerLoadTask(void*);
static void firstLoadTask(void*);
static void loadToAramTask(void*);
static void finishTask(void*);
static void prepareFinishTask(void*);
bool headerLoad(u32, int);
bool load();
static s32 channelProcCallback(void*);
static s32 dvdErrorCheck(void*);
static void channelCallback(u32, JASChannel*, JASDsp::TChannel*, void*);
void updateChannel(u32, JASChannel*, JASDsp::TChannel*);
s32 channelProc();
void channelStart();
void channelStop(u16);
void setPitch(f32 pitch) { mPitch = pitch; }
void setVolume(f32 volume) {

14
include/JSystem/JAudio2/JASAudioReseter.h
View File

@ -8,13 +8,13 @@
*
*/
struct JASAudioReseter {
/* 8029D0B4 */ JASAudioReseter();
/* 8029D0FC */ ~JASAudioReseter();
/* 8029D138 */ bool start(u32, bool);
/* 8029D1D4 */ void resume();
/* 8029D1F8 */ s32 checkDone() const;
/* 8029D200 */ s32 calc();
/* 8029D2D4 */ static s32 callback(void*);
JASAudioReseter();
~JASAudioReseter();
bool start(u32, bool);
void resume();
s32 checkDone() const;
s32 calc();
static s32 callback(void*);
/* 0x0 */ u32 field_0x0;
/* 0x4 */ f32 mDSPLevel;

14
include/JSystem/JAudio2/JASAudioThread.h
View File

@ -15,13 +15,13 @@ enum JASAudioMessage {
*
*/
struct JASAudioThread : public JKRThread, public JASGlobalInstance<JASAudioThread> {
/* 8029CCDC */ JASAudioThread(int, int, u32);
/* 8029CD4C */ static void create(s32);
/* 8029CDC0 */ void stop();
/* 8029CDEC */ virtual void* run();
/* 8029CF68 */ static void DMACallback();
/* 8029CFBC */ static void DSPCallback(void*);
/* 8029D028 */ virtual ~JASAudioThread() {}
JASAudioThread(int, int, u32);
static void create(s32);
void stop();
virtual void* run();
static void DMACallback();
static void DSPCallback(void*);
virtual ~JASAudioThread() {}
static JASAudioThread* getThreadPointer() { return getInstance(); }
static int getDSPSyncCount() { return snIntCount; }

14
include/JSystem/JAudio2/JASBNKParser.h
View File

@ -54,8 +54,8 @@ namespace JASBNKParser {
/* 0xC */ u32 mOffsets[0];
};
/* 80299600 */ TChunk* findChunk(void const*, u32);
/* 8029963C */ JASBasicBank* createBasicBank(void const*, JKRHeap*);
TChunk* findChunk(void const*, u32);
JASBasicBank* createBasicBank(void const*, JKRHeap*);
};
namespace Ver0 {
@ -124,13 +124,13 @@ namespace JASBNKParser {
/* 0x20 */ TOffsetData mOffsets;
};
/* 80299A3C */ JASBasicBank* createBasicBank(void const*, JKRHeap*);
/* 80299E68 */ JASOscillator::Data* findOscPtr(JASBasicBank*, THeader const*, TOsc const*);
/* 80299F8C */ JASOscillator::Point const* getOscTableEndPtr(JASOscillator::Point const*);
JASBasicBank* createBasicBank(void const*, JKRHeap*);
JASOscillator::Data* findOscPtr(JASBasicBank*, THeader const*, TOsc const*);
JASOscillator::Point const* getOscTableEndPtr(JASOscillator::Point const*);
};
/* 80299538 */ JASBank* createBank(void const*, JKRHeap*);
/* 80299558 */ JASBasicBank* createBasicBank(void const*, JKRHeap*);
JASBank* createBank(void const*, JKRHeap*);
JASBasicBank* createBasicBank(void const*, JKRHeap*);
inline u32 getBankNumber(const void* param_0) { return ((u32*)param_0)[2]; }

4
include/JSystem/JAudio2/JASBank.h
View File

@ -25,9 +25,9 @@ public:
JASWaveBank* getWaveBank() const { return mWaveBank; }
void assignWaveBank(JASWaveBank* param_0) { mWaveBank = param_0; }
/* 80297930 */ static JASChannel* noteOn(JASBank const*, int, u8, u8, u16,
static JASChannel* noteOn(JASBank const*, int, u8, u8, u16,
void (*)(u32, JASChannel*, JASDsp::TChannel*, void*), void*);
/* 80297C40 */ static JASChannel* noteOnOsc(int, u8, u8, u16,
static JASChannel* noteOnOsc(int, u8, u8, u16,
void (*)(u32, JASChannel*, JASDsp::TChannel*, void*), void*);
private:

14
include/JSystem/JAudio2/JASBasicBank.h
View File

@ -7,13 +7,13 @@
class JASBasicBank : public JASBank {
public:
/* 80297D78 */ JASBasicBank();
/* 80297DA4 */ void newInstTable(u8, JKRHeap*);
/* 80297E00 */ bool getInstParam(int, int, int, JASInstParam*) const;
/* 80297E68 */ void setInst(int, JASInst*);
/* 80297E80 */ JASInst* getInst(int) const;
/* 80297F0C */ ~JASBasicBank() {}
/* 80297F68 */ u32 getType() const { return 'BSIC'; }
JASBasicBank();
void newInstTable(u8, JKRHeap*);
bool getInstParam(int, int, int, JASInstParam*) const;
void setInst(int, JASInst*);
JASInst* getInst(int) const;
~JASBasicBank() {}
u32 getType() const { return 'BSIC'; }
/* 0x8 */ JASInst** mInstTable;
/* 0xC */ u8 mInstNumMax;

18
include/JSystem/JAudio2/JASBasicInst.h
View File

@ -44,8 +44,8 @@ struct JASInst {
*/
struct JASBasicInst : public JASInst {
struct TKeymap {
/* 80298250 */ ~TKeymap();
/* 802982D4 */ TKeymap() { mHighKey = -1; }
~TKeymap();
TKeymap() { mHighKey = -1; }
void setHighKey(int key) { mHighKey = key; }
/* 0x0 */ s32 mHighKey;
@ -55,14 +55,14 @@ struct JASBasicInst : public JASInst {
/* 0xC */ f32 field_0xc;
};
/* 80298014 */ JASBasicInst();
/* 8029819C */ void setKeyRegionCount(u32, JKRHeap*);
/* 8029821C */ void setOsc(int, JASOscillator::Data const*);
/* 8029822C */ TKeymap* getKeyRegion(int);
JASBasicInst();
void setKeyRegionCount(u32, JKRHeap*);
void setOsc(int, JASOscillator::Data const*);
TKeymap* getKeyRegion(int);
/* 8029807C */ virtual ~JASBasicInst();
/* 802980F8 */ virtual bool getParam(int, int, JASInstParam*) const;
/* 802982E0 */ virtual u32 getType() const { return 'BSIC'; };
virtual ~JASBasicInst();
virtual bool getParam(int, int, JASInstParam*) const;
virtual u32 getType() const { return 'BSIC'; };
void setVolume(f32 volume) { mVolume = volume; }
void setPitch(f32 pitch) { mPitch = pitch; }

42
include/JSystem/JAudio2/JASBasicWaveBank.h
View File

@ -10,9 +10,9 @@
*/
struct JASBasicWaveBank : public JASWaveBank {
struct TWaveHandle : public JASWaveHandle {
/* 80298B64 */ int getWavePtr() const;
/* 80298C18 */ TWaveHandle() { mHeap = NULL; }
/* 80298C64 */ const JASWaveInfo* getWaveInfo() const { return &field_0x4; }
int getWavePtr() const;
TWaveHandle() { mHeap = NULL; }
const JASWaveInfo* getWaveInfo() const { return &field_0x4; }
bool compareHeap(JASHeap* heap) const { return mHeap == heap;}
/* 0x04 */ JASWaveInfo field_0x4;
@ -20,7 +20,7 @@ struct JASBasicWaveBank : public JASWaveBank {
};
struct TGroupWaveInfo {
/* 80298C4C */ TGroupWaveInfo() {
TGroupWaveInfo() {
field_0x0 = 0xffff;
field_0x4 = -1;
}
@ -30,12 +30,12 @@ struct JASBasicWaveBank : public JASWaveBank {
};
struct TWaveGroup : JASWaveArc {
/* 802989C0 */ TWaveGroup();
/* 80298A0C */ ~TWaveGroup();
/* 80298A84 */ void setWaveCount(u32, JKRHeap*);
/* 80298B04 */ void onLoadDone();
/* 80298B2C */ void onEraseDone();
/* 80298B54 */ u32 getWaveID(int) const;
TWaveGroup();
~TWaveGroup();
void setWaveCount(u32, JKRHeap*);
void onLoadDone();
void onEraseDone();
u32 getWaveID(int) const;
/* 0x74 */ JASBasicWaveBank* mBank;
/* 0x78 */ TGroupWaveInfo* mCtrlWaveArray;
@ -44,17 +44,17 @@ struct JASBasicWaveBank : public JASWaveBank {
u32 getWaveCount() const { return mWaveCount; }
};
/* 802984F8 */ JASBasicWaveBank();
/* 80298558 */ ~JASBasicWaveBank();
/* 80298640 */ TWaveGroup* getWaveGroup(u32);
/* 80298664 */ void setGroupCount(u32, JKRHeap*);
/* 80298710 */ void setWaveTableSize(u32, JKRHeap*);
/* 80298790 */ void incWaveTable(JASBasicWaveBank::TWaveGroup const*);
/* 8029883C */ void decWaveTable(JASBasicWaveBank::TWaveGroup const*);
/* 802988DC */ JASWaveHandle* getWaveHandle(u32) const;
/* 80298910 */ void setWaveInfo(JASBasicWaveBank::TWaveGroup*, int, u16, JASWaveInfo const&);
/* 80298C6C */ JASWaveArc* getWaveArc(u32 param_0) { return getWaveGroup(param_0); }
/* 80298C8C */ u32 getArcCount() const { return mGroupCount; }
JASBasicWaveBank();
~JASBasicWaveBank();
TWaveGroup* getWaveGroup(u32);
void setGroupCount(u32, JKRHeap*);
void setWaveTableSize(u32, JKRHeap*);
void incWaveTable(JASBasicWaveBank::TWaveGroup const*);
void decWaveTable(JASBasicWaveBank::TWaveGroup const*);
JASWaveHandle* getWaveHandle(u32) const;
void setWaveInfo(JASBasicWaveBank::TWaveGroup*, int, u16, JASWaveInfo const&);
JASWaveArc* getWaveArc(u32 param_0) { return getWaveGroup(param_0); }
u32 getArcCount() const { return mGroupCount; }
/* 0x04 */ OSMutex field_0x4;
/* 0x1C */ TWaveHandle* mWaveTable;

12
include/JSystem/JAudio2/JASCalc.h
View File

@ -8,12 +8,12 @@
*
*/
struct JASCalc {
/* 8028F2E8 */ static void imixcopy(const s16*, const s16*, s16*, u32);
/* 8028F318 */ static void bcopyfast(const void* src, void* dest, u32 size);
/* 8028F354 */ static void bcopy(const void* src, void* dest, u32 size);
/* 8028F454 */ static void bzerofast(void* dest, u32 size);
/* 8028F480 */ static void bzero(void* dest, u32 size);
/* 8028F578 */ static f32 pow2(f32);
static void imixcopy(const s16*, const s16*, s16*, u32);
static void bcopyfast(const void* src, void* dest, u32 size);
static void bcopy(const void* src, void* dest, u32 size);
static void bzerofast(void* dest, u32 size);
static void bzero(void* dest, u32 size);
static f32 pow2(f32);
// Could not make it work as inline - specialization is in JASCalc.cpp
template <typename A, typename B>

42
include/JSystem/JAudio2/JASChannel.h
View File

@ -81,28 +81,28 @@ public:
} parts;
};
/* 8029A800 */ JASChannel(Callback, void*);
/* 8029A918 */ ~JASChannel();
/* 8029A9F0 */ int play();
/* 8029AA60 */ int playForce();
/* 8029AAD0 */ void release(u16);
/* 8029AB64 */ void setOscInit(u32, JASOscillator::Data const*);
/* 8029AB98 */ void setMixConfig(u32, u16);
/* 8029ABA8 */ static f32 calcEffect(JASChannel::PanVector const*);
/* 8029ABC0 */ static f32 calcPan(JASChannel::PanVector const*);
/* 8029ABEC */ void effectOsc(u32, JASOscillator::EffectParams*);
/* 8029ACD4 */ void setKeySweepTarget(s32, u32);
/* 8029AD38 */ void updateEffectorParam(JASDsp::TChannel*, u16*,
JASChannel(Callback, void*);
~JASChannel();
int play();
int playForce();
void release(u16);
void setOscInit(u32, JASOscillator::Data const*);
void setMixConfig(u32, u16);
static f32 calcEffect(JASChannel::PanVector const*);
static f32 calcPan(JASChannel::PanVector const*);
void effectOsc(u32, JASOscillator::EffectParams*);
void setKeySweepTarget(s32, u32);
void updateEffectorParam(JASDsp::TChannel*, u16*,
JASOscillator::EffectParams const&);
/* 8029AF78 */ static s32 dspUpdateCallback(u32, JASDsp::TChannel*, void*);
/* 8029B004 */ s32 initialUpdateDSPChannel(JASDsp::TChannel*);
/* 8029B324 */ s32 updateDSPChannel(JASDsp::TChannel*);
/* 8029B6A0 */ void updateAutoMixer(JASDsp::TChannel*, f32, f32, f32, f32);
/* 8029B7D8 */ void updateMixer(f32, f32, f32, f32, u16*);
/* 8029BBFC */ void free();
/* 8029BC0C */ static void initBankDisposeMsgQueue();
/* 8029BC48 */ static void receiveBankDisposeMsg();
/* 8029BCC0 */ bool checkBankDispose() const;
static s32 dspUpdateCallback(u32, JASDsp::TChannel*, void*);
s32 initialUpdateDSPChannel(JASDsp::TChannel*);
s32 updateDSPChannel(JASDsp::TChannel*);
void updateAutoMixer(JASDsp::TChannel*, f32, f32, f32, f32);
void updateMixer(f32, f32, f32, f32, u16*);
void free();
static void initBankDisposeMsgQueue();
static void receiveBankDisposeMsg();
bool checkBankDispose() const;
void setPauseFlag(bool param_0) { mPauseFlag = param_0; }
void setUpdateTimer(u32 param_0) { mUpdateTimer = param_0; }

2
include/JSystem/JAudio2/JASCmdStack.h
View File

@ -42,7 +42,7 @@ struct JASPortCmd : JSULink<JASPortCmd> {
void execCommandStay();
};
/* 80291060 */ static void execAllCommand();
static void execAllCommand();
Command _10;
JASPortArgs* _14;

28
include/JSystem/JAudio2/JASDSPChannel.h
View File

@ -23,21 +23,21 @@ struct JASDSPChannel {
/* 3 */ CB_DROP,
};
/* 8029D2F4 */ JASDSPChannel();
/* 8029D320 */ void free();
/* 8029D330 */ void start();
/* 8029D340 */ void drop();
/* 8029D534 */ void setPriority(u8);
/* 8029D65C */ void updateProc();
JASDSPChannel();
void free();
void start();
void drop();
void setPriority(u8);
void updateProc();
/* 8029D3C8 */ static void initAll();
/* 8029D44C */ static JASDSPChannel* alloc(u8, Callback, void*);
/* 8029D4BC */ static JASDSPChannel* allocForce(u8, Callback, void*);
/* 8029D540 */ static JASDSPChannel* getLowestChannel(int);
/* 8029D5D0 */ static JASDSPChannel* getLowestActiveChannel();
/* 8029D89C */ static void updateAll();
/* 8029D910 */ static int killActiveChannel();
/* 8029D948 */ static JASDSPChannel* getHandle(u32);
static void initAll();
static JASDSPChannel* alloc(u8, Callback, void*);
static JASDSPChannel* allocForce(u8, Callback, void*);
static JASDSPChannel* getLowestChannel(int);
static JASDSPChannel* getLowestActiveChannel();
static void updateAll();
static int killActiveChannel();
static JASDSPChannel* getHandle(u32);
static JASDSPChannel* sDspChannels;

68
include/JSystem/JAudio2/JASDSPInterface.h
View File

@ -30,28 +30,28 @@ namespace JASDsp {
} FxBuf;
struct TChannel {
/* 8029DCA4 */ void init();
/* 8029DCE0 */ void playStart();
/* 8029DD44 */ void playStop();
/* 8029DD50 */ void replyFinishRequest();
/* 8029DD60 */ void forceStop();
/* 8029DD6C */ bool isActive() const;
/* 8029DD7C */ bool isFinish() const;
/* 8029DD8C */ void setWaveInfo(JASWaveInfo const&, u32, u32);
/* 8029DEAC */ void setOscInfo(u32);
/* 8029DEC4 */ void initAutoMixer();
/* 8029DEF0 */ void setAutoMixer(u16, u8, u8, u8, u8);
/* 8029DF1C */ void setPitch(u16);
/* 8029DF34 */ void setMixerInitVolume(u8, s16);
/* 8029DF54 */ void setMixerVolume(u8, s16);
/* 8029DF80 */ void setPauseFlag(u8);
/* 8029DF8C */ void flush();
/* 8029DFB0 */ void initFilter();
/* 8029E00C */ void setFilterMode(u16);
/* 8029E044 */ void setIIRFilterParam(s16*);
/* 8029E06C */ void setFIR8FilterParam(s16*);
/* 8029E094 */ void setDistFilter(s16);
/* 8029E09C */ void setBusConnect(u8, u8);
void init();
void playStart();
void playStop();
void replyFinishRequest();
void forceStop();
bool isActive() const;
bool isFinish() const;
void setWaveInfo(JASWaveInfo const&, u32, u32);
void setOscInfo(u32);
void initAutoMixer();
void setAutoMixer(u16, u8, u8, u8, u8);
void setPitch(u16);
void setMixerInitVolume(u8, s16);
void setMixerVolume(u8, s16);
void setPauseFlag(u8);
void flush();
void initFilter();
void setFilterMode(u16);
void setIIRFilterParam(s16*);
void setFIR8FilterParam(s16*);
void setDistFilter(s16);
void setBusConnect(u8, u8);
/* 0x000 */ u16 mIsActive;
/* 0x002 */ u16 mIsFinished;
@ -99,18 +99,18 @@ namespace JASDsp {
/* 0x158 */ u8 field_0x158[0x180 - 0x158];
};
/* 8029D958 */ void boot(void (*)(void*));
/* 8029D9A4 */ void releaseHalt(u32);
/* 8029D9C4 */ void finishWork(u16);
/* 8029D9E4 */ void syncFrame(u32, u32, u32);
/* 8029DA04 */ void setDSPMixerLevel(f32);
/* 8029DA30 */ f32 getDSPMixerLevel();
/* 8029DA38 */ TChannel* getDSPHandle(int);
/* 8029DA48 */ void setFilterTable(s16*, s16*, u32);
/* 8029DA6C */ void flushBuffer();
/* 8029DAA0 */ void invalChannelAll();
/* 8029DAC8 */ void initBuffer();
/* 8029DB78 */ int setFXLine(u8, s16*, JASDsp::FxlineConfig_*);
void boot(void (*)(void*));
void releaseHalt(u32);
void finishWork(u16);
void syncFrame(u32, u32, u32);
void setDSPMixerLevel(f32);
f32 getDSPMixerLevel();
TChannel* getDSPHandle(int);
void setFilterTable(s16*, s16*, u32);
void flushBuffer();
void invalChannelAll();
void initBuffer();
int setFXLine(u8, s16*, JASDsp::FxlineConfig_*);
extern u8 const DSPADPCM_FILTER[64];
extern u32 const DSPRES_FILTER[320];

24
include/JSystem/JAudio2/JASDriverIF.h
View File

@ -6,18 +6,18 @@
typedef s32 (*DriverCallback)(void*);
namespace JASDriver {
/* 8029E130 */ void setDSPLevel(f32);
/* 8029E150 */ u16 getChannelLevel_dsp();
/* 8029E158 */ f32 getDSPLevel();
/* 8029E178 */ void setOutputMode(u32);
/* 8029E180 */ u32 getOutputMode();
/* 8029E188 */ void waitSubFrame();
/* 8029E1C4 */ int rejectCallback(DriverCallback, void*);
/* 8029E240 */ bool registerDspSyncCallback(DriverCallback, void*);
/* 8029E274 */ bool registerSubFrameCallback(DriverCallback, void*);
/* 8029E2A8 */ void subframeCallback();
/* 8029E2D0 */ void DSPSyncCallback();
/* 8029E2F8 */ void updateDacCallback();
void setDSPLevel(f32);
u16 getChannelLevel_dsp();
f32 getDSPLevel();
void setOutputMode(u32);
u32 getOutputMode();
void waitSubFrame();
int rejectCallback(DriverCallback, void*);
bool registerDspSyncCallback(DriverCallback, void*);
bool registerSubFrameCallback(DriverCallback, void*);
void subframeCallback();
void DSPSyncCallback();
void updateDacCallback();
extern JASCallbackMgr sDspSyncCallback;
extern JASCallbackMgr sSubFrameCallback;

16
include/JSystem/JAudio2/JASDrumSet.h
View File

@ -11,8 +11,8 @@ struct JKRHeap;
*/
struct JASDrumSet : public JASInst {
struct TPerc {
/* 802984C4 */ TPerc();
/* 802984E4 */ void setRelease(u32);
TPerc();
void setRelease(u32);
void setVolume(f32 volume) { mVolume = volume; }
void setPitch(f32 pitch) { mPitch = pitch; }
@ -27,12 +27,12 @@ struct JASDrumSet : public JASInst {
/* 0x14 */ f32 field_0x14;
};
/* 802982EC */ JASDrumSet();
/* 80298314 */ virtual ~JASDrumSet();
/* 80298370 */ void newPercArray(u8, JKRHeap*);
/* 802983CC */ virtual bool getParam(int, int, JASInstParam*) const;
/* 802984B4 */ void setPerc(int, JASDrumSet::TPerc*);
/* 802984EC */ virtual u32 getType() const;
JASDrumSet();
virtual ~JASDrumSet();
void newPercArray(u8, JKRHeap*);
virtual bool getParam(int, int, JASInstParam*) const;
void setPerc(int, JASDrumSet::TPerc*);
virtual u32 getType() const;
/* 0x4 */ TPerc** field_0x4;
/* 0x8 */ u8 field_0x8;

4
include/JSystem/JAudio2/JASDvdThread.h
View File

@ -11,8 +11,8 @@ class JASTaskThread;
*/
class JASDvd {
public:
/* 8028FEFC */ static JASTaskThread* getThreadPointer();
/* 8028FF04 */ static bool createThread(s32 priority, int msgCount, u32 stackSize);
static JASTaskThread* getThreadPointer();
static bool createThread(s32 priority, int msgCount, u32 stackSize);
static JASTaskThread* sThread;
};

38
include/JSystem/JAudio2/JASHeapCtrl.h
View File

@ -17,15 +17,15 @@ class JKRSolidHeap;
*/
class JASHeap {
public:
/* 80290140 */ JASHeap(JASDisposer* param_0 = NULL);
/* 802901AC */ void initRootHeap(void*, u32);
/* 8029021C */ bool alloc(JASHeap*, u32);
/* 802903F4 */ bool allocTail(JASHeap*, u32);
/* 802904E4 */ bool free();
/* 80290608 */ void insertChild(JASHeap*, JASHeap*, void*, u32, bool);
/* 802906F0 */ JASHeap* getTailHeap();
/* 8029077C */ u32 getTailOffset();
/* 802907E0 */ u32 getCurOffset();
JASHeap(JASDisposer* param_0 = NULL);
void initRootHeap(void*, u32);
bool alloc(JASHeap*, u32);
bool allocTail(JASHeap*, u32);
bool free();
void insertChild(JASHeap*, JASHeap*, void*, u32, bool);
JASHeap* getTailHeap();
u32 getTailOffset();
u32 getCurOffset();
void* getBase() { return mBase; }
bool isAllocated() { return mBase; }
@ -44,11 +44,11 @@ public:
*
*/
struct JASGenericMemPool {
/* 80290848 */ JASGenericMemPool();
/* 80290860 */ ~JASGenericMemPool();
/* 802908C8 */ void newMemPool(u32, int);
/* 80290948 */ void* alloc(u32);
/* 80290994 */ void free(void*, u32);
JASGenericMemPool();
~JASGenericMemPool();
void newMemPool(u32, int);
void* alloc(u32);
void free(void*, u32);
/* 0x00 */ void* field_0x0;
/* 0x04 */ u32 freeMemCount;
@ -235,11 +235,11 @@ public:
};
namespace JASKernel {
/* 802909B8 */ void setupRootHeap(JKRSolidHeap*, u32);
/* 80290AC0 */ JKRHeap* getSystemHeap();
/* 80290AC8 */ JASMemChunkPool<1024, JASThreadingModel::ObjectLevelLockable>* getCommandHeap();
/* 80290AD0 */ void setupAramHeap(u32, u32);
/* 80290B08 */ JASHeap* getAramHeap();
void setupRootHeap(JKRSolidHeap*, u32);
JKRHeap* getSystemHeap();
JASMemChunkPool<1024, JASThreadingModel::ObjectLevelLockable>* getCommandHeap();
void setupAramHeap(u32, u32);
JASHeap* getAramHeap();
extern JASHeap audioAramHeap;
extern u32 sAramBase;

8
include/JSystem/JAudio2/JASLfo.h
View File

@ -8,10 +8,10 @@
*
*/
struct JASLfo {
/* 8029BD14 */ JASLfo();
/* 8029BD44 */ f32 getValue() const;
/* 8029BDD8 */ void incCounter(f32);
/* 8029BE2C */ void resetCounter();
JASLfo();
f32 getValue() const;
void incCounter(f32);
void resetCounter();
void setDepth(f32 param_0) { mDepth = param_0; }
void setPitch(f32 param_0) { mPitch = param_0; }

8
include/JSystem/JAudio2/JASProbe.h
View File

@ -8,10 +8,10 @@
*
*/
struct JASProbe {
/* 80290EE4 */ static void start(s32, char const*);
/* 80290D74 */ void start(char const*);
/* 80290DC4 */ void stop();
/* 80290F24 */ static void stop(s32);
static void start(s32, char const*);
void start(char const*);
void stop();
static void stop(s32);
static JASProbe* sProbeTable[16];

8
include/JSystem/JAudio2/JASRegisterParam.h
View File

@ -16,10 +16,10 @@ public:
REG3,
};
/* 80293644 */ JASRegisterParam();
/* 80293664 */ void init();
/* 80293684 */ void write(JASRegisterParam::RegID, u32);
/* 802937B8 */ u32 read(JASRegisterParam::RegID);
JASRegisterParam();
void init();
void write(JASRegisterParam::RegID, u32);
u32 read(JASRegisterParam::RegID);
u16 field_0x0[14];
};

8
include/JSystem/JAudio2/JASResArcLoader.h
View File

@ -5,10 +5,10 @@
#include <dolphin/os.h>
namespace JASResArcLoader {
/* 80290BD0 */ size_t getResSize(JKRArchive const*, u16);
/* 80290C04 */ size_t getResMaxSize(JKRArchive const*);
/* 80290C7C */ static void loadResourceCallback(void*);
/* 80290D18 */ int loadResourceAsync(JKRArchive*, u16, u8*, u32, void (*)(u32, u32), u32);
size_t getResSize(JKRArchive const*, u16);
size_t getResMaxSize(JKRArchive const*);
static void loadResourceCallback(void*);
int loadResourceAsync(JKRArchive*, u16, u8*, u32, void (*)(u32, u32), u32);
};
class JKRArchive;

22
include/JSystem/JAudio2/JASSeqCtrl.h
View File

@ -22,17 +22,17 @@ public:
INTRTYPE_VALUE_6,
};
/* 802938BC */ JASSeqCtrl();
/* 80293924 */ void init();
/* 80293980 */ void start(void*, u32);
/* 802939C4 */ int tickProc(JASTrack*);
/* 80293ABC */ void interrupt(JASSeqCtrl::IntrType);
/* 80293AE0 */ void setIntrMask(u32);
/* 80293AF0 */ void clrIntrMask(u32);
/* 80293B00 */ int retIntr();
/* 80293B28 */ int findIntr();
/* 80293B78 */ void checkIntr();
/* 80293BE8 */ void timerProcess();
JASSeqCtrl();
void init();
void start(void*, u32);
int tickProc(JASTrack*);
void interrupt(JASSeqCtrl::IntrType);
void setIntrMask(u32);
void clrIntrMask(u32);
int retIntr();
int findIntr();
void checkIntr();
void timerProcess();
const JASSeqReader* getSeqReader() const { return &mReader; }
void* getBase() { return mReader.getBase(); }

138
include/JSystem/JAudio2/JASSeqParser.h
View File

@ -19,76 +19,76 @@ public:
u16 field_0xe;
};
/* 80293CAC */ virtual ~JASSeqParser() {}
/* 802958D4 */ virtual s32 parse(JASTrack*);
/* 80295540 */ virtual s32 execNoteOnMidi(JASTrack*, u32, u32, u32);
/* 80295498 */ virtual s32 execNoteOnGate(JASTrack*, u32, u32, u32, u32);
/* 80295570 */ virtual s32 execNoteOff(JASTrack*, u32);
/* 8029559C */ virtual s32 execCommand(JASTrack*, s32 (JASSeqParser::*)(JASTrack*, u32*), u32, u32*);
virtual ~JASSeqParser() {}
virtual s32 parse(JASTrack*);
virtual s32 execNoteOnMidi(JASTrack*, u32, u32, u32);
virtual s32 execNoteOnGate(JASTrack*, u32, u32, u32, u32);
virtual s32 execNoteOff(JASTrack*, u32);
virtual s32 execCommand(JASTrack*, s32 (JASSeqParser::*)(JASTrack*, u32*), u32, u32*);
/* 80293CF4 */ bool conditionCheck(JASTrack*, JASSeqParser::BranchCondition);
/* 80293DC4 */ void writeReg(JASTrack*, u32, u32);
/* 80293FC8 */ u32 readReg(JASTrack*, u32) const;
/* 80294188 */ s32 cmdOpenTrack(JASTrack*, u32*);
/* 802941F0 */ s32 cmdCloseTrack(JASTrack*, u32*);
/* 8029421C */ s32 cmdCall(JASTrack*, u32*);
/* 80294248 */ s32 cmdCallF(JASTrack*, u32*);
/* 8029429C */ s32 cmdRet(JASTrack*, u32*);
/* 802942D4 */ s32 cmdRetF(JASTrack*, u32*);
/* 80294328 */ s32 cmdJmp(JASTrack*, u32*);
/* 80294340 */ s32 cmdJmpF(JASTrack*, u32*);
/* 80294398 */ s32 cmdJmpTable(JASTrack*, u32*);
/* 802943CC */ s32 cmdCallTable(JASTrack*, u32*);
/* 8029441C */ s32 cmdLoopS(JASTrack*, u32*);
/* 80294448 */ s32 cmdLoopE(JASTrack*, u32*);
/* 80294470 */ s32 cmdNote(JASTrack*, u32*);
/* 802944B4 */ s32 cmdNoteOn(JASTrack*, u32*);
/* 802944F4 */ s32 cmdNoteOff(JASTrack*, u32*);
/* 80294528 */ s32 cmdReadPort(JASTrack*, u32*);
/* 80294588 */ s32 cmdWritePort(JASTrack*, u32*);
/* 802945BC */ s32 cmdParentWritePort(JASTrack*, u32*);
/* 802945F8 */ s32 cmdChildWritePort(JASTrack*, u32*);
/* 80294644 */ s32 cmdParentReadPort(JASTrack*, u32*);
/* 802946AC */ s32 cmdChildReadPort(JASTrack*, u32*);
/* 80294724 */ s32 cmdCheckPortImport(JASTrack*, u32*);
/* 80294770 */ s32 cmdCheckPortExport(JASTrack*, u32*);
/* 802947BC */ s32 cmdWait(JASTrack*, u32*);
/* 802947F4 */ s32 cmdWaitByte(JASTrack*, u32*);
/* 80294804 */ s32 cmdSetLastNote(JASTrack*, u32*);
/* 8029483C */ s32 cmdEnvScaleSet(JASTrack*, u32*);
/* 8029488C */ s32 cmdEnvSet(JASTrack*, u32*);
/* 802948C8 */ s32 cmdSimpleADSR(JASTrack*, u32*);
/* 8029491C */ s32 cmdBusConnect(JASTrack*, u32*);
/* 8029494C */ s32 cmdSetIntTable(JASTrack*, u32*);
/* 8029495C */ s32 cmdSetInterrupt(JASTrack*, u32*);
/* 80294988 */ s32 cmdDisInterrupt(JASTrack*, u32*);
/* 802949B4 */ s32 cmdClrI(JASTrack*, u32*);
/* 802949E4 */ s32 cmdRetI(JASTrack*, u32*);
/* 80294A20 */ s32 cmdIntTimer(JASTrack*, u32*);
/* 80294A3C */ s32 cmdSyncCPU(JASTrack*, u32*);
/* 80294AA4 */ s32 cmdTempo(JASTrack*, u32*);
/* 80294AD4 */ s32 cmdFinish(JASTrack*, u32*);
/* 80294ADC */ s32 cmdNop(JASTrack*, u32*);
/* 80294AE4 */ s32 cmdFIRSet(JASTrack*, u32*);
/* 80294B1C */ s32 cmdIIRSet(JASTrack*, u32*);
/* 80294B70 */ s32 cmdIIRCutOff(JASTrack*, u32*);
/* 80294BB4 */ s32 cmdBankPrg(JASTrack*, u32*);
/* 80294BD0 */ s32 cmdBank(JASTrack*, u32*);
/* 80294BE4 */ s32 cmdPrg(JASTrack*, u32*);
/* 80294BF8 */ s32 cmdParamI(JASTrack*, u32*);
/* 80294C54 */ s32 cmdParamII(JASTrack*, u32*);
/* 80294CB0 */ s32 cmdParamE(JASTrack*, u32*);
/* 80294D2C */ s32 cmdParamEI(JASTrack*, u32*);
/* 80294DA8 */ s32 cmdReg(JASTrack*, u32*);
/* 80294F10 */ s32 cmdRegLoad(JASTrack*, u32*);
/* 80294F40 */ s32 cmdRegUni(JASTrack*, u32*);
/* 80294FB4 */ s32 cmdRegTblLoad(JASTrack*, u32*);
/* 80295088 */ s32 cmdDump(JASTrack*, u32*);
/* 8029526C */ s32 cmdPrintf(JASTrack*, u32*);
/* 802955C8 */ s32 parseNoteOff(JASTrack*, u8);
/* 80295600 */ s32 parseNoteOn(JASTrack*, u8);
/* 802956B0 */ s32 parseCommand(JASTrack*, u8, u16);
/* 80295864 */ s32 parseRegCommand(JASTrack*, int);
bool conditionCheck(JASTrack*, JASSeqParser::BranchCondition);
void writeReg(JASTrack*, u32, u32);
u32 readReg(JASTrack*, u32) const;
s32 cmdOpenTrack(JASTrack*, u32*);
s32 cmdCloseTrack(JASTrack*, u32*);
s32 cmdCall(JASTrack*, u32*);
s32 cmdCallF(JASTrack*, u32*);
s32 cmdRet(JASTrack*, u32*);
s32 cmdRetF(JASTrack*, u32*);
s32 cmdJmp(JASTrack*, u32*);
s32 cmdJmpF(JASTrack*, u32*);
s32 cmdJmpTable(JASTrack*, u32*);
s32 cmdCallTable(JASTrack*, u32*);
s32 cmdLoopS(JASTrack*, u32*);
s32 cmdLoopE(JASTrack*, u32*);
s32 cmdNote(JASTrack*, u32*);
s32 cmdNoteOn(JASTrack*, u32*);
s32 cmdNoteOff(JASTrack*, u32*);
s32 cmdReadPort(JASTrack*, u32*);
s32 cmdWritePort(JASTrack*, u32*);
s32 cmdParentWritePort(JASTrack*, u32*);
s32 cmdChildWritePort(JASTrack*, u32*);
s32 cmdParentReadPort(JASTrack*, u32*);
s32 cmdChildReadPort(JASTrack*, u32*);
s32 cmdCheckPortImport(JASTrack*, u32*);
s32 cmdCheckPortExport(JASTrack*, u32*);
s32 cmdWait(JASTrack*, u32*);
s32 cmdWaitByte(JASTrack*, u32*);
s32 cmdSetLastNote(JASTrack*, u32*);
s32 cmdEnvScaleSet(JASTrack*, u32*);
s32 cmdEnvSet(JASTrack*, u32*);
s32 cmdSimpleADSR(JASTrack*, u32*);
s32 cmdBusConnect(JASTrack*, u32*);
s32 cmdSetIntTable(JASTrack*, u32*);
s32 cmdSetInterrupt(JASTrack*, u32*);
s32 cmdDisInterrupt(JASTrack*, u32*);
s32 cmdClrI(JASTrack*, u32*);
s32 cmdRetI(JASTrack*, u32*);
s32 cmdIntTimer(JASTrack*, u32*);
s32 cmdSyncCPU(JASTrack*, u32*);
s32 cmdTempo(JASTrack*, u32*);
s32 cmdFinish(JASTrack*, u32*);
s32 cmdNop(JASTrack*, u32*);
s32 cmdFIRSet(JASTrack*, u32*);
s32 cmdIIRSet(JASTrack*, u32*);
s32 cmdIIRCutOff(JASTrack*, u32*);
s32 cmdBankPrg(JASTrack*, u32*);
s32 cmdBank(JASTrack*, u32*);
s32 cmdPrg(JASTrack*, u32*);
s32 cmdParamI(JASTrack*, u32*);
s32 cmdParamII(JASTrack*, u32*);
s32 cmdParamE(JASTrack*, u32*);
s32 cmdParamEI(JASTrack*, u32*);
s32 cmdReg(JASTrack*, u32*);
s32 cmdRegLoad(JASTrack*, u32*);
s32 cmdRegUni(JASTrack*, u32*);
s32 cmdRegTblLoad(JASTrack*, u32*);
s32 cmdDump(JASTrack*, u32*);
s32 cmdPrintf(JASTrack*, u32*);
s32 parseNoteOff(JASTrack*, u8);
s32 parseNoteOn(JASTrack*, u8);
s32 parseCommand(JASTrack*, u8, u16);
s32 parseRegCommand(JASTrack*, int);
static void registerSeqCallback(u16 (*param_0)(JASTrack*, u16)) { sCallBackFunc = param_0; }

14
include/JSystem/JAudio2/JASSeqReader.h
View File

@ -9,13 +9,13 @@
*/
class JASSeqReader {
public:
/* 80296108 */ void init();
/* 80296148 */ void init(void*);
/* 8029618C */ bool call(u32);
/* 802961CC */ bool loopStart(u32);
/* 80296210 */ bool loopEnd();
/* 8029627C */ bool ret();
/* 802962B0 */ int readMidiValue();
void init();
void init(void*);
bool call(u32);
bool loopStart(u32);
bool loopEnd();
bool ret();
int readMidiValue();
void jump(u32 param_1) {
field_0x04 = field_0x00 + param_1;

20
include/JSystem/JAudio2/JASSimpleWaveBank.h
View File

@ -7,21 +7,21 @@
struct JASSimpleWaveBank : JASWaveBank, JASWaveArc {
struct TWaveHandle : JASWaveHandle {
/* 80298F38 */ int getWavePtr() const;
/* 80298F5C */ TWaveHandle();
/* 80298F90 */ const JASWaveInfo* getWaveInfo() const;
int getWavePtr() const;
TWaveHandle();
const JASWaveInfo* getWaveInfo() const;
/* 0x04 */ JASWaveInfo mWaveInfo;
/* 0x28 */ JASHeap* mHeap;
};
/* 80298C94 */ JASSimpleWaveBank();
/* 80298CF4 */ ~JASSimpleWaveBank();
/* 80298DE0 */ void setWaveTableSize(u32, JKRHeap*);
/* 80298E60 */ JASWaveHandle* getWaveHandle(u32) const;
/* 80298E84 */ void setWaveInfo(u32, JASWaveInfo const&);
/* 80298F18 */ JASWaveArc* getWaveArc(u32);
/* 80298F98 */ u32 getArcCount() const;
JASSimpleWaveBank();
~JASSimpleWaveBank();
void setWaveTableSize(u32, JKRHeap*);
JASWaveHandle* getWaveHandle(u32) const;
void setWaveInfo(u32, JASWaveInfo const&);
JASWaveArc* getWaveArc(u32);
u32 getArcCount() const;
/* 0x78 */ TWaveHandle* mWaveTable;
/* 0x7C */ u32 mWaveTableSize;

4
include/JSystem/JAudio2/JASSoundParams.h
View File

@ -8,8 +8,8 @@
*
*/
struct JASSoundParams {
/* 8029E3B0 */ void clamp();
/* 8029E47C */ void combine(JASSoundParams const&, JASSoundParams const&);
void clamp();
void combine(JASSoundParams const&, JASSoundParams const&);
void initVolume() { mVolume = 1.0f; }
void initFxMix() { mFxMix = 0.0f; }

16
include/JSystem/JAudio2/JASTaskThread.h
View File

@ -23,15 +23,15 @@ private:
public:
typedef JASMemChunkPool<1024, JASThreadingModel::ObjectLevelLockable> ThreadMemPool;
/* 8028F6C4 */ JASTaskThread(int priority, int msgCount, u32 stackSize);
/* 8028F9EC */ void* allocCallStack(JASThreadCallback callback, void* msg);
/* 8028F850 */ void* allocCallStack(JASThreadCallback callback, const void* msg, u32 msgSize);
/* 8028FC54 */ int sendCmdMsg(JASThreadCallback callback, void* msg);
/* 8028FB5C */ int sendCmdMsg(JASThreadCallback callback, const void* msg, u32 msgSize);
/* 8028FE88 */ void pause(bool);
JASTaskThread(int priority, int msgCount, u32 stackSize);
void* allocCallStack(JASThreadCallback callback, void* msg);
void* allocCallStack(JASThreadCallback callback, const void* msg, u32 msgSize);
int sendCmdMsg(JASThreadCallback callback, void* msg);
int sendCmdMsg(JASThreadCallback callback, const void* msg, u32 msgSize);
void pause(bool);
/* 8028F724 */ virtual ~JASTaskThread();
/* 8028FD4C */ virtual void* run();
virtual ~JASTaskThread();
virtual void* run();
/* 0x7C */ OSThreadQueue threadQueue_;
/* 0x84 */ bool field_0x84;

124
include/JSystem/JAudio2/JASTrack.h
View File

@ -29,11 +29,11 @@ struct JASTrack : public JASPoolAllocObject_MultiThreaded<JASTrack> {
};
struct TChannelMgr : public JASPoolAllocObject_MultiThreaded<TChannelMgr> {
/* 802930DC */ TChannelMgr(JASTrack*);
/* 80293148 */ void init();
/* 802931B0 */ void releaseAll();
/* 80293220 */ bool noteOff(u32, u16);
/* 802932A0 */ void setPauseFlag(bool);
TChannelMgr(JASTrack*);
void init();
void releaseAll();
bool noteOff(u32, u16);
void setPauseFlag(bool);
static const int CHANNEL_MAX = 8;
@ -46,11 +46,11 @@ struct JASTrack : public JASPoolAllocObject_MultiThreaded<JASTrack> {
struct TList : JGadget::TLinkList<JASTrack, -0x240> {
TList() : mCallbackRegistered(false) {}
/* 80292F90 */ void append(JASTrack*);
/* 8029301C */ void seqMain();
/* 8029345C */ ~TList() {}
void append(JASTrack*);
void seqMain();
~TList() {}
/* 80292F6C */ static s32 cbSeqMain(void*);
static s32 cbSeqMain(void*);
/* 0xC */ bool mCallbackRegistered;
};
@ -58,7 +58,7 @@ struct JASTrack : public JASPoolAllocObject_MultiThreaded<JASTrack> {
struct MoveParam_ {
// TODO: fix this on debug
#if VERSION != VERSION_SHIELD_DEBUG
/* 802932C8 */ MoveParam_() : mValue(0.0f), mTarget(0.0f), mCount(0) {}
MoveParam_() : mValue(0.0f), mTarget(0.0f), mCount(0) {}
#endif
/* 0x00 */ f32 mValue;
@ -66,59 +66,59 @@ struct JASTrack : public JASPoolAllocObject_MultiThreaded<JASTrack> {
/* 0x08 */ u32 mCount;
};
/* 80291228 */ JASTrack();
/* 8029131C */ ~JASTrack();
/* 80291444 */ void setChannelMgrCount(u32);
/* 802915D4 */ void init();
/* 802918FC */ void initTimed();
/* 8029194C */ void inherit(JASTrack const&);
/* 802919F4 */ void assignExtBuffer(u32, JASSoundParams*);
/* 80291A08 */ void setSeqData(void*, u32);
/* 80291A28 */ void startSeq();
/* 80291A78 */ void stopSeq();
/* 80291ABC */ void start();
/* 80291AC8 */ void close();
/* 80291B8C */ bool connectChild(u32, JASTrack*);
/* 80291BB8 */ void closeChild(u32);
/* 80291C30 */ JASTrack* openChild(u32);
/* 80291DAC */ void connectBus(int, int);
/* 80291DBC */ void setLatestKey(u8);
/* 80291DF8 */ JASChannel* channelStart(JASTrack::TChannelMgr*, u32, u32, u32);
/* 80291F38 */ int noteOn(u32, u32, u32);
/* 80292008 */ int gateOn(u32, u32, f32, u32);
/* 80292198 */ int noteOff(u32, u16);
/* 80292220 */ bool checkNoteStop(u32) const;
/* 8029226C */ void overwriteOsc(JASChannel*);
/* 802922D8 */ void updateTimedParam();
/* 80292348 */ void updateTrack(f32);
/* 802924E4 */ void updateTempo();
/* 80292580 */ void updateSeq(bool, f32);
/* 80292644 */ u32 seqTimeToDspTime(f32);
/* 802926E0 */ void setParam(u32, f32, u32);
/* 80292708 */ void noteOffAll(u16);
/* 802927A0 */ void mute(bool);
/* 802927D8 */ void setOscScale(u32, f32);
/* 802927E8 */ void setOscTable(u32, JASOscillator::Point const*);
/* 80292808 */ void setOscAdsr(s16, s16, s16, s16, u16);
/* 8029285C */ void setFIR(s16 const*);
/* 8029289C */ void setIIR(s16 const*);
/* 802928D0 */ u16 readPortSelf(u32);
/* 802928F4 */ void writePortSelf(u32, u16);
/* 80292918 */ void writePort(u32, u16);
/* 8029297C */ u16 readPort(u32);
/* 802929A0 */ void setChannelPauseFlag(bool);
/* 80292A3C */ void pause(bool);
/* 80292AA4 */ int getTransposeTotal() const;
/* 80292AF4 */ bool isMute() const;
/* 80292B58 */ void setTempo(u16);
/* 80292B8C */ void setTempoRate(f32);
/* 80292BC0 */ void setTimebase(u16);
/* 80292BF4 */ void updateChannel(JASChannel*, JASDsp::TChannel*);
/* 80292D88 */ JASTrack* getRootTrack();
/* 80292DA0 */ int tickProc();
/* 80292E9C */ int seqMain();
JASTrack();
~JASTrack();
void setChannelMgrCount(u32);
void init();
void initTimed();
void inherit(JASTrack const&);
void assignExtBuffer(u32, JASSoundParams*);
void setSeqData(void*, u32);
void startSeq();
void stopSeq();
void start();
void close();
bool connectChild(u32, JASTrack*);
void closeChild(u32);
JASTrack* openChild(u32);
void connectBus(int, int);
void setLatestKey(u8);
JASChannel* channelStart(JASTrack::TChannelMgr*, u32, u32, u32);
int noteOn(u32, u32, u32);
int gateOn(u32, u32, f32, u32);
int noteOff(u32, u16);
bool checkNoteStop(u32) const;
void overwriteOsc(JASChannel*);
void updateTimedParam();
void updateTrack(f32);
void updateTempo();
void updateSeq(bool, f32);
u32 seqTimeToDspTime(f32);
void setParam(u32, f32, u32);
void noteOffAll(u16);
void mute(bool);
void setOscScale(u32, f32);
void setOscTable(u32, JASOscillator::Point const*);
void setOscAdsr(s16, s16, s16, s16, u16);
void setFIR(s16 const*);
void setIIR(s16 const*);
u16 readPortSelf(u32);
void writePortSelf(u32, u16);
void writePort(u32, u16);
u16 readPort(u32);
void setChannelPauseFlag(bool);
void pause(bool);
int getTransposeTotal() const;
bool isMute() const;
void setTempo(u16);
void setTempoRate(f32);
void setTimebase(u16);
void updateChannel(JASChannel*, JASDsp::TChannel*);
JASTrack* getRootTrack();
int tickProc();
int seqMain();
/* 80292CA4 */ static void channelUpdateCallback(u32, JASChannel*, JASDsp::TChannel*, void*);
static void channelUpdateCallback(u32, JASChannel*, JASDsp::TChannel*, void*);
static JASOscillator::Point const sAdsTable[4];
static JASOscillator::Data const sEnvOsc;

14
include/JSystem/JAudio2/JASTrackPort.h
View File

@ -9,13 +9,13 @@
*/
class JASTrackPort {
public:
/* 8029354C */ void init();
/* 8029357C */ u16 readImport(u32);
/* 802935A0 */ u16 readExport(u32);
/* 802935C4 */ void writeImport(u32, u16);
/* 802935E8 */ void writeExport(u32, u16);
/* 8029360C */ u32 checkImport(u32) const;
/* 80293628 */ u32 checkExport(u32) const;
void init();
u16 readImport(u32);
u16 readExport(u32);
void writeImport(u32, u16);
void writeExport(u32, u16);
u32 checkImport(u32) const;
u32 checkExport(u32) const;
u16 get(u32 param_0) const { return field_0x4[param_0]; }
void set(u32 param_0, u16 param_1) { field_0x4[param_0] = param_1; }

6
include/JSystem/JAudio2/JASVoiceBank.h
View File

@ -10,9 +10,9 @@
*/
class JASVoiceBank : public JASBank {
public:
/* 80297F74 */ virtual bool getInstParam(int, int, int, JASInstParam*) const;
/* 80297FAC */ virtual ~JASVoiceBank();
/* 80298008 */ virtual u32 getType() const;
virtual bool getInstParam(int, int, int, JASInstParam*) const;
virtual ~JASVoiceBank();
virtual u32 getType() const;
static const JASOscillator::Data sOscData;
static JASOscillator::Data* sOscTable;

8
include/JSystem/JAudio2/JASWSParser.h
View File

@ -79,10 +79,10 @@ public:
/* 0x14 */ TOffset<TCtrlGroup> mCtrlGroupOffset;
};
/* 80298FB0 */ static u32 getGroupCount(void const*);
/* 80298FD8 */ static JASWaveBank* createWaveBank(void const*, JKRHeap*);
/* 80299034 */ static JASBasicWaveBank* createBasicWaveBank(void const*, JKRHeap*);
/* 80299264 */ static JASSimpleWaveBank* createSimpleWaveBank(void const*, JKRHeap*);
static u32 getGroupCount(void const*);
static JASWaveBank* createWaveBank(void const*, JKRHeap*);
static JASBasicWaveBank* createBasicWaveBank(void const*, JKRHeap*);
static JASSimpleWaveBank* createSimpleWaveBank(void const*, JKRHeap*);
static u32 sUsedHeapSize;
};

39
include/JSystem/JAudio2/JASWaveArcLoader.h
View File

@ -2,7 +2,6 @@
#define JASWAVEARCLOADER_H
#include "JSystem/JAudio2/JASHeapCtrl.h"
#include "dol2asm.h"
#include <dolphin/os.h>
class JKRHeap;
@ -14,8 +13,8 @@ class JKRSolidHeap;
*/
struct JASDisposer {
JASDisposer() {}
/* 8029A7B8 */ virtual ~JASDisposer() {}
/* 80290BCC */ virtual void onDispose() {}
virtual ~JASDisposer() {}
virtual void onDispose() {}
};
#define DIR_MAX 64
@ -25,9 +24,9 @@ struct JASDisposer {
*
*/
struct JASWaveArcLoader {
/* 8029A0A0 */ static JASHeap* getRootHeap();
/* 8029A0D0 */ static void setCurrentDir(char const*);
/* 8029A130 */ static char* getCurrentDir();
static JASHeap* getRootHeap();
static void setCurrentDir(char const*);
static char* getCurrentDir();
static char sCurrentDir[DIR_MAX];
static JASHeap* sAramHeap;
@ -38,21 +37,21 @@ struct JASWaveArcLoader {
*
*/
struct JASWaveArc : JASDisposer {
/* 8029A13C */ JASWaveArc();
/* 8029A258 */ bool loadSetup(u32);
/* 8029A2EC */ bool eraseSetup();
/* 8029A378 */ static void loadToAramCallback(void*);
/* 8029A404 */ bool sendLoadCmd();
/* 8029A4C0 */ bool load(JASHeap*);
/* 8029A580 */ bool loadTail(JASHeap*);
/* 8029A640 */ bool erase();
/* 8029A6AC */ void setEntryNum(s32);
/* 8029A70C */ void setFileName(char const*);
JASWaveArc();
bool loadSetup(u32);
bool eraseSetup();
static void loadToAramCallback(void*);
bool sendLoadCmd();
bool load(JASHeap*);
bool loadTail(JASHeap*);
bool erase();
void setEntryNum(s32);
void setFileName(char const*);
/* 8029A1B4 */ virtual ~JASWaveArc();
/* 8029A664 */ virtual void onDispose();
/* 80298FA0 */ virtual void onLoadDone() {}
/* 80298FA4 */ virtual void onEraseDone() {}
virtual ~JASWaveArc();
virtual void onDispose();
virtual void onLoadDone() {}
virtual void onEraseDone() {}
s32 getStatus() const { return mStatus; }

2
include/JSystem/JAudio2/JASWaveInfo.h
View File

@ -48,7 +48,7 @@ public:
*/
class JASWaveBank {
public:
/* 80298B88 */ virtual ~JASWaveBank() {}
virtual ~JASWaveBank() {}
virtual JASWaveHandle* getWaveHandle(u32) const = 0;
virtual JASWaveArc* getWaveArc(u32) = 0;
virtual u32 getArcCount() const = 0;

10
include/JSystem/JAudio2/JAUAudioArcInterpreter.h
View File

@ -9,8 +9,8 @@
*/
class JAUAudioArcInterpreter {
public:
/* 802A4244 */ JAUAudioArcInterpreter();
/* 802A4260 */ virtual ~JAUAudioArcInterpreter();
JAUAudioArcInterpreter();
virtual ~JAUAudioArcInterpreter();
virtual void readWS(u32, void const*, u32) = 0;
virtual void readBNK(u32, void const*) = 0;
virtual void readBSC(void const*, u32) = 0;
@ -24,9 +24,9 @@ public:
virtual void readMaxSeCategory(int, int, int) = 0;
virtual void beginBNKList(u32, u32) = 0;
virtual void endBNKList() = 0;
/* 802A42A8 */ bool parse(void const*);
/* 802A4314 */ virtual bool readCommandMore(u32);
/* 802A431C */ bool readCommand_();
bool parse(void const*);
virtual bool readCommandMore(u32);
bool readCommand_();
u8 readU8_() {
return *mReadPtr++;

32
include/JSystem/JAudio2/JAUAudioArcLoader.h
View File

@ -11,22 +11,22 @@ struct JAUSection;
*/
class JAUAudioArcLoader : public JAUAudioArcInterpreter {
public:
/* 802A4740 */ JAUAudioArcLoader(JAUSection*);
/* 802A478C */ bool load(void const*);
/* 802A47AC */ virtual void readWS(u32, void const*, u32);
/* 802A4804 */ virtual void readBNK(u32, void const*);
/* 802A4834 */ virtual void readBSC(void const*, u32);
/* 802A4858 */ virtual void readBST(void const*, u32);
/* 802A4880 */ virtual void readBSTN(void const*, u32);
/* 802A48A8 */ virtual void readBMS(u32, void const*, u32);
/* 802A48D4 */ virtual void readBMS_fromArchive(u32);
/* 802A4900 */ virtual void newVoiceBank(u32, u32);
/* 802A4930 */ virtual void newDynamicSeqBlock(u32);
/* 802A4968 */ virtual void readBSFT(void const*);
/* 802A4990 */ virtual void beginBNKList(u32, u32);
/* 802A49B4 */ virtual void endBNKList();
/* 802A49D8 */ virtual void readMaxSeCategory(int, int, int);
/* 802A49FC */ virtual ~JAUAudioArcLoader() {}
JAUAudioArcLoader(JAUSection*);
bool load(void const*);
virtual void readWS(u32, void const*, u32);
virtual void readBNK(u32, void const*);
virtual void readBSC(void const*, u32);
virtual void readBST(void const*, u32);
virtual void readBSTN(void const*, u32);
virtual void readBMS(u32, void const*, u32);
virtual void readBMS_fromArchive(u32);
virtual void newVoiceBank(u32, u32);
virtual void newDynamicSeqBlock(u32);
virtual void readBSFT(void const*);
virtual void beginBNKList(u32, u32);
virtual void endBNKList();
virtual void readMaxSeCategory(int, int, int);
virtual ~JAUAudioArcLoader() {}
/* 0x0C */ JAUSection* mSection;
};

4
include/JSystem/JAudio2/JAUBankTable.h
View File

@ -16,7 +16,7 @@ public:
JAUBankTable(u32 param_0, JASBank** param_1, u32 param_2) : mBankPtrTable(param_1, param_2) {
field_0xc = param_0;
}
/* 802A4AA0 */ const JASBank* getBank(u32 bank) const { return mBankPtrTable.get(bank); }
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); }
@ -39,7 +39,7 @@ public:
*
*/
struct JAUBankTableDictionary : JSUList<JAUBankTable> {
/* 802A4A80 */ void appendBankTable(JSULink<JAUBankTable>*);
void appendBankTable(JSULink<JAUBankTable>*);
};
class JASWaveBank;

8
include/JSystem/JAudio2/JAUInitializer.h
View File

@ -11,8 +11,8 @@ class JKRSolidHeap;
*/
class JAU_JASInitializer {
public:
/* 802A4AD0 */ JAU_JASInitializer();
/* 802A4B28 */ void initJASystem(JKRSolidHeap* heap);
JAU_JASInitializer();
void initJASystem(JKRSolidHeap* heap);
/* 0x00 */ u32 audioMemory_;
/* 0x04 */ u32 audioMemSize_;
@ -35,8 +35,8 @@ public:
*/
class JAU_JAIInitializer {
public:
/* 802A4D3C */ JAU_JAIInitializer();
/* 802A4D60 */ void initJAInterface();
JAU_JAIInitializer();
void initJAInterface();
int field_0x0;
int field_0x4;

Some files were not shown because too many files have changed in this diff Show More