d_a_npc work

daBaseNpc_c::setBckAnm and J3DAnmTransform* daBaseNpc_c daBaseNpc_c::setBtpAnm daBaseNpc_c::attnSttsOn daBaseNpc_c::orderEvent daBaseNpc_c::setEnvTevColor daBaseNpc_c::setRoomNo daBaseNpc_c::checkEndAnm attempt CheckCreateHeap daNpcF_addIdx daNpcF_subIdx daNpcF_incIdx daNpcF_decIdx daNpcF_ActorMngr_c::initialize() daNpcF_ActorMngr_c::entry cleanup daNpcF_ActorMngr_c::entry daNpcF_ActorMngr_c::remove daNpcF_ActorMngr_c::getActorP daNpcF_MatAnm_c::calc attempt daNpcF_SPCurve_c::initialize minor fixes daNpcF_Path_c::initialize daNpcF_Path_c::setPathInfo daNpcF_Path_c::chkPassed daNpcF_Path_c::reverse daNpcF_Path_c::setNextIdx daNpcF_Path_c::getNextIdx daNpcF_Path_c::getBeforeIdx daNpcF_Path_c::getBeforePos daNpcF_Path_c::getNextPos daNpcT_MatAnm_c::initialize daNpcT_MatAnm_c::calc daNpcT_addIdx daNpcT_subIdx daNpcT_decIdx daNpcT_Path_c::hermite daNpcT_Path_c::initialize daNpcT_Path_c::setPathInfo attempt daNpcT_Path_c::setNextPathInfo daNpcT_Path_c::reverse daNpcT_Path_c::setNextIdx daNpcT_Path_c::getDstPos attempt daNpcT_DmgStagger_c::setParam Add FLOAT_LABEL where possible fopEn_enemy / fix e_wb move jasper's jsystem work over d_attention / d_demo / d_lib work remove asm clean up dolphin files / work on some rels (#212) * d_a_alldie / d_a_tboxSw / d_a_tag_gstart / d_a_tag_hstop * dolphin OS work / cleanup * dolphin GX work / cleanup * finish changing dolphin files to C * more files into C * match rest of MSL_C math functions * more dolphin files converted to C * remove asm * d_bg_w work * remove asm * d_a_alink work / kytag14 initial changes to d_a_e_yc checkpoint until virtual destructor issue is solved daNpcF_Lookat_c::adjustMoveDisAngle daBaseNpc_c::setMtx daBaseNpc_moveBgActor_c::daBaseNpc_moveBgActor_c() daNpcT_c::ctrlFaceMotion daNpcT_c::ctrlMsgAnm attempt daNpcT_c::initTalk daNpcF_clearMessageTmpBit daNpcF_getDistTableIdx daNpcF_offTmpBit daNpcF_onTmpBit daNpcF_chkTmpBit daNpcF_onEvtBit daNpcF_chkEvtBit daNpcF_c::getDistTableIdx daNpcF_chkPointInArea daNpcF_chkDoBtnEqSpeak daNpcF_getPlayerInfoFromPlayerList attempt daNpcF_pntVsLineSegmentLengthSquare2D daNpcF_c::chkPointInArea daNpcF_c::chkPointInArea daNpcF_c::getAttentionPos daNpcT_chkTmpBit daNpcT_offTmpBit daNpcT_onTmpBit daNpcT_chkEvtBit daNpcT_offEvtBit daNpcT_onEvtBit daNpcT_chkDoBtnIsSpeak daNpcT_getDistTableIdx daBaseNpc_acMngr_c::entry daNpcF_c::initTalk undo override
2026-06-27 18:53:08 -04:00 · 2022-10-15 15:32:34 -06:00
parent 84950e08b4
commit 85ad8b190d
880 changed files with 23183 additions and 38749 deletions
@@ -11,22 +11,37 @@ class J3DDrawPacket;
 class J3DMatPacket;
 class J3DShapePacket;

