d_camera / m_Do_ext / d_particle + minor various wip (#210)

4 files changed, 10 insertions, 0 deletions

diff --git a/include/JSystem/J3DGraphBase/J3DMaterial.h b/include/JSystem/J3DGraphBase/J3DMaterial.h
index 6814350795..c9c21cfd40 100644
--- a/include/JSystem/J3DGraphBase/J3DMaterial.h
+++ b/include/JSystem/J3DGraphBase/J3DMaterial.h
@@ -51,6 +51,7 @@ public:
     J3DTexGenBlock* getTexGenBlock() const { return mTexGenBlock; }
     J3DDisplayListObj* getSharedDisplayListObj() const { return mSharedDLObj; }
     J3DShape* getShape() { return mShape; }
+    J3DJoint* getJoint() { return mJoint; }
     J3DMaterialAnm* getMaterialAnm() const {
         if ((u32)mMaterialAnm < 0xC0000000) {
             return mMaterialAnm;
diff --git a/include/JSystem/J3DGraphBase/J3DSys.h b/include/JSystem/J3DGraphBase/J3DSys.h
index a4bded7e42..fd75fc48f7 100644
--- a/include/JSystem/J3DGraphBase/J3DSys.h
+++ b/include/JSystem/J3DGraphBase/J3DSys.h
@@ -123,6 +123,8 @@ struct J3DSys {
 
     void setViewMtx(Mtx m) { PSMTXCopy(m, mViewMtx); }
 
+    J3DModel* getModel() { return mModel; }
+
     static Mtx mCurrentMtx;
     static Vec mCurrentS;
     static Vec mParentS;
diff --git a/include/JSystem/J3DGraphBase/J3DTexture.h b/include/JSystem/J3DGraphBase/J3DTexture.h
index 923bf225ed..e5559255ba 100644
--- a/include/JSystem/J3DGraphBase/J3DTexture.h
+++ b/include/JSystem/J3DGraphBase/J3DTexture.h
@@ -19,6 +19,11 @@ public:
 
     u16 getNum() const { return mNum; }
     ResTIMG* getResTIMG(u16 entry) const { return &mpRes[entry]; }
+    void setResTIMG(u16 entry, const ResTIMG& timg) {
+        mpRes[entry] = timg;
+        mpRes[entry].imageOffset = ((mpRes[entry].imageOffset - (u32)(mpRes + entry))) + (u32)&timg;
+        mpRes[entry].paletteOffset = ((mpRes[entry].paletteOffset - (u32)(mpRes + entry))) + (u32)&timg;
+    }
 };
 
 struct J3DTextureSRTInfo {
diff --git a/include/JSystem/J3DGraphBase/J3DVertex.h b/include/JSystem/J3DGraphBase/J3DVertex.h
index 2e3e1430c0..309194628a 100644
--- a/include/JSystem/J3DGraphBase/J3DVertex.h
+++ b/include/JSystem/J3DGraphBase/J3DVertex.h
@@ -54,6 +54,8 @@ private:
 
 class J3DVertexBuffer {
 public:
+    J3DVertexBuffer() { init(); }
+
     /* 80310F78 */ void setVertexData(J3DVertexData*);
     /* 80310FD8 */ void init();
     /* 80311030 */ ~J3DVertexBuffer();