From c0d02ccfcf9ec93b0d8a427567e1dffd58182da5 Mon Sep 17 00:00:00 2001
From: "Jasper St. Pierre" <jstpierre@mecheye.net>
Date: Tue, 12 Sep 2023 20:16:11 -0700
Subject: J3DVertex almost

---
 include/JSystem/J3DGraphBase/J3DPacket.h   | 2 ++
 include/JSystem/J3DGraphBase/J3DShape.h    | 1 +
 include/JSystem/J3DGraphBase/J3DShapeMtx.h | 1 +
 include/JSystem/J3DGraphBase/J3DVertex.h   | 6 +++---
 4 files changed, 7 insertions(+), 3 deletions(-)

(limited to 'include/JSystem/J3DGraphBase')

diff --git a/include/JSystem/J3DGraphBase/J3DPacket.h b/include/JSystem/J3DGraphBase/J3DPacket.h
index 278fb918..143065ab 100644
--- a/include/JSystem/J3DGraphBase/J3DPacket.h
+++ b/include/JSystem/J3DGraphBase/J3DPacket.h
@@ -179,9 +179,11 @@ public:
     void setModel(J3DModel* pModel) { mpModel = pModel; }
     void setDrawMtx(Mtx** pDrawMtx) { mpDrawMtx = pDrawMtx; }
     void setNrmMtx(Mtx33** pNrmMtx) { mpNrmMtx = pNrmMtx; }
+    void setBaseMtxPtr(Mtx* pMtx) { mpBaseMtxPtr = pMtx; }
 
     J3DShape* getShape() const { return mpShape; }
     J3DModel* getModel() const { return mpModel; }
+    Mtx* getBaseMtxPtr() const { return mpBaseMtxPtr; }
 
 public:
     /* 0x24 */ J3DShape* mpShape;
diff --git a/include/JSystem/J3DGraphBase/J3DShape.h b/include/JSystem/J3DGraphBase/J3DShape.h
index 457724a8..a1fdf247 100644
--- a/include/JSystem/J3DGraphBase/J3DShape.h
+++ b/include/JSystem/J3DGraphBase/J3DShape.h
@@ -121,6 +121,7 @@ public:
     static void resetVcdVatCache() { sOldVcdVatCmd = NULL; }
 
     static void* sOldVcdVatCmd;
+    static u8 sEnvelopeFlag;
 
 private:
     friend struct J3DShapeFactory;
diff --git a/include/JSystem/J3DGraphBase/J3DShapeMtx.h b/include/JSystem/J3DGraphBase/J3DShapeMtx.h
index 029e73ec..8c2a29f8 100644
--- a/include/JSystem/J3DGraphBase/J3DShapeMtx.h
+++ b/include/JSystem/J3DGraphBase/J3DShapeMtx.h
@@ -54,6 +54,7 @@ public:
     static u32 sCurrentPipeline;
     // static J3DScaleFlag sCurrentScaleFlag;
     static u8* sCurrentScaleFlag;
+    static u8 sNBTFlag;
     static u32 sTexMtxLoadType;
 
     static void setCurrentPipeline(u32 pipeline) { sCurrentPipeline = pipeline; }
diff --git a/include/JSystem/J3DGraphBase/J3DVertex.h b/include/JSystem/J3DGraphBase/J3DVertex.h
index ed07b064..5598f491 100644
--- a/include/JSystem/J3DGraphBase/J3DVertex.h
+++ b/include/JSystem/J3DGraphBase/J3DVertex.h
@@ -53,11 +53,11 @@ private:
     /* 0x1C */ void* mVtxNBTArray;
     /* 0x20 */ GXColor* mVtxColorArray[2];
     /* 0x28 */ void* mVtxTexCoordArray[8];
-    /* 0x48 */ u8 mPacketNum;
+    /* 0x48 */ u8 mVtxPosFrac;
     /* 0x4C */ GXCompType mVtxPosType;
-    /* 0x50 */ u8 mVtxPosFrac;
+    /* 0x50 */ u8 mVtxNrmFrac;
     /* 0x54 */ GXCompType mVtxNrmType;
-    /* 0x58 */ u8 mVtxNrmFrac;
+    /* 0x58 */ u32 mPacketNum;
 };
 
 class J3DVertexBuffer {
-- 
cgit v1.2.3