Commit Graph

390 Commits

Author SHA1 Message Date
Andreas Fabri c836b21521 no typename needed 2014-06-19 18:45:29 +02:00
Andreas Fabri 4ba2eae6bf replace copy pasted specific code by a call to a generic function 2014-06-19 13:42:38 +02:00
Andreas Fabri 67f9dbf111 fix assertion 2014-06-12 09:09:24 +02:00
Sébastien Loriot 432bf75c3c remove extra template paramater 2014-06-11 14:15:00 +02:00
Andreas Fabri 4c8f452a78 Add {Find/Use}Openmesh.cmake and fix the CMakeLists.txt 2014-06-11 12:13:50 +02:00
Andreas Fabri d92d0cef84 Use CGAL points even for OpenMesh 2014-06-10 15:26:06 +02:00
Andreas Fabri 3d7d596e6b Use vertex_point property map so that it now also compiled with OpenMesh 2014-06-05 15:29:49 +02:00
Andreas Fabri ad642db3b5 forgot to initialize the constraint map. 2014-06-04 20:29:30 +02:00
Andreas Fabri 2425bba8a5 The OpenMesh example shows at the same time how to wrap the OpenMesh properties 2014-06-04 16:14:04 +02:00
Andreas Fabri 071a273ce5 Fix edge_collapse_constrain_sharp_edges.cpp
The problem was that the hash function for an edge_descriptor
did return another size_t depending on which of two halfedge
descriptors is stored.

