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

CRayCollisionTester: Tidy up code a little

This commit is contained in:
Lioncash 2020-06-19 18:39:21 -04:00
parent 40f0fbca4c
commit b02b507675
1 changed files with 11 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/Core/CRayCollisionTester.cpp
View File

@ -6,14 +6,11 @@ CRayCollisionTester::CRayCollisionTester(const CRay& rkRay)
{
}
CRayCollisionTester::~CRayCollisionTester()
{
}
CRayCollisionTester::~CRayCollisionTester() = default;
void CRayCollisionTester::AddNode(CSceneNode *pNode, uint32 ComponentIndex, float Distance)
{
mBoxIntersectList.emplace_back(SRayIntersection());
SRayIntersection& rIntersection = mBoxIntersectList.back();
SRayIntersection& rIntersection = mBoxIntersectList.emplace_back();
rIntersection.pNode = pNode;
rIntersection.ComponentIndex = ComponentIndex;
rIntersection.Distance = Distance;
@ -34,36 +31,34 @@ void CRayCollisionTester::AddNodeModel(CSceneNode *pNode, CBasicModel *pModel)
SRayIntersection CRayCollisionTester::TestNodes(const SViewInfo& rkViewInfo)
{
// Sort nodes by distance from ray
mBoxIntersectList.sort(
[](const SRayIntersection& rkLeft, const SRayIntersection& rkRight) -> bool
{
return (rkLeft.Distance < rkRight.Distance);
mBoxIntersectList.sort([](const auto& rkLeft, const auto& rkRight) {
return rkLeft.Distance < rkRight.Distance;
});
// Now do more precise intersection tests on geometry
SRayIntersection Result;
Result.Hit = false;
for (auto iNode = mBoxIntersectList.begin(); iNode != mBoxIntersectList.end(); iNode++)
for (const auto& rIntersection : mBoxIntersectList)
{
SRayIntersection& rIntersection = *iNode;
// If we have a result, and the distance for the bounding box hit is further than the current result distance
// then we know that every remaining node is further away and there is no chance of finding a closer hit.
if ((Result.Hit) && (Result.Distance < rIntersection.Distance))
if (Result.Hit && Result.Distance < rIntersection.Distance)
break;
// Otherwise, more intersection tests...
CSceneNode *pNode = rIntersection.pNode;
SRayIntersection MidResult = pNode->RayNodeIntersectTest(mRay, rIntersection.ComponentIndex, rkViewInfo);
const SRayIntersection MidResult = pNode->RayNodeIntersectTest(mRay, rIntersection.ComponentIndex, rkViewInfo);
if (MidResult.Hit)
{
if ((!Result.Hit) || (MidResult.Distance <= Result.Distance))
if (!Result.Hit || MidResult.Distance <= Result.Distance)
Result = MidResult;
}
}
if (Result.Hit) Result.HitPoint = mRay.PointOnRay(Result.Distance);
if (Result.Hit)
Result.HitPoint = mRay.PointOnRay(Result.Distance);
return Result;
}