songsenand
/
cgal
mirror of https://github.com/CGAL/cgal
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
113,804 Commits 3 Branches 156 Tags 959 MiB
Commit Graph

419 Commits

Author SHA1 Message Date
Andreas Fabri f3db661acb Deal a little bit with Linear_cell_complex and Combinatorial_map 2022-03-09 14:13:31 +00: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
Guillaume Damiand 849b477654
Merge branch 'master' into LCC_update-gdamiand 2022-02-11 07:38:46 +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
Guillaume Damiand 54142fd2a1 Update generic copy to proper copy marks and add an option to enable/disable this copy. Add move constructors. 2022-01-27 15:16:16 +01:00
Guillaume Damiand 46f5325c1b Remove deprecated code in CMap and LCC (deprecated since CGAL 4.9) 2022-01-27 10:36:22 +01:00
Laurent Rineau 921380202b Merge pull request #6055 from gdamiand/LCC_improvements-gdamiand 
Lcc improvements
 2022-01-12 12:22:00 +01:00
Guillaume Damiand b0c9cf958b Really remove the warning in LCC incremental builder 2021-12-10 16:32:44 +01:00
Guillaume Damiand c56dc46679 Fix a warning (and some strange indentation) 2021-12-07 16:43:10 +01:00
Guillaume Damiand 2bbcabe71b The size of argv array is now 2, ending with nullptr. 2021-11-11 17:23:37 +01:00
Guillaume Damiand ee11c858b5 The size of argv array is changed to 1 in all basic viewers. 2021-11-10 09:59:48 +01:00
Guillaume Damiand 6f46025652 More small improvments in sew3_same_facets (undocumented function) 2021-11-05 10:26:48 +01:00
Guillaume Damiand 2f5841e179 Use std::unorderd_map everywhere in CMap, GMap and LCC. 2021-10-14 17:53:01 +02:00
Guillaume Damiand 3fb45bdd5a Improve sew_3_same_facets complexity 2021-10-14 17:52:03 +02:00
Guillaume Damiand 26322683d7 Modify save of cmap/gmap to deal with the case of attributes that do not store darts. 2021-10-14 17:06:41 +02:00
Guillaume Damiand c0392e1bba Improve LCC incremental builder. 2021-10-14 16:33:29 +02:00
Mael Rouxel-Labbé 8166579e55 Merge branch 'PM-Fix_pmaps_reference_types-GF' into PM-Fix_pmaps_reference_types_master-GF 2021-10-11 19:58:07 +02:00
Mael Rouxel-Labbé 590ddf8015 Various fixes for pmaps: 
- Use `value_type` when the returned type is not a reference
- Enforce `reference = value_type` if the returned type is not
  a reference (to avoid `typename PM::reference r = get(m, k)`,
  which will take a ref to a temporary if the `reference`
  typedef is an actualy reference)
- Do not use `put_get_helper` if the property map is not a `lvalue`
  **mutable** property map: the `put()` is `map[k] = v`, which
  is broken if `operator[]` does not return a reference
- The concept `boost::lvalue_property_map_tag` requires `operator[](key)`,
  not a reference in `get(map, key)`. You can have a readable property map
  returning a reference through its `get(map, key)`, but if there is
  no `operator[]`, it's just a `boost::readable_property_map_tag`
- Some const correctness to avoid copying maps with state
  or heavy keys in `get(map, key)` / `put(map, key, value)`
- Base the category of a wrapping pmap on what it offers instead
  of just forwarding the base property map's category
- Tried to do something like mutable lvalue pmap:
  * `value_type& operator[](key&)`
  * `ref get(map, const key&)`
  * `put(map, const key&, const value_type&)`
  and non-mutable lvalue pmap:
  * `const value_type& operator[](const key&)`
  * `ref get(map, const key&)`
  but not everything fits properly...
 2021-10-08 15:38:47 +02:00
Sébastien Loriot 98e471849b moving files from internal to PKG/internal 2021-08-26 11:33:39 +02:00
Maxime Gimeno a3d1765ab4 Merge remote-tracking branch 'cgal/master' into CGAL-Clean_up_boost_versions-maxGimeno 2021-07-19 14:18:40 +02:00
Maxime Gimeno e6c767d5c9 Simplify the GNUC versions tests 2021-05-12 15:45:07 +02:00
Sébastien Loriot 4e519a3c7a move documented IO functions in IO namespace 2021-05-05 13:15:37 +02:00
Sébastien Loriot fb6f703b55 IO namespace for files in IO directories 2021-05-04 14:36:06 +02:00
Andreas Fabri 2c1832bc25 Surface Mesh Topology: Try to fix warning 2021-04-21 09:27:10 +01:00
Laurent Rineau d25c29145d Merge pull request #5499 from Dig-Doug/linear-complex-add-builder 
Linear cell complex: Add points and edges constructor
 2021-04-06 15:13:13 +02:00
