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

CElitePirate: Remove unnecessary reference qualifiers 

Same behavior, but makes locations where copies occur much more
explicit.
This commit is contained in:
Lioncash 2020-04-02 00:22:45 -04:00
parent 6017e99aac
commit 6e179bfa87
1 changed files with 34 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

68
Runtime/MP1/World/CElitePirate.cpp
View File

@ -324,10 +324,10 @@ void CElitePirate::DoUserAnimEvent(CStateManager& mgr, const CInt32POINode& node
handled = true; handled = true;
break; break;
case EUserEventType::BeginAction: { case EUserEventType::BeginAction: {
const zeus::CVector3f& origin = GetTranslation(); const zeus::CVector3f origin = GetTranslation();
const zeus::CVector3f& front = GetTransform().frontVector(); const zeus::CVector3f front = GetTransform().frontVector();
float dot = (GetLctrTransform(node.GetLocatorName()).origin - origin).dot(front); const float dot = (GetLctrTransform(node.GetLocatorName()).origin - origin).dot(front);
const zeus::CTransform& xf = zeus::CTransform::Translate({ const zeus::CTransform xf = zeus::CTransform::Translate({
origin.x() + dot * front.x(), origin.x() + dot * front.x(),
origin.y() + dot * front.y(), origin.y() + dot * front.y(),
origin.z(), origin.z(),
@ -402,14 +402,14 @@ void CElitePirate::PathFind(CStateManager& mgr, EStateMsg msg, float dt) {
if (!TooClose(mgr, 0.f) && !PathShagged(mgr, 0.f)) { if (!TooClose(mgr, 0.f) && !PathShagged(mgr, 0.f)) {
CPatterned::PathFind(mgr, msg, dt); CPatterned::PathFind(mgr, msg, dt);
} else if (PathShagged(mgr, 0.f)) { } else if (PathShagged(mgr, 0.f)) {
const zeus::CVector3f& move = x8c0_.GetValue(GetTranslation(), GetTransform().frontVector()); const zeus::CVector3f move = x8c0_.GetValue(GetTranslation(), GetTransform().frontVector());
if (move != zeus::skZero3f) { if (move != zeus::skZero3f) {
x450_bodyController->GetCommandMgr().DeliverCmd(CBCLocomotionCmd(move, zeus::skZero3f, 1.f)); x450_bodyController->GetCommandMgr().DeliverCmd(CBCLocomotionCmd(move, zeus::skZero3f, 1.f));
} }
} else if (ShouldTurn(mgr, 0.f)) { } else if (ShouldTurn(mgr, 0.f)) {
const zeus::CVector3f& aim = const zeus::CVector3f aim =
mgr.GetPlayer().GetAimPosition(mgr, 0.5f * GetModelData()->GetAnimationData()->GetSpeedScale()); mgr.GetPlayer().GetAimPosition(mgr, 0.5f * GetModelData()->GetAnimationData()->GetSpeedScale());
const zeus::CVector3f& face = aim - GetTranslation(); const zeus::CVector3f face = aim - GetTranslation();
if (face.canBeNormalized()) { if (face.canBeNormalized()) {
x450_bodyController->GetCommandMgr().DeliverCmd(CBCLocomotionCmd(zeus::skZero3f, face.normalized(), 1.f)); x450_bodyController->GetCommandMgr().DeliverCmd(CBCLocomotionCmd(zeus::skZero3f, face.normalized(), 1.f));
} }
@ -434,7 +434,7 @@ void CElitePirate::TargetPatrol(CStateManager& mgr, EStateMsg msg, float dt) {
} }
} else if (msg == EStateMsg::Update) { } else if (msg == EStateMsg::Update) {
if (PathShagged(mgr, 0.f)) { if (PathShagged(mgr, 0.f)) {
const zeus::CVector3f& move = x45c_steeringBehaviors.Arrival(*this, x8b4_targetDestPos, 25.f); const zeus::CVector3f move = x45c_steeringBehaviors.Arrival(*this, x8b4_targetDestPos, 25.f);
x450_bodyController->GetCommandMgr().DeliverCmd(CBCLocomotionCmd(move, zeus::skZero3f, 1.f)); x450_bodyController->GetCommandMgr().DeliverCmd(CBCLocomotionCmd(move, zeus::skZero3f, 1.f));
} else { } else {
CPatterned::PathFind(mgr, msg, dt); CPatterned::PathFind(mgr, msg, dt);
@ -471,13 +471,13 @@ void CElitePirate::Run(CStateManager& mgr, EStateMsg msg, float dt) {
CPatterned::PathFind(mgr, msg, dt); CPatterned::PathFind(mgr, msg, dt);
} else if (msg == EStateMsg::Update) { } else if (msg == EStateMsg::Update) {
if (PathShagged(mgr, 0.f)) { if (PathShagged(mgr, 0.f)) {
auto move = x8c0_.GetValue(GetTranslation(), GetTransform().frontVector()); const auto move = x8c0_.GetValue(GetTranslation(), GetTransform().frontVector());
if (move != zeus::skZero3f) { if (move != zeus::skZero3f) {
x450_bodyController->GetCommandMgr().DeliverCmd(CBCLocomotionCmd(move, zeus::skZero3f, 1.f)); x450_bodyController->GetCommandMgr().DeliverCmd(CBCLocomotionCmd(move, zeus::skZero3f, 1.f));
} else if (ShouldTurn(mgr, 0.f)) { } else if (ShouldTurn(mgr, 0.f)) {
const zeus::CVector3f& aim = const zeus::CVector3f aim =
mgr.GetPlayer().GetAimPosition(mgr, 0.5f * GetModelData()->GetAnimationData()->GetSpeedScale()); mgr.GetPlayer().GetAimPosition(mgr, 0.5f * GetModelData()->GetAnimationData()->GetSpeedScale());
auto face = aim - GetTranslation(); const auto face = aim - GetTranslation();
if (face.canBeNormalized()) { if (face.canBeNormalized()) {
x450_bodyController->GetCommandMgr().DeliverCmd(CBCLocomotionCmd(zeus::skZero3f, face.normalized(), 1.f)); x450_bodyController->GetCommandMgr().DeliverCmd(CBCLocomotionCmd(zeus::skZero3f, face.normalized(), 1.f));
} }
@ -504,7 +504,7 @@ void CElitePirate::Generate(CStateManager& mgr, EStateMsg msg, float) {
} }
} else if (x568_state == EState::One) { } else if (x568_state == EState::One) {
if (ShouldTurn(mgr, 0.f)) { if (ShouldTurn(mgr, 0.f)) {
const auto& face = mgr.GetPlayer().GetTranslation() - GetTranslation(); const auto face = mgr.GetPlayer().GetTranslation() - GetTranslation();
if (face.canBeNormalized()) { if (face.canBeNormalized()) {
x450_bodyController->GetCommandMgr().DeliverCmd(CBCLocomotionCmd(zeus::skZero3f, face.normalized(), 1.f)); x450_bodyController->GetCommandMgr().DeliverCmd(CBCLocomotionCmd(zeus::skZero3f, face.normalized(), 1.f));
} }
@ -671,14 +671,14 @@ void CElitePirate::Cover(CStateManager& mgr, EStateMsg msg, float dt) {
if (!TooClose(mgr, 0.f) && !PathShagged(mgr, 0.f)) { if (!TooClose(mgr, 0.f) && !PathShagged(mgr, 0.f)) {
CPatterned::PathFind(mgr, msg, dt); CPatterned::PathFind(mgr, msg, dt);
} else if (PathShagged(mgr, 0.f)) { } else if (PathShagged(mgr, 0.f)) {
const zeus::CVector3f& move = x8c0_.GetValue(GetTranslation(), GetTransform().frontVector()); const zeus::CVector3f move = x8c0_.GetValue(GetTranslation(), GetTransform().frontVector());
if (move != zeus::skZero3f) { if (move != zeus::skZero3f) {
x450_bodyController->GetCommandMgr().DeliverCmd(CBCLocomotionCmd(move, zeus::skZero3f, 1.f)); x450_bodyController->GetCommandMgr().DeliverCmd(CBCLocomotionCmd(move, zeus::skZero3f, 1.f));
} }
} else if (ShouldTurn(mgr, 0.f)) { } else if (ShouldTurn(mgr, 0.f)) {
const zeus::CVector3f& aim = const zeus::CVector3f aim =
mgr.GetPlayer().GetAimPosition(mgr, 0.5f * GetModelData()->GetAnimationData()->GetSpeedScale()); mgr.GetPlayer().GetAimPosition(mgr, 0.5f * GetModelData()->GetAnimationData()->GetSpeedScale());
const zeus::CVector3f& face = aim - GetTranslation(); const zeus::CVector3f face = aim - GetTranslation();
if (face.canBeNormalized()) { if (face.canBeNormalized()) {
x450_bodyController->GetCommandMgr().DeliverCmd(CBCLocomotionCmd(zeus::skZero3f, face.normalized(), 1.f)); x450_bodyController->GetCommandMgr().DeliverCmd(CBCLocomotionCmd(zeus::skZero3f, face.normalized(), 1.f));
} }
@ -746,8 +746,8 @@ bool CElitePirate::ShotAt(CStateManager& mgr, float) { return x988_27_shotAt; }
bool CElitePirate::ShouldSpecialAttack(CStateManager& mgr, float) { bool CElitePirate::ShouldSpecialAttack(CStateManager& mgr, float) {
if (x7b8_attackTimer <= 0.f && GetAreaIdAlways() == mgr.GetPlayer().GetAreaIdAlways()) { if (x7b8_attackTimer <= 0.f && GetAreaIdAlways() == mgr.GetPlayer().GetAreaIdAlways()) {
const zeus::CVector3f& dist = mgr.GetPlayer().GetAimPosition(mgr, 0.f) - GetTranslation(); const zeus::CVector3f dist = mgr.GetPlayer().GetAimPosition(mgr, 0.f) - GetTranslation();
float magSquared = dist.magSquared(); const float magSquared = dist.magSquared();
if (x2fc_minAttackRange * x2fc_minAttackRange <= magSquared && if (x2fc_minAttackRange * x2fc_minAttackRange <= magSquared &&
magSquared <= x300_maxAttackRange * x300_maxAttackRange) { magSquared <= x300_maxAttackRange * x300_maxAttackRange) {
return std::abs(dist.z()) < 3.f; return std::abs(dist.z()) < 3.f;
@ -869,7 +869,7 @@ void CElitePirate::SetupCollisionActorInfo(CStateManager& mgr) {
if (HasWeakPointHead()) { if (HasWeakPointHead()) {
for (size_t i = 0; i < x730_collisionActorMgrHead->GetNumCollisionActors(); ++i) { for (size_t i = 0; i < x730_collisionActorMgrHead->GetNumCollisionActors(); ++i) {
const auto& colDesc = x730_collisionActorMgrHead->GetCollisionDescFromIndex(i); const auto& colDesc = x730_collisionActorMgrHead->GetCollisionDescFromIndex(i);
const TUniqueId& uid = colDesc.GetCollisionActorId(); const TUniqueId uid = colDesc.GetCollisionActorId();
if (TCastToPtr<CCollisionActor> act = mgr.ObjectById(uid)) { if (TCastToPtr<CCollisionActor> act = mgr.ObjectById(uid)) {
if (colDesc.GetName() == "Head_1"sv) { if (colDesc.GetName() == "Head_1"sv) {
x770_collisionHeadId = uid; x770_collisionHeadId = uid;
@ -970,7 +970,7 @@ void CElitePirate::SetLauncherActive(CStateManager& mgr, bool val, TUniqueId uid
} }
zeus::CVector3f CElitePirate::GetLockOnPosition(const CActor* actor) const { zeus::CVector3f CElitePirate::GetLockOnPosition(const CActor* actor) const {
const zeus::CTransform& targetTransform = actor->GetLocatorTransform("lockon_target_LCTR"sv); const zeus::CTransform targetTransform = actor->GetLocatorTransform("lockon_target_LCTR"sv);
return actor->GetTranslation() + actor->GetTransform().rotate(targetTransform.origin); return actor->GetTranslation() + actor->GetTransform().rotate(targetTransform.origin);
} }
@ -980,8 +980,8 @@ bool CElitePirate::CanKnockBack(const CDamageInfo& info) const {
void CElitePirate::UpdateDestPos(CStateManager& mgr) { void CElitePirate::UpdateDestPos(CStateManager& mgr) {
x8b4_targetDestPos = GetTranslation(); x8b4_targetDestPos = GetTranslation();
const zeus::CVector3f& playerPos = mgr.GetPlayer().GetTranslation(); const zeus::CVector3f playerPos = mgr.GetPlayer().GetTranslation();
const zeus::CVector3f& dist = GetTranslation() - playerPos; const zeus::CVector3f dist = GetTranslation() - playerPos;
if (dist.canBeNormalized() && dist.magSquared() > x2fc_minAttackRange * x2fc_minAttackRange) { if (dist.canBeNormalized() && dist.magSquared() > x2fc_minAttackRange * x2fc_minAttackRange) {
x2e0_destPos = playerPos + (x2fc_minAttackRange * dist.normalized()); x2e0_destPos = playerPos + (x2fc_minAttackRange * dist.normalized());
x8b4_targetDestPos = x2e0_destPos; x8b4_targetDestPos = x2e0_destPos;
@ -1004,10 +1004,10 @@ void CElitePirate::AttractProjectiles(CStateManager& mgr) {
} }
float radius = x5d8_data.GetX1C(); float radius = x5d8_data.GetX1C();
const zeus::CVector3f& actorPos = actor->GetTranslation(); const zeus::CVector3f actorPos = actor->GetTranslation();
const zeus::CVector3f& pos = GetTranslation(); const zeus::CVector3f pos = GetTranslation();
rstl::reserved_vector<TUniqueId, 1024> projNearList; rstl::reserved_vector<TUniqueId, 1024> projNearList;
zeus::CAABox aabb{pos - radius, pos + radius}; const zeus::CAABox aabb{pos - radius, pos + radius};
mgr.BuildNearList(projNearList, aabb, CMaterialFilter::MakeInclude({EMaterialTypes::Projectile}), nullptr); mgr.BuildNearList(projNearList, aabb, CMaterialFilter::MakeInclude({EMaterialTypes::Projectile}), nullptr);
if (projNearList.empty()) { if (projNearList.empty()) {
return; return;
@ -1023,7 +1023,7 @@ void CElitePirate::AttractProjectiles(CStateManager& mgr) {
continue; continue;
} }
const zeus::CVector3f& projectilePos = projectile->GetTranslation(); const zeus::CVector3f projectilePos = projectile->GetTranslation();
const zeus::CVector3f actorProjDist = actorPos - projectilePos; const zeus::CVector3f actorProjDist = actorPos - projectilePos;
if (GetTransform().frontVector().dot(actorProjDist) < 0.f) { if (GetTransform().frontVector().dot(actorProjDist) < 0.f) {
const zeus::CVector3f projectileDir = projectilePos - projectile->GetPreviousPos(); const zeus::CVector3f projectileDir = projectilePos - projectile->GetPreviousPos();
@ -1068,8 +1068,8 @@ void CElitePirate::UpdateAbsorbBodyState(CStateManager& mgr, float dt) {
} else { } else {
bool b = false; bool b = false;
if (HasWeakPointHead()) { if (HasWeakPointHead()) {
if (TCastToConstPtr<CCollisionActor> actor = mgr.GetObjectById(x770_collisionHeadId)) { if (const TCastToConstPtr<CCollisionActor> actor = mgr.GetObjectById(x770_collisionHeadId)) {
float z = actor->GetTranslation().z(); const float z = actor->GetTranslation().z();
b = z - 0.5f * (z - GetTranslation().z()) <= mgr.GetPlayer().GetTranslation().z(); b = z - 0.5f * (z - GetTranslation().z()) <= mgr.GetPlayer().GetTranslation().z();
} }
} }
@ -1098,7 +1098,7 @@ void CElitePirate::UpdateTimers(float dt) {
} }
void CElitePirate::UpdatePositionHistory() { void CElitePirate::UpdatePositionHistory() {
const zeus::CVector3f& pos = GetTranslation(); const zeus::CVector3f pos = GetTranslation();
if (x7d0_pathFindSearch.OnPath(pos) == CPathFindSearch::EResult::Success) { if (x7d0_pathFindSearch.OnPath(pos) == CPathFindSearch::EResult::Success) {
x8c0_.Clear(); x8c0_.Clear();
} }
@ -1149,20 +1149,20 @@ bool CElitePirate::ShouldFireFromLauncher(CStateManager& mgr, TUniqueId launcher
if (launcher == nullptr) { if (launcher == nullptr) {
return false; return false;
} }
const zeus::CVector3f& aim = mgr.GetPlayer().GetAimPosition(mgr, 0.f); const zeus::CVector3f aim = mgr.GetPlayer().GetAimPosition(mgr, 0.f);
if (x300_maxAttackRange * x300_maxAttackRange > (aim - GetTranslation()).magSquared() || ShouldTurn(mgr, 0.f)) { if (x300_maxAttackRange * x300_maxAttackRange > (aim - GetTranslation()).magSquared() || ShouldTurn(mgr, 0.f)) {
return false; return false;
} }
const zeus::CVector3f& origin = GetLockOnPosition(launcher); const zeus::CVector3f origin = GetLockOnPosition(launcher);
if (IsPatternObstructed(mgr, origin, aim)) { if (IsPatternObstructed(mgr, origin, aim)) {
return false; return false;
} }
const zeus::CVector3f& target = CGrenadeLauncher::GrenadeTarget(mgr); const zeus::CVector3f target = CGrenadeLauncher::GrenadeTarget(mgr);
float angleOut = x5d8_data.GetGrenadeTrajectoryInfo().GetAngleMin(); float angleOut = x5d8_data.GetGrenadeTrajectoryInfo().GetAngleMin();
float velocityOut = x5d8_data.GetGrenadeTrajectoryInfo().GetVelocityMin(); float velocityOut = x5d8_data.GetGrenadeTrajectoryInfo().GetVelocityMin();
CGrenadeLauncher::CalculateGrenadeTrajectory(target, origin, x5d8_data.GetGrenadeTrajectoryInfo(), angleOut, CGrenadeLauncher::CalculateGrenadeTrajectory(target, origin, x5d8_data.GetGrenadeTrajectoryInfo(), angleOut,
velocityOut); velocityOut);
const zeus::CVector3f& rot = GetTransform().rotate({0.f, std::cos(angleOut), std::sin(angleOut)}); const zeus::CVector3f rot = GetTransform().rotate({0.f, std::cos(angleOut), std::sin(angleOut)});
return !CPatterned::IsPatternObstructed(mgr, target, target + (7.5f * rot)); return !CPatterned::IsPatternObstructed(mgr, target, target + (7.5f * rot));
} }
@ -1176,9 +1176,9 @@ bool CElitePirate::ShouldCallForBackupFromLauncher(const CStateManager& mgr, TUn
bool CElitePirate::IsClosestEnergyAttractor(const CStateManager& mgr, bool CElitePirate::IsClosestEnergyAttractor(const CStateManager& mgr,
const rstl::reserved_vector<TUniqueId, 1024>& charNearList, const rstl::reserved_vector<TUniqueId, 1024>& charNearList,
const zeus::CVector3f& projectilePos) const { const zeus::CVector3f& projectilePos) const {
float distance = (projectilePos - GetTranslation()).magSquared(); const float distance = (projectilePos - GetTranslation()).magSquared();
for (const auto id : charNearList) { for (const auto id : charNearList) {
if (TCastToConstPtr<CPatterned> actor = mgr.GetObjectById(id)) { if (const TCastToConstPtr<CPatterned> actor = mgr.GetObjectById(id)) {
if (actor->GetUniqueId() != GetUniqueId() && actor->IsEnergyAttractor() && if (actor->GetUniqueId() != GetUniqueId() && actor->IsEnergyAttractor() &&
(projectilePos - actor->GetTranslation()).magSquared() < distance) { (projectilePos - actor->GetTranslation()).magSquared() < distance) {
return false; return false;