matching d_lyt_map_capture and helping functions in d_stage

This commit is contained in:
compugab
2026-06-22 13:42:28 -04:00
parent 9aac632fd0
commit 895ee9eb03
6 changed files with 104 additions and 54 deletions
+8 -6
View File
@@ -42,12 +42,10 @@ class MapRelated {
bool c;
};
public:
MapRelated();
~MapRelated();
int fn_801B5970(const GXTexObj*);
bool fn_801B5970(GXTexObj *) const;
/* 0x000 */ mHeapAllocator_c mAllocator;
/* 0x01C */ Child mChildren[8];
/* 0x0FC */ mVec3_c field_0x0FC;
@@ -57,7 +55,7 @@ public:
/* 0x12C */ f32 field_0x12C;
/* 0x130 */ EGG::ScreenEffectBlur mScreenEffect;
/* 0x168 */ EGG::PostEffectBlur mPostEffect;
/* 0x1E0 */ u32 field_0x1E0;
/* 0x1E0 */ EGG::CpuTexture *mpCpuTexture;
/* 0x1E4 */ u16 field_0x1E4;
/* 0x1E6 */ u16 field_0x1E6;
/* 0x1E8 */ u8 field_0x1E8;
@@ -65,7 +63,7 @@ public:
/* 0x1EA */ s8 field_0x1EA;
/* 0x1EB */ u8 field_0x1EB;
/* 0x1EC */ s8 field_0x1EC;
/* 0x1ED */ u8 field_0x1ED;
/* 0x1ED */ s8 field_0x1ED;
/* 0x1EE */ u8 field_0x1EE;
/* 0x1EF */ u8 field_0x1EF;
/* 0x1F0 */ u8 field_0x1F0;
@@ -87,11 +85,15 @@ public:
field_0x1EF = v;
}
Child *getChildForFloor(s32 floor) {
return &mChildren[floor + 3];
}
void init(MapRelated *);
void fn_801b4900();
void fn_801B4B80(u32 mapParams, const mVec3_c &center, const mVec3_c &size);
void fn_801B4C70(const mVec3_c &);
void fn_801B50C0(s32);
bool 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;
+5 -5
View File
@@ -2,14 +2,14 @@
#define D_LYT_MAP_CAPTURE_H
#include "common.h"
#include "m/m_vec.h"
#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) {
dLytMapCapture_c() : mStateMgr(*this), mpPicture(nullptr) {
mRenderRequest = false;
mIsBusyRendering = false;
field_0x06C = 0.0f;
@@ -25,11 +25,11 @@ public:
void renderRequest() {
mRenderRequest = true;
}
void setPicture(nw4r::lyt::Picture *pic) {
mpPicture = pic;
}
void execute();
bool isBusyRendering() const;
void fn_8012D610(mVec3_c *out);
@@ -38,7 +38,7 @@ public:
private:
void fn_8012D6F0();
void fn_8012D800(nw4r::lyt::Pane *pane, const GXTexObj *texObj);
void fn_8012D800(nw4r::lyt::Pane *pane, GXTexObj *texObj);
/* 0x004 */ UI_STATE_MGR_DECLARE(dLytMapCapture_c);
/* 0x040 */ nw4r::lyt::Picture *mpPicture;