Doug Roeper b039206679
Separates the `import_from_plane_graph` logic into 2 separate functions so the user can build the graph directly from a list of points and edges instead of a `std::istream`. 2021-03-25 07:31:46 -04:00
Doug Roeper 504e4cf08b
Linear_cell_complex_incremental_builder include 
Adds a missing include. This file uses `Generalized_map_tag` on line 50, which is defined in `Linear_cell_complex_base.h`.
 2021-03-20 19:34:55 -04:00
Mael Rouxel-Labbé 5efa544734 Merge remote-tracking branch 'cgal/master' into SDG-Fix_doc-GF 2021-02-22 17:19:40 +01:00
Laurent Rineau c5ba414c72 Merge pull request #5336 from maxGimeno/GraphicsView-Use_opengl_4_1_context-maxGImeno 
Graphics_view: Upgrade glsl version in basic_viewer_shaders
 2021-02-05 16:12:42 +01:00
Laurent Rineau 468ce8f700 Merge pull request #5347 from gdamiand/LCC_demo-bugfix-gdamiand 
Bug fix in LCC demo
 2021-02-05 16:10:34 +01:00
Laurent Rineau b134ed8246 Merge pull request #5336 from maxGimeno/GraphicsView-Use_opengl_4_1_context-maxGImeno 
Graphics_view: Upgrade glsl version in basic_viewer_shaders
 2021-02-05 16:07:32 +01:00
Maxime Gimeno a85cf6ed52 Move the include in the ifdef 2021-01-26 09:45:18 +01:00
Mael Rouxel-Labbé 1f45360d7a Merge remote-tracking branch 'cgal/master' into SDG-Fix_doc-GF 2021-01-26 09:05:24 +01:00
Guillaume Damiand c1158a32c8 Orient mark is now local to compute element in draw LCC. 2021-01-12 18:58:04 +01:00
Guillaume Damiand f506515008 Bug fix in lcc basic viewer when lcc is null 2021-01-12 18:24:43 +01:00
Maxime Gimeno 04753381e5 Rename file and add ::Qt 2021-01-12 13:22:34 +01:00
Maxime Gimeno 95192d6d4b factorize context initialization 2021-01-12 13:08:58 +01:00
Maxime Gimeno 3d1c41fd14 Merge remote-tracking branch 'cgal/master' into CGAL_IO-maxGimeno 2021-01-07 15:05:28 +01:00
Maxime Gimeno 2a212bb2a8 Upgrade non-compatibility sahders in Basic_viewer to glsl 150 and add a context creation before the creation of the QApp in draw_xxx examples 2021-01-07 13:06:40 +01:00
Maxime Gimeno 0bbb6c6f4e Fix some warnings 2020-12-09 14:34:14 +01:00
Mael Rouxel-Labbé 6b87fe393d Fix various grammar issues 2020-12-05 11:11:33 +01:00
Maxime Gimeno 277b8cc74b Fix OFF_reading 2020-11-25 13:40:19 +01:00
Guillaume Damiand 70bf9038ed Whitespaces 2020-10-22 15:42:15 +02:00
Guillaume Damiand d6306bebcb Add a tag in storages (CMap, GMap, LCC) allowing to chose between compact container and concurrent compact container as underlying container. 2020-10-22 10:30:38 +02:00
Maxime Gimeno 3a33334ad3 More fixes 2020-06-17 10:55:47 +02:00
Maxime Gimeno 9199534373 WIP fixes. 2020-06-08 15:05:48 +02:00
Maxime Gimeno 6a466dd6b5 fix OFF I/O 2020-06-05 15:40:13 +02:00
Mael Rouxel-Labbé df39cceb58 Misc fixes 2020-05-29 18:12:18 +02:00
Mael Rouxel-Labbé 580a1efd5c Remove trailing whitespace / tabs 2020-05-22 15:31:50 +02:00
Maxime Gimeno 049439fa6b Merge remote-tracking branch 'cgal/master' into CGAL_IO-maxGimeno 2020-04-30 16:47:58 +02:00
Sebastien Loriot 2d3e126450
Merge pull request #4602 from gdamiand/gsoc2019-nccycles-thien 
Surface mesh topology shortest cycle
 2020-04-29 09:10:37 +02:00
