From 38eca47ad5a7c35cbc009bc82762f51f3490d6b3 Mon Sep 17 00:00:00 2001 From: lepelog <25211966+lepelog@users.noreply.github.com> Date: Tue, 17 Aug 2021 02:59:00 +0200 Subject: __sinit_d_com_inf_game_cpp OK (#140) * mass mng header * d_cc_d start * c_cc_d ok * tmp commit * almost, reordering of vtable functions * progress * more progress * cleanup, still non matching * mark all of d_cc_d as nonmatching to OK * c_cc_s * c_cc_s OK * d_cc_mass_s OK * cleanup * gameinfo __sinit, not OK * a bit of cleanup * format * remove asm Co-authored-by: lepelog --- include/JSystem/J3DGraphBase/J3DStruct.h | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) (limited to 'include/JSystem/J3DGraphBase') diff --git a/include/JSystem/J3DGraphBase/J3DStruct.h b/include/JSystem/J3DGraphBase/J3DStruct.h index 45121ca98a..a9ba9f82f4 100644 --- a/include/JSystem/J3DGraphBase/J3DStruct.h +++ b/include/JSystem/J3DGraphBase/J3DStruct.h @@ -5,11 +5,13 @@ #include "dolphin/gx/GXTexture.h" #include "dolphin/types.h" -struct J3DLightInfo { +class J3DLightInfo { +public: + J3DLightInfo(J3DLightInfo const& other) { *this = other; } /* 803256C4 */ void operator=(J3DLightInfo const&); - /* 0x00 */ cXyz mLightPosition; - /* 0x0C */ cXyz mLightDirection; + /* 0x00 */ Vec mLightPosition; + /* 0x0C */ Vec mLightDirection; /* 0x18 */ _GXColor mColor; /* 0x1C */ f32 mA0; /* 0x20 */ f32 mA1; @@ -19,8 +21,11 @@ struct J3DLightInfo { /* 0x30 */ f32 mK2; }; // Size = 0x34 -struct J3DLightObj { - /* 80018C0C */ J3DLightObj(); +extern "C" extern J3DLightInfo const j3dDefaultLightInfo; + +class J3DLightObj { +public: + /* 80018C0C */ J3DLightObj() : mInfo(j3dDefaultLightInfo) {} /* 0x00 */ J3DLightInfo mInfo; /* 0x34 */ u8 field_0x34[64]; -- cgit v1.2.3