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

CTeamAiMgr: Make use of TCastToConstPtr where applicable 

Makes mutability explicit.
This commit is contained in:
Lioncash 2020-05-19 23:47:02 -04:00
parent e1ddabaff8
commit 96129264a3
1 changed files with 32 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
Runtime/World/CTeamAiMgr.cpp
View File

@ -90,27 +90,29 @@ void CTeamAiMgr::ResetRoles(CStateManager& mgr) {
} }
void CTeamAiMgr::SpacingSort(CStateManager& mgr, const zeus::CVector3f& pos) { void CTeamAiMgr::SpacingSort(CStateManager& mgr, const zeus::CVector3f& pos) {
TeamAiRoleSorter sorter(pos, 2); const TeamAiRoleSorter sorter(pos, 2);
std::sort(x58_roles.begin(), x58_roles.end(), sorter); std::sort(x58_roles.begin(), x58_roles.end(), sorter);
float tierStagger = 4.5f; float tierStagger = 4.5f;
for (const auto& role : x58_roles) { for (const auto& role : x58_roles) {
if (TCastToPtr<CAi> ai = mgr.ObjectById(role.GetOwnerId())) { if (const TCastToConstPtr<CAi> ai = mgr.ObjectById(role.GetOwnerId())) {
float length = (ai->GetBaseBoundingBox().max.y() - ai->GetBaseBoundingBox().min.y()) * 1.5f; const float length = (ai->GetBaseBoundingBox().max.y() - ai->GetBaseBoundingBox().min.y()) * 1.5f;
if (length > tierStagger) if (length > tierStagger) {
tierStagger = length; tierStagger = length;
}
} }
} }
float curTierDist = tierStagger; float curTierDist = tierStagger;
int tierTeamSize = 0; int tierTeamSize = 0;
int maxTierTeamSize = 3; int maxTierTeamSize = 3;
for (auto& role : x58_roles) { for (auto& role : x58_roles) {
if (TCastToPtr<CAi> ai = mgr.ObjectById(role.GetOwnerId())) { if (const TCastToConstPtr<CAi> ai = mgr.ObjectById(role.GetOwnerId())) {
zeus::CVector3f delta = ai->GetTranslation() - pos; zeus::CVector3f delta = ai->GetTranslation() - pos;
zeus::CVector3f newPos; zeus::CVector3f newPos;
if (delta.canBeNormalized()) if (delta.canBeNormalized()) {
newPos = pos + delta.normalized() * curTierDist; newPos = pos + delta.normalized() * curTierDist;
else } else {
newPos = pos + ai->GetTransform().basis[1] * curTierDist; newPos = pos + ai->GetTransform().basis[1] * curTierDist;
}
role.x1c_position = newPos; role.x1c_position = newPos;
role.x1c_position.z() = ai->GetTranslation().z(); role.x1c_position.z() = ai->GetTranslation().z();
tierTeamSize += 1; tierTeamSize += 1;
@ -121,7 +123,7 @@ void CTeamAiMgr::SpacingSort(CStateManager& mgr, const zeus::CVector3f& pos) {
} }
} }
} }
TeamAiRoleSorter sorter2(pos, 0); const TeamAiRoleSorter sorter2(pos, 0);
std::sort(x58_roles.begin(), x58_roles.end(), sorter2); std::sort(x58_roles.begin(), x58_roles.end(), sorter2);
} }
@ -132,24 +134,29 @@ void CTeamAiMgr::PositionTeam(CStateManager& mgr) {
SpacingSort(mgr, aimPos); SpacingSort(mgr, aimPos);
break; break;
default: default:
for (auto& role : x58_roles) for (auto& role : x58_roles) {
if (TCastToPtr<CAi> ai = mgr.ObjectById(role.GetOwnerId())) if (const TCastToConstPtr<CAi> ai = mgr.ObjectById(role.GetOwnerId())) {
role.x1c_position = ai->GetOrigin(mgr, role, aimPos); role.x1c_position = ai->GetOrigin(mgr, role, aimPos);
}
}
break; break;
} }
} }
void CTeamAiMgr::AssignRoles(CTeamAiRole::ETeamAiRole assRole, s32 count) { void CTeamAiMgr::AssignRoles(CTeamAiRole::ETeamAiRole assRole, s32 count) {
if (count == 0) if (count == 0) {
return; return;
}
s32 lastIdx = 0; s32 lastIdx = 0;
for (auto& role : x58_roles) { for (auto& role : x58_roles) {
if (role.GetTeamAiRole() == CTeamAiRole::ETeamAiRole::Initial) { if (role.GetTeamAiRole() == CTeamAiRole::ETeamAiRole::Initial) {
if (role.x4_roleA == assRole || role.x8_roleB == assRole || role.xc_roleC == assRole) { if (role.x4_roleA == assRole || role.x8_roleB == assRole || role.xc_roleC == assRole) {
role.x10_curRole = assRole; role.x10_curRole = assRole;
role.x14_roleIndex = lastIdx++; role.x14_roleIndex = lastIdx++;
if (lastIdx == count) if (lastIdx == count) {
return; return;
}
} }
} }
} }
@ -157,26 +164,34 @@ void CTeamAiMgr::AssignRoles(CTeamAiRole::ETeamAiRole assRole, s32 count) {
void CTeamAiMgr::UpdateRoles(CStateManager& mgr) { void CTeamAiMgr::UpdateRoles(CStateManager& mgr) {
ResetRoles(mgr); ResetRoles(mgr);
zeus::CVector3f aimPos = mgr.GetPlayer().GetAimPosition(mgr, 0.f);
TeamAiRoleSorter sorter(aimPos, 1); const zeus::CVector3f aimPos = mgr.GetPlayer().GetAimPosition(mgr, 0.f);
const TeamAiRoleSorter sorter(aimPos, 1);
std::sort(x58_roles.begin(), x58_roles.end(), sorter); std::sort(x58_roles.begin(), x58_roles.end(), sorter);
AssignRoles(CTeamAiRole::ETeamAiRole::Melee, x34_data.x4_meleeCount); AssignRoles(CTeamAiRole::ETeamAiRole::Melee, x34_data.x4_meleeCount);
AssignRoles(CTeamAiRole::ETeamAiRole::Ranged, x34_data.x8_rangedCount); AssignRoles(CTeamAiRole::ETeamAiRole::Ranged, x34_data.x8_rangedCount);
AssignRoles(CTeamAiRole::ETeamAiRole::Unknown, x34_data.xc_unknownCount); AssignRoles(CTeamAiRole::ETeamAiRole::Unknown, x34_data.xc_unknownCount);
for (auto& role : x58_roles) { for (auto& role : x58_roles) {
if (role.GetTeamAiRole() <= CTeamAiRole::ETeamAiRole::Initial || if (role.GetTeamAiRole() <= CTeamAiRole::ETeamAiRole::Initial ||
role.GetTeamAiRole() > CTeamAiRole::ETeamAiRole::Unassigned) role.GetTeamAiRole() > CTeamAiRole::ETeamAiRole::Unassigned) {
role.SetTeamAiRole(CTeamAiRole::ETeamAiRole::Unassigned); role.SetTeamAiRole(CTeamAiRole::ETeamAiRole::Unassigned);
}
} }
TeamAiRoleSorter sorter2(aimPos, 0);
const TeamAiRoleSorter sorter2(aimPos, 0);
std::sort(x58_roles.begin(), x58_roles.end(), sorter2); std::sort(x58_roles.begin(), x58_roles.end(), sorter2);
x88_timeDirty = 0.f; x88_timeDirty = 0.f;
} }
void CTeamAiMgr::Think(float dt, CStateManager& mgr) { void CTeamAiMgr::Think(float dt, CStateManager& mgr) {
CEntity::Think(dt, mgr); CEntity::Think(dt, mgr);
if (ShouldUpdateRoles(dt))
if (ShouldUpdateRoles(dt)) {
UpdateRoles(mgr); UpdateRoles(mgr);
}
PositionTeam(mgr); PositionTeam(mgr);
x90_timeSinceMelee += dt; x90_timeSinceMelee += dt;
x94_timeSinceRanged += dt; x94_timeSinceRanged += dt;