diff --git a/include/d/d_bg_s_movebg_actor.h b/include/d/d_bg_s_movebg_actor.h index 8bc36aa16..af44ff277 100644 --- a/include/d/d_bg_s_movebg_actor.h +++ b/include/d/d_bg_s_movebg_actor.h @@ -15,6 +15,7 @@ class dBgS_MoveBgActor : public fopAc_ac_c { public: /* 0x290 */ dBgW* mpBgW; /* 0x294 */ Mtx mBgMtx; + /* 0x2C4 */ /* vtable */ dBgS_MoveBgActor(); int MoveBGCreateHeap(); @@ -36,6 +37,8 @@ public: static const char* m_name; static int m_dzb_id; static MoveBGActor_SetFunc m_set_func; -}; +}; // Size: 0x2C8 + +STATIC_ASSERT(sizeof(dBgS_MoveBgActor) == 0x2C8); #endif /* D_BG_S_MOVEBG_ACTOR_H */ \ No newline at end of file diff --git a/include/f_op/f_op_actor.h b/include/f_op/f_op_actor.h index 45060435e..912dd309e 100644 --- a/include/f_op/f_op_actor.h +++ b/include/f_op/f_op_actor.h @@ -182,27 +182,33 @@ class JntHit_c; struct fopAc_cullSizeSphere { public: -#ifndef __INTELLISENSE__ +#ifdef __INTELLISENSE__ + /* 0x0 */ Vec mCenter; + /* 0xC */ f32 mRadius; +#else + /* 0x0 */ cXyz mCenter; + /* 0xC */ f32 mRadius; + fopAc_cullSizeSphere() {} fopAc_cullSizeSphere(cXyz, float); ~fopAc_cullSizeSphere() {} #endif - - /* 0x0 */ Vec mCenter; - /* 0xC */ f32 mRadius; }; struct fopAc_cullSizeBox { public: -#ifndef __INTELLISENSE__ +#ifdef __INTELLISENSE__ + /* 0x0 */ Vec mMin; + /* 0xC */ Vec mMax; +#else fopAc_cullSizeBox() {} fopAc_cullSizeBox(const fopAc_cullSizeBox&); fopAc_cullSizeBox(cXyz, cXyz); ~fopAc_cullSizeBox() {} -#endif /* 0x0 */ cXyz mMin; /* 0xC */ cXyz mMax; +#endif }; class fopAc_ac_c : public leafdraw_class { diff --git a/include/f_op/f_op_actor_mng.h b/include/f_op/f_op_actor_mng.h index 956d02310..188d1fc3d 100644 --- a/include/f_op/f_op_actor_mng.h +++ b/include/f_op/f_op_actor_mng.h @@ -386,11 +386,15 @@ bool fopAcM_entrySolidHeap_(fopAc_ac_c* p_actor, heapCallbackFunc p_heapCallback bool fopAcM_entrySolidHeap(fopAc_ac_c* p_actor, heapCallbackFunc p_heapCallback, u32 size); inline void fopAcM_SetMin(fopAc_ac_c* p_actor, f32 minX, f32 minY, f32 minZ) { +#ifndef __INTELLISENSE__ p_actor->mCull.mBox.mMin.set(minX, minY, minZ); +#endif } inline void fopAcM_SetMax(fopAc_ac_c* p_actor, f32 maxX, f32 maxY, f32 maxZ) { +#ifndef __INTELLISENSE__ p_actor->mCull.mBox.mMax.set(maxX, maxY, maxZ); +#endif } void fopAcM_setCullSizeBox(fopAc_ac_c* p_actor, f32 minX, f32 minY, f32 minZ, f32 maxX, f32 maxY,