d_a_player_main work

include/JSystem/J3DGraphAnimator/J3DModelData.h

@@ -81,6 +81,7 @@ public:
     bool checkBBoardFlag() const { return mbHasBillboard == 1; }
     void entryTexMtxAnimator(J3DAnmTextureSRTKey* anm) { mMaterialTable.entryTexMtxAnimator(anm); }
     void entryTevRegAnimator(J3DAnmTevRegKey* anm) { mMaterialTable.entryTevRegAnimator(anm); }
+    void entryMatColorAnimator(J3DAnmColor* anm) { mMaterialTable.entryMatColorAnimator(anm); }
     void setTexMtxAnimator(J3DAnmTextureSRTKey* pAnm, J3DTexMtxAnm* pTexAnm, J3DTexMtxAnm* pDualAnmR) {
         mMaterialTable.setTexMtxAnimator(pAnm, pTexAnm, pDualAnmR);
     }
@@ -102,7 +103,6 @@ public:
     }
 
     // TODO
-    void entryMatColorAnimator(J3DAnmColor*) {}
     void getBasicMtxCalc() {}
     void getBinary() {}
     void getRootNode() {}

include/JSystem/J3DGraphBase/J3DMatBlock.h

@@ -566,7 +566,7 @@ struct J3DZMode {
     J3DZMode() { mZModeID = j3dDefaultZModeID; }
     explicit J3DZMode(const J3DZModeInfo& info) { setZModeInfo(info); }
 
-    u8 getCompareEnaable() const { return j3dZModeTable[mZModeID * 3 + 0]; }
+    u8 getCompareEnable() const { return j3dZModeTable[mZModeID * 3 + 0]; }
     u8 getFunc() const { return j3dZModeTable[mZModeID * 3 + 1]; }
     u8 getUpdateEnable() const { return j3dZModeTable[mZModeID * 3 + 2]; }
 
@@ -575,8 +575,8 @@ struct J3DZMode {
         mZModeID = calcZModeID(compareEn, info.mFunc, info.mUpdateEnable);
     }
 
-    void load() {
-        J3DGDSetZMode(getCompareEnaable(), GXCompare(getFunc()), getUpdateEnable());
+    void load() const {
+        J3DGDSetZMode(getCompareEnable(), GXCompare(getFunc()), getUpdateEnable());
     }
 
     void setCompareEnable(u8 i_compare) {

include/JSystem/JKernel/JKRArchive.h

@@ -225,4 +225,16 @@ inline void* JKRGetTypeResource(u32 tag, const char* name, JKRArchive* arc) {
     return JKRArchive::getGlbResource(tag, name, arc);
 }
 
+inline u32 JKRReadIdxResource(void* buffer, u32 bufferSize, u32 index, JKRArchive* arc) {
+    return arc->readIdxResource(buffer, bufferSize, index);
+}
+
+inline u32 JKRReadIdResource(void* buffer, u32 bufferSize, u16 id, JKRArchive* arc) {
+    return arc->readResource(buffer, bufferSize, id);
+}
+
+inline u32 JKRReadResource(void* buffer, u32 bufferSize, u16 id, JKRArchive* arc) {
+    return arc->readResource(buffer, bufferSize, id);
+}
+
 #endif

include/JSystem/JParticle/JPAParticle.h

@@ -39,6 +39,7 @@ public:
     JPABaseParticle() : mLink(this), mCurFrame(0.0f) {}
     void setOffsetPosition(f32 x, f32 y, f32 z) { mGlobalPosition.set(x, y, z); }
     void setOffsetPosition(const JGeometry::TVec3<f32>& pos) { mGlobalPosition.set(pos); }
+    void getGlobalPosition(JGeometry::TVec3<f32>& out) const { out.set(mGlobalPosition); }
 
     bool checkStatus(u32 flag) { return mStatus & flag; }
     bool isInvisibleParticle() { return checkStatus(JPAPtclStts_Invisible); }
@@ -50,7 +51,6 @@ public:
     void getAge() const {}
     void getDrawParamCPtr() {}
     void getDrawParamPPtr() {}
-    void getGlobalPosition(JGeometry::TVec3<f32>&) const {}
     void getHeight() {}
     void getLifeTime() const {}
     void getLocalPosition(JGeometry::TVec3<f32>&) const {}