Maxime Gimeno 55361fe782 fix color and texture reading in OFF 2020-04-28 16:53:22 +02:00
Guillaume Damiand 3fb644e566 Improve basic viewer to draw consistent orientated faces for generalized maps. 2020-04-27 18:55:26 +02:00
Guillaume Damiand 02bc93a84d Do not re-use standard keys in basic viewer. 2020-04-27 18:55:25 +02:00
Guillaume Damiand daab96982e Bugfix 2020-04-27 18:55:25 +02:00
Guillaume Damiand f3098fc3f7 More trailling whitespaces... 2020-04-27 18:52:23 +02:00
Guillaume Damiand 35bff47118 Remove deprecated in forward declaration. 2020-04-27 18:52:22 +02:00
Guillaume Damiand 0308d1a1bb Add forward declaration files for CMap, GMap, LCC, Polygonal_schema. Improve copy methods for CMap and GMap to deal with const and non const cases. 2020-04-27 18:52:22 +02:00
Sébastien Loriot bfecbf55a1 Update from master (done during rebasing) 
Original commit:
    commit 573f9f3224939fb2cd74d9a82bd5b1c0e471edc7
    Merge: c824946ef60 16fc8d1fe2
    Author: Guillaume Damiand <guillaume.damiand@liris.cnrs.fr>
    Date:   Fri Mar 27 10:38:38 2020 +0100

        Merge remote-tracking branch 'cgal/master' into gsoc2019-nccycles-thien
 2020-04-27 18:42:57 +02:00
Sébastien Loriot 24f684092d Update from master (while rebasing) 
Original merge commit:
    commit 2e4a18e3e6f73c41d4935aed22330adf83f99f28 (HEAD)
    Merge: b91b6cab3a1 29f973a616
    Author: Guillaume Damiand <guillaume.damiand@liris.cnrs.fr>
    Date:   Thu Mar 12 18:05:22 2020 +0100

        Merge master; NYF
 2020-04-27 18:34:34 +02:00
Thien Hoang 4535c33a19 Fix draw_linear_cell_complex.h 2020-04-27 18:20:16 +02:00
Thien Hoang aa1907bf93 Roll back draw_linear_cell_complex.h 2020-04-27 18:20:16 +02:00
Thien Hoang 07dde8e9aa Re-add LCC drawing functions 2020-04-27 18:20:15 +02:00
Sébastien Loriot a8f9858099 Merge remote-tracking branch 'cgal/releases/CGAL-5.0-branch' 2020-04-16 16:29:55 +02:00
Sébastien Loriot b4c0e6ef29 remove unused parameter 2020-03-27 19:12:07 +01:00
Maxime Gimeno 4e6fb685c6 Merge remote-tracking branch 'mine/CGAL_IO-maxGimeno' into HEAD 2020-03-27 11:11:10 +01:00
Sébastien Loriot 620dfa40fc extra run of the script to remove tabs and trailing whitespaces 2020-03-27 08:37:32 +01:00
Sébastien Loriot ba42fcb6ca Update branch from master after trailing whitespaces and tabs removal 2020-03-27 08:36:40 +01:00
Sébastien Loriot 8bb22d5b2c extra run of the script to remove tabs and trailing whitespaces 
right after the merge of the 5.0 release branch

+ manual fix of the files (indentation was changed in the meantime):
   * Spatial_sorting/include/CGAL/Multiscale_sort.h
   * Spatial_sorting/test/Spatial_sorting/test_multiscale.cpp
 2020-03-26 14:26:59 +01:00
Sébastien Loriot 8b153fb495 Merge branch 'cgal/releases/CGAL-5.0-branch' 
whitespace+tab removal, merged with option -Xignore-space-change
 2020-03-26 14:22:32 +01:00
Sébastien Loriot 0779373835 extra run of the script to remove tabs and trailing whitespaces 
right after the  merge of 4.14 release branch

+ manual fix on one line in:
    * Arrangement_on_surface_2/include/CGAL/IO/Arr_text_formatter.h
    * .travis/generate_travis.sh
 2020-03-26 14:16:06 +01:00
Mael Rouxel-Labbé 30d4754a04 Merge remote-tracking branch 'cgal/master' into CGAL_IO-maxGimeno 2020-03-17 09:03:12 +01:00
Sébastien Loriot af913f781a fix dynamic properties for LCC 2020-03-13 12:28:02 +01:00
Guillaume Damiand 9e250c0093 Typo in comments. 2020-02-12 10:33:57 +01:00
Mael Rouxel-Labbé 828e47f61e Fix some header includes 2020-01-17 17:55:53 +01:00
Guillaume Damiand a666cb0857 Resolve conflict 2020-01-16 08:33:24 +01:00
Guillaume Damiand 47abaf1fdb Add operator= to avoid a deprecated warning 2019-12-07 08:43:32 +01:00
Guillaume Damiand 055d6fd1f9 Do not inverse normal by default in LCC viewer 2019-11-29 08:45:52 +01:00
Guillaume Damiand 9a50c0f830 Merge branch 'master' into Surface_mesh_topology-gdamiand 2019-11-26 13:22:03 +01:00
Sébastien Loriot 52164b1fba First pass on removing license notice in header for LGPL files 2019-10-19 15:40:30 +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
Guillaume Damiand 0707d80d63 Update basic viewer to avoid conflict with another external function. 2019-10-15 11:16:02 +02:00
Guillaume Damiand e44fef7d0b Update polygonal schema to allow to perforate faces; impact on face graph wrapper. 2019-09-17 16:04:38 +02:00
Sebastien Loriot 2a426bb1e1
Merge pull request #4063 from sloriot/CGAL-NO_CXX11 
Remove CGAL_CXX11 macro usage
 2019-07-19 16:16:22 +02:00
