From 86b7b5691818858b13d6293d048549cf5d07e2de Mon Sep 17 00:00:00 2001 From: compugab Date: Sun, 31 May 2026 20:56:23 -0400 Subject: match d_lyt_map_capture --- include/d/d_stage.h | 19 ++++++++++--------- include/d/lyt/d_lyt_map_capture.h | 8 ++++---- 2 files changed, 14 insertions(+), 13 deletions(-) (limited to 'include') diff --git a/include/d/d_stage.h b/include/d/d_stage.h index 3c3d2a93..de690955 100644 --- a/include/d/d_stage.h +++ b/include/d/d_stage.h @@ -48,15 +48,16 @@ public: /* 0x000 */ mHeapAllocator_c mAllocator; /* 0x01C */ Child mChildren[8]; /* 0x0FC */ mVec3_c field_0x0FC; - /* 0x108 */ f32 field_0x108; - /* 0x10C */ f32 field_0x10C; - /* 0x110 */ f32 field_0x110; - /* 0x114 */ f32 field_0x114; - /* 0x118 */ f32 field_0x118; - /* 0x11C */ f32 field_0x11C; - /* 0x120 */ f32 field_0x120; - /* 0x124 */ f32 field_0x124; - /* 0x128 */ f32 field_0x128; + /* 0x108 */ mVec3_c field_0x108; + //f32 field_0x108; + /* 0x10C f32 field_0x10C; + /* 0x110 f32 field_0x110; */ + /* 0x114 */ mVec3_c field_0x114; + ///* 0x118 */ f32 field_0x118; + ///* 0x11C */ f32 field_0x11C; + /* 0x120 */ mVec3_c field_0x120; + ///* 0x124 */ f32 field_0x124; + ///* 0x128 */ f32 field_0x128; /* 0x12C */ f32 field_0x12C; /* 0x130 */ EGG::ScreenEffectBlur mScreenEffect; /* 0x168 */ EGG::PostEffectBlur mPostEffect; diff --git a/include/d/lyt/d_lyt_map_capture.h b/include/d/lyt/d_lyt_map_capture.h index a99fb335..c9e0dcf5 100644 --- a/include/d/lyt/d_lyt_map_capture.h +++ b/include/d/lyt/d_lyt_map_capture.h @@ -9,8 +9,6 @@ class dLytMapCapture_c { public: dLytMapCapture_c() :mStateMgr(*this), mpPicture(nullptr) { - field_0x070 = 0.0f; - field_0x074 = 0.0f; mRenderRequest = false; mIsBusyRendering = false; field_0x06C = 0.0f; @@ -34,8 +32,11 @@ public: void execute(); bool isBusyRendering() const; + + private: void fn_8012D6F0(); + void fn_8012D800(nw4r::lyt::Pane *pane, const GXTexObj *texObj); /* 0x004 */ UI_STATE_MGR_DECLARE(dLytMapCapture_c); /* 0x040 */ nw4r::lyt::Picture *mpPicture; @@ -43,8 +44,7 @@ private: /* 0x064 */ f32 field_0x064; /* 0x068 */ f32 field_0x068; /* 0x06C */ f32 field_0x06C; - /* 0x070 */ f32 field_0x070; - /* 0x074 */ f32 field_0x074; + /* 0x070 */ nw4r::lyt::Size field_0x070; /* 0x078 */ bool mRenderRequest; /* 0x079 */ bool mIsBusyRendering; }; -- cgit v1.2.3