From 0c1cecbdc2f267b9745e8d90d93d2de66616c0d0 Mon Sep 17 00:00:00 2001 From: swekka Date: Sun, 7 Dec 2025 12:11:17 +0100 Subject: d_a_obj_grass_coil OK --- src/REL/d/a/obj/d_a_obj_grass_coil.cpp | 146 +++++++++++++++++++++++++++++++++ 1 file changed, 146 insertions(+) (limited to 'src') diff --git a/src/REL/d/a/obj/d_a_obj_grass_coil.cpp b/src/REL/d/a/obj/d_a_obj_grass_coil.cpp index 18a2aba4..edb4dac2 100644 --- a/src/REL/d/a/obj/d_a_obj_grass_coil.cpp +++ b/src/REL/d/a/obj/d_a_obj_grass_coil.cpp @@ -1,9 +1,155 @@ #include "d/a/obj/d_a_obj_grass_coil.h" +#include "c/c_lib.h" +#include "common.h" +#include "d/a/d_a_player.h" +#include "d/a/obj/d_a_obj_base.h" +#include "d/col/c/c_cc_d.h" +#include "d/col/cc/d_cc_s.h" +#include "d/snd/d_snd_wzsound.h" +#include "f/f_base.h" +#include "m/m_angle.h" +#include "m/m_vec.h" +#include "nw4r/g3d/res/g3d_resmdl.h" +#include "s/s_Math.h" +#include "toBeSorted/attention.h" +#include "toBeSorted/d_emitter.h" + SPECIAL_ACTOR_PROFILE(OBJ_GRASS_COIL, dAcOgrassCoil_c, fProfile::OBJ_GRASS_COIL, 0x263, 0, 2); STATE_DEFINE(dAcOgrassCoil_c, Wait); +dCcD_SrcCyl dAcOgrassCoil_c::sCylSrc = { + /* mObjInf */ + {/* mObjAt */ {0, 0, {0, 0, 0}, 0, 0, 0, 0, 0, 0}, + /* mObjTg */ + {AT_TYPE_SWORD | AT_TYPE_BOMB | AT_TYPE_0x40 | AT_TYPE_SLINGSHOT | AT_TYPE_WHIP | AT_TYPE_ARROW | + AT_TYPE_CLAWSHOT | AT_TYPE_0x800000, + 0x200111, + {0, 0xb, 0x407}, + 0x0, + 0x0}, + /* mObjCo */ {0x29}}, + /* mCylInf */ + {50.f, 130.f} +}; + +const u32 dAcOgrassCoil_c::sCalcAngleRatio = 5; + +bool dAcOgrassCoil_c::createHeap() { + void *data = getOarcResFile("GrassCoilNormal"); + mResFile = nw4r::g3d::ResFile(data); + nw4r::g3d::ResMdl mdl = mResFile.GetResMdl("GrassCoilNormal"); + TRY_CREATE(mMdl[0].create(mdl, &mAllocator, 0x120, 1, nullptr)); + nw4r::g3d::ResMdl mdlCut = mResFile.GetResMdl("GrassCoilNormalCut"); + TRY_CREATE(mMdl[1].create(mdlCut, &mAllocator, 0x120, 1, nullptr)); + return SUCCEEDED; +} + +int dAcOgrassCoil_c::create() { + field_0x510 = mRotation.y; + mRotation.y = 0; + CREATE_ALLOCATOR(dAcOgrassCoil_c); + mStts.SetRank(8); + mCollider.Set(sCylSrc); + mCollider.SetStts(mStts); + updateMatrix(); + mWorldMtx.YrotM(field_0x510 - mRotation.y); + mMdl[mCut].setLocalMtx(mWorldMtx); + mStateMgr.changeState(StateID_Wait); + mCullingDistance = 9000.0f; + mBoundingBox.Set(mVec3_c(-100.0f, -50.0f, -100.0f), mVec3_c(100.0f, 200.0f, 100.0f)); + field_0x1A8 = 0.0f; + return SUCCEEDED; +} + +int dAcOgrassCoil_c::doDelete() { + return SUCCEEDED; +} + +const s16 dAcOgrassCoil_c::sEffectRotIncrement = 0xe39; + +int dAcOgrassCoil_c::actorExecute() { + if (checkObjectProperty(OBJ_PROP_0x1)) { + if (dAcPy_c::GetLink()->mPosition.squareDistanceToXZ(mPosition) > 1000000.f) { + return SUCCEEDED; + } + } + if (!mCut) { + AttentionManager::GetInstance()->addUnk3Target(*this, 1, 250.0f, -100.0f, 100.0f); + } + if (!mCut) { + bool hit = false; + if (mCollider.ChkTgHit()) { + if (mCollider.ChkTgAtHitType(AT_TYPE_SLINGSHOT)) { + hit = true; + } else { + mEffectRot.y = field_0x510; + u16 effectIndex = PARTICLE_RESOURCE_ID_MAPPING_485_; + s32 i = 0; + for (s32 i = 0; i < 2; i++) { + if (i == 1) { + mEffectRot.y += mAng(sEffectRotIncrement); + } + dEmitterBase_c *emitter = dJEffManager_c::spawnEffect( + effectIndex, mPosition, &mEffectRot, nullptr, nullptr, nullptr, 0, 0 + ); + if (emitter != nullptr) { + emitter->bindShpEmitter(dJEffManager_c::GrassCoil, true); + } + } + mCollider.ClrTgSet(); + mCut = true; + field_0x50E = mAng(-0xccd); + startSound(SE_Gcoil_CUT); + mCollider.SetR(25.0f); + mCollider.SetH(70.0f); + mSpawnPos = mPosition; + mSpawnPos.y += 30.0f; + itemDroppingAndGivingRelated(&mSpawnPos, 0); + } + } + if (hit || !(field_0x50E || !mCollider.ChkCoHit() || !(dAcPy_c::GetLink()->mSpeed > 0.0f))) { + if (!mCut) { + field_0x50E = mAng(-0x93f); + } else { + field_0x50E = mAng(-0x16c); + } + field_0x50C = mAng(cLib::targetAngleY(dAcPy_c::GetLink()->mPosition, mPosition) - 0x8000); + } + } + + if (field_0x50E != 0) { + s32 _a = 0; + + field_0x50E += mAng(-field_0x50A.mVal * (0.35f + (0.01f * _a))).mVal; + field_0x50E *= 0.85f + (0.01f * _a); + field_0x50A += field_0x50E; + } + if (field_0x50A != mRotation.x) { + sLib::addCalcAngle(mRotation.x.ref(), field_0x50A, 5, 0x4fa, 0xb6); + } + if (field_0x50C != mRotation.y) { + sLib::addCalcAngle(mRotation.y.ref(), field_0x50C, 5, 0x4fa, 0xb6); + } + updateMatrix(); + mWorldMtx.YrotM(field_0x510 - mRotation.y); + mMdl[mCut].setLocalMtx(mWorldMtx); + if (!mCut) { + mCollider.SetC(mPosition); + dCcS::GetInstance()->Set(&mCollider); + } + return SUCCEEDED; +} + +const float dAcOgrassCoil_c::sSqDistThreshold = 1000000.f; +const u32 dAcOgrassCoil_c::lbl_268_rodata_4C = 2; + +int dAcOgrassCoil_c::draw() { + drawModelType1(&mMdl[mCut]); + return SUCCEEDED; +} + void dAcOgrassCoil_c::initializeState_Wait() {} void dAcOgrassCoil_c::executeState_Wait() {} void dAcOgrassCoil_c::finalizeState_Wait() {} -- cgit v1.2.3 From 0f335a5429c67917f8460c57bab7fd2421b24b86 Mon Sep 17 00:00:00 2001 From: elijah-thomas774 Date: Sun, 7 Dec 2025 15:07:18 -0500 Subject: Member naming and typing --- src/REL/d/a/obj/d_a_obj_grass_coil.cpp | 46 ++++++++++++++++------------------ 1 file changed, 22 insertions(+), 24 deletions(-) (limited to 'src') diff --git a/src/REL/d/a/obj/d_a_obj_grass_coil.cpp b/src/REL/d/a/obj/d_a_obj_grass_coil.cpp index edb4dac2..7f974664 100644 --- a/src/REL/d/a/obj/d_a_obj_grass_coil.cpp +++ b/src/REL/d/a/obj/d_a_obj_grass_coil.cpp @@ -47,14 +47,14 @@ bool dAcOgrassCoil_c::createHeap() { } int dAcOgrassCoil_c::create() { - field_0x510 = mRotation.y; + mSpawnRotY = mRotation.y; mRotation.y = 0; CREATE_ALLOCATOR(dAcOgrassCoil_c); mStts.SetRank(8); mCollider.Set(sCylSrc); mCollider.SetStts(mStts); updateMatrix(); - mWorldMtx.YrotM(field_0x510 - mRotation.y); + mWorldMtx.YrotM(mSpawnRotY - mRotation.y); mMdl[mCut].setLocalMtx(mWorldMtx); mStateMgr.changeState(StateID_Wait); mCullingDistance = 9000.0f; @@ -67,7 +67,7 @@ int dAcOgrassCoil_c::doDelete() { return SUCCEEDED; } -const s16 dAcOgrassCoil_c::sEffectRotIncrement = 0xe39; +const s16 dAcOgrassCoil_c::sEffectRotIncrement = 0xe39; // ~20 degrees int dAcOgrassCoil_c::actorExecute() { if (checkObjectProperty(OBJ_PROP_0x1)) { @@ -79,20 +79,18 @@ int dAcOgrassCoil_c::actorExecute() { AttentionManager::GetInstance()->addUnk3Target(*this, 1, 250.0f, -100.0f, 100.0f); } if (!mCut) { - bool hit = false; + bool hitBySlingshot = false; if (mCollider.ChkTgHit()) { if (mCollider.ChkTgAtHitType(AT_TYPE_SLINGSHOT)) { - hit = true; + hitBySlingshot = true; } else { - mEffectRot.y = field_0x510; - u16 effectIndex = PARTICLE_RESOURCE_ID_MAPPING_485_; - s32 i = 0; + mEffectRot.y = mSpawnRotY; for (s32 i = 0; i < 2; i++) { if (i == 1) { - mEffectRot.y += mAng(sEffectRotIncrement); + mEffectRot.y += mAng(0xe39); } dEmitterBase_c *emitter = dJEffManager_c::spawnEffect( - effectIndex, mPosition, &mEffectRot, nullptr, nullptr, nullptr, 0, 0 + PARTICLE_RESOURCE_ID_MAPPING_485_, mPosition, &mEffectRot, nullptr, nullptr, nullptr, 0, 0 ); if (emitter != nullptr) { emitter->bindShpEmitter(dJEffManager_c::GrassCoil, true); @@ -100,7 +98,7 @@ int dAcOgrassCoil_c::actorExecute() { } mCollider.ClrTgSet(); mCut = true; - field_0x50E = mAng(-0xccd); + mSwayAmt = -mAng::d2s(18.0011); startSound(SE_Gcoil_CUT); mCollider.SetR(25.0f); mCollider.SetH(70.0f); @@ -109,31 +107,31 @@ int dAcOgrassCoil_c::actorExecute() { itemDroppingAndGivingRelated(&mSpawnPos, 0); } } - if (hit || !(field_0x50E || !mCollider.ChkCoHit() || !(dAcPy_c::GetLink()->mSpeed > 0.0f))) { + if (hitBySlingshot || (mSwayAmt == 0 && mCollider.ChkCoHit() && dAcPy_c::GetLink()->mSpeed > 0.0f)) { if (!mCut) { - field_0x50E = mAng(-0x93f); + mSwayAmt = -mAng::d2s(13.0025); } else { - field_0x50E = mAng(-0x16c); + mSwayAmt = -mAng::d2s(2); } - field_0x50C = mAng(cLib::targetAngleY(dAcPy_c::GetLink()->mPosition, mPosition) - 0x8000); + mTargetRotY = cLib::targetAngleY(dAcPy_c::GetLink()->mPosition, mPosition) - 0x8000; } } - if (field_0x50E != 0) { + if (mSwayAmt != 0) { s32 _a = 0; - field_0x50E += mAng(-field_0x50A.mVal * (0.35f + (0.01f * _a))).mVal; - field_0x50E *= 0.85f + (0.01f * _a); - field_0x50A += field_0x50E; + mSwayAmt += s16(-mTargetRotX * (0.35f + (0.01f * _a))); + mSwayAmt *= 0.85f + (0.01f * _a); + mTargetRotX += mSwayAmt; } - if (field_0x50A != mRotation.x) { - sLib::addCalcAngle(mRotation.x.ref(), field_0x50A, 5, 0x4fa, 0xb6); + if (mTargetRotX != mRotation.x) { + sLib::addCalcAngle(mRotation.x.ref(), mTargetRotX, 5, mAng::d2s(7), mAng::d2s(1)); } - if (field_0x50C != mRotation.y) { - sLib::addCalcAngle(mRotation.y.ref(), field_0x50C, 5, 0x4fa, 0xb6); + if (mTargetRotY != mRotation.y) { + sLib::addCalcAngle(mRotation.y.ref(), mTargetRotY, 5, mAng::d2s(7), mAng::d2s(1)); } updateMatrix(); - mWorldMtx.YrotM(field_0x510 - mRotation.y); + mWorldMtx.YrotM(mSpawnRotY - mRotation.y); mMdl[mCut].setLocalMtx(mWorldMtx); if (!mCut) { mCollider.SetC(mPosition); -- cgit v1.2.3 From 1bd24d205575aeefcf022d5563b01ff31da58762 Mon Sep 17 00:00:00 2001 From: elijah-thomas774 Date: Sun, 7 Dec 2025 16:48:01 -0500 Subject: revert constant replacment --- src/REL/d/a/obj/d_a_obj_grass_coil.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src') diff --git a/src/REL/d/a/obj/d_a_obj_grass_coil.cpp b/src/REL/d/a/obj/d_a_obj_grass_coil.cpp index 7f974664..1ece5d83 100644 --- a/src/REL/d/a/obj/d_a_obj_grass_coil.cpp +++ b/src/REL/d/a/obj/d_a_obj_grass_coil.cpp @@ -87,7 +87,7 @@ int dAcOgrassCoil_c::actorExecute() { mEffectRot.y = mSpawnRotY; for (s32 i = 0; i < 2; i++) { if (i == 1) { - mEffectRot.y += mAng(0xe39); + mEffectRot.y += mAng(sEffectRotIncrement); } dEmitterBase_c *emitter = dJEffManager_c::spawnEffect( PARTICLE_RESOURCE_ID_MAPPING_485_, mPosition, &mEffectRot, nullptr, nullptr, nullptr, 0, 0 -- cgit v1.2.3