Commit Graph

1019 Commits

Author SHA1 Message Date
Guillaume Damiand 92ba7fa6c9 Update minimum cmake required version in all CMakeLists.txt 2018-10-18 14:49:23 +02:00
Guillaume Damiand 0bd9088b5a Remove all include( ) and include( CGAL_CreateSingleSourceCGALProgram ) in CMakeLists.txt; they are no more required. 2018-10-17 14:17:08 +02:00
Guillaume Damiand 7f09308d33 Remove all include_directories(BEFORE ../../include) in CMakeLists.txt 2018-10-17 13:07:22 +02:00
Guillaume Damiand ae5b6e00ad Bug fix in basic viewers when using EPEK.
For polyhedron, surface mesh and LCC viewers, we compute face and vertex normals in the basic viewers. These normals should be computed in a Vector_3 of a non exact kernel.
2018-10-15 14:58:52 +02:00
Sébastien Loriot ea240cfac5 use \PkgXXX instead of \PkgXXXSummary 2018-10-08 10:28:44 +02:00
Sébastien Loriot a2e8a1c68f add the suffix Ref to doxygen link to reference 2018-10-08 10:26:56 +02:00
Guillaume Damiand b4407bcf14 Add an example that loads an off, compute two random pathes and verify that they are isotopic 2018-09-28 18:25:49 +02:00
Guillaume Damiand 6a39a47a15 Update tests 2018-09-25 13:31:40 +02:00
Guillaume Damiand 2e910371fb Add the possibility to visualize marked darts 2018-09-25 13:29:24 +02:00
Guillaume Damiand ade06be0f0 Comment a test to simplify debugging. 2018-09-18 16:57:17 +02:00
Guillaume Damiand f52676769f Continue isotopy test. 2018-09-18 15:16:40 +02:00
Guillaume Damiand ee3ee27432 Continue draw for arrangement 2018-09-13 16:15:17 +02:00
Guillaume Damiand ddd7f8fa3b Add an option to disable viewer when running ctest. 2018-09-07 13:29:38 +02:00
Guillaume Damiand 2c8af2ebcc Update all draw_XXX functions to use specialized version, allowing to use different draw in a same program. 2018-09-06 18:43:32 +02:00
Guillaume Damiand ed81c8491c Add tests. 2018-09-04 18:31:31 +02:00
Guillaume Damiand c9a80f75ea Return a bool in undocumented read and write off functions 2018-09-04 16:17:33 +02:00
Guillaume Damiand 542d94dcdb Add default value for update attribute parameter 2018-09-04 16:17:11 +02:00
Guillaume Damiand 4fae0480fd Add option to fix the initial random seed; add some debug code. 2018-09-04 14:51:40 +02:00
Guillaume Damiand 142f36d6b4 New random path generator 2018-07-09 16:29:33 +02:00
Guillaume Damiand 30d5118740 Update path generators; start a test with long random paths deformed. 2018-07-06 16:42:23 +02:00
Maxime Gimeno 4086888964 Update glCode in 3D demos 2018-07-06 12:08:22 +02:00
Guillaume Damiand 53ed894ec7 Update isotopy test; seems to work now; need more tests. 2018-07-04 17:00:28 +02:00
Laurent Rineau 0e4e50f2e7 Merge pull request #3060 from maxGimeno/BGL-read_write_off_use_np-GF
BGL: Use Named Parameters in OFF I/O
2018-06-27 10:21:33 +02:00
Laurent Rineau 5ec1b841b7 Merge pull request #3170 from MaelRL/CGAL-Fix_some_STL_extension_namespaces-GF
STL_Extension: move CGAL::iterator and CGAL::unary/binary functions to CGAL::cpp98::
2018-06-20 17:21:01 +02:00
Laurent Rineau 08043e442c Merge pull request #2835 from gdamiand/CGAL-basic_viewers-gdamiand
Add basic viewers
2018-06-14 17:36:37 +02:00
Mael Rouxel-Labbé 26c857a431 Moved unary/binary_function to CGAL::cpp98 2018-06-13 15:58:19 +02:00
Guillaume Damiand f6fd8cae4c Remove a warning; when using test suite, compile all the code but run nothing. 2018-06-13 09:14:18 +02:00
Laurent Rineau e33030b3a9 Add dependencies to GraphicsView 2018-06-11 15:54:56 +02:00
Guillaume Damiand 59f797f066 Update the 5 basic viewers to remove factorized functions, and to define different versions in order to remove default template parameters. 2018-06-11 13:09:50 +02:00
Maxime Gimeno 10c277ea2d Use special args if running testsuite to avoid execution errors. 2018-06-07 13:35:28 +02:00
Maxime Gimeno 605bf1da52 Add missing includes in other plugins 2018-06-05 12:08:08 +02:00
Maxime Gimeno 6e878c4f66 Fix LCC example 2018-05-29 11:38:48 +02:00
Guillaume Damiand c62fb2b01e Move include iostream. 2018-05-29 11:11:49 +02:00
Guillaume Damiand b361e78a99 Add missing include 2018-05-29 11:11:49 +02:00
Guillaume Damiand d8a62aa2c8 Update licence headers of new files. 2018-05-29 11:11:49 +02:00
Guillaume Damiand 8a0dc2f279 Add one draw example in each user manual. 2018-05-29 11:11:49 +02:00
Guillaume Damiand 23426e70c4 Remove macro modified. 2018-05-29 11:11:49 +02:00
Guillaume Damiand dba44f48a1 Harmonize the 5 basic viewers. 2018-05-29 11:11:49 +02:00
Guillaume Damiand 53769e98a7 * Add draw examples in the 5 concerned packages (Polyhedron, Surface_mesh, T2, T3, LCC)
* Update FindQGLViewel to add a target.
2018-05-29 11:11:49 +02:00
Guillaume Damiand 202781aa93 The -> the 2018-05-29 11:06:07 +02:00
Guillaume Damiand 381d09104a Small update of LCC doc, following Andreas remarks. 2018-05-29 11:06:07 +02:00
Guillaume Damiand a251b3a0cd Rename file for basic viewers. 2018-05-29 11:06:07 +02:00
Guillaume Damiand 6e83b034dc Rename file for basic viewers. 2018-05-29 11:06:07 +02:00
Guillaume Damiand 82179b45a4 Some more replace of display by draw; for lcc basic viewer. 2018-05-29 11:06:07 +02:00
Guillaume Damiand d1bce718f9 Rename display into draw (for basic viewers) 2018-05-29 11:06:07 +02:00
Guillaume Damiand 69aa5d2188 Update user manual of LCC following Andreas comments. 2018-05-29 11:06:07 +02:00
Guillaume Damiand de23cdc86f Update cmake of LCC example 2018-05-29 11:06:07 +02:00
Guillaume Damiand 73905ce8dd Avoid to run the viewer for the CGAL test suite. 2018-05-29 11:06:07 +02:00
Guillaume Damiand c7a4236281 Update CMakeLists.txt to allow drawing of lcc example 2018-05-29 11:06:07 +02:00
Guillaume Damiand 6d01411003 Remove ifdef in draw example since this is now done in the basic viewer. 2018-05-29 11:04:57 +02:00
Guillaume Damiand 5e5a9611db Protect the code of the basic viewers; rename display into draw; add a draw function that display an error message if the basic viewer is not defined. 2018-05-29 11:04:57 +02:00
Guillaume Damiand a59c5f6398 Update all basic viewers to allow to have a color functor as parameter. 2018-05-29 11:04:57 +02:00
Guillaume Damiand d0010de73f Add an example to illustrate the use of display for LCC; remove all the use of display from other examples 2018-05-29 11:04:56 +02:00
Guillaume Damiand aaf0c578f0 Document in doxygen the new display function for LCC. 2018-05-29 11:02:00 +02:00
Guillaume Damiand d881a203e2 Update LCC, Polyhedron and Surface mesh viewers to follow last modification of basic viewer. 2018-05-29 11:02:00 +02:00
Guillaume Damiand f70c6fed86 Update basic viewer to: (1) use a generic class that can maybe be used also in demos; (2) use same name to add mono/colored objects. 2018-05-29 11:02:00 +02:00
Guillaume Damiand 8870e304a3 Update basic viewer; now it works for LCC, Polyhedron and Surface_mesh. 2018-05-29 11:01:59 +02:00
Guillaume Damiand 0e6eded6b7 Update basic viewer. 2018-05-29 11:01:59 +02:00
Guillaume Damiand cc3410a729 Bugfix in basic viewer. 2018-05-29 11:01:59 +02:00
Guillaume Damiand b7f5c709f0 rename filename for polyhedron viewer 2018-05-29 11:01:59 +02:00
Guillaume Damiand 374da8b55d Update basic viewer. 2018-05-29 11:01:59 +02:00
Guillaume Damiand 9e4f2870b8 Work on generic display function. 2018-05-29 11:01:59 +02:00
Maxime Gimeno fbe5ee39c7 Update cmake files 2018-05-28 17:18:59 +02:00
Andreas Fabri 4712fbeb0d Fixes in Linear cell complex demo 2018-05-18 07:51:41 +01:00
Maxime Gimeno 25685fbedd add missing include 2018-05-17 10:43:03 +02:00
Maxime Gimeno f22c2864a0 Put qglviewer in the namespace CGAL 2018-05-17 10:20:56 +02:00
Andreas Fabri ff0836ec79 cleanup 2018-05-17 10:20:56 +02:00
Maxime Gimeno 6584abd90b Use integrated qglviewer for 3D demos 2018-05-17 10:20:55 +02:00
Maxime Gimeno c4da8690cb Add NamedParameters to the off IO functions. 2018-04-26 14:00:06 +02:00
Laurent Rineau 095c27e2be cosmetic changes 2018-04-17 17:14:19 +02:00
Andreas Fabri 7cbffac35b Deal with deprecated functions allocator<T>::construct/destroy 2018-04-17 13:35:04 +01:00
Guillaume Damiand a52a324262 Continue tests. 2018-03-30 16:42:22 +02:00
Guillaume Damiand ba014bfa3c Update all tests for canonical representation; start tests for isotopy. 2018-03-30 15:03:02 +02:00
Guillaume Damiand 6ec0beba66 Add more test of validity 2018-03-29 17:39:32 +02:00
Guillaume Damiand 122eeb0be8 3 first tests are ok. 2018-03-29 17:23:26 +02:00
Guillaume Damiand d302193844 Update tests to simplify the usage. 2018-03-29 12:03:20 +02:00
Guillaume Damiand 858c81c919 Update tests to remove debug messages. 2018-03-29 10:13:23 +02:00
Guillaume Damiand 13859a4fa4 Add test of random paths. 2018-03-28 22:40:52 +02:00
Guillaume Damiand 8be85817c7 l-shape case 8 OK. 2018-03-28 22:10:53 +02:00
Guillaume Damiand a42a4546ae l-shape case 7 started (nyf) 2018-03-28 17:53:48 +02:00
Guillaume Damiand e4afaf5ea5 l-push cases 5 & 6 ok. 2018-03-28 17:42:34 +02:00
Guillaume Damiand c8cdf75b8b l-push case 4 ok. 2018-03-28 16:36:21 +02:00
Guillaume Damiand b3389488f5 Better test suite for path canonizing. 2018-03-28 12:45:34 +02:00
Guillaume Damiand dec0a55276 Push l-shape ok for cases 1, 2 and 3. 2018-03-28 10:19:41 +02:00
Laurent Rineau 624bb54475 Merge pull request #2953 from gdamiand/LCC-remove_one_dependency-gdamiand
Remove one useless dependency in LCC to Polyhedron.
2018-03-27 10:11:36 +02:00
Guillaume Damiand 4ee2036093 Update l-shape right shift. 2018-03-26 17:54:10 +02:00
Laurent Rineau 312f61248e Modify the file `dependencies` 2018-03-26 12:53:41 +02:00
Andreas Fabri b918ab4ba7 Move internal class from Polyhedron to BGL 2018-03-24 11:41:30 +01:00
Guillaume Damiand 8f8cbbc84e Remove one useless dependency in LCC to Polyhedron. 2018-03-23 16:46:38 +01:00
Guillaume Damiand d3f1a4c703 Seems ok for bracket flatering and spurs removal. 2018-03-23 16:10:55 +01:00
Guillaume Damiand 1d97d27ba9 Case (1 2^r) is now ok. 2018-03-20 11:30:14 +01:00
Guillaume Damiand 5521f52d96 Add more tests for special cases of bracket reduction 2018-03-20 09:17:09 +01:00
Guillaume Damiand dfc76816b3 Update 2018-03-19 22:19:38 +01:00
Guillaume Damiand b848314336 Improve method 2018-03-19 16:36:03 +01:00
Guillaume Damiand 584def3c0f Continue path simplification for homotopy test. 2018-03-14 22:20:53 +01:00
Guillaume Damiand 763edf0030 Update path generator and bracket reduction 2018-03-14 19:43:46 +01:00
Sébastien Loriot 01af331c72 use https for all links to www.cgal.org and doc.cgal.org 2018-03-14 15:59:38 +01:00
Laurent Rineau 0a74393dcf Commit all new dependencies files 2018-03-06 18:44:48 +01:00
Laurent Rineau 9d227d0fba Merge pull request #2758 from maxGimeno/BGL-Document_graph_has_property-GF
BGL: Document graph_has_property
2018-02-19 14:26:33 +01:00
Guillaume Damiand 39742b0d32 Continue bracket_flattening 2018-02-11 17:02:54 +01:00
Guillaume Damiand 8e73a49cb4 Start method bracket_flattening() 2018-02-10 10:52:36 +01:00
Guillaume Damiand 275c133a2c Continue the homotopy test algorithm. 2018-02-09 11:19:09 +01:00
Maxime Gimeno 688b5dd06e Move dependencies creation to package_info and add dependencies to git 2018-02-02 12:08:05 +01:00
Maxime Gimeno 8bde832931 Fix METIS headers in BGL 2018-02-02 12:08:05 +01:00
Maxime Gimeno a676d5a60e Try to fix errors in classification checks 2018-02-02 12:08:05 +01:00
Maxime Gimeno acd0a72edf Modify travis script to test dependencies 2018-02-02 12:08:05 +01:00
Maxime Gimeno ae36b452bc Add dependencies of all packages 2018-02-02 12:08:05 +01:00
Maxime Gimeno 7fa4b380d2 fixes in includes logic. 2018-02-02 12:08:05 +01:00
Maxime Gimeno c3215b9331 Move graph_has_property from namespace boost to namespace CGAL and provide some doc for it. 2018-01-22 12:43:29 +01:00
Guillaume Damiand 3ed36aa4fd Initialize dart info, when non void; otherwise isomorphism is sometimes false (on some 32 bits os in release mode). 2018-01-20 18:10:22 +01:00
Sébastien Loriot f6459368aa move fig_src dirs 2018-01-08 20:35:40 +01:00
Guillaume Damiand 7694565cb0 Update new functionalities 2017-12-17 19:01:39 +01:00
Guillaume Damiand 58387e9af4 Add viewer for surface and paths; add function to generate random paths. 2017-12-17 11:31:06 +01:00
Guillaume Damiand 4bb1758a0d Simplification in one vertex uses now also union find trees 2017-12-16 11:53:02 +01:00
Guillaume Damiand 78efb73a75 cmap function cont 2017-12-15 20:51:01 +01:00
Guillaume Damiand 9495a4da73 Add example for lcc new functionality 2017-12-15 10:35:52 +01:00
Guillaume Damiand e3b6a38adf Add default value for insertion operation in lcc 2017-12-15 10:35:35 +01:00
Guillaume Damiand 425a330f68 load/write fct now return bool 2017-12-15 09:52:45 +01:00
Guillaume Damiand fb1f44ab60 Add a new class for cmap functionalities; plus one example to use it. 2017-12-15 09:52:26 +01:00
Laurent Rineau 4e91d4d768 Merge pull request #2595 from gdamiand/BGL_LCC-use_generic_load-gdamiand
BGL/LCC: use generic load

