diff options
| author | hatal175 <hatal175@users.noreply.github.com> | 2023-05-09 01:10:22 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-05-08 15:10:22 -0700 |
| commit | 44b0fdbb0d73226eb8f365572f75d2ee026f1040 (patch) | |
| tree | ad41342a74f614c52413c0f0a037862672196c10 /include/JSystem | |
| parent | 85827b28ff27c09702930738e8c188472428f959 (diff) | |
Do some work on f_op_actor_mng (#328)
* decompctx - try without shiftjis and write utf8 as output
* Do some work on f_op_actor_mng
* Remove duplicated includes
* Add fopAcM_setEffectMtx
* Match dShopSystem_searchCameraActor
* fopAcM_setEffectMtx now matches with literals
* Remove unnecessary inline in headers
Diffstat (limited to 'include/JSystem')
| -rw-r--r-- | include/JSystem/J3DGraphBase/J3DMaterial.h | 1 | ||||
| -rw-r--r-- | include/JSystem/J3DGraphBase/J3DTexture.h | 6 | ||||
| -rw-r--r-- | include/JSystem/J3DU/J3DUClipper.h | 2 |
3 files changed, 7 insertions, 2 deletions
diff --git a/include/JSystem/J3DGraphBase/J3DMaterial.h b/include/JSystem/J3DGraphBase/J3DMaterial.h index 39fcfece23..3988dcf5bf 100644 --- a/include/JSystem/J3DGraphBase/J3DMaterial.h +++ b/include/JSystem/J3DGraphBase/J3DMaterial.h @@ -63,6 +63,7 @@ public: u32 getTexNo(u32 idx) const { return mTevBlock->getTexNo(idx); } GXColor* getTevKColor(u32 param_0) { return mTevBlock->getTevKColor(param_0); } J3DFog* getFog() { return mPEBlock->getFog(); } + J3DTexMtx* getTexMtx(u32 idx) { return mTexGenBlock->getTexMtx(idx); } void setTevColor(u32 i, const J3DGXColorS10* i_color) { mTevBlock->setTevColor(i, i_color); } void setTevKColor(u32 i, const J3DGXColor* i_color) { mTevBlock->setTevKColor(i, i_color); } diff --git a/include/JSystem/J3DGraphBase/J3DTexture.h b/include/JSystem/J3DGraphBase/J3DTexture.h index 8a8158b7ba..95580afa91 100644 --- a/include/JSystem/J3DGraphBase/J3DTexture.h +++ b/include/JSystem/J3DGraphBase/J3DTexture.h @@ -36,12 +36,13 @@ struct J3DTextureSRTInfo { struct J3DTexMtxInfo { /* 80325718 */ void operator=(J3DTexMtxInfo const&); + /* 80325794 */ void setEffectMtx(Mtx); /* 0x00 */ u8 mProjection; - /* 0x01 */ u8 mInfo; + /* 0x01 */ s8 mInfo; /* 0x04 */ Vec mCenter; /* 0x10 */ J3DTextureSRTInfo mSRT; - /* 0x24 */ Mtx44 mEffectMtx; + /* 0x24 */ Mtx44 mEffectMtx; }; // Size: 0x64 class J3DTexMtx { @@ -55,6 +56,7 @@ public: J3DTexMtxInfo& getTexMtxInfo() { return mTexMtxInfo; } Mtx& getMtx() { return mMtx; } + void setEffectMtx(Mtx effectMtx) { mTexMtxInfo.setEffectMtx(effectMtx); } private: /* 0x00 */ J3DTexMtxInfo mTexMtxInfo; diff --git a/include/JSystem/J3DU/J3DUClipper.h b/include/JSystem/J3DU/J3DUClipper.h index d622fbde44..3f8645a23b 100644 --- a/include/JSystem/J3DU/J3DUClipper.h +++ b/include/JSystem/J3DU/J3DUClipper.h @@ -19,6 +19,8 @@ public: void setNear(f32 near) { mNear = near; } void setFar(f32 far) { mFar = far; } + f32 getFar() { return mFar; } + private: Vec _04; Vec _10; |