d_drawlist (#1881)

7 files changed, 17 insertions, 5 deletions

diff --git a/include/SSystem/SComponent/c_bg_s_shdw_draw.h b/include/SSystem/SComponent/c_bg_s_shdw_draw.h
index b6938b9368..6a4fe439e2 100644
--- a/include/SSystem/SComponent/c_bg_s_shdw_draw.h
+++ b/include/SSystem/SComponent/c_bg_s_shdw_draw.h
@@ -18,6 +18,8 @@ public:
     void Set(cXyz&, cXyz&);
     void SetCallback(cBgS_ShdwDraw_Callback);
 
+    cM3dGAab* GetBndP() { return &mM3dGAab; }
+
 private:
     /* 0x14 */ cM3dGAab mM3dGAab;
     /* 0x30 */ cBgS_ShdwDraw_Callback mCallbackFun;
diff --git a/include/SSystem/SComponent/c_m3d_g_aab.h b/include/SSystem/SComponent/c_m3d_g_aab.h
index d268ceb5d6..f7658e1e4e 100644
--- a/include/SSystem/SComponent/c_m3d_g_aab.h
+++ b/include/SSystem/SComponent/c_m3d_g_aab.h
@@ -25,8 +25,8 @@ public:
     void SetMax(const cXyz&);
     void CalcCenter(cXyz*) const;
     void PlusR(f32);
-    const cXyz& getMaxP(void) const { return mMax; }
-    const cXyz& getMinP(void) const { return mMin; }
+    const cXyz* GetMaxP(void) const { return &mMax; }
+    const cXyz* GetMinP(void) const { return &mMin; }
     const f32 GetMaxX(void) const { return mMax.x; }
     const f32 GetMaxY(void) const { return mMax.y; }
     const f32 GetMaxZ(void) const { return mMax.z; }
diff --git a/include/SSystem/SComponent/c_m3d_g_pla.h b/include/SSystem/SComponent/c_m3d_g_pla.h
index 17b1e033ca..d6aa2fe51a 100644
--- a/include/SSystem/SComponent/c_m3d_g_pla.h
+++ b/include/SSystem/SComponent/c_m3d_g_pla.h
@@ -26,7 +26,7 @@ public:
 
     f32 getPlaneFunc(const Vec* pPoint) const { return mD + PSVECDotProduct(&mNormal, pPoint); }
     const cXyz& GetNP() const { return mNormal; }
-    const cXyz& i_GetNP() const { return mNormal; }
+    const cXyz* i_GetNP() const { return &mNormal; }
     f32 GetD() const { return mD; }
     void SetupFrom3Vtx(const Vec* v1, const Vec* v2, const Vec* v3) {
         cM3d_CalcPla(v1, v2, v3, &mNormal, &mD);
diff --git a/include/d/d_drawlist.h b/include/d/d_drawlist.h
index 3f4ddfe924..7f008dfa5b 100644
--- a/include/d/d_drawlist.h
+++ b/include/d/d_drawlist.h
@@ -42,6 +42,9 @@ public:
     /* 80053E9C */ virtual void draw();
     /* 800541F4 */ void update(cXyz&, _GXColor&, u16, u16, u16, u16, f32, f32, f32, f32);
 
+    f32 getRndValue(f32 param_0, f32 param_1) { return mRnd.getValue(param_0, param_1); }
+    f32 getRndFX(f32 param_0) { return mRnd.getFX(param_0); }
+
 private:
     /* 0x04 */ cM_rnd_c mRnd;
     /* 0x10 */ cXyz field_0x10;
@@ -92,6 +95,10 @@ public:
     /* 80052B00 */ dDlst_2DT2_c();
     /* 80052B4C */ void init(ResTIMG*, f32, f32, f32, f32, u8, u8, u8, f32, f32);
 
+    f32 getScaleX() { return mScaleX; }
+    void setScaleX(f32 scale) { mScaleX = scale; }
+    void setScaleY(f32 scale) { mScaleY = scale; }
+
     /* 0x04 */ GXTexObj mTexObj;
     /* 0x24 */ f32 field_0x24;
     /* 0x28 */ f32 field_0x28;
diff --git a/include/d/s/d_s_play.h b/include/d/s/d_s_play.h
index 1c85842d72..9a58e2ab3a 100644
--- a/include/d/s/d_s_play.h
+++ b/include/d/s/d_s_play.h
@@ -30,7 +30,6 @@ public:
 
     /* 8025AC0C */ virtual ~dScnPly_env_otherHIO_c();
 
-private:
     /* 0x4 */ f32 mShadowDensity;
     /* 0x8 */ u8 mLODBias;
     /* 0x9 */ u8 field_0x9;
@@ -55,7 +54,6 @@ class dScnPly_env_HIO_c {
 public:
     /* 8025AD04 */ virtual ~dScnPly_env_HIO_c();
 
-private:
     /* 0x04 */ u8 field_0x4;
     /* 0x08 */ dScnPly_env_otherHIO_c mOther;
     /* 0x14 */ dScnPly_env_debugHIO_c mDebug;
diff --git a/include/m_Do/m_Do_lib.h b/include/m_Do/m_Do_lib.h
index 33e6ae7f3f..b8c915df85 100644
--- a/include/m_Do/m_Do_lib.h
+++ b/include/m_Do/m_Do_lib.h
@@ -26,6 +26,7 @@ struct mDoLib_clipper {
     }
 
     static f32 getFar() { return mSystemFar; }
+    static f32 getFovyRate() { return mFovyRate; }
     
     static void resetFar() {
         mClipper.setFar(mSystemFar);
diff --git a/include/m_Do/m_Do_mtx.h b/include/m_Do/m_Do_mtx.h
index c05e64d138..e2dbf5c99e 100644
--- a/include/m_Do/m_Do_mtx.h
+++ b/include/m_Do/m_Do_mtx.h
@@ -67,6 +67,10 @@ inline void cMtx_ZrotM(Mtx mtx, s16 z) {
     mDoMtx_ZrotM(mtx, z);
 }
 
+inline void cMtx_lookAt(Mtx param_0, const Vec* param_1, const Vec* param_2, s16 param_3) {
+    mDoMtx_lookAt(param_0, param_1, param_2, param_3);
+}
+
 inline void cMtx_multVec(Mtx mtx, const Vec* src, Vec* dst) {
     mDoMtx_multVec(mtx, src, dst);
 }