Commit Graph

284 Commits

Author SHA1 Message Date
Andreas Fabri 602e6b456f find_package SuiteSparse 2017-06-22 16:15:57 +02:00
Mael Rouxel-Labbé 261da94f36 Added the bear example for SMP 2017-06-22 16:15:57 +02:00
Mael Rouxel-Labbé c62e503a39 Added Orbital Tutte parameterizer and an example
Only the orbifold type I method with MVC coefs is implented in this commit
2017-06-22 16:15:57 +02:00
Mael Rouxel-Labbé 66fc6c6c5d Added the selection file that goes with square_border_parameterizer.cpp 2017-06-22 16:15:57 +02:00
Mael Rouxel-Labbé f910d2ee60 Misc minor changes 2017-06-22 16:15:57 +02:00
Mael Rouxel-Labbé ccdf3a6bf4 Added some safety guard when vertices are given to border paramterizers
to make sure that the given vertices are on the same border/connected component.
2017-06-22 16:15:57 +02:00
Mael Rouxel-Labbé 8e77c99653 Fixed seam meshes not always picking the longest border in a connected component 2017-06-22 16:15:57 +02:00
Mael Rouxel-Labbé a8f82f4382 Merged the ParameterizedTraits_3 and BorderParameterizer_3 concepts
Incident changes:
- Angle computations helper, Error_code and kernel_traits<TriangleMesh> live in
  their own file
- Doc and examples changes
2017-06-22 16:14:55 +02:00
Mael Rouxel-Labbé 8922e36408 Fixed compilation after moving headers 2017-06-22 16:14:55 +02:00
Mael Rouxel-Labbé e96c474f78 Documentation changes for SMP 2017-06-22 16:14:55 +02:00
Mael Rouxel-Labbé 7ce8fdf3f6 Misc minor changes 2017-06-22 16:14:55 +02:00
Mael Rouxel-Labbé a8492d987f Reworked the way corner vertices are passed to the square_border_parameterizer
and added an example of usage.
2017-06-22 16:14:55 +02:00
Mael Rouxel-Labbé c1868dff4c Removed erroneous comment 2017-06-22 16:14:55 +02:00
Mael Rouxel-Labbé bb9230f4ff Fixed discrete authalic example
This example is now used to illustrate the use of various border parameterizers
2017-06-22 16:14:55 +02:00
Mael Rouxel-Labbé 8ffe7a5df2 Cleaned off the examples
The idea is to keep meaningful examples
-- A basic example using Surface_mesh with as few parameters as possible
-- A seam mesh using Polyhedron_3 with the default parameterizer (MVC)
-- A seam mesh using Surface_mesh with the LSCM parameterizer
-- An example with a fixed border parameterizer and using different border
   parameterizer
