mirror of https://github.com/CGAL/cgal
WIP
This commit is contained in:
parent
98c944450a
commit
0261184dee
|
|
@ -34,7 +34,7 @@ minimum_dihedral_angle(
|
|||
const typename K::Point_3& p1,
|
||||
const typename K::Point_3& p2,
|
||||
const typename K::Point_3& p3,
|
||||
K k = K())
|
||||
const K& k = K())
|
||||
{
|
||||
typedef typename K::FT FT;
|
||||
|
||||
|
|
@ -84,7 +84,7 @@ minimum_dihedral_angle(
|
|||
const typename K::Point_3& p1,
|
||||
const typename K::Point_3& p2,
|
||||
const typename K::Point_3& p3,
|
||||
K k = K())
|
||||
const K& k)
|
||||
{
|
||||
typedef typename K::FT FT;
|
||||
|
||||
|
|
@ -148,6 +148,7 @@ template <typename Tetrahedron_3>
|
|||
typename Kernel_traits<Tetrahedron_3>::Kernel::FT
|
||||
minimum_dihedral_angle(const Tetrahedron_3& t )
|
||||
{
|
||||
std::cout << "A" << std::endl;
|
||||
return minimum_dihedral_angle(t, typename Kernel_traits<Tetrahedron_3>::Kernel() );
|
||||
}
|
||||
|
||||
|
|
@ -155,6 +156,8 @@ template<typename C3T3>
|
|||
typename C3T3::Triangulation::Geom_traits::FT
|
||||
minimum_dihedral_angle_in_c3t3(const C3T3& c3t3)
|
||||
{
|
||||
|
||||
std::cout << "B" << std::endl;
|
||||
typedef typename C3T3::Triangulation::Geom_traits K;
|
||||
typename K::FT min_angle = (typename K::FT)(90.);
|
||||
|
||||
|
|
|
|||
|
|
@ -544,7 +544,7 @@ public:
|
|||
typedef CGAL::Periodic_3_regular_triangulation_remove_traits_3< Gt > P3removeT;
|
||||
typedef CGAL::Regular_triangulation_3< P3removeT > Euclidean_triangulation;
|
||||
typedef Vertex_remover< Euclidean_triangulation > Remover;
|
||||
P3removeT remove_traits(domain());
|
||||
P3removeT remove_traits(geom_traits());
|
||||
Euclidean_triangulation tmp(remove_traits);
|
||||
Remover remover(this, tmp);
|
||||
Conflict_tester ct(this);
|
||||
|
|
@ -576,7 +576,7 @@ public:
|
|||
typedef CGAL::Regular_triangulation_3< P3removeT > Euclidean_triangulation;
|
||||
typedef Vertex_remover< Euclidean_triangulation > Remover;
|
||||
|
||||
P3removeT remove_traits(domain());
|
||||
P3removeT remove_traits(geom_traits());
|
||||
Euclidean_triangulation tmp(remove_traits);
|
||||
Remover remover(this, tmp);
|
||||
Cover_manager cover_manager(*this);
|
||||
|
|
|
|||
|
|
@ -81,7 +81,7 @@ public:
|
|||
typedef typename Kernel::Iso_cuboid_3 Iso_cuboid_3;
|
||||
|
||||
virtual ~Periodic_3_triangulation_filtered_traits_base_3() { }
|
||||
|
||||
Periodic_3_triangulation_filtered_traits_base_3(const& Periodic_3_triangulation_filtered_traits_base_3) = delete;
|
||||
Periodic_3_triangulation_filtered_traits_base_3(const Iso_cuboid_3& domain,
|
||||
const Kernel& k)
|
||||
:
|
||||
|
|
@ -165,6 +165,8 @@ public:
|
|||
typedef K_ Kernel;
|
||||
typedef typename Kernel::Iso_cuboid_3 Iso_cuboid_3;
|
||||
|
||||
Periodic_3_triangulation_filtered_traits_3& operator=(const Periodic_3_triangulation_filtered_traits_3&) = delete;
|
||||
Periodic_3_triangulation_filtered_traits_3(const& Periodic_3_triangulation_filtered_traits_3) = delete;
|
||||
Periodic_3_triangulation_filtered_traits_3(const Iso_cuboid_3& domain,
|
||||
const Kernel& k)
|
||||
: Base(domain, k)
|
||||
|
|
@ -181,6 +183,11 @@ public:
|
|||
typedef K_ Kernel;
|
||||
typedef typename Kernel::Iso_cuboid_3 Iso_cuboid_3;
|
||||
|
||||
Periodic_3_triangulation_filtered_traits_3& operator=(const Periodic_3_triangulation_filtered_traits_3& other)
|
||||
{ static_cast<Base&>(*this) = other;
|
||||
std::cout << "here" << std::endl;
|
||||
return *this; }
|
||||
Periodic_3_triangulation_filtered_traits_3(const& Periodic_3_triangulation_filtered_traits_3) = delete;
|
||||
Periodic_3_triangulation_filtered_traits_3(const Iso_cuboid_3& domain,
|
||||
const Kernel& k)
|
||||
: Base(domain, k)
|
||||
|
|
|
|||
|
|
@ -279,7 +279,7 @@ public:
|
|||
{ return Construct_weighted_circumcenter_3(static_cast<const Base_traits&>(*this)); }
|
||||
|
||||
Robust_periodic_weighted_circumcenter_traits_3(const Iso_cuboid_3& domain = Iso_cuboid_3(0,0,0,1,1,1),
|
||||
const Base_traits& t = Base_traits())
|
||||
const Base_traits& t = Base_traits() ) // AF
|
||||
: Base_traits(domain, t)
|
||||
{ }
|
||||
};
|
||||
|
|
|
|||
Loading…
Reference in New Issue