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

Moved orbifold type-related functions to the corresponding helper file

This commit is contained in:
Mael Rouxel-Labbé 2016-12-09 11:53:13 +01:00
parent b052d3bc5f
commit adb03e8ee9
2 changed files with 75 additions and 84 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

89
Surface_mesh_parameterization/include/CGAL/Surface_mesh_parameterization/Orbital_Tutte_parameterizer_3.h
View File

@ -68,36 +68,12 @@ namespace CGAL {
namespace Surface_mesh_parameterization {
enum Orbifold_type
{
Square = 0,
Diamond,
Triangle,
Parallelogram
};
enum Weight_type
{
Cotangent = 0,
Mean_value
};
const char* get_orbifold_type(int orb_type)
{
// Messages corresponding to Error_code list above. Must be kept in sync!
static const char* type[Parallelogram+1] = {
"Square",
"Diamond",
"Triangle",
"Parallelogram"
};
if(orb_type > Parallelogram || orb_type < 0)
return "Unknown orbifold type";
else
return type[orb_type];
}
template
<
typename TriangleMesh,
@ -175,65 +151,7 @@ private:
return OK;
}
// Orbifold type functions
std::vector<Point_2> get_cones_parameterized_coordinates() const
{
std::vector<Point_2> tcoords;
if(orb_type == Square) {
tcoords.push_back(Point_2(-1, -1));
tcoords.push_back(Point_2(1, 1));
} else if(orb_type == Parallelogram) {
tcoords.push_back(Point_2(0, -0.5));
tcoords.push_back(Point_2(-1, -0.5));
tcoords.push_back(Point_2(0, 0.5));
} else { // if(orb_type == Diamond || orb_type == Triangle)
tcoords.push_back(Point_2(-1, 1));
tcoords.push_back(Point_2(-1, -1));
}
return tcoords;
}
/// Angles are minus as we go around the seam border in a counterclockwise manner
std::vector<NT> get_angles_at_cones() const
{
std::vector<NT> angs;
if(orb_type == Square) {
angs.push_back(4.);
angs.push_back(4.);
} else if(orb_type == Diamond) {
angs.push_back(3.);
angs.push_back(3.);
} else if(orb_type == Triangle) {
angs.push_back(6.);
angs.push_back(2.);
} else { // if(orb_type == Parallelogram)
angs.push_back(2);
angs.push_back(1);
angs.push_back(2);
}
return angs;
}
// Linear system
template<typename ConeMap,
typename VertexIndexMap>
void find_start_cone(const ConeMap& cmap,
VertexIndexMap vimap,
vertex_descriptor& cone,
int& cone_index) const
{
typename ConeMap::const_iterator cmit = cmap.begin(), cend = cmap.end();
for(; cmit!=cend; ++cmit) {
if(cmit->second != First_unique_cone)
continue;
cone = cmit->first;
cone_index = get(vimap, cone);
return;
}
}
/// Compute the number of linear constraints in the system.
int number_of_linear_constraints(const TriangleMesh& mesh) const
{
@ -360,10 +278,13 @@ private:
Matrix& A, Vector& B) const
{
// positions of the cones in the plane
const std::vector<Point_2>& tcoords = get_cones_parameterized_coordinates();
typedef std::vector<Point_2> Point_container;
const Point_container& tcoords =
get_cones_parameterized_coordinates<Point_container>(orb_type);
// angles at the cones
const std::vector<NT>& angs = get_angles_at_cones();
typedef std::vector<NT> Angle_container;
const Angle_container& angs = get_angles_at_cones<Angle_container>(orb_type);
// the index of the line in A that we are filling next
int current_line_id_in_A = 0.;

70
Surface_mesh_parameterization/include/CGAL/Surface_mesh_parameterization/internal/orbital_cone_helper.h
View File

@ -28,6 +28,7 @@
#include <boost/foreach.hpp>
#include <boost/graph/graph_traits.hpp>
#include <boost/unordered_set.hpp>
#include <fstream>
#include <set>
@ -47,6 +48,75 @@ enum Cone_type
Duplicated_cone
};
enum Orbifold_type
{
Square = 0,
Diamond,
Triangle,
Parallelogram
};
const char* get_orbifold_type(int orb_type)
{
// Messages corresponding to Error_code list above. Must be kept in sync!
static const char* type[Parallelogram+1] = {
"Square",
"Diamond",
"Triangle",
"Parallelogram"
};
if(orb_type > Parallelogram || orb_type < 0)
return "Unknown orbifold type";
else
return type[orb_type];
}
// Orbifold type functions
template<typename Point_container>
Point_container get_cones_parameterized_coordinates(const Orbifold_type orb_type)
{
typedef typename Point_container::value_type Point;
Point_container tcoords;
if(orb_type == Square) {
tcoords.push_back(Point(-1, -1));
tcoords.push_back(Point(1, 1));
} else if(orb_type == Parallelogram) {
tcoords.push_back(Point(0, -0.5));
tcoords.push_back(Point(-1, -0.5));
tcoords.push_back(Point(0, 0.5));
} else { // if(orb_type == Diamond || orb_type == Triangle)
tcoords.push_back(Point(-1, 1));
tcoords.push_back(Point(-1, -1));
}
return tcoords;
}
/// Angles are minus as we go around the seam border in a counterclockwise manner
template<typename NT_container>
NT_container get_angles_at_cones(const Orbifold_type orb_type)
{
NT_container angs;
if(orb_type == Square) {
angs.push_back(4.);
angs.push_back(4.);
} else if(orb_type == Diamond) {
angs.push_back(3.);
angs.push_back(3.);
} else if(orb_type == Triangle) {
angs.push_back(6.);
angs.push_back(2.);
} else { // if(orb_type == Parallelogram)
angs.push_back(2);
angs.push_back(1);
angs.push_back(2);
}
return angs;
}
namespace internal {
/// Read the cones from the input file.