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

Work on J2DWindowEx (#1979)

Browse Source
This commit is contained in:
hatal175
2023-11-08 03:58:56 -08:00
committed by GitHub
parent 493c5d75e1
commit c6b47d83e1
36 changed files with 684 additions and 1449 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/JSystem/J2DGraph/J2DAnimation.h
+3
View File
@@ -55,6 +55,9 @@ public:
}
/* 8030A358 */ virtual ~J2DAnmVtxColor() {}
/* 8030363C */ virtual void getColor(u8, u16, _GXColor*) const;
u16 getAnmTableNum(u8 param_0) const { return mAnmTableNum[param_0]; }
J3DAnmVtxColorIndexDataItem* getAnmVtxColorIndexData(u8 param_0, u16 param_1) const { return mVtxColorIndexData[param_0]->field_0x0 + param_1; }
u16* getVtxColorIndexPointer(u8 param_0) const { return mVtxColorIndexPointer[param_0]; }
/* 0x10 */ u16 mAnmTableNum[2];
/* 0x14 */ J3DAnmVtxColorIndexData* mVtxColorIndexData[2];
include/JSystem/J2DGraph/J2DWindow.h
+1 -1
View File
@@ -73,7 +73,7 @@ public:
setContentsColor(param_0, param_0, param_0, param_0);
}
private:
protected:
/* 0x100 */ JUTTexture* field_0x100;
/* 0x104 */ JUTTexture* field_0x104;
/* 0x108 */ JUTTexture* field_0x108;
include/JSystem/J2DGraph/J2DWindowEx.h
+5 -4
View File
@@ -16,9 +16,9 @@ public:
/* 80302284 */ void setTevOrder(bool);
/* 80302388 */ void setTevStage(bool);
/* 803024B4 */ void setStage(J2DTevStage*, J2DWindowEx::stage_enum);
/* 80302A4C */ void getBlackWhite(JUtility::TColor*, JUtility::TColor*) const;
/* 80302BE8 */ void isSetBlackWhite(JUtility::TColor, JUtility::TColor) const;
/* 8030321C */ void isNeedSetAnm(u8);
/* 80302A4C */ bool getBlackWhite(JUtility::TColor*, JUtility::TColor*) const;
/* 80302BE8 */ bool isSetBlackWhite(JUtility::TColor, JUtility::TColor) const;
/* 8030321C */ bool isNeedSetAnm(u8);
/* 80301144 */ virtual ~J2DWindowEx();
/* 803035C0 */ virtual void setCullBack(bool);
@@ -36,7 +36,7 @@ public:
/* 80303194 */ virtual void setAnimation(J2DAnmTevRegKey*);
/* 80303274 */ virtual void setAnimation(J2DAnmVisibilityFull*);
/* 8030327C */ virtual void setAnimation(J2DAnmVtxColor*);
/* 80303370 */ virtual J2DAnmTransform* animationPane(J2DAnmTransform const*);
/* 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);
@@ -62,6 +62,7 @@ private:
/* 0x170 */ u8 field_0x170;
/* 0x174 */ J2DAnmVisibilityFull* mAnmVisibilityFull;
/* 0x178 */ J2DAnmVtxColor* mAnmVtxColor;
/* 0x17C */ u8 field_0x17c;
};
#endif /* J2DWINDOWEX_H */
include/JSystem/J3DGraphAnimator/J3DAnimation.h
+8 -1
View File
@@ -21,7 +21,14 @@ struct J3DAnmColorKeyTable {
J3DAnmKeyTableBase mAInfo;
}; // Size = 0x18
struct J3DAnmVtxColorIndexData;
struct J3DAnmVtxColorIndexDataItem {
u16 count;
u32 offset;
};
struct J3DAnmVtxColorIndexData {
J3DAnmVtxColorIndexDataItem field_0x0[4];
};
struct J3DAnmColorFullTable {
/* 0x00 */ u16 mRMaxFrame;
include/JSystem/JGeometry.h
+1 -1
View File
@@ -389,7 +389,7 @@ template<> struct TBox<TVec2<f32> > {
template <typename T>
struct TBox2 : TBox<TVec2<T> > {
TBox2() {}
TBox2(const TVec2<f32>& i, const TVec2<f32> f) { set(i, f); }
TBox2(const TVec2<f32>& i, const TVec2<f32>& f) { set(i, f); }
TBox2(f32 x0, f32 y0, f32 x1, f32 y1) { set(x0, y0, x1, y1); }
void absolute() {