mirror/ss
1
0
Fork 0
mirror of https://github.com/zeldaret/ss synced 2026-07-11 22:50:06 -04:00
Code Issues Packages Projects Releases Wiki Activity

d_a_obj_time_stage_bg with a weak function order issue (#78)

Browse Source
This commit is contained in:
robojumper
2024-10-23 01:46:02 +02:00
committed by GitHub
parent 8723bc3186
commit b9409ccac5
7 changed files with 190 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/d/a/obj/d_a_obj_time_stage_bg.h
+28 -2
View File
@@ -2,18 +2,44 @@
#define D_A_OBJ_TIME_STAGE_BG_H
#include "d/a/obj/d_a_obj_base.h"
#include "m/m3d/m_anmmatclr.h"
#include "m/m3d/m_smdl.h"
#include "m/m_vec.h"
#include "nw4r/g3d/g3d_resfile.h"
#include "s/s_State.hpp"
#include "s/s_StateMgr.hpp"
#include "toBeSorted/stage_render_stuff.h"
#include "toBeSorted/time_area_mgr.h"
class dAcOTimeStageBg_c : public dAcObjBase_c {
public:
dAcOTimeStageBg_c() : mStateMgr(*this, sStateID::null) {}
dAcOTimeStageBg_c() : mStateMgr(*this, sStateID::null), mSceneCallback(this) {}
virtual ~dAcOTimeStageBg_c() {}
virtual bool createHeap() override;
virtual int actorCreate() override;
virtual int doDelete() override;
virtual int actorPostCreate() override;
virtual int actorExecute() override;
virtual int draw() override;
STATE_FUNC_DECLARE(dAcOTimeStageBg_c, Wait);
private:
/* 0x??? */ STATE_MGR_DECLARE(dAcOTimeStageBg_c);
bool secondMdl() const {
return mSubType == 2 || mSubType == 3;
}
/* 0x330 */ nw4r::g3d::ResFile mRes;
/* 0x334 */ m3d::smdl_c mMdl1;
/* 0x350 */ m3d::smdl_c mMdl2;
/* 0x36C */ STATE_MGR_DECLARE(dAcOTimeStageBg_c);
/* 0x3A8 */ TimeAreaStruct mTimeArea;
/* 0x3B4 */ dScnCallback_c mSceneCallback;
/* 0x3C0 */ m3d::anmMatClr_c mAnm;
/* 0x3EC */ mVec3_c field_0x3EC;
/* 0x3F8 */ f32 field_0x3F8;
/* 0x3FC */ u8 mSubType;
};
#endif
include/nw4r/g3d/g3d_resnode.h
+2 -4
View File
@@ -24,10 +24,8 @@ struct ResNodeData {
f32 FLOAT_0x38;
f32 FLOAT_0x3C;
f32 FLOAT_0x40;
f32 FLOAT_0x44;
f32 FLOAT_0x48;
f32 FLOAT_0x4C;
f32 FLOAT_0x50;
math::VEC3 VEC3_0x44;
math::VEC3 VEC3_0x50;
};
struct ResNode {
include/toBeSorted/time_area_mgr.h
+5
View File
@@ -30,6 +30,7 @@ private:
};
struct TimeAreaStruct {
TimeAreaStruct() : field_0x00(0.0f), field_0x08(0) {}
TimeAreaStruct(f32 arg) : field_0x00(arg), field_0x08(0) {}
/* 0x00 */ f32 field_0x00;
/* 0x04 */ UNKWORD field_0x04;
@@ -39,6 +40,10 @@ struct TimeAreaStruct {
return fabsf(field_0x00) <= FLT_EPSILON;
}
f32 getDistMaybe() {
return field_0x00;
}
bool check(int, const mVec3_c &, u32, f32, f32);
};