-
Notifications
You must be signed in to change notification settings - Fork 1.6k
PMP: Non-rigid mesh registration #8329
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Open
soesau
wants to merge
45
commits into
CGAL:main
Choose a base branch
from
soesau:PMP-Non_rigid_registration-GF
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
Show all changes
45 commits
Select commit
Hold shift + click to select a range
4c41bda
Non-rigid mesh registration
soesau 97ce59f
added a preliminary license header
soesau d1de633
fixes for CI
soesau 2f2551b
revert Point_set_3 dependency
soesau b73ce3e
working on registration and doc
soesau db8ffbe
doc fix
soesau d981129
pass on doc
soesau ba01e61
update on doc
soesau 2fdfb80
update on doc
soesau 06a3187
updated changes.md
soesau 29d1fd1
typo; whitespace
afabri eb79dfe
proper license; internal::registration; move in CMakeLists
afabri eebeff2
No 'should' after discussion with @robertod
afabri c013d13
calculate -> compute https://langeek.co/en/grammar/course/1822
afabri 8667d66
pass on doc
soesau fb1bb51
Merge branch 'master' into PMP-Non_rigid_registration-GF
soesau 3a274b3
doc of CorrespondenceRange
soesau 3e08965
moving correspondences into named parameters
soesau 5a4fae7
added std::cref to doc of correspondences
soesau b0e5301
added apply_non_rigid_transformation to CHANGES.md
soesau 4b14289
Merge branch 'master' into PMP-Non_rigid_registration-GF
soesau 357d345
bug fixes
soesau ab51f73
removed unused variable
soesau 7e0022c
fix warning
soesau 36f59c3
compatibility with Eigen3.3
soesau d328aac
fix warnings
soesau 09ca6d5
making it easy to switch between both arap terms
soesau a093496
changes following review
soesau a948e53
Merge remote-tracking branch 'cgal/master' into PMP-Non_rigid_registr…
soesau 6b363ec
adapt CHANGES.md
soesau 7a10001
another pass for review
soesau b8937ab
adding proper edge weights for new arap weight as suggested by Roberto
soesau 47b7f67
switching licenses from LGPL to GPL
soesau 688f4a1
moving ARAP visitor into Weights package
soesau 2159bee
vertex normals are estimated if not provided
soesau 37d66b7
documentation of Deformation_algorithm_tag
soesau d1059ac
doc fix
soesau 608de95
fixing vertex normal rotation after registration
soesau ff97fb9
doc updates
soesau 09bbae9
doc of geom_traits
soesau 1f897b8
fixed warning
soesau 0a03248
Update Polygon_mesh_processing/doc/Polygon_mesh_processing/Polygon_me…
soesau fe9e8d9
renaming maximum_matching_distance to maximal_matching_distance
soesau b2399b9
Merge branch 'master' into PMP-Non_rigid_registration-GF
soesau c8bb801
CI fix
soesau File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
54 changes: 54 additions & 0 deletions
54
Installation/include/CGAL/license/Polygon_mesh_processing/registration.h
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,54 @@ | ||
| // Copyright (c) 2016 GeometryFactory SARL (France). | ||
| // All rights reserved. | ||
| // | ||
| // This file is part of CGAL (www.cgal.org) | ||
| // | ||
| // $URL$ | ||
| // $Id$ | ||
| // SPDX-License-Identifier: LGPL-3.0-or-later OR LicenseRef-Commercial | ||
| // | ||
| // Author(s) : Andreas Fabri | ||
| // | ||
| // Warning: this file is generated, see include/CGAL/license/README.md | ||
|
|
||
| #ifndef CGAL_LICENSE_POLYGON_MESH_PROCESSING_REGISTRATION_H | ||
| #define CGAL_LICENSE_POLYGON_MESH_PROCESSING_REGISTRATION_H | ||
|
|
||
| #include <CGAL/config.h> | ||
| #include <CGAL/license.h> | ||
|
|
||
| #ifdef CGAL_POLYGON_MESH_PROCESSING_REGISTRATION_COMMERCIAL_LICENSE | ||
|
|
||
| # if CGAL_POLYGON_MESH_PROCESSING_REGISTRATION_COMMERCIAL_LICENSE < CGAL_RELEASE_DATE | ||
|
|
||
| # if defined(CGAL_LICENSE_WARNING) | ||
|
|
||
| CGAL_pragma_warning("Your commercial license for CGAL does not cover " | ||
| "this release of the Polygon Mesh Processing - Registration package.") | ||
| # endif | ||
|
|
||
| # ifdef CGAL_LICENSE_ERROR | ||
| # error "Your commercial license for CGAL does not cover this release \ | ||
| of the Polygon Mesh Processing - Registration package. \ | ||
| You get this error, as you defined CGAL_LICENSE_ERROR." | ||
| # endif // CGAL_LICENSE_ERROR | ||
|
|
||
| # endif // CGAL_POLYGON_MESH_PROCESSING_REGISTRATION_COMMERCIAL_LICENSE < CGAL_RELEASE_DATE | ||
|
|
||
| #else // no CGAL_POLYGON_MESH_PROCESSING_REGISTRATION_COMMERCIAL_LICENSE | ||
|
|
||
| # if defined(CGAL_LICENSE_WARNING) | ||
| CGAL_pragma_warning("\nThe macro CGAL_POLYGON_MESH_PROCESSING_REGISTRATION_COMMERCIAL_LICENSE is not defined." | ||
| "\nYou use the CGAL Polygon Mesh Processing - Registration package under " | ||
| "the terms of the GPLv3+.") | ||
| # endif // CGAL_LICENSE_WARNING | ||
|
|
||
| # ifdef CGAL_LICENSE_ERROR | ||
| # error "The macro CGAL_POLYGON_MESH_PROCESSING_REGISTRATION_COMMERCIAL_LICENSE is not defined.\ | ||
| You use the CGAL Polygon Mesh Processing - Registration package under the terms of \ | ||
| the GPLv3+. You get this error, as you defined CGAL_LICENSE_ERROR." | ||
| # endif // CGAL_LICENSE_ERROR | ||
|
|
||
| #endif // no CGAL_POLYGON_MESH_PROCESSING_REGISTRATION_COMMERCIAL_LICENSE | ||
|
|
||
| #endif // CGAL_LICENSE_POLYGON_MESH_PROCESSING_REGISTRATION_H |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Binary file added
BIN
+357 KB
Polygon_mesh_processing/doc/Polygon_mesh_processing/fig/non-rigid_registration.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
6 changes: 6 additions & 0 deletions
6
Polygon_mesh_processing/examples/Polygon_mesh_processing/data/bear_bear_bis.corr
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,6 @@ | ||
| 1136 824 | ||
| 1229 1747 | ||
| 1089 1426 | ||
| 1914 129 | ||
| 1957 144 | ||
| 1714 1293 |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.