From 612f26c132280da43ecfa5fa8c8cc32966f06eb6 Mon Sep 17 00:00:00 2001
From: TakaRikka <38417346+TakaRikka@users.noreply.github.com>
Date: Tue, 25 Jan 2022 12:24:14 -0800
Subject: d_kankyo_wether / d_eye_hl (#178)

* d_eye_hl / d_kankyo_wether wip

* more d_kankyo_wether + format

* remove asm

* some d_kankyo wip

* fix dccs vtable

* some m_Do_graphic / d_meter2_draw work
---
 include/JSystem/J3DGraphBase/J3DPacket.h  |  2 +-
 include/JSystem/J3DGraphBase/J3DSys.h     | 17 ++++++++++++++++-
 include/JSystem/J3DGraphBase/J3DTexture.h |  5 ++++-
 3 files changed, 21 insertions(+), 3 deletions(-)

(limited to 'include/JSystem/J3DGraphBase')

diff --git a/include/JSystem/J3DGraphBase/J3DPacket.h b/include/JSystem/J3DGraphBase/J3DPacket.h
index 21bb39e83a..3ed3fe2804 100644
--- a/include/JSystem/J3DGraphBase/J3DPacket.h
+++ b/include/JSystem/J3DGraphBase/J3DPacket.h
@@ -66,7 +66,7 @@ public:
 
     virtual bool entry(J3DDrawBuffer*);
     virtual void draw();
-    virtual ~J3DPacket();
+    virtual ~J3DPacket() {}
 
 public:
     /* 0x04 */ J3DPacket* mpNextSibling;
diff --git a/include/JSystem/J3DGraphBase/J3DSys.h b/include/JSystem/J3DGraphBase/J3DSys.h
index 8dfca2d554..0f947d0a34 100644
--- a/include/JSystem/J3DGraphBase/J3DSys.h
+++ b/include/JSystem/J3DGraphBase/J3DSys.h
@@ -11,6 +11,11 @@ enum J3DError {
     kJ3DError_Alloc = 4,
 };
 
+enum J3DSysDrawBuffer {
+    /* 0x0 */ OPA_BUFFER,
+    /* 0x1 */ XLU_BUFFER
+};
+
 class J3DMtxCalc;
 class J3DModel;
 class J3DMatPacket;
@@ -64,7 +69,7 @@ struct J3DSys {
         /* 0x4 */ XLU,
     };
 
-    Mtx* getViewMtx() { return &mViewMtx; }
+    MtxP getViewMtx() { return mViewMtx; }
 
     void setDrawModeOpaTexEdge() { mDrawMode = OPA_TEX_EDGE; }
 
@@ -102,6 +107,16 @@ struct J3DSys {
         GXSetArray(GX_NRM_MTX_ARRAY, mModelNrmMtx, sizeof(*mModelNrmMtx));
     }
 
+    // Type 0: Opa Buffer
+    // Type 1: Xlu Buffer
+    void setDrawBuffer(J3DDrawBuffer* buffer, int type) { mDrawBuffer[type] = buffer; }
+
+    // Type 0: Opa Buffer
+    // Type 1: Xlu Buffer
+    J3DDrawBuffer* getDrawBuffer(int type) { return mDrawBuffer[type]; }
+
+    void setViewMtx(Mtx m) { PSMTXCopy(m, mViewMtx); }
+
     static Mtx mCurrentMtx;
     static Vec mCurrentS;
     static Vec mParentS;
diff --git a/include/JSystem/J3DGraphBase/J3DTexture.h b/include/JSystem/J3DGraphBase/J3DTexture.h
index 93e098842f..f62d2e2d9f 100644
--- a/include/JSystem/J3DGraphBase/J3DTexture.h
+++ b/include/JSystem/J3DGraphBase/J3DTexture.h
@@ -9,13 +9,16 @@
 class J3DTexture {
 private:
     /* 0x0 */ u16 mNum;
-    /* 0x4 */ ResTIMG** mpRes;
+    /* 0x4 */ ResTIMG* mpRes;
 
 public:
     /* 8031204C */ void loadGX(u16, _GXTexMapID) const;
     /* 803121A4 */ void entryNum(u16);
     /* 8031221C */ void addResTIMG(u16, ResTIMG const*);
     /* 803366A4 */ virtual ~J3DTexture();
+
+    u16 getNum() const { return mNum; }
+    ResTIMG* getResTIMG(u16 entry) const { return &mpRes[entry]; }
 };
 
 struct J3DTextureSRTInfo {
-- 
cgit v1.2.3