2017-06-22 16:14:55 +02:00
Mael Rouxel-Labbé 013e32d314 Replaced calls to num_vertices() 2017-06-22 16:14:55 +02:00
Mael Rouxel-Labbé ae06b044ce Improved existing SMP code
-Factorized the different tools to construct vertices and faces container in
a single class.
-Updated all examples accordingly and replaced the polylines output by an OFF
output across all files.
-Some other minor changes (missing includes, indentation, typos, etc.)
2017-06-22 16:14:55 +02:00
Mael Rouxel-Labbé 3245d726e3 Misc minor changes 2017-06-22 16:14:55 +02:00
Mael Rouxel-Labbé 664d873d2d Removed Parameterization_polyhedron_adaptor_ex.h 2017-06-22 16:14:55 +02:00
Mael Rouxel-Labbé c71d8285d0 Updated the examples of the SMP to work with the new Seam mesh
Also a small change in the Polyhedron demo
2017-06-22 16:14:55 +02:00
Andreas Fabri c3057850e9 Add example 2017-06-22 16:14:55 +02:00
Mael Rouxel-Labbé 3644a91f82 Added a way to write uvmaps into OFF files 2017-06-22 16:14:55 +02:00
Mael Rouxel-Labbé 7e7ff03831 Changed some comments 2017-06-22 16:14:55 +02:00
Mael Rouxel-Labbé e8d22d0f24 Some progress towards compilation of ARAP with a seam_mesh
Most of the issues come from the incomplete seam_mesh graph traits now.
2017-06-22 16:14:55 +02:00
Mael Rouxel-Labbé d978cc47c8 Added an example to test various configuration of mesh type and parameterizer 2017-06-22 16:14:55 +02:00
Mael Rouxel-Labbé 79490fd8b0 Cleaned code (indentation, whitespace, etc.) 2017-06-22 16:14:55 +02:00
Maxime Gimeno f9f000d1e5 Clean-up
- errors still remain :Surface_mesh_parameterize/next_bug and BGL/tests
2017-06-22 16:14:55 +02:00
Maxime Gimeno fd8336ecf8 Implementation of the seaming. 2017-06-22 16:12:26 +02:00
Maxime Gimeno 407bb3e675 Restore Parameterization_plugin with the BGL API. 2017-06-22 16:12:26 +02:00
Andreas Fabri 88b81378ce WIP 2017-06-22 16:12:26 +02:00
Andreas Fabri 63a5c1fd0b still WIP 2017-06-22 16:12:26 +02:00
Andreas Fabri c03ca8fb63 broken code, as I ask Sebastien to find the compile timer error 2017-06-22 16:12:26 +02:00
Andreas Fabri f6f52e01b0 cleanup and fix of Simple_parameterization.cpp 2017-06-22 16:12:26 +02:00
Andreas Fabri f7b826125b Add the possibility to pass the two vertices that are selected 2017-06-22 16:12:26 +02:00
Andreas Fabri 92be8f478d Add lscm.cpp 2017-06-22 16:12:26 +02:00
Andreas Fabri 45e19be366 Use property maps to store seam edges and vertices 2017-06-22 16:12:26 +02:00
Andreas Fabri 9cc84e828c Add an initial User Manual section for Seam_mesh 2017-06-22 16:12:26 +02:00
Andreas Fabri 162759ca87 polish 2017-06-22 16:11:38 +02:00
Andreas Fabri ac11cf8032 deal correctly with a patch 2017-06-22 16:11:38 +02:00
Andreas Fabri befec4c3c9 remove .cmd files 2017-06-22 16:11:38 +02:00
Andreas Fabri eda683816d Add three different seams sets for lion.off 2017-06-22 16:11:38 +02:00
Andreas Fabri b11385455f Fix target(Seam_msh) 2017-06-22 16:11:38 +02:00
Andreas Fabri 82f2a2b4ca WIP 2017-06-22 16:11:38 +02:00
Andreas Fabri f0f6575c76 WIP on the doc 2017-06-22 16:11:38 +02:00
Andreas Fabri afc6476992 start rewriting the doc 2017-06-22 16:11:38 +02:00
Andreas Fabri fa68850338 Use Vertex_around_target_circulator again 2017-06-22 16:11:38 +02:00
Andreas Fabri 869dfbb1e9 finally it works with a Seam_mesh 2017-06-22 16:11:38 +02:00
Andreas Fabri a6a62bc4f6 index vertices inside parameterize() 2017-06-22 16:11:38 +02:00
Andreas Fabri b7c5d49689 clean Simple_parameterization.cpp 2017-06-22 16:11:38 +02:00
Andreas Fabri 7997925bf8 Add a function longest_border(PolygonMesh&) to PMP 2017-06-22 16:11:38 +02:00
Andreas Fabri 46ed3edf92 LSCM seems to work too 2017-06-22 16:11:38 +02:00
Andreas Fabri 6dc52b4166 port two parametrisation classes 2017-06-22 16:11:38 +02:00
Andreas Fabri 92a463bdcc split constructor of Seam_mesh in two functions 2017-06-22 16:11:38 +02:00
Andreas Fabri 99a3b99283 make connecteced_component work for Seam_mesh 2017-06-22 16:11:38 +02:00
Andreas Fabri 4a2344f0cc discrete authalic now works for Surface_mesh and for a Seam_mesh 2017-06-22 16:11:38 +02:00
Andreas Fabri e1089a9168 WIP: Add vertex_descriptor which is a kind of canonical halfede_descriptor 2017-06-22 16:11:38 +02:00
Andreas Fabri 1164cb14bf Discrete Authalic parametrisation now works for a Seam_mesh with borders and seams 2017-06-22 16:11:38 +02:00
Andreas Fabri b7cdb47463 WIP - lets get it working with the Seam_graph next 2017-06-22 16:11:38 +02:00
Andreas Fabri c746425f8c Authalic parametrization works with a Surface_mesh with border 2017-06-22 16:11:38 +02:00
Andreas Fabri 675a15c63e add modified lion (holes at eye and mouth) 2017-06-22 16:11:38 +02:00
Andreas Fabri b237249d0b deal with seam tree. so far seam must not touch the border 2017-06-22 16:11:38 +02:00
Andreas Fabri e90fbb9867 it seems to work with seams. need visual output next to inspect it 2017-06-22 16:11:38 +02:00
Andreas Fabri 5327c116fe Add a tool to construct a seam polyline connecting two points 2017-06-22 16:11:38 +02:00
Andreas Fabri 37a32d6727 WIP 2017-06-22 16:11:38 +02:00
Andreas Fabri 9699e99162 make square border parameterizer work 2017-06-22 16:11:38 +02:00
Andreas Fabri d77bb6c242 make all parametrization methods work 2017-06-22 16:11:38 +02:00
Andreas Fabri f664cb4268 get it working for Surface_mesh 2017-06-22 16:11:38 +02:00
Andreas Fabri cb9f0aa21d fixes so that LSCM works as well 2017-06-22 16:11:38 +02:00
Andreas Fabri 6399e49be0 use a property map for the uv values 2017-06-22 16:11:38 +02:00
Andreas Fabri 511add25fa introduce index property maps 2017-06-22 16:11:38 +02:00
Andreas Fabri 67964f22b4 output a 2D OFF file to visualize the result 2017-06-22 16:11:38 +02:00
Andreas Fabri 8721b58b1a towards a BGL API -- still a long way to go :< 2017-06-22 16:11:38 +02:00
Sébastien Loriot 6b338eeb1f improve the name of projects in cmake scripts of examples 2016-09-08 00:02:55 +02:00
Sébastien Loriot 881e4d3199 request Core only in examples, tests and demos when really needed 2016-03-07 22:36:57 +01:00
Sebastien Loriot e0e22a4b9e Merge pull request #711 from afabri/Parameterization-clean_CmakeLists-GF
No need for -fno-strict-aliasing
2016-02-03 09:35:11 +01:00
Andreas Fabri e26f25829a No need for -fno-strict-aliasing 2016-02-02 12:38:54 +01:00
Andreas Fabri 2cff1012de only use it if it is available 2016-01-26 17:42:35 +01:00
Andreas Fabri 4b8944e5b2 Replace #ifdef CGAL_USE_BOOST_PROGRAM_OPTIONS with #ifndef DONT_USE_BOOST_PROGRAM_OPTIONS 2016-01-26 17:16:02 +01:00
Sebastien Loriot 2e493f297b Merge pull request #389 from afabri/CGAL-Qt3-GF
Remove Qt3 based demos
2015-10-23 17:08:49 +02:00
Andreas Fabri 38d063539a cleanup 2015-10-02 08:17:19 +02:00
Simon Giraudot af8e73750c Merge branch 'CGAL-Solver-package-GF-old' into CGAL-Solver-package-GF 2015-08-20 11:51:34 +02:00
Laurent Rineau f9917c487e CMake 2.8.11 2015-07-13 12:36:43 +02:00
Andreas Fabri d003e7bb2f fix CMakeList.txt 2015-04-15 12:32:42 +02:00
Andreas Fabri 3f1883e075 remove example as Eigen is now the default 2015-04-14 11:25:09 +02:00
Andreas Fabri 8ae42933c7 Do not explain OpenNL and say that LSCM has no parameter for a solver 2015-04-13 16:37:40 +02:00
Sébastien Loriot 5994a5f9e9 remove last mention of taucs in parameterization 2014-07-03 14:29:27 +02:00
Sébastien Loriot aeb094e4cc more Taucs removal 2014-06-25 15:58:37 +02:00
Andreas Fabri 9ed4f837c3 Merge branch 'CGAL-compilable_headers-GF'
The conflict was about whitesapce
Approved by the release manager

