Commit Graph

382 Commits

Author SHA1 Message Date
Mael Rouxel-Labbé fba9a19fe4 Add missing #include's 2020-03-09 10:03:31 +01:00
Mael Rouxel-Labbé 84215c95c4 Merge branch 'Box_intersection_d-accelerate-GF-old' into Box_intersection_d-accelerate-GF 2020-02-07 11:03:07 +01:00
Laurent Rineau 4a9eea9778 Merge pull request #4443 from MaelRL/SMP-Fix_solver_traits_pragma_message-GF
SMP: Fix bad usage of pragma message
2020-01-15 17:19:19 +01:00
Mael Rouxel-Labbé 5806b8831e Fix bad usage of pragma message
The previous error message would show up even if Eigen is not available
and the user has passed a solver traits.

Reported in https://github.com/CGAL/cgal/issues/4442#issuecomment-570511774
2020-01-03 11:07:43 +01:00
Mael cf83a22e2d
Merge branch 'master' into T2-Throw_on_collinear_strongly_intersecting_segments-GF 2019-12-02 16:32:29 +01:00
Mael Rouxel-Labbé 41bb11cdee Make unique indentation style a little less unique (no real changes) 2019-11-19 17:08:25 +01:00
Mael Rouxel-Labbé b6dd62be52 Use ID_FROM_BOX_ADDRESS in Box_with_info_d where safe
That is, where we are passing box ranges by pointer.

See also 52ce0b6ac4
2019-11-19 17:06:47 +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
Laurent Rineau 38539d9a70 Merge pull request #4276 from MaelRL/SMP-ARAP_improvements-GF
SMP: Various improvements to the ARAP parameterizer

