From c92739a95d73eba7a6727da472ee348db5187203 Mon Sep 17 00:00:00 2001 From: Uwe Date: Sun, 19 Jun 2022 17:10:55 +0200 Subject: [PATCH] [Point] remove unnecessary Boolean comparisons --- src/Mod/Points/App/PointsGrid.cpp | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/src/Mod/Points/App/PointsGrid.cpp b/src/Mod/Points/App/PointsGrid.cpp index 3cb4db1675..84086650fb 100644 --- a/src/Mod/Points/App/PointsGrid.cpp +++ b/src/Mod/Points/App/PointsGrid.cpp @@ -203,7 +203,7 @@ unsigned long PointsGrid::InSide (const Base::BoundBox3d &rclBB, std::vector::iterator itP = aulElements.begin(); itP != aulElements.end(); ++itP ) { const Base::Vector3d& cP = _pclPoints->getPoint(*itP); - if ( it.GetBoundBox().IsInBox( cP ) == false ) + if (!it.GetBoundBox().IsInBox(cP)) return false; // point doesn't lie inside the grid element } } @@ -757,7 +757,7 @@ bool PointsGridIterator::InitOnRay (const Base::Vector3d &rclPt, const Base::Vec _bValidRay = false; // point lies within global BB - if ((_rclGrid.GetBoundBox().IsInBox(rclPt)) == true) + if (_rclGrid.GetBoundBox().IsInBox(rclPt)) { // determine the voxel by the starting point _rclGrid.Position(rclPt, _ulX, _ulY, _ulZ); raulElements.insert(raulElements.end(), _rclGrid._aulGrid[_ulX][_ulY][_ulZ].begin(), _rclGrid._aulGrid[_ulX][_ulY][_ulZ].end()); @@ -766,7 +766,7 @@ bool PointsGridIterator::InitOnRay (const Base::Vector3d &rclPt, const Base::Vec else { // StartPoint outside Base::Vector3d cP0, cP1; - if (_rclGrid.GetBoundBox().IntersectWithLine(rclPt, rclDir, cP0, cP1) == true) + if (_rclGrid.GetBoundBox().IntersectWithLine(rclPt, rclDir, cP0, cP1)) { // determine the next point if ((cP0 - rclPt).Length() < (cP1 - rclPt).Length()) _rclGrid.Position(cP0, _ulX, _ulY, _ulZ); @@ -783,7 +783,7 @@ bool PointsGridIterator::InitOnRay (const Base::Vector3d &rclPt, const Base::Vec bool PointsGridIterator::NextOnRay (std::vector &raulElements) { - if (_bValidRay == false) + if (!_bValidRay) return false; // not initialized or beam exited raulElements.clear(); @@ -821,7 +821,7 @@ bool PointsGridIterator::NextOnRay (std::vector &raulElements) _bValidRay = false; // grid element already visited => result from GetSideFromRay invalid } - if ((_bValidRay == true) && (_rclGrid.CheckPos(_ulX, _ulY, _ulZ) == true)) + if (_bValidRay && _rclGrid.CheckPos(_ulX, _ulY, _ulZ)) { GridElement pos(_ulX, _ulY, _ulZ); _cSearchPositions.insert(pos); raulElements.insert(raulElements.end(), _rclGrid._aulGrid[_ulX][_ulY][_ulZ].begin(), _rclGrid._aulGrid[_ulX][_ulY][_ulZ].end());