AxioDL
/
metaforce
mirror of https://github.com/AxioDL/metaforce.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Start renaming CThardus functions

This commit is contained in:
Phillip Stephens 2021-05-06 10:53:19 -07:00
parent 847211f81f
commit bd050e8ac0
2 changed files with 25 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
Runtime/MP1/World/CThardus.cpp
View File

@ -129,7 +129,7 @@ CThardus::CThardus(TUniqueId uid, std::string_view name, const CEntityInfo& info
SetMass(100000.f); SetMass(100000.f);
} }
void CThardus::sub801dbf34(float dt, CStateManager& mgr) { void CThardus::UpdateRockThermalState(float dt, CStateManager& mgr) {
if (x7c4_ == 0) { if (x7c4_ == 0) {
x93a_ = false; x93a_ = false;
return; return;
@ -267,7 +267,7 @@ void CThardus::sub801dcfa4(CStateManager& mgr) {
x90c_rockHealths[j] = hInfo->GetHP(); x90c_rockHealths[j] = hInfo->GetHP();
} }
} else if (!rock->IsUsingPhazonModel()) { } else if (!rock->IsUsingPhazonModel()) {
sub801dae2c(mgr, j); BreakRock(mgr, j);
DoFaint(mgr); DoFaint(mgr);
} else { } else {
rock->SetActive(false); rock->SetActive(false);
@ -277,7 +277,7 @@ void CThardus::sub801dcfa4(CStateManager& mgr) {
DoFlinch(mgr); DoFlinch(mgr);
const bool isThermalActive = mgr.GetPlayerState()->GetCurrentVisor() != CPlayerState::EPlayerVisor::Thermal; const bool isThermalActive = mgr.GetPlayerState()->GetCurrentVisor() != CPlayerState::EPlayerVisor::Thermal;
if (isThermalActive || (!isThermalActive && x7c4_ != 3)) { if (isThermalActive || (!isThermalActive && x7c4_ != 3)) {
sub801dc444(mgr, GetTranslation(), x6d8_); SetRockParticle(mgr, GetTranslation(), x6d8_);
} }
ProcessSoundEvent(x758_, 1.f, 0, 0.1f, 1000.f, 0.16f, 1.f, zeus::skZero3f, GetTranslation(), ProcessSoundEvent(x758_, 1.f, 0, 0.1f, 1000.f, 0.16f, 1.f, zeus::skZero3f, GetTranslation(),
mgr.GetNextAreaId(), mgr, true); mgr.GetNextAreaId(), mgr, true);
@ -315,7 +315,7 @@ void CThardus::Think(float dt, CStateManager& mgr) {
} }
} }
sub801dbf34(dt, mgr); UpdateRockThermalState(dt, mgr);
if (!sub801dc2c8()) { if (!sub801dc2c8()) {
// NOTE: (phil), yes this is what's actually happening // NOTE: (phil), yes this is what's actually happening
@ -385,7 +385,8 @@ void CThardus::Think(float dt, CStateManager& mgr) {
if (auto* act = static_cast<CActor*>(mgr.ObjectById(x610_destroyableRocks[i]))) { if (auto* act = static_cast<CActor*>(mgr.ObjectById(x610_destroyableRocks[i]))) {
if (!x688_ && !x93c_ && !x909_ && !x93d_) { if (!x688_ && !x93c_ && !x909_ && !x93d_) {
bool found = act->GetName().find("Neck_1"sv) != std::string::npos; bool found = act->GetName().find("Neck_1"sv) != std::string::npos;
if (!found || !x6b0_destroyedRocks[x648_currentRock] || x648_currentRock == x610_destroyableRocks.size() - 1) { if (!found || !x6b0_destroyedRocks[x648_currentRock] ||
x648_currentRock == x610_destroyableRocks.size() - 1) {
if (!x6b0_destroyedRocks[i]) { if (!x6b0_destroyedRocks[i]) {
if (!found || x6b0_destroyedRocks[i]) { if (!found || x6b0_destroyedRocks[i]) {
act->RemoveMaterial(EMaterialTypes::Orbit, mgr); act->RemoveMaterial(EMaterialTypes::Orbit, mgr);
@ -494,7 +495,7 @@ void CThardus::AcceptScriptMsg(EScriptObjectMessage msg, TUniqueId uid, CStateMa
x420_curDamageRemTime = x424_damageWaitTime; x420_curDamageRemTime = x424_damageWaitTime;
} else if (TCastToConstPtr<CBomb>(mgr.GetObjectById(colAct->GetLastTouchedObject()))) { } else if (TCastToConstPtr<CBomb>(mgr.GetObjectById(colAct->GetLastTouchedObject()))) {
if (x644_ == 1 && x93c_) { if (x644_ == 1 && x93c_) {
sub801dae2c(mgr, x648_currentRock); BreakRock(mgr, x648_currentRock);
} }
} }
} }
@ -632,7 +633,7 @@ void CThardus::AcceptScriptMsg(EScriptObjectMessage msg, TUniqueId uid, CStateMa
rock->TakeDamage(zeus::skZero3f, 0.f); rock->TakeDamage(zeus::skZero3f, 0.f);
const bool thermalInactive = mgr.GetPlayerState()->GetCurrentVisor() != CPlayerState::EPlayerVisor::Thermal; const bool thermalInactive = mgr.GetPlayerState()->GetCurrentVisor() != CPlayerState::EPlayerVisor::Thermal;
if (thermalInactive || x7c4_ != 3) { if (thermalInactive || x7c4_ != 3) {
sub801dc444(mgr, proj->GetTranslation(), x6d0_); SetRockParticle(mgr, proj->GetTranslation(), x6d0_);
} }
if (!rock->IsUsingPhazonModel()) { if (!rock->IsUsingPhazonModel()) {
ProcessSoundEvent(x75c_, 1.f, 0, 0.1f, 1000.f, 0.16f, 1.f, zeus::skZero3f, rock->GetTranslation(), ProcessSoundEvent(x75c_, 1.f, 0, 0.1f, 1000.f, 0.16f, 1.f, zeus::skZero3f, rock->GetTranslation(),
@ -806,7 +807,7 @@ void CThardus::PathFind(CStateManager& mgr, EStateMsg msg, float arg) {
CPatterned::PathFind(mgr, EStateMsg::Activate, arg); CPatterned::PathFind(mgr, EStateMsg::Activate, arg);
++x660_; ++x660_;
} }
x650_ = sub801dc60c(arg, mgr); x650_ = GetTargetVector(arg, mgr);
} else if (msg == EStateMsg::Deactivate) { } else if (msg == EStateMsg::Deactivate) {
x8d4_ = false; x8d4_ = false;
} }
@ -893,7 +894,7 @@ void CThardus::LoopedAttack(CStateManager& mgr, EStateMsg msg, float arg) {
offset, zeus::CQuaternion(GetTransform().buildMatrix3f()).toTransform() * zeus::CVector3f{0.f, 1.f, 0.f}, offset, zeus::CQuaternion(GetTransform().buildMatrix3f()).toTransform() * zeus::CVector3f{0.f, 1.f, 0.f},
100.f, CMaterialFilter::MakeInclude({EMaterialTypes::Wall, EMaterialTypes::Floor, EMaterialTypes::Ceiling})); 100.f, CMaterialFilter::MakeInclude({EMaterialTypes::Wall, EMaterialTypes::Floor, EMaterialTypes::Ceiling}));
if (result.IsInvalid()) { if (result.IsInvalid()) {
zeus::CVector2f vec = sub801dac30(mgr); zeus::CVector2f vec = GetSteeringVector(mgr);
if (vec != zeus::skZero2f) { if (vec != zeus::skZero2f) {
x650_ = vec; x650_ = vec;
} }
@ -907,7 +908,7 @@ void CThardus::LoopedAttack(CStateManager& mgr, EStateMsg msg, float arg) {
} }
} else if (x658_ == 0) { } else if (x658_ == 0) {
zeus::CVector3f dir = (mgr.GetPlayer().GetTranslation() - GetTranslation()).normalized(); zeus::CVector3f dir = (mgr.GetPlayer().GetTranslation() - GetTranslation()).normalized();
zeus::CVector2f vec = sub801dac30(mgr); zeus::CVector2f vec = GetSteeringVector(mgr);
if (vec != zeus::skZero2f) { if (vec != zeus::skZero2f) {
x650_ = vec; x650_ = vec;
} else { } else {
@ -1286,7 +1287,7 @@ void CThardus::FindNonDestroyableActors(const std::unique_ptr<CCollisionActorMan
} }
} }
void CThardus::sub801dae2c(CStateManager& mgr, u32 rockIndex) { void CThardus::BreakRock(CStateManager& mgr, u32 rockIndex) {
TCastToPtr<CCollisionActor> rockCol = TCastToPtr<CCollisionActor> rockCol =
mgr.ObjectById(x5f0_rockColliders->GetCollisionDescFromIndex(rockIndex).GetCollisionActorId()); mgr.ObjectById(x5f0_rockColliders->GetCollisionDescFromIndex(rockIndex).GetCollisionActorId());
if (TCastToPtr<CDestroyableRock> rock = mgr.ObjectById(x610_destroyableRocks[rockIndex])) { if (TCastToPtr<CDestroyableRock> rock = mgr.ObjectById(x610_destroyableRocks[rockIndex])) {
@ -1305,7 +1306,7 @@ void CThardus::sub801dae2c(CStateManager& mgr, u32 rockIndex) {
light->SetActive(true); light->SetActive(true);
if (mgr.GetPlayerState()->GetCurrentVisor() == CPlayerState::EPlayerVisor::Thermal || if (mgr.GetPlayerState()->GetCurrentVisor() == CPlayerState::EPlayerVisor::Thermal ||
(mgr.GetPlayerState()->GetCurrentVisor() != CPlayerState::EPlayerVisor::Thermal && x7c4_ != 3)) { (mgr.GetPlayerState()->GetCurrentVisor() != CPlayerState::EPlayerVisor::Thermal && x7c4_ != 3)) {
sub801dc444(mgr, GetTranslation(), x6d4_); SetRockParticle(mgr, GetTranslation(), x6d4_);
} }
x90c_rockHealths[rockIndex] = hp; x90c_rockHealths[rockIndex] = hp;
sub801dbc5c(mgr, rock); sub801dbc5c(mgr, rock);
@ -1315,7 +1316,7 @@ void CThardus::sub801dae2c(CStateManager& mgr, u32 rockIndex) {
} }
} }
void CThardus::sub801dc444(CStateManager& mgr, const zeus::CVector3f& pos, CAssetId particle) { void CThardus::SetRockParticle(CStateManager& mgr, const zeus::CVector3f& pos, CAssetId particle) {
u32 w = x6f4_; u32 w = x6f4_;
++x6f4_; ++x6f4_;
std::string particleName = fmt::format(FMT_STRING("ROCK_EFFECT{}-{}"), particle.Value(), w); std::string particleName = fmt::format(FMT_STRING("ROCK_EFFECT{}-{}"), particle.Value(), w);
@ -1445,7 +1446,7 @@ zeus::CVector3f CThardus::sub801de550(CStateManager& mgr) {
unkVec.push_back(lastIdx); unkVec.push_back(lastIdx);
} }
//zeus::CVector2f plVec = mgr.GetPlayer().GetTranslation().toVec2f(); // zeus::CVector2f plVec = mgr.GetPlayer().GetTranslation().toVec2f();
float maxDist = 0.f; float maxDist = 0.f;
float curDist = 0.f; float curDist = 0.f;
@ -1491,7 +1492,7 @@ zeus::CVector3f CThardus::sub801de434(CStateManager& mgr) {
->GetTranslation(); ->GetTranslation();
} }
zeus::CVector2f CThardus::sub801dac30(CStateManager& mgr) const { zeus::CVector2f CThardus::GetSteeringVector(CStateManager& mgr) const {
zeus::CVector2f ret; zeus::CVector2f ret;
zeus::CVector3f pos = GetTranslation(); zeus::CVector3f pos = GetTranslation();
for (const auto& repulsor : x664_repulsors) { for (const auto& repulsor : x664_repulsors) {
@ -1506,7 +1507,8 @@ zeus::CVector2f CThardus::sub801dac30(CStateManager& mgr) const {
} }
if (ret != zeus::skZero2f) { if (ret != zeus::skZero2f) {
ret = x45c_steeringBehaviors.Arrival2D(*this, x764_startTransform.origin.toVec2f()); ret = x45c_steeringBehaviors.Arrival2D(*this, x764_startTransform.origin.toVec2f()) * zeus::CVector2f(1.f) +
ret * zeus::CVector2f(0.f);
} }
return ret; return ret;
} }
@ -1548,7 +1550,6 @@ void CThardus::BouncePlayer(float intensity, CStateManager& mgr) {
if (intensity <= 0.f) { if (intensity <= 0.f) {
return; return;
} }
zeus::CVector3f posDiff = GetTranslation() - mgr.GetPlayer().GetTranslation(); zeus::CVector3f posDiff = GetTranslation() - mgr.GetPlayer().GetTranslation();
CPlayer::ESurfaceRestraints restraints = mgr.GetPlayer().GetSurfaceRestraint(); CPlayer::ESurfaceRestraints restraints = mgr.GetPlayer().GetSurfaceRestraint();
if (restraints != CPlayer::ESurfaceRestraints::Air && !mgr.GetPlayer().IsInWaterMovement()) { if (restraints != CPlayer::ESurfaceRestraints::Air && !mgr.GetPlayer().IsInWaterMovement()) {
@ -1570,7 +1571,7 @@ void CThardus::sub801dbc40() {
x938_ = false; x938_ = false;
} }
zeus::CVector2f CThardus::sub801dc60c(float arg, CStateManager& mgr) { zeus::CVector2f CThardus::GetTargetVector(float arg, CStateManager& mgr) {
zeus::CVector2f ret; zeus::CVector2f ret;
if (GetSearchPath() != nullptr) { if (GetSearchPath() != nullptr) {
if (GetSearchPath()->GetResult() == CPathFindSearch::EResult::Success) { if (GetSearchPath()->GetResult() == CPathFindSearch::EResult::Success) {
@ -1582,7 +1583,7 @@ zeus::CVector2f CThardus::sub801dc60c(float arg, CStateManager& mgr) {
} }
if (x8d4_ || (!x8d4_ && x7f0_pathFindSearch.OnPath(GetTranslation()) != CPathFindSearch::EResult::Success)) { if (x8d4_ || (!x8d4_ && x7f0_pathFindSearch.OnPath(GetTranslation()) != CPathFindSearch::EResult::Success)) {
zeus::CVector2f vec = sub801dac30(mgr); zeus::CVector2f vec = GetSteeringVector(mgr);
if (vec != zeus::skZero2f) { if (vec != zeus::skZero2f) {
return vec; return vec;
} }

10
Runtime/MP1/World/CThardus.hpp
View File

@ -137,7 +137,7 @@ class CThardus : public CPatterned {
void GatherWaypoints(CScriptWaypoint* wp, CStateManager& mgr, rstl::reserved_vector<TUniqueId, 16>& uids); void GatherWaypoints(CScriptWaypoint* wp, CStateManager& mgr, rstl::reserved_vector<TUniqueId, 16>& uids);
void sub801dec80() { x68c_ = 20000; } void sub801dec80() { x68c_ = 20000; }
void FindNonDestroyableActors(const std::unique_ptr<CCollisionActorManager>& colMgr); void FindNonDestroyableActors(const std::unique_ptr<CCollisionActorManager>& colMgr);
void sub801dbf34(float dt, CStateManager& mgr); void UpdateRockThermalState(float dt, CStateManager& mgr);
bool sub801dc2c8() const { return (x610_destroyableRocks.size() - 1) == x648_currentRock; } bool sub801dc2c8() const { return (x610_destroyableRocks.size() - 1) == x648_currentRock; }
void sub801de9f8(CStateManager& mgr); void sub801de9f8(CStateManager& mgr);
void sub801dd608(CStateManager& mgr); void sub801dd608(CStateManager& mgr);
@ -152,9 +152,9 @@ class CThardus : public CPatterned {
x944_ = 0.f; x944_ = 0.f;
} }
} }
void sub801dae2c(CStateManager& mgr, u32 rockIndex); void BreakRock(CStateManager& mgr, u32 rockIndex);
void sub801dc444(CStateManager& mgr, const zeus::CVector3f& pos, CAssetId particle); void SetRockParticle(CStateManager& mgr, const zeus::CVector3f& pos, CAssetId particle);
void sub801dbc5c(CStateManager& mgr, CDestroyableRock* rock); void sub801dbc5c(CStateManager& mgr, CDestroyableRock* rock);
void sub801dbbdc(CStateManager& mgr, CDestroyableRock* rock); void sub801dbbdc(CStateManager& mgr, CDestroyableRock* rock);
bool sub801dc2c8() { return x648_currentRock == (x610_destroyableRocks.size() - 1); } bool sub801dc2c8() { return x648_currentRock == (x610_destroyableRocks.size() - 1); }
@ -168,7 +168,7 @@ class CThardus : public CPatterned {
void RenderFlare(const CStateManager& mgr, float t); void RenderFlare(const CStateManager& mgr, float t);
zeus::CVector3f sub801de550(CStateManager& mgr); zeus::CVector3f sub801de550(CStateManager& mgr);
zeus::CVector3f sub801de434(CStateManager& mgr); zeus::CVector3f sub801de434(CStateManager& mgr);
zeus::CVector2f sub801dc60c(float f1, CStateManager& mgr); zeus::CVector2f GetTargetVector(float arg, CStateManager& mgr);
void sub801dbc40(); void sub801dbc40();
std::optional<CTexturedQuadFilter> m_flareFilter; std::optional<CTexturedQuadFilter> m_flareFilter;
@ -185,7 +185,7 @@ class CThardus : public CPatterned {
void _DoSuckState(CStateManager& mgr) { x330_stateMachineState.SetState(mgr, *this, GetStateMachine(), "Suck"sv); } void _DoSuckState(CStateManager& mgr) { x330_stateMachineState.SetState(mgr, *this, GetStateMachine(), "Suck"sv); }
zeus::CVector2f sub801dac30(CStateManager& mgr) const; zeus::CVector2f GetSteeringVector(CStateManager& mgr) const;
void UpdateHealthInfo(CStateManager& mgr); void UpdateHealthInfo(CStateManager& mgr);
void BouncePlayer(float f1, CStateManager& mgr); void BouncePlayer(float f1, CStateManager& mgr);