encounter/tp
0
0
Fork 0
mirror of https://github.com/encounter/tp.git synced 2026-07-11 06:18:46 -07:00
Code Issues Packages Projects Releases Wiki Activity

project cleanup (#2895)

Browse Source 
* 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 15:23:42 -07:00
committed by GitHub
parent 434415337d
commit a6e76c0841
2375 changed files with 24683 additions and 71069 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/DynamicLink.h
+30 -30
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;
include/JSystem/J2DGraph/J2DAnimation.h
+40 -40
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 */
include/JSystem/J2DGraph/J2DAnmLoader.h
+30 -30
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;
};
include/JSystem/J2DGraph/J2DGrafContext.h
+16 -16
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;
include/JSystem/J2DGraph/J2DManage.h
+4 -4
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 */
include/JSystem/J2DGraph/J2DMatBlock.h
+310 -310
View File
File diff suppressed because it is too large Load Diff
include/JSystem/J2DGraph/J2DMaterial.h
+12 -12
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; }
include/JSystem/J2DGraph/J2DMaterialFactory.h
+26 -26
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;
include/JSystem/J2DGraph/J2DOrthoGraph.h
+8 -8
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(); }
include/JSystem/J2DGraph/J2DPicture.h
+69 -69
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) {
include/JSystem/J2DGraph/J2DPictureEx.h
+75 -75
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;
include/JSystem/J2DGraph/J2DPrint.h
+14 -14
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;
include/JSystem/J2DGraph/J2DScreen.h
+34 -34
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; }
include/JSystem/J2DGraph/J2DTevs.h
+23 -23
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) {
include/JSystem/J2DGraph/J2DTextBox.h
+28 -28
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;
include/JSystem/J2DGraph/J2DTextBoxEx.h
+33 -33
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;
include/JSystem/J2DGraph/J2DWindow.h
+33 -33
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; }
include/JSystem/J2DGraph/J2DWindowEx.h
+41 -41
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];
include/JSystem/J3DGraphAnimator/J3DAnimation.h
+67 -67
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;
};
include/JSystem/J3DGraphAnimator/J3DCluster.h
+5 -5
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));

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