Commit Graph

492 Commits

Author SHA1 Message Date
Andreas Fabri 349f9ac384 Fix link 2022-08-02 16:01:43 +01:00
Andreas Fabri b52d211824 Parameterization: Scope name of a #define 2022-08-02 09:27:01 +01:00
Sven Oesau d98076bba6 removed protected copy_sparse_matrix as it is no longer required when the matrix type is assignable 2022-07-29 15:44:24 +02:00
Andreas Fabri 7fd9f8c887 Fix debug #define 2022-06-27 15:11:54 +01:00
Andreas Fabri a28f8f553d Parameterization: Make Iterative_authalic faster (WIP) 2022-06-27 15:03:20 +01:00
Sébastien Loriot ac8b6d4731 boost::is_same --> std::is_same 2022-06-10 08:18:20 +02:00
Sébastien Loriot 4f5f8341cc use std::enable_if_t 2022-06-10 07:37:53 +02:00
Andreas Fabri 7c207526f8 Add parameterization 2022-05-04 17:38:32 +01:00
Laurent Rineau 258d704a90 Merge pull request #6209 from sloriot/PMP-std_instead_of_boost
Use features available in std instead of boost
2022-02-24 19:57:17 +01:00
Sébastien Loriot 4ffc949199 replace boost::unordered by std::unordered
but in T3, Mesh_3, TDS_3, P3[TM]3
2022-02-03 19:11:12 +01:00
Andreas Fabri 440a8dfb7b Fix file name 2022-02-03 08:41:04 +00:00
Andreas Fabri 735752bec9 Do the remaining changes after Laurent's check 2022-02-03 08:02:11 +00:00
Sébastien Loriot 6d3176e061 move Named_parameters class in STL_extension
helpers stay in BGL because it depends on BGL tags
2022-01-07 15:12:22 +01:00
Laurent Rineau 373d21e1d8 Merge pull request #6177 from MaelRL/SMP-Silence_warning-GF
Silence warning message in ARAP
2021-12-20 18:06:26 +01:00
Mael Rouxel-Labbé 8bb1044d2b Silence warning message 2021-12-14 15:54:25 +01:00
Laurent Rineau 3cea6c72d8 Merge pull request #6139 from sloriot/SMP-ambiguous
Fix ambiguity in function signature
2021-11-23 15:39:23 +01:00
Sébastien Loriot c47ba58ca0 fix ambiguity in function signature 2021-11-19 13:42:11 +01:00
Dmitry Anisimov 9e89439645 user-defined mv weight is replaced with the edge tangent weight 2021-08-04 13:57:30 +02:00
Dmitry Anisimov 6fe0b062b6 smp, refactoring internal weights representation 2021-06-09 13:35:34 +02:00
Dmitry Anisimov cac04ed149 quick mael review 2021-06-08 13:36:09 +02:00
Dmitry Anisimov a4b645a6ad quick andreas review 2021-06-08 12:48:15 +02:00
Dmitry Anisimov 752c07e6c4 updated weights in the surface mesh parameterization package 2021-06-04 11:23:16 +02:00
Sébastien Loriot ad911271a9 Merge commit '6594e7549bd70923990d86c31e2aa267a79bb629' into HEAD 2021-01-15 10:12:17 +01:00
Sébastien Loriot 6594e7549b do no include a deprecated header 2021-01-15 10:07:59 +01:00
Sébastien Loriot bdd4efe3b3 Merge commit 'efc0c525e8b' into HEAD 2021-01-15 10:06:56 +01:00
Sébastien Loriot efc0c525e8 include non-deprecated header 2021-01-15 10:02:00 +01:00
Maxime Gimeno 3b70343590 Merge remote-tracking branch 'cgal/master' into CGAL_IO-maxGimeno 2020-11-16 16:19:43 +01:00
Mael Rouxel-Labbé 7c2ffc57ec Try to fix some maybe-uninitialized warnign 2020-10-20 14:52:40 +02:00
Mael Rouxel-Labbé 1b80ca4a17 Add some more preconditions 2020-10-20 14:51:00 +02:00
Mael Rouxel-Labbé 29b9946507 Fix warnings and compilation errors 2020-10-16 09:57:04 +02:00
Mael Rouxel-Labbé 479ba42269 Add missing include 2020-08-07 15:43:55 +02:00
Mael Rouxel-Labbé 30ccc1f243 Fix .h permissions 2020-08-05 11:05:22 +02:00
Mael Rouxel-Labbé 1bdcd6f5ca Fix license header 2020-07-28 16:25:09 +02:00
Mael Rouxel-Labbé d2289098af Fix some conversion warnings 2020-07-22 12:33:33 +02:00
Mael Rouxel-Labbé eb56ec4f48 Add documentation for iterative authalic parameterizer 2020-07-22 12:23:14 +02:00
Mael Rouxel-Labbé 7ad62d7cfe Fix compilation 2020-07-21 17:15:36 +02:00
Mael Rouxel-Labbé 91cce231f4 Fix missing typedef 2020-07-21 17:13:11 +02:00
Mael Rouxel-Labbé 50c870eb3c Add a warning about potential degenerate faces on the square border 2020-07-21 17:12:19 +02:00
Mael Rouxel-Labbé 025df4aa9a Add an extra overload to Iterative_authalic, for convenience 2020-07-21 17:11:53 +02:00
Mael Rouxel-Labbé 93a70d32b9 Fix documentation of Surface_mesh_parameterization
Too many classes/functions/typedefs/etc. showing, extract_all to blame?
2020-07-21 16:46:50 +02:00
Mael Rouxel-Labbé d5185e68f8 SMP doc improvements 2020-07-21 13:38:47 +02:00
Mael Rouxel-Labbé 5bad9ff61c Minor code cleaning 2020-07-10 12:57:45 +02:00
Mael Rouxel-Labbé 6a55952a87 Fix initialization of Boolean dedicing whether to use uniform weights or not 2020-07-10 12:56:00 +02:00
Mael Rouxel-Labbé 144a1c2b7b Template some functions with the VIM for convenience 2020-07-10 12:55:41 +02:00
Mael Rouxel-Labbé 52323c4a94 Remove extra (and wrong) sqrt 2020-07-10 12:55:22 +02:00
Mael Rouxel-Labbé a89cf1dd49 Store the total 3D area instead of recomputing it every err evaluation 2020-07-10 12:54:43 +02:00
Mael Rouxel-Labbé d2cd147bad Fix doc of Iterative_authalic_parameterization 2020-07-10 10:54:07 +02:00
Mael Rouxel-Labbé 495f6dbe1e Add some helper functions to measure distortion between SMP input and output 2020-07-09 17:41:25 +02:00
Mael Rouxel-Labbé 07b9e89be5 Refactor Iterative Authalic parameterization 2020-07-09 17:37:46 +02:00
Mael Rouxel-Labbé d9debb99fb Add some explicit preconditions on the input in SMP 2020-07-09 12:02:42 +02:00
Mael Rouxel-Labbé c9279b6e4b Rework vertex-index/bool maps in SMP to use dynamic properties rather than sets 2020-07-07 16:04:47 +02:00
Mael Rouxel-Labbé f168d3911e Remove useless Seam_mesh overload 2020-07-07 15:19:33 +02:00
Mael Rouxel-Labbé d45c769081 Orbifold Tutte Parameterizer is not a model of Parameterizer_3
The API of parameterize() is not compatible: cones must be provided by the user
2020-07-07 15:18:40 +02:00
Mael Rouxel-Labbé 6083c81d28 Modernize code and other aesthetic changes 2020-07-06 15:57:43 +02:00
Mael Rouxel-Labbé 26355e2e32 Uniformize capital / third person usage of \brief 2020-06-25 15:13:47 +02:00
Hardik Jain 9e49252247 Removed: Unnecessary debug logging 2020-03-28 16:56:03 +01:00
Hardik Jain 337365a4f1 Merge branch 'master' into Iterative_authalic_parameterization 2020-03-28 16:46:51 +01:00
Hardik Jain 07dc0b2d2d Modified: Initial inner vertices parameterization by cotangent weights 2020-03-28 16:35:24 +01:00
Hardik Jain ee9fcee717 Modified: Tutte weights initialization for inner border vertices with valency-2. However such vertices can affect optimization. 2020-03-28 16:29:41 +01:00
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
Hardik Jain 63189fae53 Added: Iterative Authalic Parameterization scheme with examples 2019-09-26 20:03:43 +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