-typedef void (*J3DDrawBuffer_DrawFunc)(const J3DDrawBuffer* this_);
+typedef int (J3DDrawBuffer::*sortFunc)(J3DMatPacket*);
+typedef void (J3DDrawBuffer::*drawFunc)() const;

 class J3DDrawBuffer {
 public:
+    enum EDrawType {
+        DRAW_HEAD,
+        DRAW_TAIL,
+    };
+
+    enum ESortType {
+        SORT_MAT,
+        SORT_MAT_ANM,
+        SORT_Z,
+        SORT_MODEL,
+        SORT_INVALID,
+        SORT_NON,
+    };
+
    J3DDrawBuffer() { initialize(); }
    ~J3DDrawBuffer();
    void initialize();
    J3DError allocBuffer(u32);
    void frameInit();
-    void entryMatSort(J3DMatPacket*);
-    void entryMatAnmSort(J3DMatPacket*);
-    void entryZSort(J3DMatPacket*);
-    void entryModelSort(J3DMatPacket*);
-    void entryInvalidSort(J3DMatPacket*);
-    bool entryNonSort(J3DMatPacket*);
-    bool entryImm(J3DPacket* pPacket, u16 index);
+    int entryMatSort(J3DMatPacket*);
+    int entryMatAnmSort(J3DMatPacket*);
+    int entryZSort(J3DMatPacket*);
+    int entryModelSort(J3DMatPacket*);
+    int entryInvalidSort(J3DMatPacket*);
+    int entryNonSort(J3DMatPacket*);
+    int entryImm(J3DPacket* pPacket, u16 index);
    void draw() const;
    void drawHead() const;
    void drawTail() const;
@@ -43,12 +58,12 @@ public:
    /* 0x10 */ f32 mZNear;
    /* 0x14 */ f32 mZFar;
    /* 0x18 */ f32 mZRatio;
-    /* 0x1C */ Mtx* mpZMtx;
+    /* 0x1C */ MtxP mpZMtx;
    /* 0x20 */ J3DPacket* mpCallBackPacket;

-    static u8 sortFuncTable[72];
-    static u8 drawFuncTable[24];
-    static u8 entryNum[4 + 4 /* padding */];
+    static sortFunc sortFuncTable[6];
+    static drawFunc drawFuncTable[2];
+    static int entryNum;
 };

 #endif /* J3DDRAWBUFFER_H */
@@ -51,27 +51,29 @@ public:
 class J3DPacket {
 public:
    J3DPacket() {
-        mpNextSibling = NULL;
+        mpNextPacket = NULL;
        mpFirstChild = NULL;
        mpUserData = NULL;
    }

    void addChildPacket(J3DPacket*);
-    J3DPacket* getNextPacket() const { return mpNextSibling; }
+    
+    J3DPacket* getNextPacket() const { return mpNextPacket; }
+    void setNextPacket(J3DPacket* i_packet) { mpNextPacket = i_packet; }

-    inline void clear() {
-        mpNextSibling = NULL;
+    void drawClear() {
+        mpNextPacket = NULL;
        mpFirstChild = NULL;
    }

    void setUserArea(u32 area) { mpUserData = (void*)area; }

-    virtual bool entry(J3DDrawBuffer*);
+    virtual int entry(J3DDrawBuffer*);
    virtual void draw();
    virtual ~J3DPacket() {}

 public:
-    /* 0x04 */ J3DPacket* mpNextSibling;
+    /* 0x04 */ J3DPacket* mpNextPacket;
    /* 0x08 */ J3DPacket* mpFirstChild;
    /* 0x0C */ void* mpUserData;
 };  // Size: 0x10
@@ -143,19 +145,21 @@ public:
    void endDiff();
    bool isSame(J3DMatPacket*) const;

+    J3DMaterial* getMaterial() const { return mpMaterial; }
    J3DShapePacket* getShapePacket() const { return mpShapePacket; }
    void setShapePacket(J3DShapePacket* packet) { mpShapePacket = packet; }
    void setInitShapePacket(J3DShapePacket* packet) { mpInitShapePacket = packet; }
+    bool isChanged() const { return mDiffFlag < 0; }

    virtual ~J3DMatPacket();
-    virtual bool entry(J3DDrawBuffer*);
+    virtual int entry(J3DDrawBuffer*);
    virtual void draw();

 public:
    /* 0x28 */ J3DShapePacket* mpInitShapePacket;
    /* 0x2C */ J3DShapePacket* mpShapePacket;
    /* 0x30 */ J3DMaterial* mpMaterial;
-    /* 0x34 */ u32 mSortFlags;
+    /* 0x34 */ u32 mDiffFlag;
    /* 0x38 */ J3DTexture* mpTexture;
    /* 0x3C */ J3DMaterialAnm* mpMaterialAnm;
 };  // Size: 0x40
