AxioDL/metaforce
2
0
Fork 0
mirror of https://github.com/AxioDL/metaforce.git synced 2025-12-09 13:47:43 +00:00
Code Issues Projects Releases Wiki Activity

Various bug fixes

Browse Source
This commit is contained in:
Jack Andersen
2018-05-26 18:22:38 -10:00
parent 92ed463051
commit cc6d79e280
25 changed files with 182 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
Runtime/Collision/CollisionUtil.cpp
View File

@@ -1237,6 +1237,25 @@ bool AABox_AABox_Moving(const zeus::CAABox& aabb0, const zeus::CAABox& aabb1, co
void AddAverageToFront(const CCollisionInfoList& in, CCollisionInfoList& out)
{
if (in.GetCount() > 1)
{
zeus::CVector3f pointAccum, normAccum;
for (const CCollisionInfo& info : in)
{
pointAccum += info.GetPoint();
normAccum += info.GetNormalLeft();
}
if (normAccum.canBeNormalized())
{
out.Add(CCollisionInfo(pointAccum / float(in.GetCount()),
in.GetItem(0).GetMaterialRight(), in.GetItem(0).GetMaterialLeft(),
normAccum.normalized()), false);
}
}
for (const CCollisionInfo& info : in)
out.Add(info, false);
}
}