Commit Graph

495 Commits

Author SHA1 Message Date
Sébastien Loriot 0a46621dc6 Merge branch 'cgal/releases/CGAL-4.14-branch'
whitespace+tab removal, merged with option -Xignore-all-space
2020-03-26 13:28:46 +01:00
Sébastien Loriot 590612a563 run the script to remove tabs and trailing whitespaces 2020-03-26 13:25:16 +01:00
Mael Rouxel-Labbé e5ac71fd38 Fix maybe uninitialized warning (?) 2020-02-10 18:18:13 +01:00
Mael Rouxel-Labbé 80b98fafed Update header guard after move 2020-01-17 17:13:38 +01:00
Mael Rouxel-Labbé 29251da753 Get rid of 'CGAL_ALPHA_SHAPE_3_H' checks in VRML Alpha shape output 2020-01-17 15:54:59 +01:00
Mael Rouxel-Labbé 548149da48 Move Alpha_shape_3_VRML_2_ostream to Alpha_shape_3 and make it GPL
The code uses Alpha_shape_3 which is GPL, so the license change is
not too extreme.
2020-01-17 15:38:03 +01:00
Mael Rouxel-Labbé d620198049 Merge branch 'CGAL_IO-maxGimeno-old' into CGAL_IO-maxGimeno 2020-01-17 12:34:08 +01:00
Marc Glisse abe9dccd21
Typo in doc for Alpha_shape_3 2019-11-06 13:52:51 +01:00
Sébastien Loriot 254d60f642 First pass on removing license notice in header for GPL files 2019-10-19 15:23:19 +02:00
Sébastien Loriot 7356421d80 introduce Commercial license SPDX tag 2019-10-19 12:15:19 +02:00
Sébastien Loriot 9bd9c68b83 update LGPL[23]+ and GPL[23]+ SPDX tags
ack -l --no-svg "SPDX-License-Identifier: GPL-3.0\+" | xargs sed -i "s/SPDX-License-Identifier: GPL-3.0+/SPDX-License-Identifier: GPL-3.0-or-later/"
ack -l --no-svg "SPDX-License-Identifier: LGPL-3.0\+" | xargs sed -i "s/SPDX-License-Identifier: LGPL-3.0+/SPDX-License-Identifier: LGPL-3.0-or-later/"
ack -l --no-svg "SPDX-License-Identifier: GPL-2.0\+" | xargs sed -i "s/SPDX-License-Identifier: GPL-2.0+/SPDX-License-Identifier: GPL-2.0-or-later/"
ack -l --no-svg "SPDX-License-Identifier: LGPL-2.0\+" | xargs sed -i "s/SPDX-License-Identifier: LGPL-2.0+/SPDX-License-Identifier: LGPL-2.0-or-later/"
2019-10-18 21:57:54 +02:00
Maxime Gimeno e5a0ddb7ba Add skeleton for some formats and list DS with documented IO in IOStream.txt 2019-09-18 14:45:38 +02:00
Andreas Fabri e13c9ac1e4 ostream -> std::ostream 2019-08-21 02:59:51 -07:00
Andreas Fabri f54fe71b11 backtick and lowercase as a cleanup 2019-08-21 02:51:04 -07:00
Andreas Fabri 1bf3680ade Fixed_alpha_shape_3: Replace destroyed with swapped in documentation 2019-08-21 02:28:19 -07:00
Maxime Gimeno 660ebe9e81 Add missing highp and remove unwanted highp 2019-08-05 14:16:02 +02:00
Sébastien Loriot fbafb9d06f fix remaining mismatches and fix bugs 2019-07-10 11:40:45 +02:00
Sébastien Loriot 983645a51a match @{ and @} 2019-07-05 21:49:46 +02:00
Laurent Rineau 4fbf00fb8a CMake>=3.13: opt for for new policies up to 3.15 2019-06-19 14:34:59 +02:00
Andreas Fabri 4581f1b7a8 Morte replacements 2019-06-05 08:39:55 +02:00
Sébastien Loriot db65bd8ecc Merge remote-tracking branch 'cgal/releases/CGAL-4.14-branch' 2019-04-11 21:38:48 +02:00
albert-github 1dd7473818 Correction of links
Correction of redirected links and links that moved to another place.
2019-04-11 21:37:05 +02:00
Sébastien Loriot f62624c4f9 replace cpp11::tuple by std::tuple 2019-03-29 13:28:33 +01:00
Sébastien Loriot d60f5645aa replace BOOST_FOREACH by c++ ranged-based for loop
some of the command used for the replacement:
ack --cpp  BOOST_FOREACH -l  | xargs sed -i -E "s/BOOST_FOREACH\(([a-zA-Z_:&0-9]+)\s(\w+)\,/for(\1 \2 :/"
ack --cpp  BOOST_FOREACH -l  | xargs sed -i -E "s/BOOST_FOREACH\((const [a-zA-Z_:&0-9]+)\s(\w+)\,/for(\1 \2 :/"
ack --cpp  BOOST_FOREACH -l  | xargs sed -i -E "s/BOOST_FOREACH\((const typename [a-zA-Z_:&0-9]+)\s(\w+)\,/for(\1 \2 :/"
ack --cpp  BOOST_FOREACH -l  | xargs sed -i -E "s/BOOST_FOREACH\((typename [<>a-zA-Z_:&0-9]+)\s(\w+)\,/for(\1 \2 :/"
ack "boost/foreach.hpp" -l --cpp | xargs sed -i '/boost\/foreach.hpp>/d'
2019-03-29 13:22:15 +01:00
Sébastien Loriot 59bc453b42 first batch of replacement for level 1 in classified ref man
command used:
grep -l  "##" */doc/*/PackageDescription.txt | xargs  sed -i  -E 's/\#\#\s*([[:print:]]+[[:alnum:]])\s*\#\#\s*$/\\cgalCRPSection{\1}/'
2019-02-14 10:32:39 +01:00
Sebastien Loriot b3503f435f
Merge pull request #3450 from mglisse/Alpha_shapes_3-lazy_to_double-glisse
Copy relative_precision_of_to_double from Lazy_exact_nt to Lazy_alpha_nt_3
2018-11-14 18:51:43 +01:00
Marc Glisse 45505a3c68 Copy relative_precision_of_to_double from Lazy_exact_nt to Lazy_alpha_nt_3. 2018-11-11 12:03:09 +01:00
Guillaume Damiand 7d406fbb9c
Merge branch 'master' into CGAL-cmake_cleanup-gdamiand 2018-11-05 07:32:58 +01:00
Guillaume Damiand 92ba7fa6c9 Update minimum cmake required version in all CMakeLists.txt 2018-10-18 14:49:23 +02:00
Guillaume Damiand 0bd9088b5a Remove all include( ) and include( CGAL_CreateSingleSourceCGALProgram ) in CMakeLists.txt; they are no more required. 2018-10-17 14:17:08 +02:00
Sébastien Loriot ea240cfac5 use \PkgXXX instead of \PkgXXXSummary 2018-10-08 10:28:44 +02:00
Sébastien Loriot a2e8a1c68f add the suffix Ref to doxygen link to reference 2018-10-08 10:26:56 +02:00
Sébastien Loriot b78217e7e9 fix conversion warning 2018-08-27 15:01:36 +02:00
Sébastien Loriot 8b9897c393 do not use c++11 features 2018-08-27 15:00:28 +02:00
Sébastien Loriot b394525171 fix warning 2018-08-23 08:44:33 +02:00
Sébastien Loriot 47b758ff38 add an example showing how to dump into OFF visible facets of an alpha-shape 2018-08-20 10:26:37 +02:00
Sébastien Loriot d05df530b3 Merge pull request #2658 from MaelRL/Periodic_3_mesh_3-Feature-MBogdanov
Periodic_3_mesh_3, new package
2018-07-25 18:55:12 +02:00
Maxime Gimeno 4ca9d8b83d Fix Alpha Shapes 3 demo 2018-07-10 09:35:17 +02:00
Mael Rouxel-Labbé 7ea3a8044e Merge branch 'Periodic_3_mesh_3-Feature-MBogdanov-old' into Periodic_3_mesh_3-Feature-MBogdanov 2018-06-05 14:39:18 +02:00
Maxime Gimeno f22c2864a0 Put qglviewer in the namespace CGAL 2018-05-17 10:20:56 +02:00
Maxime Gimeno 6584abd90b Use integrated qglviewer for 3D demos 2018-05-17 10:20:55 +02:00
Andreas Fabri 887766a0e1 Postfix class names with _2 and _3 as they are different 2018-05-09 09:54:57 +01:00
Mael Rouxel-Labbé a0427ec756 Fixed abusing Triangulation_cell_base_3 for Delaunay triangulations
TriangulationCellBase_3 does not request a circumcenter;
DelaunayTriangulationCellBase_3 does.

Delaunay_triangulation_3 only compiled because
Triangulation_cell_base_3 (and Triangulation_ds_cell_base_3 !)
provided circumcenter() operators and DT3 inherited T3's TDS.

- The circumcenter() functions are removed where they shouldn't exist
- DT3 uses DT_cell_base_3 as cell base instead of T_cell_base_3
- Concepts/Classes that supposedly only required TriangulationCellBase_3
  and then built Delaunay triangulations with that (Alpha Shapes, etc.)
  are upgraded to request DelaunayTriangulationCellBase_3 (anyway, it
  wouldn't compile if you actually provided a model of
  TriangulationCellBase_3)
- Fixed various wrong templates in classes/concepts such as
  MeshVertexBase_3 not refining RegularTriangulationVertexBase_3
  and (only in the doc) defaulting to Triangulation_vertex_base_3
- Removed the deprecated class (for 4+ years) T_cell_base_with_circumcenter
2018-04-26 13:21:53 +02:00
Mael Rouxel-Labbé 17d46e9211 Merge branch 'Periodic_3_mesh_3-Feature-MBogdanov-old' into Periodic_3_mesh_3-Feature-MBogdanov 2018-04-26 11:55:17 +02:00
Mael Rouxel-Labbé 8646350d47 Merge branch 'Periodic_3_mesh_3-Feature-MBogdanov-old' into Periodic_3_mesh_3-Feature-MBogdanov 2018-03-15 14:42:21 +01:00
Sébastien Loriot 01af331c72 use https for all links to www.cgal.org and doc.cgal.org 2018-03-14 15:59:38 +01:00
Laurent Rineau 0a74393dcf Commit all new dependencies files 2018-03-06 18:44:48 +01:00
Mael Rouxel-Labbé c28e05be0c Merge branch 'Periodic_3_mesh_3-Feature-MBogdanov-old' into Periodic_3_mesh_3-Feature-MBogdanov 2018-02-23 12:50:06 +01:00
Maxime Gimeno 688b5dd06e Move dependencies creation to package_info and add dependencies to git 2018-02-02 12:08:05 +01:00
Maxime Gimeno 8bde832931 Fix METIS headers in BGL 2018-02-02 12:08:05 +01:00
Maxime Gimeno a676d5a60e Try to fix errors in classification checks 2018-02-02 12:08:05 +01:00
Maxime Gimeno acd0a72edf Modify travis script to test dependencies 2018-02-02 12:08:05 +01:00
Maxime Gimeno ae36b452bc Add dependencies of all packages 2018-02-02 12:08:05 +01:00
Mael Rouxel-Labbé 34d53aa2d9 Merge branch 'Periodic_3_mesh_3-Feature-MBogdanov-old' into Periodic_3_mesh_3-Feature-MBogdanov 2017-12-05 20:32:30 +01:00
Laurent Rineau 3c6640bf59 Merge pull request #1436 from lrineau/CGAL-new_cmake-GF
Renewal of CMake scripts: header-only, ctest, CMake>=3.1

# Conflicts:
#	Installation/config/testfiles/CGAL_CFG_NESTED_CLASS_FRIEND_DECLARATION_BUG.cpp
2017-12-05 18:20:05 +01:00
Mael Rouxel-Labbé ba3a59ed5a Merge branch 'Periodic_3_mesh_3-Feature-MBogdanov-old' into Periodic_3_mesh_3-Feature-MBogdanov 2017-11-30 15:54:00 +01:00
Laurent Rineau fe132099ad Fix a merge error 2017-11-28 17:54:46 +01:00
Laurent Rineau f5b5aead66 Remove direct use of the OpenGL API
We always use the Qt wrappers.
2017-11-28 16:07:37 +01:00
Mael Rouxel-Labbé 91ba96c71b Fixed typo 2017-11-19 01:43:23 +01:00
Laurent Rineau e3bc760374 Fix compilation 2017-11-17 15:17:19 +01:00
Laurent Rineau 891a83840e Merge branch 'CMake-parse_CTest_XML_output-lrineau' into CGAL-new_cmake-GF 2017-11-17 15:03:57 +01:00
Laurent Rineau 25dffa1710 Modern usage of Qt5 CMake scripts, to allow CMAKE_WARN_DEPRECATED 2017-11-17 12:54:13 +01:00
Laurent Rineau 21dabf1b1b Add compilation tests for demos 2017-11-16 18:45:33 +01:00
Laurent Rineau bbee705221 Add compilation tests for demos 2017-11-16 18:38:15 +01:00
Sébastien Loriot 8cdfad0d08 add missing URL and Id tags 2017-11-15 22:58:57 +01:00
Laurent Rineau a9365554c9 Merge pull request #2550 from sloriot/CGAL-add_SPDX_tags
Add SPDX License Identifier
2017-11-15 16:48:27 +01:00
Sébastien Loriot ee57fc2d6c add SPDX identifier for files under the GPL-3+ license 2017-11-12 10:17:51 +01:00
Sébastien Loriot 97e8ea1794 remove extra space 2017-11-12 10:17:51 +01:00
Laurent Rineau 62c70d41ca Renew the handle of policies, for CMake-3.10
Now that we require CMake>=3.1, we can forget a lot of old CMake policies.

`CMP0053` `OLD` behavior is still needed, because of a bug in Qt5 CMake files, but it will
not be set with CMake>=3.10. Let's assume that a recent CMake version means
a recent Qt5 version.
2017-11-06 14:58:36 +01:00
Mael Rouxel-Labbé 1fce05f81f Doc fixes 2017-08-24 11:33:43 +02:00
Mael Rouxel-Labbé 3d63f86ae3 Minor doc fixes 2017-08-24 10:30:39 +02:00
Mael Rouxel-Labbé d0318957f2 Fixed a bunch of Alpha shape 3-related headers 2017-08-23 17:16:07 +02:00
Mael Rouxel-Labbé 3640902c6f Misc minor changes 2017-08-23 17:15:44 +02:00
Mael Rouxel-Labbé 16ce117040 Documented the fact that ExactComparisonTag cannot be used with periodic triangulations 2017-08-23 17:13:24 +02:00
Mael Rouxel-Labbé dba83ba5bf Fixed a few Alpha Shapes 2 headers 2017-08-23 16:40:55 +02:00
Mael Rouxel-Labbé 406f41af78 Added CGAL_DEBUG macro 2017-08-23 16:31:17 +02:00
Mael Rouxel-Labbé 63d293765f Added an assertion to forbid using ExactComparisonTag with periodic triangulations
When we set the exact comparison tag to true, we use a lazy evaluation
of predicates and store pointers to the arguments of the predicates (that is,
pointer to points). However, the points are  -- in the case of periodic --
only temporary objects and it is thus dangerous to take pointers to those
temporary values because the pointers quickly become invalid.

Thus, periodic triangulations are not allowed to use the exact tag.

A possible way to make it work is to define a small class:
Periodic_triangulation_with_stored_real_points that would inherit the base
(periodic) triangulation but store all the points of its simplices.
Then, the function  point(face_handle, int) would return an entry of that
container, of which it would be safe to take a pointer.
2017-08-23 16:19:32 +02:00
Mael Rouxel-Labbé e3d27128fb Minor doc changes to Alpha Shapes 3 2017-08-23 11:10:12 +02:00
Mael Rouxel-Labbé 72908fc076 Readability changes in Alpha_Shapes_3 2017-08-23 11:04:21 +02:00
Sébastien Loriot 9bb2d4433f Merge remote-tracking branch 'cgal/releases/CGAL-4.10-branch' 2017-08-04 13:37:58 +02:00
Maxime Gimeno 831f0239cb Fix CMP0071 warning. 2017-08-03 10:38:19 +02:00
Mael Rouxel-Labbé 85b74fb3cc Minor example improvements 2017-07-31 16:17:49 +02:00
Mael Rouxel-Labbé fd1c9d5dfa Added periodic weighted alpha shapes to the doc 2017-07-31 16:17:23 +02:00
Mael Rouxel-Labbé 8e12efbeae Improved weighted periodic example 2017-07-31 15:30:42 +02:00
Mael Rouxel-Labbé 4a9ac3cd0c Fixed 3D Alpha Shapes's Geomview output to work with all triangulations 2017-07-31 14:37:56 +02:00
Mael Rouxel-Labbé e57e138e98 Formatting change 2017-07-31 14:37:56 +02:00
Mael Rouxel-Labbé 31c5540cd5 Added an example of Alpha Shapes 3D with a regular periodic triangulation 2017-07-31 14:37:39 +02:00
Mael Rouxel-Labbé a1c57031ba P3RT3 can now be used with Alpha Shapes 3 2017-07-31 12:52:22 +02:00
Mael Rouxel-Labbé ca4776a49f Minor doc fixes 2017-07-31 12:43:12 +02:00
Maxime Gimeno 29c55b8499 Fix misisng QMap in Alpha_shape_3 demo 2017-07-10 16:11:08 +02:00
Laurent Rineau ab46739f07 Merge pull request #2213 from maxGimeno/Fix_demos_for_qglviewer2_7_0-GF
Fix demos for qglviewer 2.7.0
2017-07-10 15:00:09 +02:00
Maxime Gimeno 28d363d4aa Fix misisng QMap in Alpha_shape_3 demo 2017-07-03 09:35:13 +02:00
Mael Rouxel-Labbé b5892b5fbc Reworded ExactAlphaComparisonTag warning 2017-06-28 10:16:23 +02:00
Mael Rouxel-Labbé e8c3618123 Updated documentation with changes from 19ae790 2017-06-28 10:16:23 +02:00
Mael Rouxel-Labbé 68d3a3eabf Modified the way weird point types are handled when ExactAlphaComparisonTag=true
Instead of requiring an implicit conversion, we require that Cartesian_converter
can convert from Traits::Point_23 to Exact_kernel::Point_23

Also it will not compile (static_assert) if this functor is not provided instead
of silently defaulting to ExactAlphaComparisingTag = false
2017-06-28 10:16:23 +02:00
Mael Rouxel-Labbé 85c75bce3b Reworded the warning about ExactAlphaComparisonTag 2017-06-28 10:16:23 +02:00
Mael Rouxel-Labbé 1030445709 Fixed missing backticks in Alpha_Shapes_23's docs 2017-06-28 10:16:23 +02:00
Mael Rouxel-Labbé 1fc2282350 Fixed regular triangulation capitalization across CGAL 2017-06-28 10:16:23 +02:00
Mael Rouxel-Labbé 11786a7b90 Fixed minor mistakes from a rebase 2017-06-28 10:16:23 +02:00
Mael Rouxel-Labbé 7ce35c7538 Added point type to the doc of alpha shapes 2/3 2017-06-28 10:15:30 +02:00