# Conflicts:
#	BGL/test/BGL/CMakeLists.txt
2017-12-05 18:23:58 +01:00
Laurent Rineau 0b0b1503ef Merge pull request #2594 from gdamiand/CMap-bugfixes-gdamiand
CMap bugfixes
2017-12-05 18:20:56 +01:00
Laurent Rineau 3c6640bf59 Merge pull request #1436 from lrineau/CGAL-new_cmake-GF
Renewal of CMake scripts: header-only, ctest, CMake>=3.1

# Conflicts:
#	Installation/config/testfiles/CGAL_CFG_NESTED_CLASS_FRIEND_DECLARATION_BUG.cpp
2017-12-05 18:20:05 +01:00
Laurent Rineau 6ec4c12031 Do not use OpenGL directly, but only using Qt5 OpenGL classes 2017-11-28 17:58:12 +01:00
Guillaume Damiand 34b1e620c1 Remove my copy of cgal/bgl/graph/io.h 2017-11-24 11:18:01 +01:00
Guillaume Damiand a189c1b1cc Use generic load_off function (in cgal/bgl/graph/) instead of my own copy. For that, add the degree function that takes a face descriptor as parameter. 2017-11-24 11:16:55 +01:00
Guillaume Damiand d5372e1a7d Remove option '-std=c++11', committed by error. 2017-11-21 10:02:23 +01:00
Laurent Rineau 25dffa1710 Modern usage of Qt5 CMake scripts, to allow CMAKE_WARN_DEPRECATED 2017-11-17 12:54:13 +01:00
Sébastien Loriot 19adf3b05e make the doc match struct/class with the implementation 2017-11-17 11:34:55 +01:00
Laurent Rineau bbee705221 Add compilation tests for demos 2017-11-16 18:38:15 +01:00
Guillaume Damiand b21b9e21c9 By default, disable the use of viewer in LCC examples. 2017-11-16 15:20:23 +01:00
Laurent Rineau a9365554c9 Merge pull request #2550 from sloriot/CGAL-add_SPDX_tags
Add SPDX License Identifier
2017-11-15 16:48:27 +01:00
Laurent Rineau 3ff09bc549 Merge pull request #2580 from lrineau/CGAL-Support_CMake_3.10-GF
Renew the handle of policies, for CMake-3.10
2017-11-15 16:47:42 +01:00
Guillaume Damiand 4c893ef009 Add missing #include 2017-11-15 14:19:43 +01:00
Guillaume Damiand 2f0f97fa47 Update basic viewer to use a generic name. 2017-11-15 12:16:13 +01:00
Guillaume Damiand f0a44e2483 update basic viewer to allow to draw mono and color faces 2017-11-14 19:12:10 +01:00
Guillaume Damiand 877e8783f5 Add new file for generic viewer. 2017-11-13 13:33:05 +01:00
Guillaume Damiand c9ba6c2950 Split the LCC viewer in two; to prepare a generic base for all cgal ds viewers. 2017-11-13 12:27:48 +01:00
Guillaume Damiand 0783fa8241 Do not clear model before loading something; this is more generic. 2017-11-13 12:24:24 +01:00
Guillaume Damiand 5f939d33ab Bug fix in CMap/GMap/LCC dart methods 2017-11-13 12:17:03 +01:00
Laurent Rineau 86fb40832a Merge pull request #2580 from lrineau/CGAL-Support_CMake_3.10-GF
Renew the handle of policies, for CMake-3.10
2017-11-13 12:01:39 +01:00
Sébastien Loriot 72cda50a5e fix incorrect LGPL version tags 2017-11-12 10:17:52 +01:00
Sébastien Loriot 0698f79aff add SPDX identifier for files under the LGPL-3+ license 2017-11-12 10:17:50 +01:00
Laurent Rineau 62c70d41ca Renew the handle of policies, for CMake-3.10
Now that we require CMake>=3.1, we can forget a lot of old CMake policies.