Conflicts:
	Polyhedron/include/CGAL/Polyhedron_copy_3.h
2013-09-23 14:50:17 +02:00
Andreas Fabri fb84aba2ea remove unused variable 2013-09-18 12:19:49 +02:00
Andreas Fabri 5244bfc153 Add a throw so that we see what happens in the VC++ debug testsuite 2013-09-12 12:49:06 +02:00
Andreas Fabri 4250b800b9 Cartesian -> Simple_cartesian 2013-08-26 17:06:42 +02:00
Andreas Fabri 13bac84716 less warnings in various packages 2013-02-01 10:27:07 +01:00
Sébastien Loriot 7d20531b1d Convert remaining CRLF files to LF 2012-12-04 17:09:28 +01:00
Sébastien Loriot 3c8f53b7bf fix reference manual 2012-10-22 15:48:42 +00:00
Philipp Möller 5bed1b15c5 Add basic Surface_mesh_parameterization, grouping and some moves to
internal are still missing
2012-09-14 11:15:18 +00:00
Laurent Rineau 2db4effa7e CMake: Fix the handling of cmake_policy
That is a followup-to my commit last year:
  | ------------------------------------------------------------------------
  | r63198 | lrineau | 2011-04-28 19:45:22 +0200 (Thu, 28 Apr 2011) | 5 lines
  | 
  | Try to fix my last revision about cmake_policy, with CMake-2.6.x
  | 
  | CMake gives an error if one tries to use cmake_policy(VERSION x.y.z) if
  | x.y.z is greater than the current CMake version.
  | 
  | ------------------------------------------------------------------------

