mirror/tww
1
0
Fork 0
mirror of https://github.com/zeldaret/tww.git synced 2026-08-06 01:48:15 -04:00
Code Issues Packages Projects Releases Wiki Activity

d_a_player_main

Browse Source
This commit is contained in:
LagoLunatic
2024-01-03 15:55:56 -05:00
parent a811016a06
commit ea78ea5f5c
26 changed files with 1269 additions and 425 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/JSystem/J3DGraphAnimator/J3DAnimation.h
+11 -2
View File
@@ -370,6 +370,7 @@ protected:
/* 0x22 */ u16 field_0x22;
}; // Size: 0x24
// BCK
class J3DAnmTransformKey : public J3DAnmTransform {
public:
friend class J3DAnmKeyLoader_v15;
@@ -389,6 +390,7 @@ private:
/* 0x28 */ J3DAnmTransformKeyTable* field_0x28;
}; // Size: 0x2C
// BCA
class J3DAnmTransformFull : public J3DAnmTransform {
public:
friend class J3DAnmFullLoader_v15;
@@ -408,6 +410,7 @@ struct J3DTextureSRTInfo;
class J3DModelData;
class J3DMaterialTable;
// BTK
class J3DAnmTextureSRTKey : public J3DAnmBase {
public:
friend class J3DAnmKeyLoader_v15;
@@ -453,8 +456,8 @@ public:
JUTNameTab * getPostUpdateMaterialName() { return &mPostUpdateMaterialName; }
u16 getPostUpdateTexMtxID(u16 idx) const { return mPostUpdateTexMtxID[idx]; }
u32 getTexMtxCalcType() const { return mTexMtxCalcType; }
Vec& getSRTCenter(u16 idx) const { return mSRTCenter[idx]; }
u32 getTexMtxCalcType() { return mTexMtxCalcType; }
Vec& getSRTCenter(u16 idx) { return mSRTCenter[idx]; }
private:
/* 0x10 */ int mDecShift;
@@ -487,6 +490,7 @@ private:
STATIC_ASSERT(sizeof(J3DAnmTextureSRTKey) == 0x88);
// BVA
class J3DAnmVisibilityFull : public J3DAnmBase {
public:
friend class J3DAnmFullLoader_v15;
@@ -511,6 +515,7 @@ private:
/* 0x18 */ u8* mVisibility;
}; // Size: 0x1C
// BTP
class J3DAnmTexPattern : public J3DAnmBase {
public:
friend class J3DAnmFullLoader_v15;
@@ -543,6 +548,7 @@ private:
/* 0x20 */ JUTNameTab mUpdateMaterialName;
}; // Size: 0x2C
// BRK
class J3DAnmTevRegKey : public J3DAnmBase {
public:
friend class J3DAnmKeyLoader_v15;
@@ -616,6 +622,7 @@ private:
/* 0x70 */ s16 * mAnmKRegDataA;
}; // Size: 0x74
// BPK
class J3DAnmColor : public J3DAnmBase {
public:
J3DAnmColor() : J3DAnmBase(0) {
@@ -775,6 +782,7 @@ protected:
/* 0x10 */ f32* mWeight;
}; // Size: 0x14
// BLA
class J3DAnmClusterFull : public J3DAnmCluster {
public:
friend class J3DAnmFullLoader_v15;
@@ -791,6 +799,7 @@ private:
/* 0x14 */ J3DAnmClusterFullTable * mAnmTable;
};
// BLK
class J3DAnmClusterKey : public J3DAnmCluster {
public:
friend class J3DAnmKeyLoader_v15;
include/JSystem/J3DGraphAnimator/J3DMaterialAttach.h
+1 -1
View File
@@ -30,7 +30,7 @@ public:
int removeTevRegAnimator(J3DAnmTevRegKey*);
s32 setMatColorAnimator(J3DAnmColor*, J3DMatColorAnm *);
s32 setTexNoAnimator(J3DAnmTexPattern*, J3DTexNoAnm*);
s32 setTexMtxAnimator(J3DAnmTextureSRTKey*, J3DTexMtxAnm*, J3DTexMtxAnm*);
s32 setTexMtxAnimator(J3DAnmTextureSRTKey* pAnm, J3DTexMtxAnm* pTexAnm, J3DTexMtxAnm* pDualAnmR);
s32 setTevRegAnimator(J3DAnmTevRegKey*, J3DTevColorAnm*, J3DTevKColorAnm*);
virtual ~J3DMaterialTable();
include/JSystem/J3DGraphAnimator/J3DModelData.h
+3 -1
View File
@@ -81,6 +81,9 @@ public:
bool checkBBoardFlag() const { return mbHasBillboard == 1; }
void entryTexMtxAnimator(J3DAnmTextureSRTKey* anm) { mMaterialTable.entryTexMtxAnimator(anm); }
void entryTevRegAnimator(J3DAnmTevRegKey* anm) { mMaterialTable.entryTevRegAnimator(anm); }
void setTexMtxAnimator(J3DAnmTextureSRTKey* pAnm, J3DTexMtxAnm* pTexAnm, J3DTexMtxAnm* pDualAnmR) {
mMaterialTable.setTexMtxAnimator(pAnm, pTexAnm, pDualAnmR);
}
int removeTexNoAnimator(J3DAnmTexPattern* anm) {
return mMaterialTable.removeTexNoAnimator(anm);
}
@@ -104,7 +107,6 @@ public:
void getBinary() {}
void getRootNode() {}
void setMatColorAnimator(J3DAnmColor*, J3DMatColorAnm*) {}
void setTexMtxAnimator(J3DAnmTextureSRTKey*, J3DTexMtxAnm*, J3DTexMtxAnm*) {}
void setTexNoAnimator(J3DAnmTexPattern*, J3DTexNoAnm*) {}
private:
include/JSystem/J3DGraphBase/J3DMaterial.h
+35 -12
View File
@@ -44,27 +44,26 @@ public:
J3DMaterial() { initialize(); }
~J3DMaterial() {}
J3DMaterial* getNext() const { return mNext; }
J3DMaterial* getNext() { return mNext; }
void setNext(J3DMaterial* material) {mNext = material; }
J3DShape* getShape() const { return mShape; }
u32 getMaterialMode() { return mMaterialMode; }
void setMaterialMode(u32 mode) { mMaterialMode = mode; }
J3DTevBlock* getTevBlock() const { return mTevBlock; }
J3DColorBlock* getColorBlock() const { return mColorBlock; }
J3DTexGenBlock* getTexGenBlock() const { return mTexGenBlock; }
J3DDisplayListObj* getSharedDisplayListObj() const { return mSharedDLObj; }
J3DIndBlock* getIndBlock() const { return mIndBlock; }
J3DShape* getShape() { return mShape; }
J3DJoint* getJoint() { return mJoint; }
J3DMaterialAnm* getMaterialAnm() const {
u32 getMaterialMode() { return mMaterialMode; }
void setMaterialMode(u32 mode) { mMaterialMode = mode; }
J3DTevBlock* getTevBlock() { return mTevBlock; }
J3DColorBlock* getColorBlock() { return mColorBlock; }
J3DTexGenBlock* getTexGenBlock() { return mTexGenBlock; }
J3DDisplayListObj* getSharedDisplayListObj() { return mSharedDLObj; }
J3DIndBlock* getIndBlock() { return mIndBlock; }
J3DMaterialAnm* getMaterialAnm() {
if ((u32)mMaterialAnm < 0xC0000000) {
return mMaterialAnm;
} else {
return NULL;
}
}
J3DNBTScale* getNBTScale() const { return mTexGenBlock->getNBTScale(); }
u16 getTexNo(u32 idx) const { return mTevBlock->getTexNo(idx); }
J3DNBTScale* getNBTScale() { return mTexGenBlock->getNBTScale(); }
u16 getTexNo(u32 idx) { return mTevBlock->getTexNo(idx); }
J3DGXColor* getTevKColor(u32 param_0) { return mTevBlock->getTevKColor(param_0); }
J3DGXColorS10* getTevColor(u32 param_0) { return mTevBlock->getTevColor(param_0); }
J3DFog* getFog() { return mPEBlock->getFog(); }
@@ -73,6 +72,8 @@ public:
J3DAlphaComp* getAlphaComp() { return mPEBlock->getAlphaComp(); }
u8 getZCompLoc() { return mPEBlock->getZCompLoc(); }
J3DTexMtx* getTexMtx(u32 idx) { return mTexGenBlock->getTexMtx(idx); }
void setTexMtx(u32 idx, J3DTexMtx* texMtx) { mTexGenBlock->setTexMtx(idx, texMtx); }
J3DTexCoord* getTexCoord(u32 idx) { return mTexGenBlock->getTexCoord(idx); }
u16 getIndex() { return mIndex; }
bool isDrawModeOpaTexEdge() { return (mMaterialMode & 3) == 0; }
J3DPEBlock* getPEBlock() { return mPEBlock; }
@@ -87,6 +88,28 @@ public:
void setMaterialAnm(J3DMaterialAnm* i_anm) { mMaterialAnm = i_anm; }
void setCullMode(u8 i_mode) { mColorBlock->setCullMode(i_mode); }
void addShape(J3DShape*) {}
void getAmbColor(u32) {}
void getColorChan(u32) {}
void getColorChanNum() const {}
void getCullMode() const {}
void getCurrentMtx() const {}
void getDither() const {}
void getIndTevStage(u32) {}
void getIndTexCoordScale(u32) {}
void getIndTexOrder(u32) {}
void getLight(u32) {}
void getMatColor(u32) {}
void getTevKAlphaSel(u32) {}
void getTevKColorSel(u32) {}
void getTevOrder(u32) {}
void getTevStage(u32) {}
void getTevSwapModeTable(u32) {}
void getZCompLoc() const {}
void setJoint(J3DJoint*) {}
void setLight(u32, J3DLightObj*) {}
void setTevStageNum(u8) {}
public:
/* 0x04 */ J3DMaterial* mNext;
/* 0x08 */ J3DShape* mShape;
include/JSystem/J3DGraphBase/J3DTexture.h
+6 -4
View File
@@ -57,9 +57,9 @@ public:
mTexMtxInfo = info;
}
~J3DTexMtx() {}
void load(u32 i) const {
void load(u32 texMtxID) const {
GDOverflowCheck(53);
J3DGDLoadTexMtxImm((Mtx&)mMtx, i * 3 + 30, (GXTexMtxType)mTexMtxInfo.mProjection);
J3DGDLoadTexMtxImm((Mtx&)mMtx, GX_TEXMTX0 + texMtxID * 3, (GXTexMtxType)mTexMtxInfo.mProjection);
};
void calc();
void calcTexMtx(f32 const (*)[4]);
@@ -71,13 +71,15 @@ public:
Mtx& getMtx() { return mMtx; }
void setEffectMtx(Mtx effectMtx) { mTexMtxInfo.setEffectMtx(effectMtx); }
Mtx& getViewMtx() { return mViewMtx; }
void setViewMtx(const Mtx viewMtx) { MTXCopy(viewMtx, mViewMtx); }
void setViewMtx(Mtx viewMtx) { MTXCopy(viewMtx, mViewMtx); }
void getTextureSRT() {}
private:
/* 0x00 */ J3DTexMtxInfo mTexMtxInfo;
/* 0x64 */ Mtx mMtx;
/* 0x94 */ Mtx mViewMtx;
}; // Size: 0xc4
}; // Size: 0xC4
struct J3DTexCoord : public J3DTexCoordInfo {
J3DTexCoord() { *(J3DTexCoordInfo*)this = j3dDefaultTexCoordInfo[0]; }
include/JSystem/JKernel/JKRArchive.h
+2 -2
View File
@@ -121,8 +121,8 @@ public:
bool getDirEntry(SDirEntry*, u32) const;
void* getIdxResource(u32);
void* getResource(u16);
u32 readIdxResource(void*, u32, u32);
u32 readResource(void*, u32, u16);
u32 readIdxResource(void* buffer, u32 bufferSize, u32 index);
u32 readResource(void* buffer, u32 bufferSize, u16 id);
u32 countResource(u32) const;
JKRArcFinder* getFirstResource(u32) const;
u32 getFileAttribute(u32) const;