diff options
| author | Jasper St. Pierre <jstpierre@mecheye.net> | 2023-09-12 00:11:53 -0700 |
|---|---|---|
| committer | Jasper St. Pierre <jstpierre@mecheye.net> | 2023-09-12 00:11:53 -0700 |
| commit | 06ec97aade63b6a358cd7c2985511aa633035256 (patch) | |
| tree | 901c3fcbd0d3293ed616d2400e8aad1514e565aa /include/JSystem/J3DGraphBase | |
| parent | f167a3e8b91fa1e8cdcd6719956237d042f6f604 (diff) | |
lib fixes, J3D included
Diffstat (limited to 'include/JSystem/J3DGraphBase')
| -rw-r--r-- | include/JSystem/J3DGraphBase/J3DMatBlock.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/include/JSystem/J3DGraphBase/J3DMatBlock.h b/include/JSystem/J3DGraphBase/J3DMatBlock.h index 57fabded..5e9b562d 100644 --- a/include/JSystem/J3DGraphBase/J3DMatBlock.h +++ b/include/JSystem/J3DGraphBase/J3DMatBlock.h @@ -5,7 +5,6 @@ #include "JSystem/J3DGraphBase/J3DTevs.h" #include "JSystem/J3DGraphBase/J3DTexture.h" #include "dolphin/types.h" -#include "m_Do/m_Do_lib.h" struct J3DGXColorS10 : public GXColorS10 { /* 8000E460 */ J3DGXColorS10() {} @@ -593,6 +592,10 @@ struct J3DAlphaCompInfo { extern const u16 j3dDefaultAlphaCmpID; +inline u32 calcAlphaCmpID(u32 param_1, u32 param_2, u32 param_3) { + return ((param_1 & 0xff) << 5) + ((param_2 & 0xff) << 3) + (param_3 & 0xff); +} + struct J3DAlphaComp { J3DAlphaComp() { field_0x0 = j3dDefaultAlphaCmpID; |