From 66fcb84f9240fa6e26054cb5877d51ccac16565d Mon Sep 17 00:00:00 2001 From: Maciej Suminski Date: Wed, 12 Mar 2014 10:05:09 +0100 Subject: [PATCH] Minor fix to SEG class. --- include/geometry/seg.h | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/include/geometry/seg.h b/include/geometry/seg.h index b400930ef2..7e789f9d21 100644 --- a/include/geometry/seg.h +++ b/include/geometry/seg.h @@ -46,7 +46,8 @@ public: * to an object the segment belongs to (e.g. a line chain) or references to locally stored * points (m_a, m_b). */ - VECTOR2I& A, B; + VECTOR2I& A; + VECTOR2I& B; /** Default constructor * Creates an empty (0, 0) segment, locally-referenced @@ -203,6 +204,8 @@ public: bool Collide( const SEG& aSeg, int aClearance ) const; + ecoord SquaredDistance( const SEG& aSeg ) const; + /** * Function Distance() * @@ -210,14 +213,16 @@ public: * @param aSeg other segment * @return minimum distance */ - - ecoord SquaredDistance( const SEG& aSeg ) const; - int Distance( const SEG& aSeg ) const { return sqrt( SquaredDistance( aSeg ) ); } + ecoord SquaredDistance( const VECTOR2I& aP ) const + { + return ( NearestPoint( aP ) - aP ).SquaredEuclideanNorm(); + } + /** * Function Distance() * @@ -225,11 +230,6 @@ public: * @param aP the point * @return minimum distance */ - ecoord SquaredDistance( const VECTOR2I& aP ) const - { - return ( NearestPoint( aP ) - aP ).SquaredEuclideanNorm(); - } - int Distance( const VECTOR2I& aP ) const { return sqrt( SquaredDistance( aP ) );