Commit Graph

321 Commits

Author SHA1 Message Date
Laurent Rineau 95cde53b17 Merge "Mesh_3 with features" in trunk, so that it is in CGAL-3.8, at last!
https://cgal.geometryfactory.com/CGAL/Members/wiki/Features/Mesh_3_with_features
2011-01-10 15:43:22 +00:00
Andreas Fabri 04482d4a54 clang is right: std::size_t is always >= 0 2010-11-12 13:04:17 +00:00
Laurent Rineau 360ae76da7 Fix the compute_normal: sum normals and *then* divide the normal by its
length.
2010-10-04 08:36:27 +00:00
Andreas Fabri 6b1e578377 Take care of collinear points when computing a facet normal 2010-09-27 10:53:45 +00:00
Andreas Fabri b0bb407625 Add convex decomposition to the Polyhedron demo 2010-09-24 15:43:14 +00:00
Laurent Rineau 7606b93406 Merge last unmerged revision from the branch CGAL-3.7-branch:
| ------------------------------------------------------------------------
  | r57979 | lrineau | 2010-08-11 15:24:20 +0200 (Wed, 11 Aug 2010) | 1 line
  | 
  | Global fix of all uses of qt4_generate_moc: the destination file path must be absolute.
  | ------------------------------------------------------------------------
  | r58026 | stayeb | 2010-08-12 17:40:41 +0200 (Thu, 12 Aug 2010) | 2 lines
  | 
  | Bug fix: ensure that c3t3 contains no in complex cell when starting a new refinement process. We need this because the first refinement of the surface does not update the volume, so c3t3 can't know that in complex cells have been deleted.
  | 
  | ------------------------------------------------------------------------

(That shows it is difficult to avoid to merge the release branch in the
trunk from time to time.)
2010-08-20 13:09:22 +00:00
Andreas Fabri c818d09799 drapg and drop come from the base class 2010-08-16 12:04:07 +00:00
Laurent Rineau 2577fe87b2 adapt fwd declaration of EPIC after a change of its declaration 2010-08-14 11:18:43 +00:00
Sébastien Loriot 5471e90cd1 s/succesful/successful 2010-08-12 08:30:26 +00:00
Laurent Rineau af3ad196a0 Global fix of all uses of qt4_generate_moc: the destination file path must be absolute. 2010-08-11 13:24:20 +00:00
Stéphane Tayeb dfc2f8d019 Fix warnings: replace some 'int' by 'std::size_t'. 2010-07-05 07:02:58 +00:00
Andreas Fabri 2c7474ce80 int/Integer32 -> size_t 2010-06-26 14:48:33 +00:00
Andreas Fabri 2bf5ec2325 Remove extra ; 2010-05-18 09:16:36 +00:00
Andreas Fabri 06c27978a4 Remove extra ';' 2010-05-17 14:03:31 +00:00
Andreas Fabri e4e3e8f594 Remove ';' 2010-05-14 10:28:52 +00:00
Marc Glisse e9c6545787 cleanup extra ';' 2010-04-24 09:29:32 +00:00
Laurent Rineau 75be4ef237 Merged revisions 54880,54942,54951-54952 via svnmerge from
svn+ssh://lrineau@scm.gforge.inria.fr/svn/cgal/branches/CGAL-3.6-branch

........
  r54880 | lrineau | 2010-03-23 16:03:16 +0100 (Tue, 23 Mar 2010) | 12 lines
  
  Backport from trunk:
    | ------------------------------------------------------------------------
    | r54879 | lrineau | 2010-03-23 15:59:11 +0100 (Tue, 23 Mar 2010) | 4 lines
    | Changed paths:
    |    M /trunk/Mesh_2/include/CGAL/Mesh_2/Clusters.h
    | 
    | Fix yet another bug of Mesh_2: if a vertex of the CDT has all its incident
    | edges in a cluster of constrained edges, then the construction of the
    | cluster was buggy.
    | 
    | ------------------------------------------------------------------------
