Merge pull request #328 from compugab/match-d_lyt_map_capture

match d_lyt_map_capture
This commit is contained in:
robojumper
2026-06-03 21:02:01 +02:00
committed by GitHub
5 changed files with 77 additions and 29 deletions
+7 -9
View File
@@ -42,21 +42,18 @@ class MapRelated {
bool c;
};
public:
MapRelated();
~MapRelated();
int fn_801B5970(const GXTexObj*);
/* 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;
/* 0x114 */ mVec3_c field_0x114;
/* 0x120 */ mVec3_c field_0x120;
/* 0x12C */ f32 field_0x12C;
/* 0x130 */ EGG::ScreenEffectBlur mScreenEffect;
/* 0x168 */ EGG::PostEffectBlur mPostEffect;
@@ -95,6 +92,7 @@ public:
void fn_801B4B80(u32 mapParams, const mVec3_c &center, const mVec3_c &size);
void fn_801B4C70(const mVec3_c &);
void fn_801B50C0(s32);
const mVec3_c &fn_801B4C90() const;
const mVec3_c &fn_801B4CB0() const;
s32 fn_801B4F10(s32 roomid, const mVec3_c &position) const;
};
+6 -4
View File
@@ -5,12 +5,11 @@
#include "nw4r/lyt/lyt_picture.h"
#include "s/s_State.hpp"
#include "s/s_StateID.hpp"
#include "m/m_vec.h"
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;
@@ -33,9 +32,13 @@ public:
void execute();
bool isBusyRendering() const;
void fn_8012D610(mVec3_c *out);
void fn_8012D670(mVec3_c *out);
void fn_8012D6D0(mVec3_c *out);
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 +46,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;
};