`CMP0053` `OLD` behavior is still needed, because of a bug in Qt5 CMake files, but it will
not be set with CMake>=3.10. Let's assume that a recent CMake version means
a recent Qt5 version.
2017-11-06 14:58:36 +01:00
Laurent Rineau 39516eaa2b Merge pull request #2478 from mtola/master
fix bug -> 2x 2 missing "inline" to prevent duplicate symbols during …
2017-10-13 16:54:11 +02:00
Laurent Rineau 7e9f756935 Replace all std::unary_function by CGAL::unary_function 2017-10-04 15:57:09 +02:00
Martial Tola 6ce7afb6e0 fix bug -> 2x 2 missing "inline" to prevent duplicate symbols during link process... 2017-10-01 16:07:33 +02:00
Sébastien Loriot 9bb2d4433f Merge remote-tracking branch 'cgal/releases/CGAL-4.10-branch' 2017-08-04 13:37:58 +02:00
Maxime Gimeno 831f0239cb Fix CMP0071 warning. 2017-08-03 10:38:19 +02:00
Maxime Gimeno 8104d153af Fixes
Conflicts:
	Polyhedron/demo/Polyhedron/Plugins/Operations_on_polyhedra/Clip_polyhedron_plugin.cpp
2017-07-10 16:16:34 +02:00
Maxime Gimeno f1a7ddf5b8 FIx LCC demo for QGLViewer v2.7 2017-07-10 16:11:09 +02:00
Laurent Rineau 80829925b7 Merge pull request #2174 from gdamiand/BGL-LCC-gdamiand
BGL version for Linear_cell_complex_for_combinatorial_map
2017-07-10 15:38:21 +02:00
Maxime Gimeno 1a5d74f020 Fixes 2017-07-03 09:39:12 +02:00
Maxime Gimeno 4a4cb688fe FIx LCC demo for QGLViewer v2.7 2017-07-03 09:35:14 +02:00
Guillaume Damiand cc4faa1151 Reorder #include, trying to solve boost bug about flat_map.hpp. 2017-06-29 10:35:02 -04:00
Guillaume Damiand d2f80b3da9 Rename internal namespace to avoid conflict 2017-06-28 09:43:24 -04:00
Guillaume Damiand 6244136d3c Remove two warnings (thanks laurent) 2017-06-27 12:25:45 -04:00
Guillaume Damiand c8250c4570 Merge branch 'master' into BGL-LCC-gdamiand 2017-06-15 10:03:53 -04:00
Guillaume Damiand f8fba47ac5 Remove cgalModif in doc 2017-06-15 09:47:30 -04:00
Guillaume Damiand 5089b05ace Add local version of read and write off for bgl; to remove when small feature generic read/write off will be integrated. 2017-06-14 11:41:25 -04:00
Guillaume Damiand f816adc18e Remove file Linear_cell_complex_incremental_builder_for_bgl.h which is no more used thanks to the generic read_off function. 2017-06-14 10:54:47 -04:00
Laurent Rineau 0338ae79a6 Merge branch 'releases/CGAL-4.9-branch' into releases/CGAL-4.10-branch 2017-06-12 18:10:14 +02:00
Guillaume Damiand 6ab57ccc2a Bug fix in doc 2017-06-12 18:09:36 +02:00
Guillaume Damiand 57928985a9 Bug fix in doc of Linear cell complex 2017-06-12 18:09:14 +02:00
Laurent Rineau 4325f22314 Merge pull request #2145 from gdamiand/patch-1
Bug fix in doc
2017-06-12 11:51:33 +02:00
Guillaume Damiand dba7e36944 Bug fix in doc of Linear cell complex 2017-05-31 17:35:43 -04:00
Guillaume Damiand 08578afb7c Bug fix in doc 2017-05-31 17:30:51 -04:00
Maxime Gimeno 5ae96fc2aa Explicitely set the policy of CMP0053 to OLD to silent the warning when it is not found. 2017-05-23 16:12:56 +02:00
Guillaume Damiand 4b196e686b Some cleanup 2017-05-12 08:37:11 -04:00
Guillaume Damiand a22a5fbd21 Update BGL LCC examples and tests following the modification of the API (helper class) 2017-05-10 13:27:37 -04:00
Guillaume Damiand 8799b904b6 Add classes Linear_cell_complex_for_bgl_combinatorial_map_helper and Linear_cell_complex_bgl_min_items in separated files. 2017-05-10 10:06:55 -04:00
Guillaume Damiand 09f82093a3 Update doc of BGL for LCC, following Sebastien comments. 2017-05-10 10:06:17 -04:00
Guillaume Damiand 1bb0a3dda3 Document class Cell_attribute_with_point_and_id 2017-05-10 08:24:40 -04:00
Guillaume Damiand 42a1419dbf Document class Cell_attribute_with_id 2017-05-10 08:22:22 -04:00
Guillaume Damiand 977876ca48 Replace class by template alias. 2017-04-19 14:12:39 -04:00
Guillaume Damiand 5e5868418b Add reserve function. 2017-04-19 14:12:23 -04:00
Guillaume Damiand 8a5828dbd5 Update licence header 2017-04-19 08:42:17 -04:00
Guillaume Damiand d343811416 One more example compile. 2017-04-18 16:51:40 -04:00
Guillaume Damiand f8f2506a38 add graph_has_property for lcc 2017-04-18 16:18:03 -04:00
Guillaume Damiand 755272148a Cleanup BGL for LCC; add shortcut for item with id to simplify definition. 2017-03-31 17:11:36 -04:00
Guillaume Damiand 5030a424f3 Remove unused parameter 2017-03-29 12:47:37 -04:00
Guillaume Damiand af7a401afd Bug fix in operator++ for edge; we need to test that we are not on the end before to do a second ++ 2017-03-29 12:47:01 -04:00
Guillaume Damiand 13ed16043b Update BGL for LCC and continue on examples/tests 2017-03-29 14:22:27 -04:00
Guillaume Damiand 3f382fe6b4 Add more examples for LCC BGL 2017-03-28 12:52:31 -04:00
Guillaume Damiand bfbee1701e Now attributes and darts in CMap/GMap/LCC can have id or not depending on a template argument. 2017-03-27 17:16:40 -04:00
Guillaume Damiand 06f73990f4 Small modifs to minimize diff with master. 2017-03-22 17:41:58 -04:00
Guillaume Damiand ff61b85322 update after rebase 2017-03-22 17:39:33 -04:00
Guillaume Damiand acad419a9a Update after rebase with master. 2017-03-22 17:33:05 -04:00
Guillaume Damiand daf726166c Update source/target one more time. 2017-03-22 16:37:24 -04:00
Guillaume Damiand a232565907 Debug (nyf) 2017-03-22 16:37:24 -04:00
Guillaume Damiand f3a6a80382 Remove my previous trick to change the orientation. 2017-03-22 16:37:24 -04:00
Guillaume Damiand fbf23b4173 Add Kernel as inner type of Linear cell complex class. 2017-03-22 16:37:01 -04:00
Guillaume Damiand 89645b3797 Add missing include 2017-03-22 16:36:01 -04:00
Guillaume Damiand 48db4e157b Ok for graph_traits_Linear_cell_complex.h for test_Euler_operations. 2017-03-22 16:36:01 -04:00
Guillaume Damiand ebd54153ea Add a second incremental builder which works as Polyhedron and Surface mesh for surface with boundaries. 2017-03-22 16:33:39 -04:00
Guillaume Damiand 533bb318cc Update source/target one more time. 2017-03-22 14:59:27 -04:00
Guillaume Damiand 97ad6e35ce Debug (nyf) 2017-03-22 14:08:25 -04:00
Laurent Rineau fcbf2d7e2f Delete flat.cpp 2017-01-19 16:31:04 +01:00
Andreas Fabri 3f5a0bd27a Linear_cell_complex_demo: Reorder includes to work around a bug in boost
Reordering includes of CGAL headers changes the inclusion order
for boost headers.  The test file  flat.cpp should reveal the bug
2017-01-13 10:57:21 +01:00
Sébastien Loriot aec5d6a60c clean up after rebase 2016-11-29 11:43:47 +01:00
Guillaume Damiand 98e0ec06f1 Test for LCC et CMap. 2016-11-29 11:43:47 +01:00
Guillaume Damiand 269dcaf78d Remove a warning 2016-11-29 11:43:47 +01:00
Guillaume Damiand a9ac4013fa Update lcc demo and viewer to allow to reverse normal and to change the light. 2016-11-29 11:43:46 +01:00
Guillaume Damiand 0a95173dc7 Add an entry in the demo to reverse the orientation of objects. 2016-11-29 11:43:46 +01:00
Guillaume Damiand c546d5ba80 Remove a test for LCC. 2016-11-29 11:43:46 +01:00
Guillaume Damiand b0c5476e69 LCC test 2016-11-29 11:43:46 +01:00
Guillaume Damiand 9aaf51c17d Use delaunay triangulation instead of triangulation in test. 2016-11-29 11:43:45 +01:00
Guillaume Damiand 5ff5358c51 Remove template keyword outside template class 2016-11-29 11:43:44 +01:00
Guillaume Damiand 5509ec0227 Remove space 2016-11-29 11:43:43 +01:00
Guillaume Damiand 04e6e0f73b Remove unused variable 2016-11-29 11:43:43 +01:00
Guillaume Damiand 9731a1a51e Correction of copy dart info functor. 2016-11-29 11:43:43 +01:00
Guillaume Damiand 8f07f91fa8 Remove red text in LCC doc; that was used for reviewing process. 2016-11-29 11:43:42 +01:00
Guillaume Damiand 5d0ce4fea4 Update LCC examples 2016-11-29 11:43:41 +01:00
Guillaume Damiand e4889ceb4c UPdate LCC test to add tests for close and insert_cell_2_in_cell_3. 2016-11-29 11:43:40 +01:00
Guillaume Damiand c500f8be73 Update LCC test. 2016-11-29 11:43:39 +01:00
Guillaume Damiand bbf4bc8471 Update LCC test; use a smaller off file to speed up tests. 2016-11-29 11:43:39 +01:00
Guillaume Damiand 81a8184879 Update demo following the renaming of .h to import from T3 and Polyhedron3 2016-11-29 11:43:38 +01:00
Guillaume Damiand b655c8df82 Update test CMap and LCC. 2016-11-29 11:43:38 +01:00
Guillaume Damiand d5fbe24775 Remove useless Dart_info 2016-11-29 11:43:38 +01:00
Guillaume Damiand d6d6d27c93 Update LCC doc to follow the modification in examples. 2016-11-29 11:43:38 +01:00
Guillaume Damiand 12328929b2 Update LCC tests: now they are done both for CMap and GMap. 2016-11-29 11:43:38 +01:00
Guillaume Damiand 588ba4f527 Allow isomorphism to test dartinfo and/or point and/or attribute independently; use this in LCC test. 2016-11-29 11:43:37 +01:00
Guillaume Damiand 80ffced770 Update lcc test 2016-11-29 11:43:37 +01:00
Guillaume Damiand 02e1eb7e96 Add is_orientable function in GMap. 2016-11-29 11:43:37 +01:00
Guillaume Damiand 2ab268965f LCC for CMap and GMap; incremental builder; save and load; test. 2016-11-29 11:43:36 +01:00
Guillaume Damiand df3b2a4850 LCC constructors compile now both for CMap and GMap (need tests) 2016-11-29 11:43:36 +01:00
Guillaume Damiand 7618192d21 Start incremental builder 2016-11-29 11:43:36 +01:00
Guillaume Damiand 1a357d5519 Now sew3 same facets works for both CMap and GMap. 2016-11-29 11:43:35 +01:00
Guillaume Damiand 4bacc7a25a Remove some useless include; set constructor of Dart and attribute protected; check for friend directives. 2016-11-29 11:43:35 +01:00
Guillaume Damiand e571639c94 Continue to work on LCC operations for CMap and GMap... 2016-11-29 11:43:35 +01:00
Guillaume Damiand a0fb8e0a26 Update LCC operations to work with CMap and GMap 2016-11-29 11:43:35 +01:00
Guillaume Damiand 8d22d7e7dc Update LCC to be compatible both for CMap and GMap. 2016-11-29 11:43:34 +01:00
Guillaume Damiand 8d577b35da Modif of copy contructors in GMap; bugfix in copy function. 2016-11-29 11:43:34 +01:00
Guillaume Damiand 1d963f4ce7 Update copy between map to copy also dart_info; update also isomorphism function; start to update test (nyf) 2016-11-29 11:43:34 +01:00
Guillaume Damiand 57e4ff3abd * replace CGAL_CMAP_DEPRECATED macro by CGAL_CMAP_DART_DEPRECATED
* protect deprecated code with #ifndef CGAL_NO_DEPRECATED_CODE
2016-11-29 11:43:33 +01:00
Guillaume Damiand 21a121019a * Update names for next, previous and opposite functions (following the ref manual);
* update GMap examples.
2016-11-29 11:43:33 +01:00
Guillaume Damiand 233840ffc5 Replace pointer by reference in all functions.
This allows to use non const reference in Foreach_static functor (why this is not possible with pointers ? there is some black magic under tuple and variadic template...).