........
  r54942 | lrineau | 2010-03-26 12:40:52 +0100 (Fri, 26 Mar 2010) | 11 lines
  
  Backport from trunk:
    | --------------------------------------------------------------------------
    | r54941 | lrineau | 2010-03-26 12:38:55 +0100 (Fri, 26 Mar 2010) | 2 lines
    | Changed paths:
    |    M /trunk/Mesh_2/doc_tex/Mesh_2/main.tex
    |    M /trunk/Mesh_2/examples/Mesh_2/mesh_with_seeds.cpp
    | 
    | Document fit->is_in_domain() in the user manual.
    | 
    | ------------------------------------------------------------------------
........
  r54951 | lrineau | 2010-03-26 15:33:41 +0100 (Fri, 26 Mar 2010) | 11 lines
  
  Backport from trunk:
    | ------------------------------------------------------------------------
    | r54209 | lrineau | 2010-02-18 11:58:00 +0100 (Thu, 18 Feb 2010) | 3 lines
    | Changed paths:
    |    M /trunk/Polyhedron/demo/Polyhedron/CMakeLists.txt
    | 
    | Move texture.o to the right place (in the DSO that deals with textured
    | polyhedra).
    | 
    | --------------------------------------------------------------------------
........
  r54952 | lrineau | 2010-03-26 15:50:38 +0100 (Fri, 26 Mar 2010) | 2 lines
  
  Let plugins be compiled in the same directory as the executable.
........
2010-03-26 14:58:52 +00:00
Laurent Rineau 2393ea040e Change path to qglobal.h, to make is work on MacOS X. 2010-03-19 11:24:26 +00:00
Laurent Rineau d089b84ffc Merged revisions 53929,53931,53933-53940,53944-53949,53951,53954-53955,53957,53959-53960,53962,53964,53966,53969-54000,54003-54004,54008-54045,54047-54057,54059-54095,54097,54099-54228,54230-54236,54239-54247,54249-54255,54257-54260,54262-54277,54281-54283,54285-54300,54302-54308,54310-54324,54326-54352 via svnmerge from
svn+ssh://lrineau@scm.gforge.inria.fr/svn/cgal/branches/CGAL-3.6-branch

........
  r54352 | lrineau | 2010-03-01 09:08:13 +0100 (Mon, 01 Mar 2010) | 2 lines
  
  Fix: do not write "warning" in CMakeLists.txt (NOTICE instead).
........
2010-03-01 08:17:31 +00:00
Laurent Rineau 7cb6f84a3d Merged revisions 54301,54309 via svnmerge from
svn+ssh://lrineau@scm.gforge.inria.fr/svn/cgal/branches/CGAL-3.6-branch

........
  r54301 | lrineau | 2010-02-24 14:46:53 +0100 (Wed, 24 Feb 2010) | 17 lines
  
  Backport form trunk:
    | ------------------------------------------------------------------------
    | r54297 | stayeb | 2010-02-24 11:56:56 +0100 (Wed, 24 Feb 2010) | 1 line
    | Changed paths:
    |    M /trunk/Polyhedron/demo/Polyhedron/Polyhedron_demo_cut_plugin.cpp
    | 
    | Fix cutting_plane plugin.
    | ------------------------------------------------------------------------
    | r54298 | stayeb | 2010-02-24 13:39:18 +0100 (Wed, 24 Feb 2010) | 1 line
    | Changed paths:
    |    M /trunk/Polyhedron/demo/Polyhedron/Polyhedron_demo_cut_plugin.cpp
    | 
    | Fix cut_plugin (draw intersection between Polyhedra and plane instead of intersected edges)
    | ------------------------------------------------------------------------
  (This commit will not be in CGAL-3.6-beta1, that will be compose from
  yesterday internal release, but it will be in the final release.)
........
  r54309 | lrineau | 2010-02-25 14:58:38 +0100 (Thu, 25 Feb 2010) | 2 lines
  
  Update TODO list for Polyhedron demo.
........
2010-02-25 14:15:57 +00:00
Stéphane Tayeb 77526d05b7 Fix cut_plugin (draw intersection between Polyhedra and plane instead of intersected edges) 2010-02-24 12:39:18 +00:00
Stéphane Tayeb a96911a47d Fix cutting_plane plugin. 2010-02-24 10:56:56 +00:00
Laurent Rineau 897bdd6d59 Merged revisions 53967-53968,54001-54002,54005-54007,54046,54058,54096,54098,54229,54237-54238 via svnmerge from
svn+ssh://lrineau@scm.gforge.inria.fr/svn/cgal/branches/CGAL-3.6-branch

