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

Merge pull request #3150 from afabri/Triangulation_3-Conflict_with_Windows_Point-GF 

Polyhedron demo: Remove conflicting 'Point' typedef
This commit is contained in:
Laurent Rineau 2018-06-06 14:39:28 +02:00
parent 4864c2aaa8 e354edc64b
commit e1831e3ea2
3 changed files with 22 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Polyhedron/demo/Polyhedron/Plugins/Surface_mesh_deformation/Scene_edit_polyhedron_item.h
View File

@ -162,9 +162,6 @@ typedef CGAL::Surface_mesh_deformation<SMesh, CGAL::Default, CGAL::Default, CGAL
,CGAL::Default, CGAL::Default, CGAL::Default,
Array_based_vertex_point_map<SMesh> > Deform_sm_mesh;
typedef Deform_mesh::Point Point;
typedef Deform_sm_mesh::Point SM_Point;
/// For storing associated data with a group of control vertices
template<typename Mesh>
class Control_vertices_data

40
Surface_mesher/demo/Surface_mesher/volume.cpp
View File

@ -769,9 +769,9 @@ void Volume::display_marchin_cube()
const unsigned int nbt = facets.size() / 9;
for(unsigned int i=begin;i<nbt;i++)
{
const Point a(facets[9*i], facets[9*i+1], facets[9*i+2]);
const Point b(facets[9*i+3], facets[9*i+4], facets[9*i+5]);
const Point c(facets[9*i+6], facets[9*i+7], facets[9*i+8]);
const Point_3 a(facets[9*i], facets[9*i+1], facets[9*i+2]);
const Point_3 b(facets[9*i+3], facets[9*i+4], facets[9*i+5]);
const Point_3 c(facets[9*i+6], facets[9*i+7], facets[9*i+8]);
const Triangle_3 t(a,b,c);
const Vector u = t[1] - t[0];
const Vector v = t[2] - t[0];
@ -876,7 +876,7 @@ void Volume::display_surface_mesher_result()
if(mw->searchSeedsCheckBox->isChecked())
{
typedef std::vector<std::pair<Point, double> > Seeds;
typedef std::vector<std::pair<Point_3, double> > Seeds;
Seeds seeds;
{
std::cerr << "Search seeds...\n";
@ -905,13 +905,13 @@ void Volume::display_surface_mesher_result()
it != end; ++it)
{
seeds_out << it->first << std::endl;
CGAL::Random_points_on_sphere_3<Point> random_points_on_sphere_3(it->second);
CGAL::Random_points_on_sphere_3<Point_3> random_points_on_sphere_3(it->second);
Oracle::Intersect_3 intersect = oracle.intersect_3_object();
for(int i = 0; i < 20; ++i)
{
const Point test = it->first + (*random_points_on_sphere_3++ - CGAL::ORIGIN);
const Point_3 test = it->first + (*random_points_on_sphere_3++ - CGAL::ORIGIN);
CGAL::Object o = intersect(surface, Segment_3(it->first, test));
if (const Point* intersection = CGAL::object_cast<Point>(&o)) {
if (const Point_3* intersection = CGAL::object_cast<Point_3>(&o)) {
segments_out << "2 " << it->first << " " << *intersection << std::endl;
del.insert(*intersection);
}
@ -1043,8 +1043,8 @@ void Volume::display_surface_mesher_result()
const int index = fit->second;
// here "left" means nothing
const Point left_circumcenter = cell->circumcenter();
const Point right_circumcenter = cell->neighbor(index)->circumcenter();
const Point_3 left_circumcenter = cell->circumcenter();
const Point_3 right_circumcenter = cell->neighbor(index)->circumcenter();
const Triangle_3 t =
Triangle_3(cell->vertex(del.vertex_triple_index(index, 0))->point(),
@ -1253,8 +1253,8 @@ void Volume::draw()
end = del.finite_edges_end();
eit != end; ++eit)
{
const Point p1 = eit->first->vertex(eit->second)->point();
const Point p2 = eit->first->vertex(eit->third)->point();
const Point_3 p1 = eit->first->vertex(eit->second)->point();
const Point_3 p2 = eit->first->vertex(eit->third)->point();
::glVertex3d(p1.x(),p1.y(),p1.z());
::glVertex3d(p2.x(),p2.y(),p2.z());
}
@ -1354,9 +1354,9 @@ void Volume::gl_draw_surface()
if(c2t3.face_status(facet_cell, facet_index) == C2t3::NOT_IN_COMPLEX) {
continue;
}
const Point& a = facet_cell->vertex(del.vertex_triple_index(facet_index, 0))->point();
const Point& b = facet_cell->vertex(del.vertex_triple_index(facet_index, 1))->point();
const Point& c = facet_cell->vertex(del.vertex_triple_index(facet_index, 2))->point();
const Point_3& a = facet_cell->vertex(del.vertex_triple_index(facet_index, 0))->point();
const Point_3& b = facet_cell->vertex(del.vertex_triple_index(facet_index, 1))->point();
const Point_3& c = facet_cell->vertex(del.vertex_triple_index(facet_index, 2))->point();
Vector n = CGAL::cross_product(b-a,c-a);
n = n / std::sqrt(n*n); // unit normal
if(m_inverse_normals) {
@ -1443,9 +1443,9 @@ void Volume::gl_draw_surface()
else
continue; // go to next facet
}
const Point& a = opposite_cell->vertex(del.vertex_triple_index(opposite_index, 0))->point();
const Point& b = opposite_cell->vertex(del.vertex_triple_index(opposite_index, 1))->point();
const Point& c = opposite_cell->vertex(del.vertex_triple_index(opposite_index, 2))->point();
const Point_3& a = opposite_cell->vertex(del.vertex_triple_index(opposite_index, 0))->point();
const Point_3& b = opposite_cell->vertex(del.vertex_triple_index(opposite_index, 1))->point();
const Point_3& c = opposite_cell->vertex(del.vertex_triple_index(opposite_index, 2))->point();
Vector n = CGAL::cross_product(b-a,c-a);
n = n / std::sqrt(n*n); // unit normal
if(m_inverse_normals) {
@ -1492,9 +1492,9 @@ void Volume::gl_draw_surface(Iterator begin, Iterator end, const QTreeWidgetItem
::glNormal3d(n.x(),n.y(),n.z());
const Triangle_3& t = f.get<0>();
const Point& a = t[0];
const Point& b = t[1];
const Point& c = t[2];
const Point_3& a = t[0];
const Point_3& b = t[1];
const Point_3& c = t[2];
::glVertex3d(a.x(),a.y(),a.z());
::glVertex3d(b.x(),b.y(),b.z());

4
Surface_mesher/demo/Surface_mesher/volume.h
View File

@ -43,7 +43,7 @@ struct Kernel : public Kernel1 {
};
typedef Kernel::FT FT;
typedef Kernel::Point_3 Point;
typedef Kernel::Point_3 Point_3;
typedef Kernel::Sphere_3 Sphere;
typedef Kernel::Vector_3 Vector;
typedef Kernel::Triangle_3 Triangle_3;
@ -53,7 +53,7 @@ typedef Kernel::Segment_3 Segment_3;
typedef boost::tuple<Triangle_3,Vector,const QTreeWidgetItem*> Facet;
typedef CBinary_image_3<FT,Point> Binary_image;
typedef CBinary_image_3<FT,Point_3> Binary_image;
class QTreeWidgetItem;