Commit Graph

132 Commits

Author SHA1 Message Date
Laurent Rineau 5a20fd8567 Merge pull request #7238 from albert-github/feature/bug_author_consistency
Making description of author(s)  of a package consistent
2023-02-24 16:14:43 +01:00
albert-github 57e900b47c Making description of author(s) of a package consistent
- use `\cgalPckAuthor` in case of one author
- use of `\cgalPckAuthors` in case of multiple authors
- using in case of multiple authors always `, and `
- in the 1.9.6 `BaseDoxyfile.in` let the `\cgalPckAuthors` point to `\cgalPckAuthor` to get consistent output (not done for other versions as in the past the `ALIASES` could not call one another).
2023-02-02 18:40:44 +01:00
Mael 153c603209
Merge branch 'master' into CGAL-Clean_CMakeLists.txt-GF 2023-01-27 22:09:02 +01:00
Sebastien Loriot f5c41bd712
Merge pull request #7022 from MaelRL/Weights-v2.0-GF-master
Weights fixes (master)
2022-12-08 15:22:19 +01:00
Mael 6538b22e06
Merge branch 'master' into CGAL-Clean_CMakeLists.txt-GF 2022-12-05 16:03:41 +01:00
Laurent Rineau dbe12c20ee Merge pull request #7072 from afabri/CGAL-cmake-3_25-GF
CGAL: Fixes for cmake 3.25

# Conflicts:
#	Barycentric_coordinates_2/examples/Barycentric_coordinates_2/CMakeLists.txt
#	Barycentric_coordinates_2/test/Barycentric_coordinates_2/CMakeLists.txt
#	Polygonal_surface_reconstruction/examples/Polygonal_surface_reconstruction/CMakeLists.txt
#	Polygonal_surface_reconstruction/test/Polygonal_surface_reconstruction/CMakeLists.txt
#	Shape_regularization/examples/Shape_regularization/CMakeLists.txt
#	Shape_regularization/test/Shape_regularization/CMakeLists.txt
#	Weights/examples/Weights/CMakeLists.txt
#	Weights/test/Weights/CMakeLists.txt
2022-12-05 12:22:44 +01:00
Andreas Fabri d157adcb6e CGAL: Fixes for cmake 3.25 2022-11-23 08:27:39 +00:00
Mael Rouxel-Labbé 491a77397c Merge branch 'Weights-v2.0-GF-5.5.x' into Weights-v2.0-GF-master 2022-11-22 17:53:26 +01:00
Mael Rouxel-Labbé f6ac98882a Merge remote-tracking branch 'mine/Weights-v2.0-GF' into Weights-v2.0-GF-5.5.x 2022-11-22 17:51:36 +01:00
Mael Rouxel-Labbé 3abb7366d5 Try to fix compatibility between Weights and OpenMesh 2022-11-22 17:46:01 +01:00
Mael Rouxel-Labbé 55ebf77a6c Merge branch 'Weights-v2.0-GF-5.5.x' into Weights-v2.0-GF-master 2022-11-09 12:36:47 +01:00
Mael Rouxel-Labbé 4174c17c06 Merge branch 'Weights-v2.0-GF' into Weights-v2.0-GF-5.5.x 2022-11-09 12:36:21 +01:00
Mael Rouxel-Labbé b603aab680 Fix syntax 2022-11-09 09:55:29 +01:00
Sébastien Loriot 8737c99339 Merge remote-tracking branch 'MaelRL/Weights-v2.0-GF-5.5.x' into HEAD 2022-11-08 17:06:21 +01:00
Sébastien Loriot ac6f4c01b4 Merge remote-tracking branch 'MaelRL/Weights-v2.0-GF' into HEAD 2022-11-08 17:05:55 +01:00
Mael Rouxel-Labbé dd249a21f8 Fix intercompatiblity between APIs of Cotangent_weight 2022-11-08 16:08:00 +01:00
Mael Rouxel-Labbé 7163a188d3 Remove unused typedefs 2022-11-08 14:45:12 +01:00
Mael Rouxel-Labbé 72fdfbeb18 Some const correctness + don't take pmaps by ref 2022-11-08 14:44:57 +01:00
Mael Rouxel-Labbé f0443a6ab3 Rework as to not break the Surface_mesh_deformation weight concept 2022-11-08 14:43:19 +01:00
Mael Rouxel-Labbé 83b0b0bdef Merge branch 'Weights-v2.0-GF-5.5.x' into Weights-v2.0-GF-master 2022-11-07 14:23:29 +01:00
Mael 56244a493f Fix test 2022-11-07 14:11:38 +01:00
Mael Rouxel-Labbé 7564b761ac Merge branch 'Weights-v2.0-GF' into Weights-v2.0-GF-5.5.x 2022-11-07 14:11:10 +01:00
Mael 07ebf4da23
Fix test 2022-11-07 13:12:49 +01:00
Laurent Rineau c6c1900c9b Merge pull request #6970 from MaelRL/SMP-Fix_ARAP_post_process-GF
Fix weights in ARAP parameterization's post processing
2022-11-03 09:44:37 +01:00
Laurent Rineau a61693582d Merge pull request #6970 from MaelRL/SMP-Fix_ARAP_post_process-GF
Fix weights in ARAP parameterization's post processing
2022-11-02 16:19:15 +01:00
Mael Rouxel-Labbé 88b3d0ab88 Fix compilation 2022-10-21 14:32:42 +02:00
Mael Rouxel-Labbé 8d7669d559 Test alternate API + add missing typedef 2022-10-21 12:15:03 +02:00
Mael Rouxel-Labbé b0c183fc3d Add missing typedef 2022-10-21 12:07:12 +02:00
Mael Rouxel-Labbé 82c0d0686e Add missing typedef 2022-10-21 11:23:45 +02:00
Mael Rouxel-Labbé 6a694366f0 Remove trailing whitespace 2022-10-21 10:34:13 +02:00
Mael Rouxel-Labbé 6a5f099f41 Add a test 2022-10-21 00:05:30 +02:00
Mael Rouxel-Labbé 0d00ad237b Remove needless normalization calls 2022-10-21 00:05:20 +02:00
Mael Rouxel-Labbé b9e7c2aa13 Misc minor fixes 2022-10-20 17:35:19 +02:00
Mael Rouxel-Labbé 0640470f5d Hide pmp_weights_deprecated.h behind CGAL_NO_DEPRECATED_CODE 2022-10-20 17:34:34 +02:00
Mael Rouxel-Labbé f4f6229c42 Weights examples/tests improvements 2022-10-20 17:34:02 +02:00
Mael Rouxel-Labbé 59f2021eaf Update Weights doc figure to use compatible notations 2022-10-20 17:32:20 +02:00
Mael Rouxel-Labbé 7eb3002790 Avoid computing all angles if possible 2022-10-20 17:25:52 +02:00
Mael Rouxel-Labbé 670fec5e3c Fix issues in tangent_weight classes
- Edge_tangent_weight returns 0 if the halfedge is border
- if opp(h, mesh) is tangent, properly returns tan of the HALF angle
  and not tangent_3.