The following check:
  if("${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}" VERSION_GREATER 2.6)
is useless just after a call to:
 cmake_minimum_required(VERSION 2.6.2)



The script used to fix that was:


#!/usr/bin/env perl

$replacement=<<'END';
if("${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}.${CMAKE_PATCH_VERSION}" VERSION_GREATER 2.8.3)
  cmake_policy(VERSION 2.8.4)
else()
  cmake_policy(VERSION 2.6)
endif()
END

while(<>) {
    if(/if\("\${CMAKE_MAJOR_VERSION}.\${CMAKE_MINOR_VERSION}" VERSION_GREATER 2.6\)/) {
        while(<>) {
            if(/^endif\(\)/) {
                print "$replacement";
                while(<>) {
                    print;
                }
                exit 0
            }
        }
    }
    print;
}
2012-08-22 12:35:03 +00:00
Laurent Rineau c59f8abc03 dos2unix on a CMakeLists.txt 2012-08-22 12:24:54 +00:00
Eric Berberich 357d6258f5 cmake's link_libraries is deprecated
removed almost all occurenced (missing UseFiles). While
doing so, some CMakeLists.txt could also be simplified. In fact
many more CMakeLists.txt can be simplified, in one of two ways:
1) add external libs to CGAL_3RD_PARTY_LIBRARIES and
2) call cgal_create_single_source_program
2012-08-03 22:32:39 +00:00
Laurent Rineau 4c3e1c3138 Fix mixed eol styles 2012-08-02 13:35:03 +00:00
Sébastien Loriot e702f20986 Eigen 3-1 is out.
Require Eigen 3.1.0 in CMake scripts.
2012-06-27 12:38:32 +00:00