diff options
| author | elijah-thomas774 <elijahthomas774@gmail.com> | 2026-09-30 13:24:41 -0400 |
|---|---|---|
| committer | elijah-thomas774 <elijahthomas774@gmail.com> | 2026-09-30 13:24:41 -0400 |
| commit | ffbfd7ace4ebe1d3f0b469b79fd3ec9b600b92e1 (patch) | |
| tree | 8688d6eecc19e369659bc47770e1b6b7fda3753d | |
| parent | 004643f3868728f0fd12a337f2918e9351611890 (diff) | |
update with mSphere_c changes
| -rw-r--r-- | config/SOUE01/rels/d_a_obj_mushroomNP/symbols.txt | 2 | ||||
| -rw-r--r-- | include/d/a/obj/d_a_obj_mushroom.h | 2 | ||||
| -rw-r--r-- | src/REL/d/a/obj/d_a_obj_mushroom.cpp | 10 |
3 files changed, 7 insertions, 7 deletions
diff --git a/config/SOUE01/rels/d_a_obj_mushroomNP/symbols.txt b/config/SOUE01/rels/d_a_obj_mushroomNP/symbols.txt index 5062e5e5..f34691bd 100644 --- a/config/SOUE01/rels/d_a_obj_mushroomNP/symbols.txt +++ b/config/SOUE01/rels/d_a_obj_mushroomNP/symbols.txt @@ -36,7 +36,7 @@ finalizeState_Init__14dAcOMushRoom_cFv = .text:0x000023A0; // type:function size getUnscaledRadiusX__14dAcOMushRoom_cFv = .text:0x000023B0; // type:function size:0xB8 getUnscaledRadiusY__14dAcOMushRoom_cFv = .text:0x00002470; // type:function size:0xBC getRadiusX__14dAcOMushRoom_cFv = .text:0x00002530; // type:function size:0x34 -getRadiusY__14dAcOMushRoom_cFv = .text:0x00002570; // type:function size:0x34 +getShadowOffsetY__14dAcOMushRoom_cFv = .text:0x00002570; // type:function size:0x34 getRadiusZ__14dAcOMushRoom_cFv = .text:0x000025B0; // type:function size:0xC4 getResFileName__14dAcOMushRoom_cFv = .text:0x00002680; // type:function size:0xB0 getResMdlName__14dAcOMushRoom_cFv = .text:0x00002730; // type:function size:0x4 diff --git a/include/d/a/obj/d_a_obj_mushroom.h b/include/d/a/obj/d_a_obj_mushroom.h index 585a5a85..8247b68b 100644 --- a/include/d/a/obj/d_a_obj_mushroom.h +++ b/include/d/a/obj/d_a_obj_mushroom.h @@ -87,7 +87,7 @@ public: f32 getUnscaledRadiusX(); f32 getUnscaledRadiusY(); f32 getRadiusX(); - f32 getRadiusY(); + f32 getShadowOffsetY(); f32 getRadiusZ(); void initCc(); diff --git a/src/REL/d/a/obj/d_a_obj_mushroom.cpp b/src/REL/d/a/obj/d_a_obj_mushroom.cpp index 593489c4..d69f4d09 100644 --- a/src/REL/d/a/obj/d_a_obj_mushroom.cpp +++ b/src/REL/d/a/obj/d_a_obj_mushroom.cpp @@ -27,7 +27,7 @@ #include "m/m3d/m3d.h" #include "m/m_color.h" #include "m/m_mtx.h" -#include "m/m_quat.h" +#include "m/m_sphere.h" #include "m/m_vec.h" #include "nw4r/g3d/g3d_camera.h" #include "nw4r/g3d/g3d_dcc.h" @@ -307,11 +307,11 @@ int dAcOMushRoom_c::actorExecute() { int dAcOMushRoom_c::draw() { drawModelType1(mMdl.getMdl()); - mQuat_c rot(mVec3_c(0.0f, getRadiusY(), 0.0f), getRadiusX() * 2.0f); + mSphere_c sph(mVec3_c(0.0f, getShadowOffsetY(), 0.0f), getRadiusX() * 2.0f); if (getType() == TYPE_MushroomD) { - drawShadow(mShadow, nullptr, mWorldMtx, &rot, -1, 0xC8, 0xB4, 0xE6, 0xFF, 0.0f); + drawShadow(mShadow, nullptr, mWorldMtx, &sph, -1, 0xC8, 0xB4, 0xE6, 0xFF, 0.0f); } else { - drawShadow(mShadow, nullptr, mWorldMtx, &rot, -1, -1, -1, -1, -1, 0.0f); + drawShadow(mShadow, nullptr, mWorldMtx, &sph, -1, -1, -1, -1, -1, 0.0f); } if (mCameraIdx >= 0) { @@ -528,7 +528,7 @@ f32 dAcOMushRoom_c::getRadiusX() { return getUnscaledRadiusX() * mScale.x; } -f32 dAcOMushRoom_c::getRadiusY() { +f32 dAcOMushRoom_c::getShadowOffsetY() { return getUnscaledRadiusY() * mScale.x; } |