josh/fart
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

got Shape::IntersectionList::merge() to sort the result with IntersectionComparator successfully

Browse Source 
git-svn-id: svn://anubis/fart/trunk@150 7f9b0f55-74a9-4bce-be96-3c2cd072584d
This commit is contained in:
Josh Holtrop 2009-02-24 00:38:09 +00:00
parent 25d6432dbd
commit 7d64dd745d
1 changed files with 21 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
shapes/Shape.cc
View File

@ -2,6 +2,7 @@
#include "Shape.h"
#include <algorithm> /* sort() */
#include <functional> /* binary_function */
#include <utility>
using namespace std;
Shape::Shape()
@ -14,6 +15,25 @@ Shape::~Shape()
{
}
class IntersectionComparator : public std::binary_function<Shape::Intersection,
Shape::Intersection,
bool>
{
public:
IntersectionComparator(const Vector & refPoint)
{
m_refPoint = refPoint;
}
bool operator()(const Shape::Intersection & i1,
const Shape::Intersection & i2) const
{
return (m_refPoint.dist_to(i1.second)
< m_refPoint.dist_to(i2.second));
}
protected:
Vector m_refPoint;
};
Shape::IntersectionList
Shape::IntersectionList::merge(const IntersectionList & other,
const Vector & startPoint)
@ -33,25 +53,7 @@ Shape::IntersectionList::merge(const IntersectionList & other,
result.add(other.m_intersections[i]);
}
class Comparator : public binary_function<Intersection,
Intersection,
bool>
{
public:
Comparator(const Vector & refPoint)
{
m_refPoint = refPoint;
}
bool operator()(Intersection const & i1, Intersection const & i2) const
{
return (m_refPoint.dist_to(i1.second)
< m_refPoint.dist_to(i2.second));
}
protected:
Vector m_refPoint;
};
sort(result.m_intersections.begin(), result.m_intersections.end(), Comparator(startPoint));
sort(result.begin(), result.end(), IntersectionComparator(startPoint));
return result;
}