From 4448c08ac082e8f569f2b4c0dd9e5f4d91dec093 Mon Sep 17 00:00:00 2001 From: TakaRikka <38417346+TakaRikka@users.noreply.github.com> Date: Sat, 12 Jun 2021 15:22:36 -0700 Subject: move / fix bunch of stuff (#133) * fix some class structures / d_event wip * d_event wip * move gamepad stuff * move m_Do_main * move d_bomb / partial m_Do_reset * format * remove asm * add Z2SoundID enum * move some Z2 classes * fix * move more Z2 stuff * fix fopAc_ac_c more --- include/JSystem/J3DGraphBase/J3DStruct.h | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) (limited to 'include/JSystem/J3DGraphBase') diff --git a/include/JSystem/J3DGraphBase/J3DStruct.h b/include/JSystem/J3DGraphBase/J3DStruct.h index c82d717ec6..45121ca98a 100644 --- a/include/JSystem/J3DGraphBase/J3DStruct.h +++ b/include/JSystem/J3DGraphBase/J3DStruct.h @@ -1,6 +1,29 @@ #ifndef J3DSTRUCT_H #define J3DSTRUCT_H +#include "SSystem/SComponent/c_xyz.h" +#include "dolphin/gx/GXTexture.h" #include "dolphin/types.h" +struct J3DLightInfo { + /* 803256C4 */ void operator=(J3DLightInfo const&); + + /* 0x00 */ cXyz mLightPosition; + /* 0x0C */ cXyz mLightDirection; + /* 0x18 */ _GXColor mColor; + /* 0x1C */ f32 mA0; + /* 0x20 */ f32 mA1; + /* 0x24 */ f32 mA2; + /* 0x28 */ f32 mK0; + /* 0x2C */ f32 mK1; + /* 0x30 */ f32 mK2; +}; // Size = 0x34 + +struct J3DLightObj { + /* 80018C0C */ J3DLightObj(); + + /* 0x00 */ J3DLightInfo mInfo; + /* 0x34 */ u8 field_0x34[64]; +}; // Size = 0x74 + #endif /* J3DSTRUCT_H */ -- cgit v1.2.3