diff options
| author | Niklas Bauer <nikbau2000@gmail.com> | 2025-12-02 19:34:19 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-12-02 20:34:19 +0200 |
| commit | 2260191fe62af7a5803012380bec21b1d46cdf44 (patch) | |
| tree | 04624820c970076688e34d74a93189ae5b6b25cc /src/d/actor/d_a_obj_kjgjs.cpp | |
| parent | ffc86e0412d619136089b4b5d9e92cfc892f79d7 (diff) | |
Consistent cull_box struct usage (#2905)
* consistent cullbox usage
* d_a_obj_waterPillar debug work so its not a regression
Diffstat (limited to 'src/d/actor/d_a_obj_kjgjs.cpp')
| -rw-r--r-- | src/d/actor/d_a_obj_kjgjs.cpp | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/src/d/actor/d_a_obj_kjgjs.cpp b/src/d/actor/d_a_obj_kjgjs.cpp index cf3e76aa82..7c2b458306 100644 --- a/src/d/actor/d_a_obj_kjgjs.cpp +++ b/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; } |