mirror/tww
1
0
Fork 0
mirror of https://github.com/zeldaret/tww.git synced 2026-09-06 02:38:11 -04:00
Code Issues Packages Projects Releases Wiki Activity

Various J3D inline fixes

Browse Source
This commit is contained in:
LagoLunatic
2026-08-28 15:03:03 -04:00
parent 60a05bdb83
commit f2be4dc1ff
10 changed files with 237 additions and 120 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/JSystem/J3DGraphBase/J3DTexture.h
+18 -12
View File
@@ -51,40 +51,46 @@ public:
}
};
class J3DTexMtx {
class J3DTexMtx : public J3DTexMtxInfo {
public:
J3DTexMtx() { mTexMtxInfo = j3dDefaultTexMtxInfo; }
J3DTexMtx() { J3DTexMtxInfo::operator=(j3dDefaultTexMtxInfo); }
J3DTexMtx(const J3DTexMtxInfo& info) {
mTexMtxInfo = info;
J3DTexMtxInfo::operator=(info);
}
~J3DTexMtx() {}
void load(u32 texMtxID) const {
GDOverflowCheck(53);
J3DGDLoadTexMtxImm((Mtx&)mMtx, GX_TEXMTX0 + texMtxID * 3, (GXTexMtxType)mTexMtxInfo.mProjection);
J3DGDLoadTexMtxImm((Mtx&)mMtx, GX_TEXMTX0 + texMtxID * 3, (GXTexMtxType)mProjection);
};
void calc();
J3DTexMtxInfo& getTexMtxInfo() { return mTexMtxInfo; }
J3DTextureSRTInfo& getTextureSRT() { return mTexMtxInfo.mSRT;}
J3DTexMtxInfo& getTexMtxInfo() { return *this; }
J3DTextureSRTInfo& getTextureSRT() { return mSRT;}
Mtx& getMtx() { return mMtx; }
void setEffectMtx(Mtx effectMtx) { mTexMtxInfo.setEffectMtx(effectMtx); }
void setEffectMtx(Mtx effectMtx) { J3DTexMtxInfo::setEffectMtx(effectMtx); }
Mtx& getViewMtx() { return mViewMtx; }
void setViewMtx(const Mtx viewMtx) { MTXCopy(viewMtx, mViewMtx); }
void setViewMtx(Mtx viewMtx) { MTXCopy(viewMtx, mViewMtx); }
public:
/* 0x00 */ J3DTexMtxInfo mTexMtxInfo;
private:
/* 0x64 */ Mtx mMtx;
/* 0x94 */ Mtx mViewMtx;
}; // Size: 0xC4
struct J3DTexCoord : public J3DTexCoordInfo {
J3DTexCoord() { *(J3DTexCoordInfo*)this = j3dDefaultTexCoordInfo[0]; }
J3DTexCoord(const J3DTexCoordInfo& info) { *(J3DTexCoordInfo*)this = info; }
J3DTexCoord() {
J3DTexCoordInfo::operator=(j3dDefaultTexCoordInfo[0]);
}
J3DTexCoord(const J3DTexCoordInfo& info) {
J3DTexCoordInfo::operator=(info);
}
u8 getTexGenType() const { return mTexGenType; }
u8 getTexGenSrc() const { return mTexGenSrc; }
u8 getTexGenMtx() const { return mTexGenMtx; }
void setTexGenMtx(u8 v) { mTexGenMtx = v; }
// void operator=(const J3DTexCoord&) {}
// void operator==(J3DTexCoord&) {}
}; // Size: 0x4
#endif /* J3DTEXTURE_H */