Additional to edge_descriptor edge(halfedge_descriptor,Graph)
we might have a function canonical_edge_descriptor(..)
2014-06-04 14:59:30 +02:00
Andreas Fabri df7e8b0776 remover border map from the doc 2014-06-04 13:57:48 +02:00
Andreas Fabri 51990f53e3 Remove border property map and switch from halfedge to edge constraints.
The latter has a bug as edge_constrain_sharp_edges removed constrained edges
2014-06-04 13:03:31 +02:00
Andreas Fabri 02ba12b686 fix Constrained_placement 2014-06-03 17:41:55 +02:00
Andreas Fabri e1b6990d42 Add a vertex-point property map so that we can use the mesh simplification with OpenMesh 2014-06-03 16:37:40 +02:00
Andreas Fabri ec5dceb0e7 BGL style in assertions 2014-06-03 09:55:59 +02:00
Andreas Fabri b866447f54 Add an example for simplifying an OpenMesh 2014-05-30 16:19:28 +02:00
Andreas Fabri 0e02466b2b remove halfedge_collapse_Polyhedron_3.h 2014-05-28 12:13:48 +02:00
Andreas Fabri c753fc97ff add Euler::collapse_edge taking into account constrained edges 2014-05-28 11:46:24 +02:00
Andreas Fabri a26b6ef84c #if 0 the low level implementation of collapse_edge as it has a bug 2014-05-28 10:30:36 +02:00
Andreas Fabri 1949cd5122 first changes in the manual 2014-05-27 17:52:08 +02:00
Andreas Fabri de34478f85 fix the mesh_simplification_plugin 2014-05-27 17:10:43 +02:00
Andreas Fabri c552dce7c6 first pass to switch to the BFL API 2014-05-27 16:02:42 +02:00
Sébastien Loriot 7cc6c1b101 fix typo 2014-05-23 17:28:52 +02:00
Sébastien Loriot ecc86d3bd7 add code for backward compatibility
Note that the result is still the same without the patch.
Indeed, the uniqueness of link vertices is guaranteed if the
collapse of the edge is topologically valid.
This patch is just to avoid users having cost/placement
relying on the former behavior even for non-topologically
valid collapse (which seems unlikely to happen)
2014-05-23 17:13:27 +02:00
Andreas Fabri e9edf5efac bug fix 2014-04-11 09:46:42 +02:00
Andreas Fabri ce2ead8a20 document that EdgeProfile::link() may have duplicates 2014-04-10 16:20:30 +02:00
Sébastien Loriot 720e3d3578 make the order of vertices in the link similar as bcb7cc03 2014-04-10 15:54:01 +02:00
Sébastien Loriot 97b5300a66 clean up 2014-04-10 15:32:27 +02:00
Sébastien Loriot c867c1d2e2 remove unused variable 2014-04-10 15:22:20 +02:00
Andreas Fabri d4f88fd138 bugfix. endleft and endright were not initialized if the surface has a border 2014-04-10 15:09:09 +02:00
Andreas Fabri 0ca4d8de85 Use the border property map (not the top level provided one, but the one obtained with get(edge_border...) 2014-04-10 10:44:26 +02:00
Andreas Fabri bcb7cc0332 Rewrite of Extract_triangles_and_link() using no map 2014-04-10 10:11:33 +02:00
Andreas Fabri e986d53df6 typo 2014-04-10 09:17:01 +02:00
Andreas Fabri c45eb40191 Check initially if the surface has borders 2014-04-09 17:18:45 +02:00
Andreas Fabri 6f278a3837 Rewrite of Extract_borders()
Don't use a map, but start from the edge that we want to contract
and turn around the two vertices by looking at each edge exactly once
2014-04-09 15:34:25 +02:00
Andreas Fabri cf28acb826 Use less index maps 2014-04-09 15:04:33 +02:00
Andreas Fabri 0b63624b1e Move the reserve to the right spot
Don't use a vertex index map
2014-04-09 13:51:15 +02:00
Andreas Fabri 3558831f22 reserve 2014-04-09 13:43:37 +02:00
Panagiotis Cheilaris 0edd0e2943 put a field access in assertion code
This fix removes a warning in compilation of mesh_simplification_plugin
in demos (in some environments).
2014-03-07 15:42:54 +01:00
Panagiotis Cheilaris 6812889b8f use a value from insert in Edge_profile_impl
This fix removes a warning in compilation of mesh_simplification_plugin
in demos (in some environments).
2014-03-06 19:20:09 +01:00
Sébastien Loriot ab06b99ce4 fix typo in variable name 2014-02-18 19:43:37 +01:00
Sébastien Loriot 9482381828 Merge branch 'Surface_mesh_simplification-uniform_renaming_surface_mesh-sloriot'
documentation bug-fix: uniformly use "surface mesh" instead of "surface" and "mesh"

  Tested in CGAL-4.4-Ic-119 and CGAL-4.4-Ic-120
2014-02-14 08:09:04 +01:00
Sébastien Loriot 1a777d017b Merge branch 'Surface_mesh_simplification-remove_extra_edges_bugfix-sloriot'
bug-fix: some edges that have been removed from the priority queue because
           there were not removable at some point can be removable later. They
           need to be reinserted in the queue

  Tested in CGAL-4.4-Ic-119 and CGAL-4.4-Ic-120
2014-02-14 08:05:54 +01:00
Sébastien Loriot d45d1a1070 Merge branch 'Surface_mesh_simplification-preserve_constrained_edges_bug_fix-sloriot'
bug-fix: preserve edges marked as non-removable
 See Features/Small_Features/SMS_with_constrained

 Tested in CGAL-4.4-Ic-119 and CGAL-4.4-Ic-120

Conflicts:
	Installation/changes.html
2014-02-14 08:02:15 +01:00
Sébastien Loriot 5786041a31 uniformly use surface mesh in the documentation, the API and the examples
This induces a renaming of the Concept EdgeCollapsableMesh to
  EdgeCollapsableSurfaceMesh and the same for the constrained version.
2014-02-13 16:33:45 +01:00
Sébastien Loriot 9b79c9a842 make sure all edges removable are removed
After the collapse of an edge the 2-ring of edges incident
  to the remaining vertex are reinserted in PQ when no longer in PQ.
  An exemple is also updated to show the issue if we remove the fix.
2014-02-13 16:32:47 +01:00
Sébastien Loriot 407efd5685 rename example and update examples.txt 2014-02-13 16:26:41 +01:00
Sébastien Loriot 9114db9085 restore figure source files removed in 0fa2cacb
| commit 0fa2cacb60
  | Author: Sébastien Loriot <sebastien.loriot@cgal.org>
  | Date:   Tue Dec 3 17:27:02 2013 +0100
  |
  |     remove doc_tex documentation (including developer manual) and old manual tools
2014-02-10 14:54:23 +01:00
Sébastien Loriot 8384c6be3c fix warnings in the testsuite 2014-01-31 12:02:17 +01:00
Sébastien Loriot 0906fb8e87 fix refinement relation 2014-01-30 19:43:41 +01:00