songsenand
/
cgal
mirror of https://github.com/CGAL/cgal
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix Triangulation_2 projection traits with arbitrary plane

This commit is contained in:
Laurent Rineau 2015-05-08 16:12:29 +02:00
parent 8f0bb6dc46
commit 2e13efa16e
2 changed files with 118 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
Triangulation_2/include/CGAL/Triangulation_2_filtered_projection_traits_3.h
View File

@ -45,7 +45,7 @@ public:
typedef Triangulation_2_projection_traits_3<Approximate_kernel> Filtering_traits;
public:
Triangulation_2_filtered_projection_traits_3(const typename K::Vector_3& n)
explicit Triangulation_2_filtered_projection_traits_3(const typename K::Vector_3& n)
: Base(n)
{
}
@ -67,22 +67,34 @@ public:
return *this;
}
#define CGAL_TRIANGULATION_2_PROJ_TRAITS_FILTER_PRED(P, Pf, obj) \
#define CGAL_TRIANGULATION_2_PROJ_TRAITS_FILTER_PRED(P, Pf, ACCESSOR) \
typedef Filtered_predicate< \
typename Exact_traits::P, \
typename Filtering_traits::P, \
C2E, \
C2F > P; \
P Pf() const { \
return P(this->normal()); \
return P(this->ACCESSOR()); \
}
// std::cerr << #P << "_object()\n";
CGAL_TRIANGULATION_2_PROJ_TRAITS_FILTER_PRED(Orientation_2,
orientation_2_object,
orientation)
normal)
CGAL_TRIANGULATION_2_PROJ_TRAITS_FILTER_PRED(Side_of_oriented_circle_2,
side_of_oriented_circle_2_object,
side_of_oriented_circle)
normal)
CGAL_TRIANGULATION_2_PROJ_TRAITS_FILTER_PRED(Less_x_2,
less_x_2_object,
base1)
CGAL_TRIANGULATION_2_PROJ_TRAITS_FILTER_PRED(Less_y_2,
less_y_2_object,
base2)
CGAL_TRIANGULATION_2_PROJ_TRAITS_FILTER_PRED(Compare_x_2,
compare_x_2_object,
base1)
CGAL_TRIANGULATION_2_PROJ_TRAITS_FILTER_PRED(Compare_y_2,
compare_y_2_object,
base2)
}; // end class Triangulation_2_projection_traits_3<Filtered_kernel>
} // end namespace CGAL

124
Triangulation_2/include/CGAL/Triangulation_2_projection_traits_3.h
View File

@ -251,6 +251,49 @@ public:
}
}; // end class Projected_intersect_3
template <class Traits>
class Less_along_axis
{
// private members
typedef typename Traits::Vector_3 Vector_3;
typedef typename Traits::Point_2 Point;
const Vector_3 base;
public:
Less_along_axis(const Vector_3& base) : base(base)
{
CGAL_PROFILER("Construct Less_along_axis")
CGAL_TIME_PROFILER("Construct Less_along_axis")
}
typedef bool result_type;
bool operator() (const Point &p, const Point &q) const {
return base * (p - q) < 0;
}
}; // end class Less_along_axis
template <class Traits>
class Compare_along_axis
{
// private members
typedef typename Traits::Vector_3 Vector_3;
typedef typename Traits::Point_2 Point;
const Vector_3 base;
public:
Compare_along_axis(const Vector_3& base) : base(base)
{
CGAL_PROFILER("Construct Compare_along_axis")
CGAL_TIME_PROFILER("Construct Compare_along_axis")
}
typedef Comparison_result result_type;
Comparison_result operator() (const Point &p, const Point &q) const {
return compare(base * (p - q), 0);
}
}; // end class Compare_along_axis
} // end namespace TriangulationProjectionTraitsCartesianFunctors
@ -259,41 +302,69 @@ class Triangulation_2_projection_traits_3
{
typedef Triangulation_2_projection_traits_3<Kernel> Self;
typename Kernel::Vector_3 n;
typename Kernel::Vector_3 n, b1, b2;
public:
typedef typename Kernel::Vector_3 Vector_3;
Triangulation_2_projection_traits_3(const Vector_3& n_)
explicit Triangulation_2_projection_traits_3(const Vector_3& n_)
: n(n_)
{}
{
typedef typename Kernel::FT FT;
typedef typename Kernel::Vector_3 Vector_3;
const FT& nx = n.x();
const FT& ny = n.y();
const FT& nz = n.z();
const FT anz = CGAL::abs(nz);
if(anz >= CGAL::abs(nx) &&
anz >= CGAL::abs(ny)) { // z is the max absolute coordinate of n
b1 = Vector_3(nz, 0, -nx);
}
else {
b1 = Vector_3(ny, -nx, 0);
}
b2 = cross_product(n, b1);
// std::cerr << "\nTriangulation_2_projection_traits_3(" << b1 << "\n"
// << " " << b2 << "\n"
// << " " << n << "\n";
}
Triangulation_2_projection_traits_3(const Self& other)
: n(other.n)
: n(other.n), b1(other.b1), b2(other.b2)
{
// std::cerr << "Copy of a traits. Type="
// << typeid(*this).name() << std::endl
// << "normal=" << normal() << std::endl;
}
const Vector_3& normal() const
{
// std::cerr << "normal=" << n << std::endl;
return n;
}
Self& operator=(const Self& other)
{
std::cerr << "Assign of a non-filtrered projected traits. Type="
<< typeid(*this).name() << std::endl;
if(this != &other) {
n = other.n;
b1 = other.b1;
b2 = other.b2;
}
std::cerr << "Normal="<< this->normal() << std::endl;
return *this;
}
const Vector_3& normal() const
{
return n;
}
const Vector_3& base1() const{
return b1;
}
const Vector_3& base2() const{
return b2;
}
typedef Kernel K;
typedef typename K::FT FT;
typedef typename K::Point_3 Point_2;
@ -302,15 +373,18 @@ public:
typedef typename K::Triangle_3 Triangle_2;
typedef typename K::Line_3 Line_2;
// Maybe not a good choice
typedef typename K::Less_xy_3 Less_x_2;
typedef typename K::Less_z_3 Less_y_2;
typedef typename K::Compare_xy_3 Compare_x_2;
typedef typename K::Compare_z_3 Compare_y_2;
typedef typename K::Angle_3 Angle_2;
typedef TriangulationProjectionTraitsCartesianFunctors::
Compare_along_axis<Self> Compare_x_2;
typedef TriangulationProjectionTraitsCartesianFunctors::
Compare_along_axis<Self> Compare_y_2;
typedef TriangulationProjectionTraitsCartesianFunctors::
Less_along_axis<Self> Less_x_2;
typedef TriangulationProjectionTraitsCartesianFunctors::
Less_along_axis<Self> Less_y_2;
typedef TriangulationProjectionTraitsCartesianFunctors::
Projected_orientation_with_normal_3<Self> Orientation_2;
@ -336,23 +410,27 @@ public:
typedef typename K::Compute_area_3 Compute_area_2;
Less_x_2
less_x_2_object() const
{ return Less_x_2();}
Less_x_2_object() const
{
return Less_x_2(this->base1());
}
Less_y_2
less_y_2_object() const
{ return Less_y_2();}
Less_y_2_object() const
{
return Less_y_2(this->base2());
}
Compare_x_2
compare_x_2_object() const
{
return Compare_x_2();
return Compare_x_2(this->base1());
}
Compare_y_2
compare_y_2_object() const
{
return Compare_y_2();
return Compare_y_2(this->base2());
}
Orientation_2