@@ -27,6 +27,11 @@ static inline void J3DFifoWriteXFCmd(u16 cmd, u16 len) {

 class J3DCurrentMtx : public J3DCurrentMtxInfo {
 public:
+    J3DCurrentMtx() {
+        mMtxIdxRegA = 0x3cf3cf00;
+        mMtxIdxRegB = 0x00f3cf3c;
+    }
+
    u32 getMtxIdxRegA() const { return mMtxIdxRegA; }
    u32 getMtxIdxRegB() const { return mMtxIdxRegB; }

@@ -54,6 +59,14 @@ enum J3DShpFlag {

 class J3DShape {
 public:
+    J3DShape() {
+        initialize();
+    }
+
+    enum {
+        kVcdVatDLSize = 0xC0,
+    };
+
    /* 80314B48 */ void initialize();
    /* 80314BB8 */ void addTexMtxIndexInDL(_GXAttr, u32);
    /* 80314CBC */ void addTexMtxIndexInVcd(_GXAttr);
@@ -93,11 +106,14 @@ public:
    inline u32 getMtxGroupNum() const { return mMtxGroupNum; }
    inline J3DShapeDraw* getShapeDraw(u32 idx) const { return mShapeDraw[idx]; }
    inline J3DShapeMtx* getShapeMtx(u32 idx) const { return mShapeMtx[idx]; }
+
    static void resetVcdVatCache() { sOldVcdVatCmd = NULL; }

    static void* sOldVcdVatCmd;

 private:
+    friend struct J3DShapeFactory;
+
    /* 0x04 */ J3DMaterial* mMaterial;
    /* 0x08 */ u16 mIndex;
    /* 0x0A */ u16 mMtxGroupNum;
@@ -24,6 +24,10 @@ extern u8 struct_804515B0[4];

 class J3DShapeMtx {
 public:
+    J3DShapeMtx(u16 useMtxIndex)
+        : mUseMtxIndex(useMtxIndex)
+    {}
+
    /* 803130A8 */ void resetMtxLoadCache();
    /* 803130E4 */ void loadMtxIndx_PNGP(int, u16) const;
    /* 80313128 */ void loadMtxIndx_PCPU(int, u16) const;
@@ -54,6 +58,10 @@ private:

 class J3DShapeMtxConcatView : public J3DShapeMtx {
 public:
+    J3DShapeMtxConcatView(u16 useMtxIndex)
+        : J3DShapeMtx(useMtxIndex)
+    {}
+
    /* 80314730 */ virtual ~J3DShapeMtxConcatView();
    /* 803147E0 */ virtual u32 getType() const;
    /* 80313C54 */ virtual void load() const;
@@ -73,6 +81,10 @@ public:

 class J3DShapeMtxYBBoardConcatView : public J3DShapeMtxConcatView {
 public:
+    J3DShapeMtxYBBoardConcatView(u16 useMtxIndex)
+        : J3DShapeMtxConcatView(useMtxIndex)
+    {}
+
    /* 80314520 */ virtual ~J3DShapeMtxYBBoardConcatView();
    /* 803147E0 */ virtual u32 getType() const;
    /* 803143E4 */ virtual void load() const;
@@ -80,6 +92,10 @@ public:

 class J3DShapeMtxBBoardConcatView : public J3DShapeMtxConcatView {
 public:
+    J3DShapeMtxBBoardConcatView(u16 useMtxIndex)
+        : J3DShapeMtxConcatView(useMtxIndex)
+    {}
+
    /* 803145A4 */ virtual ~J3DShapeMtxBBoardConcatView();
    /* 803147E0 */ virtual u32 getType() const;
    /* 803142D4 */ virtual void load() const;
@@ -87,6 +103,12 @@ public:

 class J3DShapeMtxMulti : public J3DShapeMtx {
 public:
+    J3DShapeMtxMulti(u16 useMtxIndex, u16 useMtxNum, u16* useMtxIndexTable)
+        : J3DShapeMtx(useMtxIndex)
+        , mUseMtxNum(useMtxNum)
+        , mUseMtxIndexTable(useMtxIndexTable)
+    {}
+
    /* 803146B0 */ virtual ~J3DShapeMtxMulti();
    /* 803147E0 */ virtual u32 getType() const;
    /* 80273E08 */ virtual u32 getUseMtxNum() const;
@@ -96,11 +118,17 @@ public:

 private:
    /* 0x6 */ u16 mUseMtxNum;
-    /* 0x8 */ u16* mUseMtxIndex;
+    /* 0x8 */ u16* mUseMtxIndexTable;
 };

-class J3DShapeMtxMultiConcatView : public J3DShapeMtx {
+class J3DShapeMtxMultiConcatView : public J3DShapeMtxConcatView {
 public:
+    J3DShapeMtxMultiConcatView(u16 useMtxIndex, u16 useMtxNum, u16* useMtxIndexTable)
+        : J3DShapeMtxConcatView(useMtxIndex)
+        , mUseMtxNum(useMtxNum)
+        , mUseMtxIndexTable(useMtxIndexTable)
+    {}
+
    /* 8031461C */ virtual ~J3DShapeMtxMultiConcatView();
    /* 803147E0 */ virtual u32 getType() const;
    /* 80273E08 */ virtual u32 getUseMtxNum() const;
@@ -111,7 +139,7 @@ public:

 private:
    /* 0x6 */ u16 mUseMtxNum;
-    /* 0x8 */ u16* mUseMtxIndex;
+    /* 0x8 */ u16* mUseMtxIndexTable;
 };

-#endif /* J3DSHAPEMTX_H */
+#endif /* J3DSHAPEMTX_H */
@@ -93,6 +93,9 @@ struct J3DSys {
    void setMaterialMode(u32 mode) { mMaterialMode = mode; }

    void setTexture(J3DTexture* pTex) { mTexture = pTex; }
+    J3DTexture* getTexture() { return mTexture; }
+
+    void setNBTScale(Vec* scale) { mNBTScale = scale; }

    void onFlag(u32 flag) { mFlags |= flag; }

@@ -1,13 +1,14 @@
 #ifndef J3DTRANSFORM_H
 #define J3DTRANSFORM_H

+#include "JSystem/JGeometry.h"
 #include "dolphin/mtx/mtxvec.h"
 #include "dolphin/types.h"

 struct J3DTransformInfo {
-    /* 0x00 */ Vec mScale;
-    /* 0x0C */ SVec mRotation;
-    /* 0x14 */ Vec mTranslate;
+    /* 0x00 */ JGeometry::TVec3<f32> mScale;
+    /* 0x0C */ JGeometry::TVec3<s16> mRotation;
+    /* 0x14 */ JGeometry::TVec3<f32> mTranslate;
 };  // Size: 0x20

 extern J3DTransformInfo const j3dDefaultTransformInfo;
@@ -94,8 +94,4 @@ struct VertexNormal {
    Vec data;
 };

-struct VertexPosition {
-    Vec data;
-};
-
 #endif /* J3DVERTEX_H */