diff --git a/Polyhedron/demo/Polyhedron/Plugins/Surface_mesh_deformation/Scene_edit_polyhedron_item.h b/Polyhedron/demo/Polyhedron/Plugins/Surface_mesh_deformation/Scene_edit_polyhedron_item.h index 63d178be327..a5eaf6a28d5 100644 --- a/Polyhedron/demo/Polyhedron/Plugins/Surface_mesh_deformation/Scene_edit_polyhedron_item.h +++ b/Polyhedron/demo/Polyhedron/Plugins/Surface_mesh_deformation/Scene_edit_polyhedron_item.h @@ -162,9 +162,6 @@ typedef CGAL::Surface_mesh_deformation > 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 class Control_vertices_data diff --git a/Surface_mesher/demo/Surface_mesher/volume.cpp b/Surface_mesher/demo/Surface_mesher/volume.cpp index 5f0d705bcf3..99ddc77ea88 100644 --- a/Surface_mesher/demo/Surface_mesher/volume.cpp +++ b/Surface_mesher/demo/Surface_mesher/volume.cpp @@ -769,9 +769,9 @@ void Volume::display_marchin_cube() const unsigned int nbt = facets.size() / 9; for(unsigned int i=begin;isearchSeedsCheckBox->isChecked()) { - typedef std::vector > Seeds; + typedef std::vector > 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 random_points_on_sphere_3(it->second); + CGAL::Random_points_on_sphere_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(&o)) { + if (const Point_3* intersection = CGAL::object_cast(&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()); diff --git a/Surface_mesher/demo/Surface_mesher/volume.h b/Surface_mesher/demo/Surface_mesher/volume.h index 408cb6d71ee..293c34efa51 100644 --- a/Surface_mesher/demo/Surface_mesher/volume.h +++ b/Surface_mesher/demo/Surface_mesher/volume.h @@ -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 Facet; -typedef CBinary_image_3 Binary_image; +typedef CBinary_image_3 Binary_image; class QTreeWidgetItem;