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

More J3DMatBlock progress with terrible alignment hacks (and some real fixes too)

Browse Source
This commit is contained in:
Luke Street
2023-09-23 19:53:32 -04:00
parent 5e43515ca7
commit 45eef35f72
4 changed files with 14 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/JSystem/J3DGraphBase/J3DMatBlock.h
+2 -3
View File
@@ -760,9 +760,8 @@ struct J3DIndTexCoordScale {
~J3DIndTexCoordScale();
J3DIndTexCoordScale();
/* 0x0 */ u8 mScaleS;
/* 0x0 */ u8 mScaleS __attribute__((aligned(4)));
/* 0x1 */ u8 mScaleT;
u8 pad[2];
};
struct J3DIndTexMtx {
@@ -800,7 +799,7 @@ public:
virtual void setIndTexCoordScale(u32, J3DIndTexCoordScale);
virtual void setIndTexCoordScale(u32, J3DIndTexCoordScale const*);
virtual J3DIndTexCoordScale * getIndTexCoordScale(u32);
virtual ~J3DIndBlock();
virtual ~J3DIndBlock() {}
};
class J3DIndBlockFull : public J3DIndBlock {
include/JSystem/J3DGraphBase/J3DTevs.h
+1 -5
View File
@@ -39,17 +39,13 @@ struct J3DIndTevStage {
};
struct J3DTevOrderInfo {
/* 0x0 */ u8 mTexCoord;
/* 0x0 */ u8 mTexCoord __attribute__((aligned(2)));
/* 0x1 */ u8 mTexMap;
/* 0x2 */ u8 mColorChan;
/* 0x3 */ u8 field_0x3; // Maybe padding
};
struct J3DTevOrder : public J3DTevOrderInfo {
J3DTevOrder();
J3DTevOrder(const J3DTevOrderInfo& info) {
*(J3DTevOrderInfo*)this = info;
}
u8 getTexMap() { return mTexMap; }
};