From 7528986e4449febead9b18b6118f0b096f7cf800 Mon Sep 17 00:00:00 2001 From: Loïc Blot Date: Sat, 19 Aug 2017 14:25:35 +0200 Subject: Code modernization: src/p*, src/q*, src/r*, src/s* (partial) (#6282) * Code modernization: src/p*, src/q*, src/r*, src/s* (partial) * empty function * default constructor/destructor * for range-based loops * use emplace_back instead of push_back * C++ STL header style * Spelling: vertice -> vertex --- src/raycast.cpp | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'src/raycast.cpp') diff --git a/src/raycast.cpp b/src/raycast.cpp index 42cc22587..2dbebd83b 100644 --- a/src/raycast.cpp +++ b/src/raycast.cpp @@ -31,13 +31,15 @@ bool RaycastSort::operator() (const PointedThing &pt1, // returns false if pt1 is nearer than pt2 if (pt1.distanceSq < pt2.distanceSq) { return false; - } else if (pt1.distanceSq == pt2.distanceSq) { + } + + if (pt1.distanceSq == pt2.distanceSq) { // Sort them to allow only one order if (pt1.type == POINTEDTHING_OBJECT) return (pt2.type == POINTEDTHING_OBJECT && pt1.object_id < pt2.object_id); - else - return (pt2.type == POINTEDTHING_OBJECT + + return (pt2.type == POINTEDTHING_OBJECT || pt1.node_undersurface < pt2.node_undersurface); } return true; -- cgit v1.2.3