AxioDL/PrimeWorldEditor
2
0
Fork 0
mirror of https://github.com/AxioDL/PrimeWorldEditor.git synced 2025-12-09 21:47:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

SSurface: Make IntersectsRay() a const member function

Browse Source
This commit is contained in:
Lioncash
2020-06-21 19:44:22 -04:00
parent 5b0ae09cf3
commit 2b7513b156
6 changed files with 25 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/Editor/CGizmo.cpp
View File

@@ -163,18 +163,18 @@ bool CGizmo::CheckSelectedAxes(const CRay& rkRay)
if (ModelBoxCheck)
{
bool Hit = false;
float Dist;
float Dist = 0.0f;
for (size_t iSurf = 0; iSurf < pModel->GetSurfaceCount(); iSurf++)
{
// Skip surface/box check - since we use lines the boxes might be too small
SSurface *pSurf = pModel->GetSurface(iSurf);
std::pair<bool,float> SurfCheck = pSurf->IntersectsRay(rPartRay, false, 0.05f);
const SSurface* pSurf = pModel->GetSurface(iSurf);
const auto [intersects, distance] = pSurf->IntersectsRay(rPartRay, false, 0.05f);
if (SurfCheck.first)
if (intersects)
{
if (!Hit || SurfCheck.second < Dist)
Dist = SurfCheck.second;
if (!Hit || distance < Dist)
Dist = distance;
Hit = true;
}