Thanks to this possibility, remove static variables used to return value in two functors.
2016-11-29 11:43:33 +01:00
Guillaume Damiand 788e680ecb Use index in debug functions instead of adress of elements. 2016-11-29 11:43:32 +01:00
Guillaume Damiand 2aff4068b5 Allow to not define Dart_info and Attributes type in item class. 2016-11-29 11:43:32 +01:00
Guillaume Damiand 676b547a93 Doc of CMap, GMap and LCC is now ok for rev 4 2016-11-29 11:43:31 +01:00
Guillaume Damiand 4624a0b97b Factorize dart between CMap and GMap.
Now we use the same class in both packages.
TODO: modify the doc accordingly.
2016-11-29 11:43:31 +01:00
Guillaume Damiand d277576b15 Keep deprecated classes in the doc. 2016-11-29 11:43:31 +01:00
Guillaume Damiand 268036a088 Keep old names in the doc, marked deprecated. 2016-11-29 11:43:30 +01:00
Guillaume Damiand 74b5316bde Update name in fig 2016-11-29 11:43:30 +01:00
Guillaume Damiand 535c2caff9 Update LCC examples 2016-11-29 11:43:30 +01:00
Guillaume Damiand b12b490e12 Rename classes. 2016-11-29 11:43:29 +01:00
Guillaume Damiand bd805cd44f Modif doc CMap, GMap, LCC 2016-11-29 11:43:28 +01:00
Guillaume Damiand d0539bbd5b Doc for CMap, GMap and LCC ok after review 2 2016-11-29 11:43:28 +01:00
Guillaume Damiand 954c7c2800 Doc CMap, GMap, LCC 2016-11-29 11:43:27 +01:00
Guillaume Damiand c88fd4fd1c Corrections following Sebastien review (nyf) 2016-11-29 11:43:26 +01:00
Guillaume Damiand 12f8efdba0 Typo 2016-11-29 11:43:26 +01:00
Guillaume Damiand 20979072cb Small modifs following Sebastien review. 2016-11-29 11:43:26 +01:00
Guillaume Damiand c0e903a106 Update copyright headers 2016-11-29 11:43:25 +01:00
Guillaume Damiand 288313128e End of doc for LCC. 2016-11-29 11:43:25 +01:00
Guillaume Damiand c660599bed Add a missing link 2016-11-29 11:43:24 +01:00
Guillaume Damiand 52266f5f82 Ok for LCC doc 2016-11-29 11:43:24 +01:00
Guillaume Damiand c1ff5763f6 Continue doc of LCC 2016-11-29 11:43:22 +01:00
Guillaume Damiand 101700a2e0 Add figures for GMap doc 2016-11-29 11:43:22 +01:00
Guillaume Damiand de634dbd87 Doc of GMap and LCC. 2016-11-29 11:43:21 +01:00
Guillaume Damiand 7e3cb2094e Update also LCC doc accordingly. 2016-11-29 11:43:21 +01:00
Guillaume Damiand eca1865ad7 Add an example of lcc using GMaps. 2016-11-29 11:43:18 +01:00
Guillaume Damiand 9b8eb9e785 Correction for make_tetrahedron and make_quadrangle for gmaps; modify corresponding methods in LCC to be able to work both for CMaps and GMaps. 2016-11-29 11:43:17 +01:00
Guillaume Damiand 6656ab9f4e Update doc in header files for make_xxx function in LCC. 2016-11-29 11:43:17 +01:00
Guillaume Damiand 8670c7b150 Update doc of LCC and figures. 2016-11-29 11:43:17 +01:00
Guillaume Damiand 3737af7a44 Add linear cell complex storage for GMaps. 2016-11-29 11:43:15 +01:00
Guillaume Damiand 0e80ecf8c0 Work to be able to use LCC with GMap as underlying DS (nyf) 2016-11-29 11:43:13 +01:00
Guillaume Damiand fce9c1db1c Cleanup figures in LCC. 2016-11-29 11:43:10 +01:00
Guillaume Damiand 79febdd8a3 All figures of CMap and LCC are now in svg. 2016-11-29 11:43:00 +01:00
Guillaume Damiand 55f0b69fdf Remove my previous trick to change the orientation. 2016-11-01 14:33:24 -04:00
Laurent Rineau 3044d512f2 Merge pull request #1511 from gdamiand/CMap_LCC-bugfixes-gdamiand
Some bugfixes in CMap and LCC
2016-10-17 10:01:36 +02:00
Guillaume Damiand 9aae106124 Add explicit call to base contructor to avoid warning. 2016-10-12 08:22:37 -04:00
Sébastien Loriot 6ff846a483 add missing CGAL namespace 2016-10-11 15:21:09 +02:00
Guillaume Damiand 7620635cfe * Bugfix in correct_invalid_attributes in LCC
* Remove deprecated code in LCC (that should be removed for CGAL 4.9)
2016-10-06 08:19:04 -04:00
Guillaume Damiand 0073b85d7e Some bug fixes in CMap and LCC:
* Bugfix in Combinatorial_map::copy and Combinatorial_map::swap
* Bugfix in erase dart if automatic attribute are disabled
* Add missing operator= in Linear_cell_complex
* Remove deprecated code in Linear_cell_complex storage (code which was already removed in Combinatorial_map_storage and not in LCC)
* add const for isomorphic function
2016-10-06 08:11:14 -04:00
Laurent Rineau 223c1cf5a4 Merge pull request #1530 from lrineau/Installation-compute_dependencies-GF
Compute and fix packages dependencies
2016-10-05 13:11:04 +02:00
Laurent Rineau 3fac1b31f0 Fix typos (and compilation errors!) 2016-10-03 12:12:46 +02:00
Andreas Fabri cebf2f8bab include import_from_.. headers in LCC demo 2016-10-03 08:53:28 +02:00
Andreas Fabri cf8c1a6cdf Dispatch import functions to Polyhedron, T2, T3 2016-09-30 15:23:15 +02:00
Andreas Fabri d95e7301da Fix package Linear_cell_complex: include headers 2016-09-30 15:23:14 +02:00
Sébastien Loriot 7e2ee496de update project name of cmake scripts of tests 2016-09-08 00:26:37 +02:00
Sébastien Loriot e78bef8a9c update project name of demos 2016-09-08 00:13:34 +02:00
Sébastien Loriot 6b338eeb1f improve the name of projects in cmake scripts of examples 2016-09-08 00:02:55 +02:00
Guillaume Damiand 10469f9c4e Update with master 2016-05-25 10:58:55 +02:00
Sebastien Loriot 4d56e3ef51 Merge pull request #971 from gdamiand/CMap-global_functions-gdamiand
Combinatorial map: remove global functions
2016-05-10 09:26:58 +02:00
Guillaume Damiand d44b75d192 Update version of boost_gcc 2016-05-10 09:13:32 +02:00
Guillaume Damiand a06ec250eb Correct version of gcc to ignore array buffer warnings 2016-05-09 10:16:35 +02:00
Sebastien Loriot 7630d2a6fc Merge pull request #875 from sloriot/Triangulation_2_and_PMP-fix_Triangulation_2_projection_traits_3
PMP: make triangulate_faces works with non filtered kernels
2016-05-05 14:55:11 +02:00
Guillaume Damiand f8823fd689 remove array-bounds warning for gcc >= 4.9 2016-05-02 17:18:14 +02:00
Guillaume Damiand afb03a8ae4 Remove the use of deprecated functions. 2016-04-01 22:44:29 +02:00
Guillaume Damiand 0adfd4d380 Add Kernel as inner type of Linear cell complex class. 2016-03-29 22:20:19 +02:00
Guillaume Damiand ad5a9ee2ed Add missing include 2016-03-29 22:19:32 +02:00
Guillaume Damiand de89d2ecad Ok for graph_traits_Linear_cell_complex.h for test_Euler_operations. 2016-03-28 22:08:21 +02:00
Guillaume Damiand 66fd1789b5 Add a second incremental builder which works as Polyhedron and Surface mesh for surface with boundaries. 2016-03-25 18:32:17 +01:00
Sébastien Loriot 4c29bf1b44 CMAKE_SOURCE_DIR -> CMAKE_CURRENT_SOURCE_DIR 2016-03-24 16:33:46 +01:00
Guillaume Damiand 547ca15400 Demo of lcc must link with glu library 2016-03-23 15:07:18 +01:00
Guillaume Damiand e24572c942 demo updating for LCC after deprecation of global functions. 2016-03-09 19:00:16 +01:00
Guillaume Damiand fb4bc44829 examples and tests updating for LCC after deprecation of global functions. 2016-03-09 18:48:29 +01:00
Guillaume Damiand 7f45f5faea Update LCC following the deprecated global functions of CMap 2016-03-09 17:25:10 +01:00
Clement Jamin f2c68b25cd Update CMakeLists.txt of all demos for header-only mode 2016-03-09 17:23:20 +01:00
Sébastien Loriot 881e4d3199 request Core only in examples, tests and demos when really needed 2016-03-07 22:36:57 +01:00
Sébastien Loriot 2d191d6651 commit CMakeLists.txt for all examples and tests 2016-03-07 17:39:36 +01:00
Sébastien Loriot 45406a5296 Merge pull request #788 from bo0ts/Installation-split_config-pmoeller
Split CGALConfig.cmake and CGALExports.cmake
2016-03-06 15:36:55 +01:00
Sébastien Loriot d7e9261d58 hide the filtered projection traits behind the projection traits
the selection of the base class is done using Kernel::Has_filtered_predicates
2016-03-02 21:57:54 +01:00
Guillaume Damiand 86ebce9b78 end_XXX now return one dart in incremental builder. 2016-02-26 16:28:14 +01:00
Philipp Möller 4211a4f01e Globally remove CMAKE_ALLOW_LOOSE_LOOP_CONSTRUCTS
This is a Cmake 2.4.3 variable that isn't even documented anymore.
2016-02-16 17:02:55 +01:00
Laurent Rineau def3952e0e Merge pull request #767 from bo0ts/Documentation-no_internal_in_title-pmoeller
Remove internal release number from documentation title
2016-02-11 15:42:40 +01:00
Philipp Möller 0a04a3a48f Use CGAL_DOC_VERSION 2016-02-11 15:37:54 +01:00
Laurent Rineau 8b22743b06 Merge pull request #766 from maxGimeno/LCC_Demo-MSAA_removal-GF
Removal of the MSAA in LCC