# Conflicts:
#	Surface_mesh_parameterization/include/CGAL/Surface_mesh_parameterization/ARAP_parameterizer_3.h
2019-10-15 16:33:47 +02:00
Mael Rouxel-Labbé 79362c0714 Fix typo 2019-10-07 13:10:34 +02:00
Mael Rouxel-Labbé ffb18e9e6d Improve energy-related end condition and verbose
- Ignore negative energies (bad for my chakras)
- Only compute energies if we need them
- Fix verbose and counter
2019-10-07 13:08:01 +02:00
Mael Rouxel-Labbé 0840a6e1a3 Enforce constraints by not updating their position 2019-10-07 13:07:30 +02:00
Mael Rouxel-Labbé 5983a80f6f Fix missing namespace 2019-10-07 13:07:13 +02:00
Mael Rouxel-Labbé 2b8c61b5ab Update which solvers are used in ARAP parameterization 2019-10-07 13:04:45 +02:00
Mael Rouxel-Labbé e4c0bcffa0 Update usage of intersection tags 2019-09-19 18:32:34 +02:00
Andreas Fabri e2d19b0c8d Replace NULL and Nullptr_t with nullptr and nullptr_t 2019-06-04 23:45:44 +02:00
Sébastien Loriot a5ff70122c Merge remote-tracking branch 'cgal/releases/CGAL-4.14-branch' 2019-04-12 15:43:10 +02:00
Sébastien Loriot 82103c8ebd Merge remote-tracking branch 'cgal/releases/CGAL-4.13-branch' into HEAD 2019-04-12 15:42:03 +02:00
Mael Rouxel-Labbé 6b43eaa311 Mute SMP's ARAP and Orbifold by default 2019-04-05 10:27:20 +02: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 d940632471 Merge pull request #3258 from MaelRL/PMP-Filter_degenerate_polygon_soup_input-GF
PMP: repair polygon soup
2018-11-02 10:37:58 +01:00
Mael Rouxel-Labbé d18e21cfe7 Merge branch 'PMP-Filter_degenerate_polygon_soup_input-GF-old' into PMP-Filter_degenerate_polygon_soup_input-GF 2018-10-08 16:19:26 +02:00
Sébastien Loriot 2f9408f867 rename link name to match package name 2018-10-08 10:28:55 +02:00
Sébastien Loriot 376bc42716 update URL and use https 2018-09-04 13:29:51 +02:00
Mael Rouxel-Labbé 46bd7dc832 Merge branch 'PMP-Filter_degenerate_polygon_soup_input-GF-old' into PMP-Filter_degenerate_polygon_soup_input-GF 2018-08-03 09:34:15 +02:00
Mael Rouxel-Labbé 16a9bc4d7c Fixed some links / concepts related to sgi.com and cppreference 2018-07-26 16:27:58 +02:00
Mael Rouxel-Labbé dea2ce0647 Minor improvements to the Orbifold parameterization in the demo 2018-07-20 13:05:25 +02:00
Mael Rouxel-Labbé f2b1124095 Misc minor changes (don't build FT from doubles & fix some comments) 2018-06-27 14:54:37 +02:00
Mael Rouxel-Labbé b688291c9f Removed extra verbose from SMP 2018-06-27 14:54:10 +02:00
Laurent Rineau 50c37a5eeb Merge pull request #3003 from afabri/Parameterization-inline-GF
Surface_mesh_parameterization: inline get_error_message()
2018-04-24 17:33:54 +02:00
Andreas Fabri 0f2f219e22 inline get_error_message() 2018-04-10 12:34:10 +01:00
Laurent Rineau 2df75cb8ef Merge pull request #2995 from MaelRL/Doc-Fix_minor_issues-GF
Doc: fix minor issues in Surface_mesh and SMP
2018-04-06 18:12:15 +02:00
Mael Rouxel-Labbé 80617a7f55 Fixed minor doc issues in SMP 2018-04-06 11:58:28 +02:00
Laurent Rineau 6553d7a9b3 Fix check_headers in master 2018-02-20 10:59:04 +01:00
Laurent Rineau b0c6e37c1d Merge pull request #2772 from MaelRL/SMP-Clean_internal_from_example-GF
SMP: Documented some functions used in the Orbifold Tutte parameterizer

# Conflicts:
#	Surface_mesh_parameterization/examples/Surface_mesh_parameterization/orbifold.cpp
#	Surface_mesh_parameterization/include/CGAL/Surface_mesh_parameterization/orbifold_shortest_path.h
2018-02-19 14:27:59 +01:00
Laurent Rineau 78e7060525 Merge pull request #2712 from afabri/CGAL-VC+warnlevel_4-GF
Deal with VC++ warnings of level /W4
2018-02-19 14:27:06 +01:00
Andreas Fabri df2e978158 Fix disable/enable warnings; Fix indentation 2018-02-13 14:02:40 +00:00
Mael Rouxel-Labbé f23547ef8e
Reworded sentence 2018-02-05 20:28:20 +01:00
Mael Rouxel-Labbé b5b3782aaa
Fixed typo... 2018-02-05 20:24:04 +01:00
Mael Rouxel-Labbé 17594d2795 Reduced the amount of \sa in SMP's doc
(no need to \sa every other parameterizer)
2018-02-05 12:31:40 +01:00
Mael Rouxel-Labbé 123dafc5cf Doc fixes 2018-02-05 10:30:45 +01:00
Maxime Gimeno 7fa4b380d2 fixes in includes logic. 2018-02-02 12:08:05 +01:00
Mael Rouxel-Labbé 92ac7b0eef
Fixed some variable name inconsistencies 2018-02-01 10:28:38 +01:00
Mael Rouxel-Labbé b3dd544545
Minor doc change 2018-01-31 10:20:08 +01:00
Mael Rouxel-Labbé bf21e2bd4b Minor doc improvements 2018-01-29 21:53:45 +01:00
Mael Rouxel-Labbé e803d7d5d0 Added tags 2018-01-29 18:39:33 +01:00
Mael Rouxel-Labbé b352738d70 Documented some functions used in SMP/Orbifold Tutte Embedding parameterizer
Along the way, fix a few mistakes and generalize the API of these newly
documented functions.
2018-01-29 18:32:25 +01:00
Andreas Fabri 36a2ba115d Surface_mesh_parameterization 2018-01-18 08:56:16 +00:00