Commit Graph

706 Commits

Author SHA1 Message Date
Jane Tournois d1b5737bd4 allow collapsing edges incident to boundary 2015-07-15 16:02:21 +02:00
Jane Tournois fc0b9bd51a add collapse short edges to remeshing
longest edges are split first
and shortest edges are collapsed first

todo : allow edges incident to boundary to be collapsed
2015-07-15 16:02:21 +02:00
Jane Tournois 79b5ba8553 first step : split_long_edges 2015-07-15 16:02:20 +02:00
Jane Tournois 598472d210 add framework for remeshing 2015-07-15 16:02:20 +02:00
Sébastien Loriot 017b4f501f use jpg instead of png
prepare for rebasing
2015-07-15 11:43:53 +02:00
Sébastien Loriot 0b34de5674 generate elephant with hole
prepare for rebasing
2015-07-15 11:27:53 +02:00
Sébastien Loriot 51839a0b84 remove data that can be generated
prepare for rebasing
2015-07-15 10:54:41 +02:00
Sébastien Loriot d35e1e5580 do not use a large gif file
prepare for rebasing
2015-07-15 10:30:51 +02:00
Sébastien Loriot a968e99279 do not use a large off file
prepare for rebasing
2015-07-15 10:08:57 +02:00
Sébastien Loriot 78542206ba add test for remove_degenerate_faces 2015-07-15 10:01:11 +02:00
Sébastien Loriot 1950bf0d7d update user manual for keep/remove_connected_components 2015-07-13 09:27:51 +02:00
Sébastien Loriot c60fad0095 use keep_connected_components in the implementation of keep_largest_connected_components 2015-07-13 07:43:50 +02:00
Sébastien Loriot 1fcc8937ab add todo 2015-07-13 07:14:30 +02:00
Sébastien Loriot 7d8fe2553d add remove_connected_components + overload for the keep version using cc ids 2015-07-13 07:08:45 +02:00
Sébastien Loriot 13263efa8c fix the test without Delaunay 2015-07-06 18:43:49 +02:00
Sébastien Loriot c82a3ef67d make warnings not popping in the testsuite 2015-07-06 18:32:24 +02:00
Sébastien Loriot f69cabe72c make tests more uniform 2015-07-06 18:32:09 +02:00
Sébastien Loriot de7482f998 CGAL_assertion -> assert 2015-07-06 16:52:59 +02:00
Sébastien Loriot 545fca57b7 improve test by checking the expected number of remaining holes 2015-07-06 16:49:00 +02:00
Sébastien Loriot a1e3c9787b Revert "we want to be able to test that without generating a warning"
This reverts commit cc24c0a89a43651ed11d1f87b233bf8db0d28c86.
2015-07-06 15:32:33 +02:00
Jane Tournois 270f4bbbcc we want to be able to test that without generating a warning
so let's transform into a std::cerr message
2015-07-03 17:04:49 +02:00
Jane Tournois 0c6340543c comment a bit of too verbose tests 2015-07-03 16:56:04 +02:00
Jane Tournois 1967235bbd fix return value to 0
this example was making all the testsuite line red...
2015-07-03 16:48:45 +02:00
Jane Tournois 275d24e103 add new line at end of file 2015-07-03 16:16:46 +02:00
Jane Tournois 6491a3e9c4 fix compilation for windows 2015-07-03 16:14:16 +02:00
Jane Tournois 12ccaeb3a5 rename type to avoid error on windows
Polyline conflicts with a type defined in
Program Files (x86)\Windows Kits\8.0\include\um\wingdi.h
2015-07-03 16:12:31 +02:00
Jane Tournois 433609093f add return statement 2015-07-03 16:07:45 +02:00
Jane Tournois f2f7aa6874 fix warnings about unused variables 2015-07-03 16:05:16 +02:00
Jane Tournois 6dedc9e451 add new line at end of file 2015-07-03 16:04:34 +02:00
Jane Tournois fbe442fcca remove empty constructor that causes an error
because it does not provide an initial value for pmesh_
2015-07-03 16:03:53 +02:00
Jane Tournois cf60dd41f1 fix unused variable warnings 2015-07-03 13:54:01 +02:00
Jane Tournois 4c54b2ec26 don't use typename outside of template 2015-07-03 13:46:17 +02:00
Jane Tournois 024f3ce752 remove unused variables to avoid warnings 2015-07-03 13:30:24 +02:00
Jane Tournois 4e8c149b9b fix compilation and remove useless assertions 2015-07-02 16:58:42 +02:00
Laurent Rineau 08dcd2ba6f Fix a warning on Linux
(cherry picked from commit 2cfdf907dd969b59590ec4cf798af4bfe61dcfb3)
2015-07-02 16:22:15 +02:00
Jane Tournois 01d0c2770b add return statement 2015-07-02 16:01:52 +02:00
Jane Tournois 6eacf37ba9 fix a warning in documentation
(unreported variables)
2015-07-02 15:49:25 +02:00
Jane Tournois fda787e284 add return statement 2015-07-02 15:38:59 +02:00
Jane Tournois c88a2e5a7f to get validity at level 5 after stitching a Polyhedron_3,
normalize_border should be called
this is mainly because nb_border_halfedges of the
underlying HDS gets undefined
2015-07-02 15:36:34 +02:00
Jane Tournois 0ba7215a5b add return statement 2015-07-02 14:44:30 +02:00
Jane Tournois 94e9d263c2 and end of file 2015-07-02 14:43:40 +02:00
Jane Tournois 6439294407 Merge branch 'Polygon_mesh_processing-GF' of github.com:CGAL/cgal-public-dev into Polygon_mesh_processing-GF 2015-07-02 11:49:30 +02:00
Jane Tournois 3623705fcf fix some tests 2015-07-02 11:48:59 +02:00
Andreas Fabri 76662ea2eb Add a file so that Mean_curvature_skeleton compiles with PMP 2015-07-02 11:22:19 +02:00
Laurent Rineau bb27094bea Remove a space that confuses the script
./Scripts/developer_scripts/detect_packages_licenses does not agree with
the spurious space at the end.
2015-07-01 18:04:59 +02:00
Andreas Fabri 8d86bebcaf Merge remote-tracking branch 'cgal-dev/Polygon_mesh_processing-GF' into Polygon_mesh_processing-GF 2015-07-01 17:25:13 +02:00
Andreas Fabri e072756d15 workaround to make the MCF Skeleton package compile with and without PMP 2015-07-01 15:54:29 +02:00
Andreas Fabri 20c1b1a1f6 Merge branch 'Polygon_mesh_processing-GF-old' into Polygon_mesh_processing-GF
Conflicts:
	BGL/include/CGAL/boost/graph/Euler_operations.h
	BGL/include/CGAL/boost/graph/iterator.h
	Documentation/doc/Documentation/Doxyfile.in
	Documentation/doc/Documentation/dependencies
	Polyhedron/demo/Polyhedron/Polyhedron_demo_point_inside_polyhedron_plugin.cpp
	Polyhedron/demo/Polyhedron/Scene_polygon_soup_item.cpp
	Polyhedron/demo/Polyhedron/Selection_widget.ui
