diff options
| author | Elijah Thomas <42302100+elijah-thomas774@users.noreply.github.com> | 2024-11-01 17:07:16 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-11-01 17:07:16 -0400 |
| commit | 8a3710824bf3acbe081cc942cc4fce0f695ba812 (patch) | |
| tree | 815b01341348843aaa0cc4cd387c153f74258f07 /src/d/a/obj/d_a_obj_switch.cpp | |
| parent | 1d17e35316b4fe989eae438fe55df64647277107 (diff) | |
Updated CC collision (#80)
* c_cc_d soooo close
* d_cc_shape_colliders -> d_cc_d
* ported over changes from #43
* Oops, didnt save
* use better collision functions in bombf
* bombf fixes
* bombf actorPostCreate matching
* fix
* small fix for cCcD_UnkAttr Set function
* more cleanup(?) for c_cc_d
* d_cc_mass_s OK
* Initial d_cc_s setup
* some easy funcs
---------
Co-authored-by: robojumper <robojumper@gmail.com>
Diffstat (limited to 'src/d/a/obj/d_a_obj_switch.cpp')
| -rw-r--r-- | src/d/a/obj/d_a_obj_switch.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/d/a/obj/d_a_obj_switch.cpp b/src/d/a/obj/d_a_obj_switch.cpp index 0029e81f..2131d02b 100644 --- a/src/d/a/obj/d_a_obj_switch.cpp +++ b/src/d/a/obj/d_a_obj_switch.cpp @@ -68,13 +68,13 @@ bool dAcOsw_c::createHeap() { nw4r::g3d::ResMdl resMdl = resFile.GetResMdl(SWITCH_TYPES[mSwitchType]); TRY_CREATE(mModel.create(resMdl, &heap_allocator, 0x20, 1, nullptr)); - field_0x5E8 = mScale.x * - (resMdl.GetResNode("base").mNode.ref().VEC3_0x50.x - resMdl.GetResNode("base").mNode.ref().VEC3_0x44.x); + field_0x5E8 = mScale.x * (resMdl.GetResNode("base").mNode.ref().VEC3_0x50.x - + resMdl.GetResNode("base").mNode.ref().VEC3_0x44.x); cBgD_t *dbzData = (cBgD_t *)getOarcDZB(SWITCH_TYPES[mSwitchType], SWITCH_TYPES[mSwitchType]); PLC *plcData = (PLC *)getOarcPLC(SWITCH_TYPES[mSwitchType], SWITCH_TYPES[mSwitchType]); mScale.set(1.0f, 0.8f, 1.0f); updateMatrix(); - field_0x5B8.set(mWorldMtx); + field_0x5B8.copyFrom(mWorldMtx); mModel.setLocalMtx(mWorldMtx); bool set = mCollision.Set(dbzData, plcData, cBgW::MOVE_BG_e, &field_0x5B8, &mScale); @@ -180,7 +180,7 @@ int dAcOsw_c::actorExecute() { } updateMatrix(); - field_0x5B8.set(mWorldMtx); + field_0x5B8.copyFrom(mWorldMtx); mMtx_c tmp; PSMTXTrans(tmp, 0.0f, mButtonCtrl.mElevation, 0.0f); PSMTXConcat(field_0x5B8, tmp, field_0x5B8); |