diff options
| author | Elijah Thomas <42302100+elijah-thomas774@users.noreply.github.com> | 2025-02-09 12:40:41 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-02-09 12:40:41 -0500 |
| commit | cec09ad02349a1058e2255d2bc0b68ad69885075 (patch) | |
| tree | 115af5aee890e1a0fd3a0b3031beefac35cfd308 /src/d/a/obj/d_a_obj_switch.cpp | |
| parent | 85bef3afb9605a6f084e35b5740a5f1b6655bfe3 (diff) | |
g3d initial pullover (#115)
* g3d Headers
* initial g3d source files -- NOT YET FIXED
* change ResFile static_cast to explicit ctor
Diffstat (limited to 'src/d/a/obj/d_a_obj_switch.cpp')
| -rw-r--r-- | src/d/a/obj/d_a_obj_switch.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/d/a/obj/d_a_obj_switch.cpp b/src/d/a/obj/d_a_obj_switch.cpp index 23052b7f..43546938 100644 --- a/src/d/a/obj/d_a_obj_switch.cpp +++ b/src/d/a/obj/d_a_obj_switch.cpp @@ -4,7 +4,7 @@ #include "d/col/bg/d_bg_s.h" #include "d/col/bg/d_bg_w.h" #include "d/flag/sceneflag_manager.h" -#include "nw4r/g3d/g3d_resfile.h" +#include "nw4r/g3d/res/g3d_resfile.h" #include "s/s_Math.h" SPECIAL_ACTOR_PROFILE(OBJ_SW, dAcOsw_c, fProfile::OBJ_SW, 0x12B, 0, 0x1002); @@ -63,12 +63,12 @@ void dAcOsw_c::rideCallback(dBgW *unknown, dAcObjBase_c *actor, dAcObjBase_c *in } bool dAcOsw_c::createHeap() { - nw4r::g3d::ResFile resFile = getOarcResFile(SWITCH_TYPES[mSwitchType]); - nw4r::g3d::ResMdl resMdl = resFile.GetResMdl(SWITCH_TYPES[mSwitchType]); + nw4r::g3d::ResFile resFile(getOarcResFile(SWITCH_TYPES[mSwitchType])); + 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").ref().volume_max.x - resMdl.GetResNode("base").ref().volume_min.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); |