Guillaume Damiand 7cd85f845b Merge branch 'master' into Surface_mesh_topology-gdamiand 2019-07-10 15:32:21 +02:00
Guillaume Damiand dcc78e85d2 Replace #include by forward declarations. 2019-07-09 12:08:49 +02:00
Sébastien Loriot c0edb5ecaa remove CGAL_CXX11 macro usage 2019-07-08 11:42:17 +02:00
Guillaume Damiand 56abe3c367 Merge branch 'master' into Surface_mesh_topology-gdamiand 2019-06-28 13:28:50 +02:00
Guillaume Damiand 67307dcead Merge master to remove conflicts; plus rephrase draw documentation following Sebastien comments. 2019-06-19 15:48:10 +02:00
Andreas Fabri 42e07ce912 @lrineau believe me that with VC++ it compiled locally even before this commit 2019-06-06 17:12:31 +02:00
Andreas Fabri d1e33fef68 last fix 2019-06-06 07:41:54 +02:00
Andreas Fabri 78055c1394 Fix LCC and Generalized_map 2019-06-05 23:36:42 +02:00
Andreas Fabri 4581f1b7a8 Morte replacements 2019-06-05 08:39:55 +02:00
Mael Rouxel-Labbé 2848158354 Fix typos 2019-05-20 08:54:04 +02:00
Sébastien Loriot f62624c4f9 replace cpp11::tuple by std::tuple 2019-03-29 13:28:33 +01:00
Sébastien Loriot 6e8e4a4b10 remove variadic template workaround for cmap, gmap, and lcell 2019-03-29 10:41:50 +01:00
Guillaume Damiand bbea8c7889 Add a method to import any HDS model into a CMap and a LCC 2019-03-15 16:53:47 +01:00
Andreas Fabri 0496d840ff Fix arrangement and lcc 2019-01-18 10:05:48 +01:00
Guillaume Damiand 14e32aba01 Merge branch 'CMap-path_isotopy-gdamiand-old' into CMap-path_isotopy-gdamiand 2018-12-14 10:01:38 +01:00
Guillaume Damiand 0cc980f059 Update copy constructors and copy methods for CMap, GMap, and LCC to take a CMap/GMap/LCC as parameter and not any type. 2018-12-06 18:01:03 +01:00
Guillaume Damiand 12ae925f31 Some more unused variables. 2018-12-03 20:11:19 +01:00
Guillaume Damiand c2665415cd Remove warning in lcc viewers. 2018-11-30 08:03:31 +01:00
Guillaume Damiand fdd08e9287 Create new package Surface_mesh_topology; move related files in this package. 2018-11-28 15:56:10 +01:00
Guillaume Damiand edfdc8d346 Readd the random face color option for lcc viewer. 2018-11-27 17:02:38 +01:00
Guillaume Damiand 111eb4ee21 Demo of LCC is now ok 2018-11-27 16:07:52 +01:00
Guillaume Damiand 162a4b5593 Continue to update the lcc demo and the basic viewer. 2018-11-27 15:45:05 +01:00
Guillaume Damiand a5e1edd698 Continue to update the lcc demo and the basic viewer. 2018-11-27 11:59:29 +01:00
Guillaume Damiand 5d7723af4a Update LCC demo 2018-11-27 09:10:03 +01:00
Guillaume Damiand 8297e2b849 Start to update the LCC demo, in order to re-use LCC basic viewer. 2018-11-26 16:33:39 +01: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
Guillaume Damiand 2e910371fb Add the possibility to visualize marked darts 2018-09-25 13:29:24 +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 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 f6fd8cae4c Remove a warning; when using test suite, compile all the code but run nothing. 2018-06-13 09:14:18 +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 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 dba44f48a1 Harmonize the 5 basic viewers. 2018-05-29 11:11:49 +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 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 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 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 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
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 c8cdf75b8b l-push case 4 ok. 2018-03-28 16:36:21 +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 dfc76816b3 Update 2018-03-19 22:19:38 +01:00
Guillaume Damiand b848314336 Improve method 2018-03-19 16:36:03 +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
Maxime Gimeno 7fa4b380d2 fixes in includes logic. 2018-02-02 12:08:05 +01:00