mirror/tp
1
0
Fork 0
mirror of https://github.com/zeldaret/tp synced 2026-08-16 13:17:11 -04:00
Code Issues Packages Projects Releases Wiki Activity

some J3D/misc cleanup (#2628)

Browse Source 
* some j3d cleanup

* begin using uintptr_t

* j3dgraphbase cleanup

* j3dgraphanimator cleanup
This commit is contained in:
TakaRikka
2025-09-04 07:56:59 -07:00
committed by GitHub
parent ee8b843996
commit b45a089e15
290 changed files with 4221 additions and 3605 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/JSystem/J3DGraphBase/J3DShapeMtx.h
+11 -4
View File
@@ -2,6 +2,7 @@
#define J3DSHAPEMTX_H
#include "JSystem/J3DGraphBase/J3DShape.h"
#include "JSystem/J3DAssert.h"
#include "dolphin/mtx.h"
class J3DTexMtx;
@@ -14,15 +15,21 @@ class J3DTexGenBlock;
class J3DTexMtxObj {
public:
Mtx& getMtx(u16 idx) {
J3D_ASSERT(0x113, idx <= mTexMtxNum, "Error : range over");
J3D_ASSERT_RANGE(275, idx < mTexMtxNum);
return mpTexMtx[idx];
}
void setMtx(u16 idx, const Mtx mtx) {
J3D_ASSERT_RANGE(288, idx < mTexMtxNum);
MTXCopy(mtx, mpTexMtx[idx]);
}
Mtx44& getEffectMtx(u16 idx) {
J3D_ASSERT(0x125, idx <= mTexMtxNum, "Error : range over");
J3D_ASSERT_RANGE(293, idx < mTexMtxNum);
return mpEffectMtx[idx];
}
u16 getNumTexMtx() const { return mTexMtxNum; }
void setMtx(u16 idx, Mtx const* mtx) { MTXCopy(*mtx, mpTexMtx[idx]); }
/* 0x00 */ Mtx* mpTexMtx;
/* 0x04 */ Mtx44* mpEffectMtx;
@@ -37,7 +44,7 @@ class J3DDifferedTexMtx {
public:
/* 8031322C */ static void loadExecute(f32 const (*)[4]);
static inline void load(Mtx m) {
static inline void load(const Mtx m) {
if (sTexGenBlock != NULL)
loadExecute(m);
}