2015-07-01 13:52:44 +02:00
Jane Tournois 49b2c90f3b rename normals test 2015-07-01 10:12:05 +02:00
Andreas Fabri 9356e59af0 fix copyrght headers 2015-06-30 19:54:25 +02:00
Jane Tournois 2060a4e1ad remove \todo : done 2015-06-30 10:35:40 +02:00
Jane Tournois 56b6a59c4c Merge branch 'Polygon_mesh_processing-GF' of github.com:CGAL/cgal-public-dev into Polygon_mesh_processing-GF 2015-06-30 10:32:12 +02:00
Jane Tournois cbd9a083c9 use filenames and improve tests 2015-06-30 10:30:51 +02:00
Sébastien Loriot 1334ff32dd document another overload or reverse_face_orientations 2015-06-29 15:17:41 +02:00
Jane Tournois 00d289baee add doc about property maps to the reference manual 2015-06-29 14:10:58 +02:00
Jane Tournois 0a24bdbacd make code simpler by making use of named parameters 2015-06-29 11:07:00 +02:00
Jane Tournois 95463c654f fix warning 2015-06-29 11:06:29 +02:00
Jane Tournois 1d09b521d6 add function with no named parameters 2015-06-29 10:24:22 +02:00
Jane Tournois 7e94f20842 add precisions about 2-manifold
and remove column about it.
we don't want to document anything about algorithms
working or not on a mesh for which is_valid would return false
2015-06-29 10:23:24 +02:00
Sébastien Loriot e1b4fee77f add the possibility to reverse the orientation of a subset of faces 2015-06-26 15:44:54 +02:00
Sébastien Loriot bde6c708db update table and categories 2015-06-26 08:58:16 +02:00
Jane Tournois e2a996f551 implement function keep_connected_components
and add it to the tests
2015-06-25 16:29:18 +02:00
Jane Tournois 0fa3bb46e6 add input to tests 2015-06-25 16:21:03 +02:00
Jane Tournois ce4eb95d00 fix typo 2015-06-25 15:47:32 +02:00
Jane Tournois cc21c6e35d user manual 2015-06-25 15:46:19 +02:00
Jane Tournois 028c431edd Merge branch 'Polygon_mesh_processing-GF' of github.com:CGAL/cgal-public-dev into Polygon_mesh_processing-GF 2015-06-25 15:27:54 +02:00
Jane Tournois d228e836b7 add a table about requirements of package functions
(asked by both reviewers)
some answers should still be checked
2015-06-25 15:26:22 +02:00
Sébastien Loriot 3711384bf2 a pmap should be lightweight 2015-06-25 14:35:17 +02:00
Sébastien Loriot 2381795ffb remove unused typedefs 2015-06-25 14:26:39 +02:00
Jane Tournois 21807f6873 doc fix 2015-06-25 14:18:37 +02:00
Jane Tournois e451c510ec Merge branch 'Polygon_mesh_processing-GF' of github.com:CGAL/cgal-public-dev into Polygon_mesh_processing-GF 2015-06-25 14:12:50 +02:00
Jane Tournois d07d597065 update package description 2015-06-25 14:12:07 +02:00
Sébastien Loriot 7de678e50e there are several authors 2015-06-25 13:20:20 +02:00
Jane Tournois c137daae75 improve ref manual
Andreas' review
2015-06-25 12:01:38 +02:00
Jane Tournois c0df6e1aa9 fix compilation 2015-06-25 11:52:06 +02:00
Jane Tournois 32f0c9b37b rename Point_inside_polygon_mesh to Side_of_triangle_mesh
and document it
2015-06-25 11:51:45 +02:00
Jane Tournois 1a775ff8f9 add keep_connected_components (doc only) 2015-06-25 09:58:08 +02:00
Jane Tournois b2e749894e user manual 2015-06-25 09:32:42 +02:00
Jane Tournois 5824f17caa remove useless comment 2015-06-23 14:58:25 +02:00
Jane Tournois d52ce62167 improve examples for user manual (Pierre's review) 2015-06-23 14:25:16 +02:00
Jane Tournois 6e621f037d improve examples for user manual 2015-06-23 12:28:25 +02:00
Jane Tournois 3aad1a2b56 improve example for user manual 2015-06-23 12:00:43 +02:00
Jane Tournois 5efe8e3c13 improve example for user manual 2015-06-23 11:34:15 +02:00
Jane Tournois 898b9b4609 fix a bug in triangulate_faces
on the border of the polygon mesh, we should not use Euler::make_hole,
because it is not designed to handle boundary cases.
This commit adds a local make_hole function to triangulate_faces.h
2015-06-23 10:36:51 +02:00
Jane Tournois 51a27cd4f1 reference manual 2015-06-22 17:33:20 +02:00
Jane Tournois 78f73d4542 reference manual made consistent with user manual 2015-06-22 17:25:07 +02:00
Jane Tournois c18f613c73 Merge branch 'Polygon_mesh_processing-GF' of github.com:CGAL/cgal-public-dev into Polygon_mesh_processing-GF 2015-06-22 17:17:43 +02:00
Jane Tournois 1dd9557df5 Pierre's review on reference manual 2015-06-22 17:17:11 +02:00
Jane Tournois cfce780d44 reference manual
implement Pierre's review
2015-06-22 15:04:29 +02:00
Sébastien Loriot 7292515448 fix warnings 2015-06-22 11:31:19 +02:00
Sébastien Loriot f6a2479472 fix compilation issues with g++ 2015-06-22 11:23:31 +02:00
Sébastien Loriot 24c1d9686c qualify call to boost function 2015-06-22 11:23:31 +02:00
Jane Tournois 7977d10418 rename is_self_intersecting to does_self_intersect
for consistency with do_intersect
2015-06-22 11:17:43 +02:00
Jane Tournois 31fd19c01e Pierre's review. Rename is_self_intersecting to does_self_intersect
to be consistent with do_intersect
2015-06-22 11:03:25 +02:00
Jane Tournois 6b6645af72 add "polygon mesh" and "triangle mesh" as much as possible 2015-06-18 16:48:02 +02:00
Jane Tournois 1e93d3d645 fix ref 2015-06-18 15:24:41 +02:00
Jane Tournois a26f8ed4ff fix ref to hole filling 2015-06-18 15:03:59 +02:00
Jane Tournois 86215e3a10 modify captions to take into account review 1 2015-06-18 12:59:25 +02:00
Andreas Fabri 91af42e5ba Show how to write into a property_map 2015-05-29 16:07:24 +02:00
Jane Tournois 1872768720 fix documentation of fairing 2015-05-15 14:58:29 +02:00
Jane Tournois 5f38c74514 remove code that prevents the mesh from shrinking
it is a normal behavior that fairing applied to the whole mesh
makes it shrink to (0,0,0)
2015-05-15 14:50:46 +02:00
Jane Tournois fe94a19ba1 fix warnings 2015-05-15 14:26:00 +02:00
Jane Tournois 5f92aa2966 Merge remote-tracking branch 'cgal-dev/Polygon_mesh_processing-GF' into Polygon_mesh_processing_OpenMesh-GF 2015-05-15 14:19:33 +02:00
Jane Tournois 215f748466 avoid using add_vertex(pi, pmesh) that is not documented 2015-05-15 12:59:38 +02:00
Jane Tournois 12b1238b87 change the use of is_valid_polygon_mesh 2015-05-15 12:02:50 +02:00
Jane Tournois d04eea0ac0 convert assertion 2015-05-15 11:44:05 +02:00
Jane Tournois 0db066a291 Merge branch 'Polygon_mesh_processing_OpenMesh-GF' of github.com:CGAL/cgal-public-dev into Polygon_mesh_processing_OpenMesh-GF 2015-05-15 11:21:48 +02:00
Jane Tournois 53099dccae remove debugging code 2015-05-15 11:19:49 +02:00
Jane Tournois a59df329f6 remove debugging code 2015-05-15 11:17:29 +02:00
Andreas Fabri 09ea32096d Add generic is_valid_polygon_mesh() to BGL Helpers 2015-05-15 10:52:31 +02:00
Andreas Fabri f6b518c693 remove the debug output. The bug was in edge_flip for OM 2015-05-14 17:28:17 +02:00
Sébastien Loriot dceb558e4f Merge branch 'Polygon_mesh_processing-GF' into Polygon_mesh_processing_OpenMesh-GF
Conflicts:
	Polygon_mesh_processing/examples/Polygon_mesh_processing/remove_degeneracies_example.cpp
2015-05-14 15:45:35 +02:00
Sébastien Loriot b27eedb52a the PolygonMesh is not const so must be the vertex point map 2015-05-14 15:38:42 +02:00
Sébastien Loriot 5cd9576ea0 add missing inline
the function is not template and will be defined in each compilation-unit
if not inlined
2015-05-14 15:38:08 +02:00
Sébastien Loriot b27f120a02 bug-fix: Compare_distance_3 returns an enum not a bool 2015-05-14 12:04:10 +02:00
Andreas Fabri 81f12e2a9f Add triangulate face example for OpenMesh 2015-05-14 11:12:53 +02:00
Sébastien Loriot a49312392a dump on std::cerr 2015-05-14 11:00:54 +02:00
Jane Tournois fdb98306ec add debugging code 2015-05-13 17:56:35 +02:00
Jane Tournois ce1316a94c fix debugging code 2015-05-13 17:55:55 +02:00
Jane Tournois 6c4785a29c On Polygon_mesh_processing_OpenMesh-GF: fairing pour openmesh 2015-05-13 16:10:21 +02:00
Jane Tournois 64291eceb0 Merge branch 'Polygon_mesh_processing_OpenMesh-GF' of github.com:CGAL/cgal-public-dev into Polygon_mesh_processing_OpenMesh-GF
Conflicts:
	Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/stitch_borders.h
2015-05-13 10:32:57 +02:00
Jane Tournois 664b712f83 fix compilation 2015-05-13 10:27:30 +02:00
Andreas Fabri 81318a1cfd more small examples for degenerate meshes 2015-05-13 09:29:39 +02:00
Andreas Fabri 1472ec273c cleanup 2015-05-12 19:33:35 +02:00
Andreas Fabri acd5c4c336 WIP (loops) add remove_degeneracies for OpenMesh 2015-05-12 19:33:02 +02:00
Andreas Fabri 684890d415 make stitching work for OpenMesh 2015-05-12 17:49:39 +02:00
Jane Tournois c4e9b7412c Merge branch 'Polygon_mesh_processing_OpenMesh-GF' of github.com:CGAL/cgal-public-dev into Polygon_mesh_processing_OpenMesh-GF 2015-05-12 17:25:30 +02:00
Jane Tournois 905d6d5461 use user-given vertex point map in weights.h 2015-05-12 17:00:36 +02:00
Andreas Fabri 94183e696c WIP (does not compile yet) Add stitch borders OpenMesh example 2015-05-12 16:24:28 +02:00
Andreas Fabri c0ccd47d78 Add point inside OpenMesh example 2015-05-12 15:23:33 +02:00
Andreas Fabri c5d8d81a4b add hole filling example for Surface_mesh 2015-05-12 12:34:26 +02:00
Andreas Fabri 797e51ae62 pass vertex point pmap 2015-05-11 17:05:02 +02:00
Andreas Fabri f88ff84d36 move the property map class to a CGAL header file 2015-05-11 14:57:14 +02:00
Andreas Fabri b0f21fcf34 add hole filling example 2015-05-11 13:04:48 +02:00
Andreas Fabri 9906380242 add hole filling example 2015-05-11 13:04:36 +02:00
Andreas Fabri 6ad5ff4f55 First example for PMP and OpenMesh 2015-05-11 12:28:39 +02:00
Andreas Fabri 238e054ec5 WIP: Add example using OpenMesh (won't compile as we need a wrapper for property maps 2015-05-11 09:36:44 +02:00
Jane Tournois 1e4405823c fix 10% of the vertices still does not prevent from shrinking, but it's better 2015-05-05 17:31:22 +02:00
Jane Tournois e211747d51 fix extremal vertices when fairing is launched on the complete polygon mesh
this is not enough to prevent the mesh from shrinking, though fixed vertices
keep it from shrinking to a single point
2015-05-05 16:53:55 +02:00
Jane Tournois 9800abb789 add simple fairing test 2015-05-04 15:51:05 +02:00
Jane Tournois 187895af98 fix dependencies 2015-04-28 15:11:10 +02:00
Jane Tournois ac86f5d5b8 attempt to get the CDT_2 link 2015-04-28 13:49:36 +02:00
Jane Tournois 13dd4516f9 fix indentation in code 2015-04-28 13:47:48 +02:00
Jane Tournois 0de4e59e47 stitch borders doc 2015-04-28 10:18:24 +02:00
Jane Tournois bc03c17492 update range type 2015-04-28 10:14:09 +02:00
Jane Tournois 8e3166fd6c update range documentation 2015-04-28 08:53:23 +02:00
Jane Tournois 5c3b5d9265 update doc for Range 2015-04-28 08:48:05 +02:00
Jane Tournois 47472fcdc7 use const ref 2015-04-28 08:46:43 +02:00
Jane Tournois 9598cdfaf2 update Range doc 2015-04-28 08:43:44 +02:00
Jane Tournois a5b8f4f218 use const ref 2015-04-28 08:42:07 +02:00