Consistent cull_box struct usage (#2905)

* consistent cullbox usage

* d_a_obj_waterPillar debug work so its not a regression

include/d/actor/d_a_obj_pdtile.h

@@ -58,7 +58,7 @@ private:
     /* 0x7BC */ char* mArcName;
     /* 0x7C0 */ u32 mDzbId;
     /* 0x7C4 */ u32 mBmdId;
-    /* 0x7C8 */ Vec* mCullBox;
+    /* 0x7C8 */ cull_box* mCullBox;
     /* 0x7CC */ f32 field_0x7cc;
     /* 0x7D0 */ u8 field_0x7d0;
     /* 0x7D4 */ int field_0x7d4;

include/d/actor/d_a_obj_waterPillar.h

@@ -119,7 +119,7 @@ private:
         return shape_angle.x & 0xFF;
     }
 
-    s32 getParam(u8 shift, u8 bit) {
+    s32 getParam(int shift, int bit) {
         return fopAcM_GetParamBit(this, shift, bit);
     }
 

src/d/actor/d_a_door_push.cpp

@@ -72,7 +72,7 @@ void daDoorPush_c::setBaseMtx() {
 
 static char* l_arcName = "V_OsuDoor";
 
-static Vec l_cull_box[2] = {
+static cull_box l_cull_box = {
     {-600.0f, 0.0f, -600.0f},
     {600.0f, 1000.0f, 600.0f},
 };
@@ -88,8 +88,8 @@ int daDoorPush_c::Create() {
     mIndex = 2;
     initBaseMtx();
     fopAcM_SetMtx(this, mActorMtx);
-    fopAcM_setCullSizeBox(this, l_cull_box[0].x, l_cull_box[0].y, l_cull_box[0].z, l_cull_box[1].x,
-                          l_cull_box[1].y, l_cull_box[1].z);
+    fopAcM_setCullSizeBox(this, l_cull_box.min.x, l_cull_box.min.y, l_cull_box.min.z, l_cull_box.max.x,
+                          l_cull_box.max.y, l_cull_box.max.z);
     mpBgW->SetPushPullCallback((dBgW_Base::PushPull_CallBack)PPCallBack);
     mpDoorBgW->SetPushPullCallback((dBgW_Base::PushPull_CallBack)PPCallBack2);
     eventInfo.setArchiveName(l_arcName);

src/d/actor/d_a_obj_avalanche.cpp

@@ -41,9 +41,9 @@ static char* l_evName = "SNOW_COLLAPSE";
 
 static char* l_staffName = "Obj_ava";
 
-static f32 l_cull_box[6] = {
-    -500.0f, -500.0f, -700.0f,
-    500.0f, 1000.0f, 700.0f,
+static cull_box l_cull_box = {
+    {-500.0f, -500.0f, -700.0f},
+    {500.0f, 1000.0f, 700.0f},
 };
 
 int daObjAvalanche_c::Create() {
@@ -67,8 +67,8 @@ int daObjAvalanche_c::Create() {
     }
     initBaseMtx();
     fopAcM_SetMtx(this, mModel->getBaseTRMtx());
-    fopAcM_setCullSizeBox(this, l_cull_box[0], l_cull_box[1], l_cull_box[2], l_cull_box[3],
-                          l_cull_box[4], l_cull_box[5]);
+    fopAcM_setCullSizeBox(this, l_cull_box.min.x, l_cull_box.min.y, l_cull_box.min.z, l_cull_box.max.x,
+                          l_cull_box.max.y, l_cull_box.max.z);
     if (mpBgW2 != 0) {
         mpBgW2->Move();
     }

src/d/actor/d_a_obj_bemos.cpp

@@ -231,7 +231,7 @@ static char* l_joint_table[5] = {
     l_head_joint, l_bigGear_joint, l_smallGear0_joint, l_smallGear1_joint, l_smallGear2_joint,
 };
 
-static Vec l_cull_box[2] = {
+static cull_box l_cull_box = {
     {-1200.0f, -100.0f, -1200.0f},
     {1200.0f, 400.0f, 1200.0f},
 };
@@ -287,8 +287,8 @@ int daObjBm_c::Create() {
         mCyl[i].SetStts(&mStts);
     }
 
-    fopAcM_setCullSizeBox(this, l_cull_box[0].x, l_cull_box[0].y, l_cull_box[0].z, l_cull_box[1].x,
-                          l_cull_box[1].y, l_cull_box[1].z);
+    fopAcM_setCullSizeBox(this, l_cull_box.min.x, l_cull_box.min.y, l_cull_box.min.z, l_cull_box.max.x,
+                          l_cull_box.max.y, l_cull_box.max.z);
     JUTNameTab* joint_name = mpModel->getModelData()->getJointTree().getJointName();
     for (int i = 0; i < 5; i++) {
         for (u16 j = 0; j < mpModel->getModelData()->getJointNum(); j++) {

src/d/actor/d_a_obj_bmshutter.cpp

@@ -12,7 +12,7 @@
 
 static const char* l_arcName = "K_saku00";
 
-static const f32 l_cull_box[6] = {-200.f, -100.f, -200.f, 200.f, 100.f, 200.f};
+static const cull_box l_cull_box = {{-200.f, -100.f, -200.f}, {200.f, 100.f, 200.f}};
 static const Vec l_check_area[4] = {
     -250.0, 0.0, -100.0,  // min
     200.0,  0.0, -100.0,  // unknown

src/d/actor/d_a_obj_cblock.cpp

@@ -48,7 +48,7 @@ static cXyz l_smokeSetOffset(0.0f, 0.0f, -200.0f);
 static s32 unused_bss_70 = 0;
 #endif
 
-static Vec const l_cull_box[2] = {
+static cull_box const l_cull_box = {
     {-250.0f, 0.0f, -450.0f},
     {250.0f, 250.0f, 400.0f},
 };
@@ -139,8 +139,8 @@ int daObjCBlk_c::Create() {
         cyls[i].Set(l_cyl_src);
         cyls[i].SetStts(&stts);
     }
-    fopAcM_setCullSizeBox(this, l_cull_box[0].x, l_cull_box[0].y, l_cull_box[0].z, l_cull_box[1].x,
-                          l_cull_box[1].y, l_cull_box[1].z);
+    fopAcM_setCullSizeBox(this, l_cull_box.min.x, l_cull_box.min.y, l_cull_box.min.z, l_cull_box.max.x,
+                          l_cull_box.max.y, l_cull_box.max.z);
     cXyz acStack_40(0.0f, 0.0f, 50.0f);
     mDoMtx_stack_c::YrotS(current.angle.y);
     mDoMtx_stack_c::multVec(&acStack_40, &acStack_40);

src/d/actor/d_a_obj_cboard.cpp

@@ -26,7 +26,7 @@ static char* l_dzbName[5] = {
     "ClearB00.dzb", "ClearB01.dzb", "ClearB02.dzb", "ClearB03.dzb", "ClearB04.dzb",
 };
 
-static Vec l_cull_box[2] = {
+static cull_box l_cull_box = {
     {-100.0f, -10.0f, -100.0f},
     {100.0f, 10.0f, 100.0f},
 };
@@ -39,9 +39,9 @@ int daObjBoard_c::Create() {
 
     initBaseMtx();
     fopAcM_SetMtx(this, field_0x5a8);
-    fopAcM_setCullSizeBox(this, l_cull_box[0].x * scale.x, l_cull_box[0].y,
-                          l_cull_box[0].z * scale.z, l_cull_box[1].x * scale.x, l_cull_box[1].y,
-                          l_cull_box[1].z * scale.z);
+    fopAcM_setCullSizeBox(this, l_cull_box.min.x * scale.x, l_cull_box.min.y,
+                          l_cull_box.min.z * scale.z, l_cull_box.max.x * scale.x, l_cull_box.max.y,
+                          l_cull_box.max.z * scale.z);
     return 1;
 }
 

src/d/actor/d_a_obj_cwall.cpp

@@ -71,7 +71,7 @@ static char* l_arcName[2] = {
     "P_L4Cwall",
 };
 
-static Vec l_cull_box[2] = {
+static cull_box l_cull_box = {
     {-300.0f, -100.0f, -650.0f},
     {300.0f, 500.0f, 300.0f},
 };
@@ -139,8 +139,8 @@ int daObjCwall_c::Create() {
     mCyl2.SetStts(&mStts);
     mSph.Set(l_sph_src);
     mSph.SetStts(&mStts);
-    fopAcM_setCullSizeBox(this, l_cull_box[0].x, l_cull_box[0].y, l_cull_box[0].z, l_cull_box[1].x,
-                          l_cull_box[1].y, l_cull_box[1].z);
+    fopAcM_setCullSizeBox(this, l_cull_box.min.x, l_cull_box.min.y, l_cull_box.min.z, l_cull_box.max.x,
+                          l_cull_box.max.y, l_cull_box.max.z);
     cXyz cStack_30(0.0f, 0.0f, 50.0f);
     mDoMtx_stack_c::YrotS(current.angle.y);
     mDoMtx_stack_c::multVec(&cStack_30, &cStack_30);

src/d/actor/d_a_obj_fallobj.cpp

@@ -54,7 +54,7 @@ void daObjFallObj_c::setBaseMtx() {
 
 static char* l_arcName = "K_drock00";
 
-static Vec l_cull_box[2] = {
+static cull_box l_cull_box = {
     {-200.0f, -10000.0f, -200.0f},
     {200.0f, 600.0f, 200.0f},
 };
@@ -74,8 +74,8 @@ int daObjFallObj_c::Create() {
     mFallTime = getFallTime();
     initBaseMtx();
     fopAcM_SetMtx(this, mMtx);
-    fopAcM_setCullSizeBox(this, l_cull_box[0].x, l_cull_box[0].y, l_cull_box[0].z, l_cull_box[1].x,
-                          l_cull_box[1].y, l_cull_box[1].z);
+    fopAcM_setCullSizeBox(this, l_cull_box.min.x, l_cull_box.min.y, l_cull_box.min.z, l_cull_box.max.x,
+                          l_cull_box.max.y, l_cull_box.max.z);
     fopAcM_SetGravity(this, -6.0f);
     mSoundObj.init(&current.pos, 1);
     return 1;

src/d/actor/d_a_obj_firepillar.cpp

@@ -20,9 +20,9 @@ void daObjFPillar_c::setBaseMtx() {
     mDoMtx_stack_c::ZXYrotM(shape_angle.x, shape_angle.y, shape_angle.z);
 }
 
-static f32 l_cull_box[6] = {
-    -30.0f, -10.0f, -30.0f,
-    30.0f, 60.0f, 30.0f,
+static cull_box l_cull_box = {
+    {-30.0f, -10.0f, -30.0f},
+    {30.0f, 60.0f, 30.0f},
 };
 
 static dCcD_SrcCps l_cps_src = {
@@ -42,12 +42,12 @@ int daObjFPillar_c::Create() {
     mStts.Init(0, 0xff, this);
     mCps.Set(l_cps_src);
     mCps.SetStts(&mStts);
-    f32 maxy = l_cull_box[4] * scale.y;
+    f32 maxy = l_cull_box.max.y * scale.y;
     fopAcM_setCullSizeBox(this,
-        (l_cull_box[0] * scale.x),
-        (l_cull_box[1] * scale.y),
-        (l_cull_box[2] * scale.x),
-        (l_cull_box[3] * scale.x),
+        (l_cull_box.min.x * scale.x),
+        (l_cull_box.min.y * scale.y),
+        (l_cull_box.min.z * scale.x),
+        (l_cull_box.max.x * scale.x),
         maxy,
         maxy);
     return 1;

src/d/actor/d_a_obj_firepillar2.cpp

@@ -40,7 +40,7 @@ void daObjFPillar2_c::setBaseMtx() {
 
 static char* l_arcName = "Obj_yogan";
 
-static Vec l_cull_box[2] = {
+static cull_box l_cull_box = {
     {-150.0f, -10.0f, -150.0f},
     {150.0f, 1200.0f, 150.0f},
 };
@@ -92,8 +92,8 @@ int daObjFPillar2_c::Create() {
     if (getKind() == KIND_MAGMA_POLE) {
         mCps.SetAtSpl(dCcG_At_Spl_UNK_0);
     }
-    fopAcM_setCullSizeBox(this, l_cull_box[0].x, l_cull_box[0].y, l_cull_box[0].z, l_cull_box[1].x, l_cull_box[1].y,
-                          l_cull_box[1].z);
+    fopAcM_setCullSizeBox(this, l_cull_box.min.x, l_cull_box.min.y, l_cull_box.min.z, l_cull_box.max.x, l_cull_box.max.y,
+                          l_cull_box.max.z);
     fopAcM_SetMtx(this, mMtx);
     mSoundObj.init(&mSoundPos, 1);
     if (getKind() == KIND_PIPE_FIRE) {

src/d/actor/d_a_obj_kgate.cpp

@@ -52,7 +52,7 @@ static u32 const l_gate_heap[] = {0x1940, 0x1940, 0x1940};
 
 static u32 const l_key_heap[] = {0x1000, 0x1000, 0x1000};
 
-static Vec const l_cull_box[] = {
+static cull_box const l_cull_box = {
     {-300.0f, 0.0f, -350.0f},
     {300.0f, 450.0f, 350.0f},
 };
@@ -255,8 +255,8 @@ int daObjKGate_c::Create() {
         }
     }
 
-    fopAcM_setCullSizeBox(this, l_cull_box[0].x, l_cull_box[0].y, l_cull_box[0].z, l_cull_box[1].x,
-                          l_cull_box[1].y, l_cull_box[1].z);
+    fopAcM_setCullSizeBox(this, l_cull_box.min.x, l_cull_box.min.y, l_cull_box.min.z, l_cull_box.max.x,
+                          l_cull_box.max.y, l_cull_box.max.z);
 
     if (dComIfG_Bgsp().Regist(mpBgW, this)) {
 #ifdef DEBUG

src/d/actor/d_a_obj_kjgjs.cpp

@@ -47,11 +47,11 @@ int daObjKJgjs_c::CreateHeap() {
     return mpModel != NULL ? 1 : 0;
 }
 
-static const Vec l_cull_box[4] = {
-    {-1260.0f, -3050.0f, -1260.0f},
-    {1260.0f, 2800.0f, 1260.0f},
-    {-76.37f, -10.83f, -78.51},
-    {75.52f, 10.95f, 78.06f},
+static const cull_box l_cull_box[2] = {
+    {{-1260.0f, -3050.0f, -1260.0f},
+    {1260.0f, 2800.0f, 1260.0f}},
+    {{-76.37f, -10.83f, -78.51},
+    {75.52f, 10.95f, 78.06f}},
 };
 
 int daObjKJgjs_c::Create() {
@@ -59,11 +59,11 @@ int daObjKJgjs_c::Create() {
     MTXCopy(mMtx[1], mpModel->mBaseTransformMtx);
     mpBgW->OffRoofRegist();
     if (!field_0x60c) {
-        fopAcM_setCullSizeBox(this, l_cull_box[0].x, l_cull_box[0].y, l_cull_box[0].z,
-                              l_cull_box[1].x, l_cull_box[1].y, l_cull_box[1].z);
+        fopAcM_setCullSizeBox(this, l_cull_box[0].min.x, l_cull_box[0].min.y, l_cull_box[0].min.z,
+                              l_cull_box[0].max.x, l_cull_box[0].max.y, l_cull_box[0].max.z);
     } else {
-        fopAcM_setCullSizeBox(this, l_cull_box[2].x, l_cull_box[2].y, l_cull_box[2].z,
-                              l_cull_box[3].x, l_cull_box[3].y, l_cull_box[3].z);
+        fopAcM_setCullSizeBox(this, l_cull_box[1].min.x, l_cull_box[1].min.y, l_cull_box[1].min.z,
+                              l_cull_box[1].max.x, l_cull_box[1].max.y, l_cull_box[1].max.z);
     }
     return 1;
 }

src/d/actor/d_a_obj_kshutter.cpp

@@ -129,8 +129,8 @@ static u32 const l_heap_size[5] = {
     0x1300, 0x1300, 0x1300, 0x1300, 0x20D0,
 };
 
-static f32 const l_cull_box[6] = {
-    -450.0f, 0.0f, -50.0f, 450.0f, 700.0f, 150.0f,
+static cull_box const l_cull_box = {
+    {-450.0f, 0.0f, -50.0f}, {450.0f, 700.0f, 150.0f},
 };
 
 static char* l_arcName[5] = {
@@ -209,7 +209,7 @@ int daObjKshtr_c::Create() {
 
     initBaseMtx();
     fopAcM_SetMtx(this, mMtx);
-    fopAcM_setCullSizeBox(this, l_cull_box[0], l_cull_box[1], l_cull_box[2], l_cull_box[3], l_cull_box[4], l_cull_box[5]);
+    fopAcM_setCullSizeBox(this, l_cull_box.min.x, l_cull_box.min.y, l_cull_box.min.z, l_cull_box.max.x, l_cull_box.max.y, l_cull_box.max.z);
 
     if (checkKey() == 1) {
         eventInfo.setArchiveName(l_arcName[mType]);

src/d/actor/d_a_obj_kwheel00.cpp

@@ -82,7 +82,7 @@ static void* searchLv3Water(void* param_0, void* i_this) {
 
 static const int l_bmdidx[2] = {4, 4};
 
-const Vec l_cull_box[4] = {
+const Vec l_cull_box[4] = { // cull_box struct not used due to mult later
     {-830.0f, -830.0f, -2500.0f}, {830.0f, 830.0f, 200.0f}, // Type 0
     {-560.0f, -560.0f, -350.0f}, {560.0f, 560.0f, 350.0f}   // Type 1
 };

src/d/actor/d_a_obj_kwheel01.cpp

@@ -102,7 +102,7 @@ cPhs__Step daObjKWheel01_c::create1st() {
     return phase;
 }
 
-static const Vec l_cull_box[2] = {
+static const cull_box l_cull_box = {
     {-1260.0f, -3050.0f, -1260.0f},
     {1260.0f, 2800.0f, 1260.0f}
 };
@@ -177,7 +177,7 @@ int daObjKWheel01_c::Create() {
         #endif
     }
 
-    fopAcM_setCullSizeBox(this, l_cull_box[0].x, l_cull_box[0].y, l_cull_box[0].z, l_cull_box[1].x, l_cull_box[1].y, l_cull_box[1].z);
+    fopAcM_setCullSizeBox(this, l_cull_box.min.x, l_cull_box.min.y, l_cull_box.min.z, l_cull_box.max.x, l_cull_box.max.y, l_cull_box.max.z);
 
     return 1;
 }

src/d/actor/d_a_obj_lv4prwall.cpp

@@ -51,7 +51,7 @@ int daObjLv4PRwall_c::create1st() {
     return phase_state;
 }
 
-static const Vec l_cull_box[] = {
+static const Vec l_cull_box[] = { // cull_box struct not used due to mult later
     {-1600.0f, -100.0f, -1600.0f},
     {1600.0f, 1437.7f, 1600.0f},
     {-1100.04, -60.0f, -1100.5f},

src/d/actor/d_a_obj_lv6bemos.cpp

@@ -110,9 +110,9 @@ void daObjL6Bm_c::setBaseMtx() {
 
 static char* l_arcName = "Obj_lv6bm";
 
-static f32 l_cull_box[6] = {
-    -200.0f, -100.0f, -200.0f,
-    200.0f, 100.0f, 200.0f,
+static cull_box l_cull_box = {
+    {-200.0f, -100.0f, -200.0f},
+    {200.0f, 100.0f, 200.0f},
 };
 
 static dCcD_SrcCps l_cps_src = {
@@ -136,7 +136,7 @@ int daObjL6Bm_c::Create() {
     field_0x748.Set(l_sph_src);
     field_0x748.SetStts(&mStts);
 
-    fopAcM_setCullSizeBox(this, l_cull_box[0], l_cull_box[1], l_cull_box[2], l_cull_box[3], l_cull_box[4], l_cull_box[5]);
+    fopAcM_setCullSizeBox(this, l_cull_box.min.x, l_cull_box.min.y, l_cull_box.min.z, l_cull_box.max.x, l_cull_box.max.y, l_cull_box.max.z);
 
     J3DJoint* neckJnt = mBeamosModel->getModelData()->getJointNodePointer(1);
     if (neckJnt != NULL) {

src/d/actor/d_a_obj_lv6bemos2.cpp

@@ -128,9 +128,9 @@ static char* l_joint_table[5] = {
     l_smallGear2_joint,
 };
 
-static f32 l_cull_box[6] = {
-    -1200.0f, -100.0f, -1200.0f,
-    1200.0f, 400.0f, 1200.0f,
+static cull_box l_cull_box = {
+    {-1200.0f, -100.0f, -1200.0f},
+    {1200.0f, 400.0f, 1200.0f},
 };
 
 static dCcD_SrcSph l_sph_src = {
@@ -181,7 +181,7 @@ int daObjLv6Bm_c::Create() {
     field_0x87c.Set(l_cyl_src);
     field_0x87c.SetStts(&mStts);
     
-    fopAcM_setCullSizeBox(this, l_cull_box[0], l_cull_box[1], l_cull_box[2], l_cull_box[3], l_cull_box[4], l_cull_box[5]);
+    fopAcM_setCullSizeBox(this, l_cull_box.min.x, l_cull_box.min.y, l_cull_box.min.z, l_cull_box.max.x, l_cull_box.max.y, l_cull_box.max.z);
 
     JUTNameTab* name = mBeamosModel->getModelData()->getJointTree().getJointName();
     for (int i = 0; i < 5; i++) {