Conflicts:
	GraphicsView/include/CGAL/Qt/CreateOpenGLContext.h
	Linear_cell_complex/demo/Linear_cell_complex/Viewer.cpp
2016-02-11 15:13:18 +01:00
Maxime Gimeno 9da8afe1f1 Removal of the MSAA in LCC 2016-02-11 14:27:44 +01:00
Maxime Gimeno 0a37521263 Revert "Fix for the context"
This reverts commit 552aaa159f.

Conflicts:
	Linear_cell_complex/examples/Linear_cell_complex/linear_cell_complex_3_viewer_qt.h
2016-02-11 14:16:04 +01:00
Sébastien Loriot 42a363fb3f revert changes to the cmake script 2016-02-10 09:07:33 +01:00
Maxime Gimeno bb86ec2ee9 Comment the lines in the CMakeLists 2016-02-09 15:16:59 +01:00
Maxime Gimeno 1191a9ee7a Fix for LCC example 2016-02-09 15:14:14 +01:00
Maxime Gimeno 552aaa159f Fix for the context 2016-02-09 14:48:26 +01:00
Sébastien Loriot 72863bfe44 fix doxygen warnings 2016-02-04 21:19:36 +01:00
Sébastien Loriot e211843b4f Merge pull request #654 from maxGimeno/FixForMac-GF
Demo fix for OS X (fix for #437)
2016-02-03 14:39:48 +01:00
Andreas Fabri 244c285257 4080 -> 5000 2016-02-01 13:22:17 +01:00
Andreas Fabri 3a36c7f34b the same lor LCC 2016-02-01 12:38:13 +01:00
Maxime Gimeno eb867bb810 Addition of a specific function for the MSAA in LCC 2016-01-20 14:35:00 +01:00
Maxime Gimeno 517ff8321a Fix for LCC_demo
- The setSamples(16) was causing a segfault. I moved it in the createOpenGLContext(). If the other demos performances are affected by this, a new function will have to be created.
2016-01-19 17:13:06 +01:00
Philipp Möller 71b4e9c515 Use CGAL_FULL_VERSION in all Doxyfile.in 2015-12-17 16:33:28 +01:00
Philipp Möller 81a8f982dc Handle the easy INPUT cases
If INPUT is just PKG/doc/PKG, handle it automatically.
2015-12-10 17:00:26 +01:00
Maxime Gimeno 7b4267c162 Replacement of cgalRequires
-fix for #291
2015-11-23 22:06:06 +01:00
Guillaume Damiand 1f47f46cff Remove viewer in examples 2015-11-06 17:11:51 +01:00
Guillaume Damiand c3ab85cabc Remove useless ; 2015-11-06 09:01:58 +01:00
Guillaume Damiand 418c02b63e Remove the use of typename outside template class 2015-11-05 07:30:12 +01:00
Guillaume Damiand e4515eb3be Enable viewer for example (to remove later, here only for the testsuite) 2015-11-04 11:31:11 +01:00
Guillaume Damiand ec54248572 reverse the orientation of created cube to have a correct normal orientation. 2015-11-04 11:30:47 +01:00
Guillaume Damiand a9f2278c5b Better position for light. 2015-11-04 11:29:59 +01:00
Guillaume Damiand 3f206e9b60 Improve drawing. 2015-11-03 17:36:52 +01:00
Guillaume Damiand a21da00c9d Improve drawing 2015-11-02 15:14:50 +01:00
Guillaume Damiand ef9f1d4973 Merge branch 'LCC-examples_qt5-gdamiand-old' into LCC-examples_qt5-gdamiand 2015-11-02 14:48:46 +01:00
Sebastien Loriot 5d9d9d660d Merge pull request #450 from gdamiand/CMap-marks_with_exceptions-sbrandel
C map marks with exceptions sbrandel
2015-11-02 09:12:42 +01:00
Guillaume Damiand 58d3eb9893 Update the viewer (not yet finished). 2015-10-30 21:32:44 +01:00
Guillaume Damiand afeb0eb4d2 Do not use using declaration but a typedef. 2015-10-29 07:41:55 +01:00
Guillaume Damiand d02357fb9c Remplace int by size_type for mark 2015-10-28 18:56:46 +01:00
Guillaume Damiand 06731095ae Add using declaration for Exception_no_more_available_mark. 2015-10-28 11:19:02 +01:00
Guillaume Damiand 38a28fd78c Bug fix: reserve a mark before to use it. 2015-10-16 07:28:43 +02:00
Guillaume Damiand 97f44c5749 Add smoth display mode in LCC demo. 2015-10-02 15:01:19 +02:00
Guillaume Damiand 2ee49ba5f3 Update basic viewer and corresponding examples; remove one example since it is now in the demo. 2015-10-02 14:44:42 +02:00
Guillaume Damiand 558fbb7f04 Improve triangulation method 2015-10-02 12:05:58 +02:00
Guillaume Damiand 43d4380537 Update drawing function to allow to draw faces with holes. 2015-10-01 19:21:47 +02:00
Guillaume Damiand 0f7bb719f3 Merge branch 'CMap-marks_with_exceptions-sbrandel-old' into CMap-marks_with_exceptions-sbrandel 2015-10-01 18:31:45 +02:00
Guillaume Damiand b5c34bf9cc Ok for qt5 viewer 2015-10-01 16:55:55 +02:00
Guillaume Damiand 8e39e7e4d7 Merge branch 'LCC-examples_qt5-gdamiand-OLD' into LCC-examples_qt5-gdamiand 2015-10-01 13:41:15 +02:00
Andreas Fabri 6e214c5f4a remove Qt3 demos and empty dontsubmit files 2015-09-30 12:51:40 +02:00
Laurent Rineau 09766139ec Fix a warning about moc
The warning was:

    Linear_cell_complex/demo/Linear_cell_complex/MainWindow.cpp:0: Note: No relevant classes found. No output generated.
2015-09-17 15:38:28 +02:00
Guillaume Damiand e2656f9600 Remove glu link in cmake 2015-09-03 12:35:42 +02:00
Guillaume Damiand 9b4b3ee846 More cleanup plus do not recenter the scene at each modification. 2015-09-03 12:32:20 +02:00
Guillaume Damiand 98b36b260e Update light parameters 2015-08-31 08:18:04 +02:00
Guillaume Damiand 24840dbd5c Improve drawing code in LCC demo. 2015-08-29 14:43:52 +02:00