........
  r53967 | lrineau | 2010-02-01 15:46:07 +0100 (Mon, 01 Feb 2010) | 2 lines
  
  Typo
........
  r53968 | lrineau | 2010-02-01 16:09:48 +0100 (Mon, 01 Feb 2010) | 2 lines
  
  Update the link to the installation manual.
........
  r54001 | fcacciola | 2010-02-02 16:34:59 +0100 (Tue, 02 Feb 2010) | 1 line
  
  Fixed warnings
........
  r54002 | fcacciola | 2010-02-02 16:50:18 +0100 (Tue, 02 Feb 2010) | 1 line
  
  CORRECT fix for the *branch* code
........
  r54005 | lrineau | 2010-02-02 21:26:25 +0100 (Tue, 02 Feb 2010) | 10 lines
  
  Backport from trunk:`
    | ------------------------------------------------------------------------
    | r53983 | afabri | 2010-02-02 14:26:07 +0100 (Tue, 02 Feb 2010) | 1 line
    | Changed paths:
    |    M /trunk/Triangulation_2/include/CGAL/Triangulation_line_face_circulator_2.h
    | 
    | Use the traits for comparing points, not ==
    | ------------------------------------------------------------------------
    | 
........
  r54006 | lrineau | 2010-02-03 14:12:26 +0100 (Wed, 03 Feb 2010) | 18 lines
  
  Backport from trunk:
    | ------------------------------------------------------------------------
    | r53978 | afabri | 2010-02-02 09:32:59 +0100 (Tue, 02 Feb 2010) | 1 line
    | Changed paths:
    |    M /trunk/Surface_mesh_simplification/test/Surface_mesh_simplification/test_edge_collapse_Polyhedron_3.cpp
    | 
    | Add virtual destructor in the testsuite to turn a 'W' to a 'Y'
    | ------------------------------------------------------------------------
    | r53988 | afabri | 2010-02-02 15:11:06 +0100 (Tue, 02 Feb 2010) | 1 line
    | Changed paths:
    |    M /trunk/Polyhedron/demo/Polyhedron/Messages_interface.h
    |    M /trunk/Polyhedron/demo/Polyhedron/Polyhedron_demo_io_plugin_interface.h
    |    M /trunk/Polyhedron/demo/Polyhedron/Polyhedron_demo_plugin_interface.h
    |    M /trunk/Polyhedron/demo/Polyhedron/Scene_draw_interface.h
    | 
    | Define virtual destructors
    | ------------------------------------------------------------------------
........
  r54007 | fcacciola | 2010-02-03 14:46:31 +0100 (Wed, 03 Feb 2010) | 1 line
  
  Added bug fix from recent user report (Feb-2010)
........
  r54046 | penarand | 2010-02-08 12:04:59 +0100 (Mon, 08 Feb 2010) | 3 lines
  
  removed Elias from authors
........
  r54058 | mcaroli | 2010-02-09 12:06:20 +0100 (Tue, 09 Feb 2010) | 3 lines
  
  replace version number by "last" in links to the online manual
  this is a merge from the trunk rev 54041
........
  r54096 | yvinec | 2010-02-10 15:08:17 +0100 (Wed, 10 Feb 2010) | 4 lines
  
  added Pierre and Jane as authors.
  Fixed approved by RM.
........
  r54098 | yvinec | 2010-02-10 15:17:49 +0100 (Wed, 10 Feb 2010) | 4 lines
  
  added Pierre and Jane as authors in Mesh_3.
  Fixed approved by RM
........
  r54229 | lrineau | 2010-02-19 13:52:46 +0100 (Fri, 19 Feb 2010) | 2 lines
  
  s|Qt/qglobal.h|QtCore/qglobal.h|
........
  r54237 | lrineau | 2010-02-19 17:43:53 +0100 (Fri, 19 Feb 2010) | 3 lines
  
  - Add a section about RS in the third party libraries of Preliminaries.
  - Use macros, to help the cross-referencing of RS.
........
  r54238 | stayeb | 2010-02-19 17:47:25 +0100 (Fri, 19 Feb 2010) | 1 line
  
  Bug fix: do not use infinite vertice to compute bbox.
........
2010-02-19 17:21:11 +00:00
Laurent Rineau d0e924095a Move texture.o to the right place (in the DSO that deals with textured
polyhedra).
2010-02-18 10:58:00 +00:00
Andreas Fabri 05d03ad7ac Define virtual destructors 2010-02-02 14:11:06 +00:00
Laurent Rineau 497b76f92f Add a missing break; 2010-01-29 11:10:38 +00:00
Laurent Rineau 9fb0a2b9ce Add 3D Minkowski sum to the (Nef) Polyhedron demo. 2010-01-29 11:06:00 +00:00
Laurent Rineau 9c59cd38d2 Last commit of the week. Have a nice week-end!
Merged revisions 53738,53740-53747 via svnmerge from 
svn+ssh://lrineau@scm.gforge.inria.fr/svn/cgal/branches/CGAL-3.6-branch

........
  r53738 | lrineau | 2010-01-22 17:32:59 +0100 (Fri, 22 Jan 2010) | 1 line
  
  update Biblio/how_to_cite_cgal.bib
........
  r53740 | lrineau | 2010-01-22 18:13:08 +0100 (Fri, 22 Jan 2010) | 2 lines
  
  Add a check about Boost version, before mesh_3_plugin is compiled.
........
  r53741 | lrineau | 2010-01-22 18:14:27 +0100 (Fri, 22 Jan 2010) | 2 lines
  
  typo
........
  r53742 | lrineau | 2010-01-22 18:21:46 +0100 (Fri, 22 Jan 2010) | 2 lines
  
  Now Boost>=1.34.1 is required.
........
  r53743 | lrineau | 2010-01-22 18:25:18 +0100 (Fri, 22 Jan 2010) | 12 lines
  
  Now Boost>=1.34.1 is required.
  
  + Merge from trunk:
    | New Revision: 53739
    |  Author: penarand
    |  Date: 2010-01-22 17:58:21 +0100 (Fri, 22 Jan 2010)
    |  
    |  Log message:
    |  
    | added paragraphs on the Algebraic Kernel and on the new number types Gmpfr
    | and Gmpfi
........
  r53744 | lrineau | 2010-01-22 18:35:03 +0100 (Fri, 22 Jan 2010) | 2 lines
  
  Final (I hope) version of CHANGES.
........
  r53745 | lrineau | 2010-01-22 18:36:49 +0100 (Fri, 22 Jan 2010) | 2 lines
  
  s/Trolltech/nokia
........
  r53746 | lrineau | 2010-01-22 18:37:01 +0100 (Fri, 22 Jan 2010) | 2 lines
  
  Typo
........
  r53747 | lrineau | 2010-01-22 18:42:06 +0100 (Fri, 22 Jan 2010) | 2 lines
  
  s/Trolltech/Qt.Nokia/
........
2010-01-22 17:44:28 +00:00
Laurent Rineau 5dba0fbb7f workaround for Qt-4.2 2010-01-14 10:22:10 +00:00
Laurent Rineau cf4f5a4c70 workaround for Qt-4.2 2010-01-14 10:21:23 +00:00
Laurent Rineau f1fc3e3932 Protect the call to break() with a if(COMMAND break): break is CMake>=2.6 2010-01-13 13:55:45 +00:00
Laurent Rineau 3eace192a7 - Remove in trunk/Polyhedron/demo/Polyhedron/ the bits about protecting
spheres. The experimental code will now be in
branches/experimental-packages/Mesh_3-protecting_balls-branch/.
2010-01-08 16:42:02 +00:00
Laurent Rineau 4782a0c7e5 I have finished to resurrect the parameterization code, in a
parameterization_plugin.
2009-12-20 16:58:58 +00:00
Laurent Rineau 0bb0211b72 Merged revisions 53436,53440-53441,53444,53446,53448-53449,53463,53466-53468,53470,53472,53474-53476,53478,53481-53482,53484,53491-53492 via svnmerge from
svn+ssh://lrineau@scm.gforge.inria.fr/svn/cgal/branches/CGAL-3.5-branch

........
  r53436 | lrineau | 2009-12-16 00:14:31 +0100 (Wed, 16 Dec 2009) | 6 lines
  
  Merge from trunk:
     r52128 | efif | 2009-10-05 10:42:51 +0200 (Mon, 05 Oct 2009) | 1 line
  
     fixed inclusion of boost propert_map.hpp
........
  r53440 | teillaud | 2009-12-16 10:19:53 +0100 (Wed, 16 Dec 2009) | 7 lines
  
  fixed label for bibtex entry
  (same as commit 53439 in trunk)
  
  -This line, and those below, will be ignored--
  
  M    Circular_kernel_3/PkgDescription.tex
........
  r53441 | teillaud | 2009-12-16 10:26:05 +0100 (Wed, 16 Dec 2009) | 2 lines
  
  fixed bibtex label
........
  r53444 | teillaud | 2009-12-16 10:36:51 +0100 (Wed, 16 Dec 2009) | 2 lines
  
  fixed bibtex label
........
  r53446 | teillaud | 2009-12-16 10:43:05 +0100 (Wed, 16 Dec 2009) | 4 lines
  
  (same as commit 53445 in trunk)
  changed a few labels, to comply with labelling bugs of some packages in their PkgDescription.tex
........
  r53448 | teillaud | 2009-12-16 10:58:31 +0100 (Wed, 16 Dec 2009) | 4 lines
  
  (same as commit 53447 in trunk)
  new version after changes in bib source file
........
  r53449 | lrineau | 2009-12-16 15:05:59 +0100 (Wed, 16 Dec 2009) | 2 lines
  
  Changes for 3.5.1
........
  r53463 | lrineau | 2009-12-17 09:55:34 +0100 (Thu, 17 Dec 2009) | 2 lines
  
  Fix a typo (thanks to AF).
........
  r53466 | teillaud | 2009-12-17 14:00:12 +0100 (Thu, 17 Dec 2009) | 2 lines
  
  fixed bibtex entry
........
  r53467 | lrineau | 2009-12-17 14:08:42 +0100 (Thu, 17 Dec 2009) | 2 lines
  
  Updates after Monique's suggestions.
........
  r53468 | lrineau | 2009-12-17 14:13:00 +0100 (Thu, 17 Dec 2009) | 7 lines
  
  Backport from trunk:
     | ------------------------------------------------------------------------
     | r52189 | fcacciola | 2009-10-07 17:44:30 +0200 (Wed, 07 Oct 2009) | 1 line
     | 
     | TAUCS downloading fixes
     | ------------------------------------------------------------------------
........
  r53470 | teillaud | 2009-12-17 14:17:35 +0100 (Thu, 17 Dec 2009) | 3 lines
  
  last fixes
  (same as commit 53469 in trunk)
........
  r53472 | teillaud | 2009-12-17 14:22:03 +0100 (Thu, 17 Dec 2009) | 2 lines
  
  bug fix
........
  r53474 | teillaud | 2009-12-17 14:25:28 +0100 (Thu, 17 Dec 2009) | 2 lines
  
  last version for 3.5.1 (I hope!)
........
  r53475 | lrineau | 2009-12-17 14:49:28 +0100 (Thu, 17 Dec 2009) | 9 lines
  
  Backport from trunk:
    | ------------------------------------------------------------------------
    | r52190 | fcacciola | 2009-10-07 17:47:28 +0200 (Wed, 07 Oct 2009) | 1 line
    | Changed paths:
    |    M /trunk/wininst/developer_scripts/script_cgal_3_5.nsi
    | 
    | TAUCS downloading fixes
    | ------------------------------------------------------------------------
........
  r53476 | lrineau | 2009-12-17 15:35:29 +0100 (Thu, 17 Dec 2009) | 1 line
  
  Fix the anchor name s/Pkg::/Pkg:/
........
  r53478 | lrineau | 2009-12-17 16:36:11 +0100 (Thu, 17 Dec 2009) | 2 lines
  
  Change the URL field to NOTE in how_to_cite_cgal.bib.
........
  r53481 | lrineau | 2009-12-17 17:14:24 +0100 (Thu, 17 Dec 2009) | 2 lines
  
  Update to 3.5.1
........
  r53482 | lrineau | 2009-12-17 17:15:24 +0100 (Thu, 17 Dec 2009) | 2 lines
  
  If one uses the NOTE field, one needs to quote it with \url! (Thanks to Sylvain Pion)
........
  r53484 | lrineau | 2009-12-17 18:27:09 +0100 (Thu, 17 Dec 2009) | 1 line
  
  Revert last commits, which required the use of the url or hyperred packages.
........
  r53491 | lrineau | 2009-12-18 15:40:11 +0100 (Fri, 18 Dec 2009) | 4 lines
  
  Fix the bug where plugins are put in CGAL_ROOT/lib/ instead of
  the current working directory, when CGAL is build with WITH_DEMOS and
  WITH_EXAMPLES.
........
  r53492 | lrineau | 2009-12-18 15:41:21 +0100 (Fri, 18 Dec 2009) | 4 lines
  
  Fix the bug where plugins are put in CGAL_ROOT/lib/ instead of
  the current working directory, when CGAL is build with WITH_DEMOS and
  WITH_EXAMPLES.
........
2009-12-18 14:52:14 +00:00
Laurent Rineau 900baf9576 Scene_item_with_display_list now implements draw_edges too. 2009-12-16 14:57:05 +00:00
Laurent Rineau 01b66a0e2e Fix compilation pbs in testsuite. 2009-12-16 14:56:14 +00:00
Andreas Fabri 0e1a699782 fix another strange linking error with MSVS 2009-12-11 15:24:26 +00:00
Andreas Fabri 49dfb2e909 Fix the decl(import/export) for c2t3_item 2009-12-11 15:00:07 +00:00
Laurent Rineau 31b79f7e32 Use grid layout instead of form layout, because the later is for Qt>=4.4
only.
2009-12-11 09:28:25 +00:00
Laurent Rineau 594858daf8 Set is_external markers. Now the plugin should be able to triangulate
non-convex polyhedron facets. To be tested...
2009-12-09 16:29:26 +00:00
Laurent Rineau fed44a472f Remove a cerr output 2009-12-09 15:51:44 +00:00
Laurent Rineau a15d4c1c61 The Euler operations is not the good way to retriangulate a facet of a
polyhedron. Use a Modifier class instead, that remove the current facets,
and fill the hole with new facets (and new halfedges).

I can now retriangulate the dodecahedron... I need to find off files with
non-convex facets.
2009-12-09 15:34:36 +00:00
Laurent Rineau 859a7127cc - New plugin that triangulate polyhedron facets (if it is not purely
triangular).
- For the moment, it is expected that it crashes if a facet is not convex
  (I need to compute a the interior/exterior of the facet, in the CDT, to
  avoid calling polyhedron->split_facet(he1, he2) for an exterior edge.
2009-12-08 18:21:52 +00:00
Laurent Rineau 484a649c7e Fix a lot of bugs. There are still a few. 2009-11-30 00:26:57 +00:00
Laurent Rineau efa1903787 The demo now reads its plugins from:
- the path of the executable,
  - *and* from a list of paths in the variable env
    POLYHEDRON_DEMO_PLUGINS_PATH.
2009-11-27 19:58:58 +00:00
Laurent Rineau ead86ae33c Current state:
- Scene_c2t3_item now exists as a separate item library (with a hack: 
    symbols of Vertex_info are in the remeshing_plugin), 
  - New dialog box for remeshing parameters (the mesh_3 plugin should have
    a similar dialog box),
  - Vertex_info in C2t3: general usage markers (in a bitset<32>),
  - new attempt for the protecting balls refinement.
2009-11-27 16:59:38 +00:00
Laurent Rineau c30325be82 Commit of an intermediate state of the protecting balls refinement. 2009-11-26 17:20:15 +00:00
Laurent Rineau 762634c261 Oops. I forgot to commit that file, yesterday. 2009-11-26 09:20:47 +00:00
Laurent Rineau 1362a8c109 Insert protecting balls at the very beginning. 2009-11-25 17:16:12 +00:00
Laurent Rineau 0baf9b1260 Balls refinement: first step.
- separate(B) systematically scan all balls, instead of scanning only a
  subset.
- refine_ball(v) does not act on adjacent balls, for the moment.
2009-11-25 17:04:03 +00:00