2022-10-20 17:24:40 +02:00
Mael Rouxel-Labbé 92ea84d672 Factorize cotangent_weight classes 2022-10-20 17:23:11 +02:00
Mael Rouxel-Labbé 9ab7e1ed7f Misc minor code cleaning 2022-10-20 17:21:43 +02:00
Mael Rouxel-Labbé 5f89766c5c Uniformize notations across the package + re-introduce documentation 2022-10-20 17:19:40 +02:00
Mael Rouxel-Labbé 15de97faf1 Re-organize internal functions and use usual APIs 2022-10-17 21:40:05 +02:00
Mael Rouxel-Labbé 72163bc009 Simply weight computations and use documentation variable names 2022-10-17 17:54:01 +02:00
Mael Rouxel-Labbé 85132eea04 More re-indentation 2022-10-17 17:02:29 +02:00
Mael Rouxel-Labbé 9a438b26c4 Use fewer 'auto's 2022-10-17 16:48:56 +02:00
Mael Rouxel-Labbé d20475f322 Add missing includes in Weights 2022-10-17 16:29:32 +02:00
Mael Rouxel-Labbé e0e0c4d54b Remove old doc (new one to be re-added directly on the functions) 2022-10-17 16:25:36 +02:00
Mael Rouxel-Labbé fd6745af62 Use a more standard indentation in Weights/include 2022-10-17 16:20:48 +02:00
Mael Rouxel-Labbé 2a679483b2 Fix ARAP post processing
The formula of weights is "- tan(theta / 2) / length", with:
 tan ( theta / 2 ) = sin ( theta ) / ( 1 + cos ( theta ) )
                   = ( 2 * A / |v1| * |v2| ) / ( 1 + v1 . v2 / |v1| * |v2| )
		   = 2 * A / ( |v1| * |v2| + v1 . v2 )

with A the _unsigned_ area.
2022-10-16 16:22:29 +02:00
Laurent Rineau b2f661f2dc Fix dependencies
For Periodic and SMDS_3, that is just the change of the order, using
the `C` locale (`export LC_ALL=C`).

For Weights and Shape_regularization... how come the file are missing?!
2022-09-21 14:38:09 +02:00