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

CGameProjectile: Return std::nullopt in GetTouchBounds() 

Same behavior, but doesn't potentially unnecessary zero out the entirety
of the buffer within the optional and only sets a single byte.
This commit is contained in:
Lioncash 2020-04-03 01:58:43 -04:00
parent d47f8c2784
commit b122fd30a8
1 changed files with 60 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

73
Runtime/Weapon/CGameProjectile.cpp
View File

@ -322,8 +322,9 @@ CRayCastResult CGameProjectile::RayCollisionCheckWithWorld(TUniqueId& idOut, con
CProjectileTouchResult CGameProjectile::CanCollideWith(CActor& act, CStateManager& mgr) const {
if (act.GetDamageVulnerability()->GetVulnerability(x12c_curDamageInfo.GetWeaponMode(), false) ==
EVulnerability::PassThrough) {
return {kInvalidUniqueId, {}};
} else {
return {kInvalidUniqueId, std::nullopt};
}
if (TCastToConstPtr<CScriptTrigger>(act)) {
return CanCollideWithTrigger(act, mgr);
} else if (TCastToConstPtr<CScriptPlatform>(act) || TCastToConstPtr<CCollisionActor>(act) ||
@ -332,7 +333,6 @@ CProjectileTouchResult CGameProjectile::CanCollideWith(CActor& act, CStateManage
} else {
return CanCollideWithGameObject(act, mgr);
}
}
}
CProjectileTouchResult CGameProjectile::CanCollideWithComplexCollision(const CActor& act,
@ -346,29 +346,39 @@ CProjectileTouchResult CGameProjectile::CanCollideWithComplexCollision(const CAc
useAct = toad;
} else if (const TCastToConstPtr<CCollisionActor> cact = act) {
if (cact->GetOwnerId() == xec_ownerId) {
return {kInvalidUniqueId, {}};
return {kInvalidUniqueId, std::nullopt};
}
useAct = cact.GetPtr();
}
if (useAct) {
if (!useAct) {
return {act.GetUniqueId(), std::nullopt};
}
const CCollisionPrimitive* prim = useAct->GetCollisionPrimitive();
zeus::CTransform xf = useAct->GetPrimitiveTransform();
zeus::CVector3f deltaPos = GetTranslation() - x298_previousPos;
if (deltaPos.canBeNormalized()) {
zeus::CVector3f dir = deltaPos.normalized();
const zeus::CTransform xf = useAct->GetPrimitiveTransform();
const zeus::CVector3f deltaPos = GetTranslation() - x298_previousPos;
if (!deltaPos.canBeNormalized()) {
return {kInvalidUniqueId, std::nullopt};
}
const zeus::CVector3f dir = deltaPos.normalized();
float mag = deltaPos.magnitude();
CRayCastResult res = prim->CastRayInternal(
const CRayCastResult res = prim->CastRayInternal(
{x298_previousPos, dir, mag, xf,
CMaterialFilter::MakeIncludeExclude({EMaterialTypes::Solid}, {EMaterialTypes::ProjectilePassthrough})});
if (!res.IsValid()) {
if (res.IsValid()) {
return {act.GetUniqueId(), {res}};
}
if (prim->GetPrimType() == FOURCC('SPHR')) {
mag *= 2.f;
CRayCastResult res2 = prim->CastRayInternal(
const CRayCastResult res2 = prim->CastRayInternal(
{x298_previousPos - dir * mag, dir, deltaPos.magnitude(), xf,
CMaterialFilter::MakeIncludeExclude({EMaterialTypes::Solid}, {EMaterialTypes::ProjectilePassthrough})});
if (res2.IsValid())
if (res2.IsValid()) {
return {act.GetUniqueId(), {res2}};
}
} else if (const TCastToConstPtr<CCollisionActor> cAct = act) {
const float rad = cAct->GetSphereRadius();
if ((x298_previousPos - GetTranslation()).magSquared() < rad * rad) {
@ -377,42 +387,34 @@ CProjectileTouchResult CGameProjectile::CanCollideWithComplexCollision(const CAc
return {act.GetUniqueId(), {{0.f, point, {revDir, point.dot(revDir)}, act.GetMaterialList()}}};
}
}
return {kInvalidUniqueId, {}};
} else {
return {act.GetUniqueId(), {res}};
}
} else {
return {kInvalidUniqueId, {}};
}
} else {
return {act.GetUniqueId(), {}};
}
return {kInvalidUniqueId, std::nullopt};
}
CProjectileTouchResult CGameProjectile::CanCollideWithGameObject(CActor& act, CStateManager& mgr) const {
const TCastToConstPtr<CGameProjectile> proj = act;
if (!proj) {
if (!act.GetMaterialList().HasMaterial(EMaterialTypes::Solid) && !act.HealthInfo(mgr)) {
return {kInvalidUniqueId, {}};
return {kInvalidUniqueId, std::nullopt};
} else if (act.GetUniqueId() == xec_ownerId) {
return {kInvalidUniqueId, {}};
return {kInvalidUniqueId, std::nullopt};
} else if (act.GetUniqueId() == x2c2_lastResolvedObj) {
return {kInvalidUniqueId, {}};
return {kInvalidUniqueId, std::nullopt};
} else if (xf8_filter.GetExcludeList().Intersection(act.GetMaterialList())) {
return {kInvalidUniqueId, {}};
return {kInvalidUniqueId, std::nullopt};
} else if (TCastToPtr<CAi> ai = act) {
if (!ai->CanBeShot(mgr, int(xe8_projectileAttribs))) {
return {kInvalidUniqueId, {}};
return {kInvalidUniqueId, std::nullopt};
}
}
} else if ((xe8_projectileAttribs & EProjectileAttrib::PartialCharge) == EProjectileAttrib::PartialCharge ||
(proj->xe8_projectileAttribs & EProjectileAttrib::PartialCharge) == EProjectileAttrib::PartialCharge) {
return {act.GetUniqueId(), {}};
return {act.GetUniqueId(), std::nullopt};
} else if ((xe8_projectileAttribs & EProjectileAttrib::PartialCharge) != EProjectileAttrib::PartialCharge &&
(proj->xe8_projectileAttribs & EProjectileAttrib::PartialCharge) != EProjectileAttrib::PartialCharge) {
return {kInvalidUniqueId, {}};
return {kInvalidUniqueId, std::nullopt};
}
return {act.GetUniqueId(), {}};
return {act.GetUniqueId(), std::nullopt};
}
CProjectileTouchResult CGameProjectile::CanCollideWithTrigger(const CActor& act, const CStateManager& mgr) const {
@ -431,9 +433,9 @@ CProjectileTouchResult CGameProjectile::CanCollideWithTrigger(const CActor& act,
leftWater = true;
}
}
return {(enteredWater || leftWater) ? act.GetUniqueId() : kInvalidUniqueId, {}};
return {(enteredWater || leftWater) ? act.GetUniqueId() : kInvalidUniqueId, std::nullopt};
}
return {kInvalidUniqueId, {}};
return {kInvalidUniqueId, std::nullopt};
}
zeus::CAABox CGameProjectile::GetProjectileBounds() const {
@ -446,9 +448,10 @@ zeus::CAABox CGameProjectile::GetProjectileBounds() const {
}
std::optional<zeus::CAABox> CGameProjectile::GetTouchBounds() const {
if (x2e4_24_active)
if (x2e4_24_active) {
return {GetProjectileBounds()};
return {};
}
return std::nullopt;
}
} // namespace urde