Progress on J2DPane, JUTResFont (#39)

include/JSystem/J2DGraph/J2DPane.h

@@ -4,23 +4,10 @@
 #include "JSystem/JGeometry.h"
 #include "JSystem/JSupport/JSUList.h"
 #include "SSystem/SComponent/c_xyz.h"
-#include "dolphin/gx/GXEnum.h"
 #include "dolphin/mtx/mtx.h"
 
-class J2DAnmBase;
-class J2DAnmColor;
-class J2DAnmTransform;
-class J2DAnmTevRegKey;
-class J2DAnmTextureSRTKey;
-class J2DAnmVisibilityFull;
-class J2DAnmVtxColor;
 class J2DGrafContext;
-class J2DScreen;
-class J2DAnmTexPattern;
-class JKRArchive;
 class JSURandomInputStream;
-struct ResFONT;
-struct ResTIMG;
 
 enum J2DRotateAxis {
     /* 0x78 */ ROTATE_X = 'x',
@@ -46,44 +33,26 @@ public:
     J2DPane();
     J2DPane(J2DPane*, bool, u32, const JGeometry::TBox2<f32>&);
     J2DPane(u32, const JGeometry::TBox2<f32>&);
-    J2DPane(J2DPane* other, JSURandomInputStream* stream, u8 arg3);
     J2DPane(J2DPane*, JSURandomInputStream*);
     void initiate();
-    void initialize(J2DPane*, bool, u64, const JGeometry::TBox2<f32>&);
-    void initialize(u64 tag, const JGeometry::TBox2<f32>& dim);
     void makePaneStream(J2DPane* other, JSURandomInputStream* stream);
-    void changeUseTrans(J2DPane* other);
-    bool appendChild(J2DPane* child);
     bool insertChild(J2DPane* before, J2DPane* child);
     void draw(f32 a1, f32 a2, const J2DGrafContext* ctx, bool a4);
-    void place(const JGeometry::TBox2<f32>& dim);
-    JGeometry::TBox2<f32>& getBounds();
-    void rotate(f32 offsetX, f32 offsetY, J2DRotateAxis axis, f32 angle);
-    void rotate(f32 angle);
     void clip(const JGeometry::TBox2<f32>& bounds);
     void setBasePosition(J2DBasePosition position);
-    void setInfluencedAlpha(bool arg1, bool arg2);
-    JGeometry::TVec3<f32> getGlbVtx(u8 arg1) const;
-    J2DPane* getFirstChildPane();
-    J2DPane* getNextChildPane();
-    J2DPane* getParentPane();
-    void makePaneExStream(J2DPane* other, JSURandomInputStream* stream);
-    void* getPointer(JSURandomInputStream* stream, u32 size, JKRArchive* archive);
-    void animationTransform();
-    void updateTransform(const J2DAnmTransform* transform);
 
     virtual ~J2DPane();
+    virtual u16 getTypeID() { return 16; }
     virtual void move(f32 x, f32 y);
     virtual void add(f32 x, f32 y);
     virtual void resize(f32 x, f32 y);
     virtual bool setConnectParent(bool connected);
-    virtual void update();
     virtual void calcMtx();
+    virtual void update();
     virtual void drawSelf(f32 arg1, f32 arg2);
     virtual void drawSelf(f32 arg1, f32 arg2, Mtx* mtx){};
-    virtual void makeMatrix(f32, f32);
     virtual J2DPane* search(u32 tag);
-    virtual u16 getTypeID() { return 16; }
+    virtual void makeMatrix(f32, f32);
 
     JSUTree<J2DPane>* getFirstChild() { return mPaneTree.getFirstChild(); }
     JSUTree<J2DPane>* getEndChild() { return mPaneTree.getEndChild(); }
@@ -100,7 +69,7 @@ public:
     /* 0x6C */ Mtx mDrawMtx;
     /* 0x9C */ cXy mBasePosition;
     /* 0xA4 */ f32 mRotation;
-    /* 0xA8 */ u8 mRotationAxis;
+    /* 0xA8 */ s8 mRotationAxis;
     /* 0xA9 */ u8 m2DBasePosition;
     /* 0xAA */ bool mVisible;
     /* 0xAB */ u8 mCullMode;

include/JSystem/J2DGraph/J2DTextBox.h

@@ -0,0 +1,63 @@
+#ifndef J2DTEXTBOX_H
+#define J2DTEXTBOX_H
+
+#include "JSystem/J2DGraph/J2DPane.h"
+#include "JSystem/JKernel/JKRArchive.h"
+#include "JSystem/JUtility/JUTResFont.h"
+
+enum J2DTextBoxHBinding {
+    /* 0x0 */ HBIND_CENTER,
+    /* 0x1 */ HBIND_RIGHT,
+    /* 0x2 */ HBIND_LEFT
+};
+
+enum J2DTextBoxVBinding {
+    /* 0x0 */ VBIND_CENTER,
+    /* 0x1 */ VBIND_BOTTOM,
+    /* 0x2 */ VBIND_TOP
+};
+
+struct J2DTbxBlockHeader {
+    /* 0x00 */ u32 mMagic;
+    /* 0x04 */ s32 mSize;
+};
+
+class J2DTextBox : public J2DPane {
+public:
+    J2DTextBox(const char*, const char*);
+    J2DTextBox(J2DPane*, JSURandomInputStream*);
+    J2DTextBox(u32, const JGeometry::TBox2<f32>&, const ResFONT*, const char*, J2DTextBoxHBinding,
+               J2DTextBoxVBinding);
+
+    void initiate(const ResFONT*, const char*, J2DTextBoxHBinding, J2DTextBoxVBinding);
+    void setFont(JUTFont*);
+    void draw(f32, f32, f32, J2DTextBoxHBinding);
+    char* getStringPtr() const;
+    s32 setString(const char*, ...);
+
+    virtual ~J2DTextBox();
+    virtual bool setConnectParent(bool);
+    virtual void drawSelf(f32, f32);
+    virtual void drawSelf(f32, f32, Mtx*);
+    virtual void resize(f32, f32);
+    virtual u16 getTypeID() { return 19; };
+
+private:
+    /* 0xCC */ JUTResFont* mpFont;
+    /* 0xD0 */ JUtility::TColor mGradientFirst;
+    /* 0xD4 */ JUtility::TColor mGradientSecond;
+    /* 0xD8 */ f32 field_0xd8;
+    /* 0xDC */ f32 field_0xdc;
+    /* 0xD0 */ f32 field_0xe0;
+    /* 0xE4 */ f32 mFontLeading;
+    /* 0xE8 */ f32 mFontWidth;
+    /* 0xEC */ f32 mFontHeight;
+    /* 0xF0 */ char* mStringPtr;
+    /* 0xF4 */ JUtility::TColor mTextColor;
+    /* 0xF8 */ JUtility::TColor mTextBGColor;
+    /* 0xFC */ u8 mBindingH;
+    /* 0xFD */ u8 mBindingV;
+    /* 0xFE */ bool mTextFontOwned;
+};     // Size: 0x100
+
+#endif /* J2DTEXTBOX_H */