Commit Graph

337 Commits

Author SHA1 Message Date
Laurent Rineau 7e3969578c Merge pull request #5384 from gdamiand/Surface_mesh_topology-warning-gdamiand
Warning in surface mesh topology
2021-02-18 15:19:18 +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
Maxime Gimeno a85cf6ed52 Move the include in the ifdef 2021-01-26 09:45:18 +01:00
Guillaume Damiand 15a323e3fa Use default for copy constructors 2021-01-22 17:48:08 +01:00
Guillaume Damiand 556764d638 Add copy constructor to remove a warning (implicitly-declared is deprecated [-Wdeprecated-copy]) 2021-01-22 09:52:53 +01:00
Guillaume Damiand dd8db93502 Add << operator 2021-01-18 11:51:43 +01:00
Guillaume Damiand 3ef8ea445c Merge branch 'master' into gsoc2020-Surface_mesh_topology-Simplicity-johnmave126 2021-01-18 11:24:33 +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 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
Mael Rouxel-Labbé 8682f9bafb Merge remote-tracking branch 'cgal/master' into CGAL_IO-maxGimeno 2020-08-24 11:45:17 +02:00
Youmu b58c05eea0 Add a class level switch to control the error output to std::cerr 2020-08-13 17:59:32 -04:00
Youmu 0591e38791 Merge remote-tracking branch 'fork/gsoc2020-Surface_mesh_topology-Simplicity-johnmave126' into gsoc2020-Surface_mesh_topology-Simplicity-johnmave126 2020-08-06 00:13:56 -04:00
Youmu d9a12e37b4 Remove trailing whitespace 2020-08-06 00:11:20 -04:00
Laurent Rineau 926610102f
Merge branch 'master' into gsoc2020-Surface_mesh_topology-Simplicity-johnmave126 2020-08-04 10:12:09 +02:00
Mael Rouxel-Labbé 0d66e19361 IO documentation fixes
See @sloriot's review:

https://cgal.geometryfactory.com/CGAL/Members/wiki/Features/Polgyon_soup_mesh_IO/2nd_round/Answer_to_review

(+ some commits before and after this one)
2020-07-24 17:06:00 +02:00
Youmu 8eb69e8883 Separate ordering computing and verification into separate functions 2020-07-23 20:28:34 -04:00
Youmu 6078a8cdb6 Remove special case for cylinder. Fix the condition for torus 2020-07-16 16:38:55 -04:00
Youmu 0cfe005e86 Skip checking if the length of canonical path is 1 2020-07-16 16:37:54 -04:00
Youmu 400762f0d5 Fix parenthesis checking when the lenght of path is only 2 2020-07-16 16:36:32 -04:00
Youmu c99a7d0950 Fix the calculation of power in factorization 2020-07-16 16:35:20 -04:00
Youmu c3ce805672 Short-circuit when verifying well-pairedness of darts 2020-07-15 21:03:57 -04:00
Youmu 95aef9e1e8 Add comments 2020-07-15 16:21:20 -04:00
Youmu 784395c207 Use faster method to compute turn depending on compilation flag 2020-07-15 16:20:28 -04:00
Youmu b7a3346099 Use better parenthesis pairing mechanism 2020-07-15 15:47:40 -04:00
Youmu 7687c3d854 Move switchable computation to Minimal_quadrangulation 2020-07-15 00:03:16 -04:00
Youmu 3b88d5a0e8 Prevent last dart in the dart from switching 2020-07-09 22:10:04 -04:00
Youmu c42dbacc0b WIP: Correctly handle case when there are more than 2 vertices in the
minimal quadrangulation. Correctly check well-pairedness up to rotation.
2020-07-09 21:55:03 -04:00
Youmu 7bda116f3b Remove factorize from Path_on_surface_with_rle 2020-07-07 12:17:33 -04:00
Youmu cc3fb1c876 Remove Dart_iterator and dart switching from Path_on_surface_with_rle 2020-07-07 12:09:28 -04:00
Guillaume Damiand f4110ca5c5 Bugfix when creating a path on surface with rle from a path having a flat starting from its last dart. 2020-07-07 09:57:09 +02:00
Youmu 79ca4f6755 Change the function name to is_homotopic_to_simple_cycle()
Correctly handle the order of darts when the surface has holes
2020-07-02 00:35:13 -04:00
Youmu e2a59611ce Fix a bug when checking parenthesis pairing for the opposite direction
of the first dart
2020-06-26 17:35:30 -04:00
Youmu 47702769b9 Provide an example of simplicity testing on a double-torus 2020-06-25 21:42:59 -04:00
Youmu 67fb806d63 Preliminary finished version of is_simple_cycle() 2020-06-24 16:37:56 -04:00
Youmu a40c79037f Insertion of dart into correspondent tree 2020-06-22 21:20:03 -04:00
Youmu 0b8ad2ea93 Handle case where current dart is adjacent to another exactly the same
turn
2020-06-17 17:17:02 -04:00
Youmu 21ec3ab3e1 Correctly handle switch case by also looking at the direction of darts 2020-06-17 17:16:09 -04:00
Youmu 4b17d38b85 Slightly tweak helper functions 2020-06-17 17:14:41 -04:00
Youmu 9dfec6f0d4 Add helper functions to navigate in the path based on dart direction 2020-06-17 17:01:27 -04:00
Youmu b28b5c0d1c Provide an implementation of switching for Path_on_surface 2020-06-17 17:00:09 -04:00
Youmu e383bc7d6b Set up switching edge check for rle-version of path 2020-06-15 16:32:54 -04:00
Youmu 5d1a7bd650 Add a per-dart iterator to Path_on_surface_with_rle. Allow to switch
subpath of Path_on_surface_with_rle at a dart_iterator.
2020-06-15 16:28:47 -04:00
Youmu 70f16ca800 Detect trigger of switch in unzip algorithm 2020-06-12 19:44:03 -04:00
Youmu c23b921fe9 detect switch and perform switch in RLE path 2020-06-12 19:33:47 -04:00
Youmu 274542fa9f Prepare boost intrusive rbtree. Fix indexing error in KMP and switchable
finding
2020-06-10 16:53:53 -04:00
Youmu 41183a08aa Compute switchable darts and match longest common suffix for the path 2020-06-10 01:50:52 -04:00
Youmu 59d4428fff Change interface for factorize to avoid output argument 2020-06-10 01:50:26 -04:00
Laurent Rineau e6536aaf63 Remove cpp11::(tuple|get)
And use `#ifdef CGAL_NO_DEPRECATED_CODE` around the backward
compatibility code in `<CGAL/config.h>`.
2020-06-09 20:15:16 +02:00
Youmu e29896a135 Add path factorization 2020-06-06 19:49:32 -04:00
Youmu 9651cadd1d Basic call interface. Special case for torus and cylinder. 2020-06-03 11:15:59 -04:00
Guillaume Damiand 52186a04e0 Two bug fixes: (1) computation of cycle lengths, when some halfedges are flip; (2) when we use of face graph wrapper with surface mesh we can not use nullptr. 2020-05-14 11:38:15 +02:00
Guillaume Damiand 46ffea3f02 Warnings; plus remove some tests. 2020-04-27 18:55:27 +02:00
Guillaume Damiand 92b207470b Typo 2020-04-27 18:55:27 +02:00
Guillaume Damiand db411a7a05 whitespace 2020-04-27 18:55:27 +02:00
Guillaume Damiand 210cda255e More warnings; remove some tests too long. 2020-04-27 18:55:27 +02:00
Guillaume Damiand 9b5205fb99 Add missing include 2020-04-27 18:55:27 +02:00
Guillaume Damiand 3e42827f4b Bug fix in Dijkstra spanning tree computation 2020-04-27 18:55:26 +02:00
Guillaume Damiand 2d4ec04d72 Bug in assert 2020-04-27 18:55:26 +02:00
Guillaume Damiand 63d7221dc4 Add draw functions when CGAL_USE_BASIC_VIEWER is not defined. 2020-04-27 18:55:26 +02:00
Guillaume Damiand 71162b48f9 More warnings 2020-04-27 18:55:26 +02:00
Guillaume Damiand 9838b9debc Use two different names for copy, const and non const version, to avoid ambiguity on windows (internal undocumented methods) 2020-04-27 18:55:26 +02:00
Guillaume Damiand a09b8b10fc Warnings 2020-04-27 18:55:26 +02:00
Guillaume Damiand 84b157aa04 Doc after Sebastien review. 2020-04-27 18:55:26 +02:00
Guillaume Damiand 1de5666a4f Remove warnings 2020-04-27 18:55:26 +02:00
Guillaume Damiand 5e3d85ae8f Rename computeXXX methods 2020-04-27 18:55:26 +02:00
Guillaume Damiand e5fe6a50bb Rename computeXXX methods 2020-04-27 18:55:26 +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 584a033e61 whitespaces 2020-04-27 18:55:26 +02:00
Guillaume Damiand de6030aa78 Improve basic viewer for face graph with paths, and convertion between handle and descriptor. 2020-04-27 18:55:26 +02:00
Guillaume Damiand 44a2d4d171 Edge width is only without weight. 2020-04-27 18:55:25 +02:00
Guillaume Damiand daab96982e Bugfix 2020-04-27 18:55:25 +02:00
Guillaume Damiand f4a6f06f10 solve const problem 2020-04-27 18:55:25 +02:00
Guillaume Damiand 4b97fd572f Add mising include 2020-04-27 18:55:25 +02:00
Guillaume Damiand 1af6cfb4ae Path on surface is now generic for CMap and GMap 2020-04-27 18:55:25 +02:00
Guillaume Damiand f448027cee Add one example 2020-04-27 18:52:23 +02:00
Guillaume Damiand 7893462916 Rename examples. 2020-04-27 18:52:23 +02:00
Guillaume Damiand 19d7e197c6 Bug fix in face width 2020-04-27 18:52:23 +02:00
Guillaume Damiand 821ed7ab41 Improve face width computation, avoiding unused copy. 2020-04-27 18:52:23 +02:00
Guillaume Damiand ddc152860d bug fix 2020-04-27 18:52:23 +02:00
Guillaume Damiand 2018367261 Improve face width computation; move face graph wrapper into surface mesh topology package. 2020-04-27 18:52:23 +02:00
Guillaume Damiand d553d91eb6 Improve and simplify examples; add weight functors. 2020-04-27 18:52:23 +02:00
Guillaume Damiand 0f3e5ed362 Remove trailing whitespaces 2020-04-27 18:52:23 +02:00
Guillaume Damiand 298217e45a Add missing #include of licence file. 2020-04-27 18:52:23 +02:00
Guillaume Damiand 7b65cb0004 Const correctness for shortest non contractible cycle ok. 2020-04-27 18:52:23 +02:00
Guillaume Damiand 87306ce852 Start small improvements of Facewidth 2020-04-27 18:52:22 +02:00
Guillaume Damiand a40b1f8016 Small fixes 2020-04-27 18:52:22 +02:00
Guillaume Damiand 0c81c64c51 Generic map selector copy also perforated darts and mark them. 2020-04-27 18:52:22 +02:00
Guillaume Damiand 9bd10459a2 Bug fix; plus add a draw method taking only one path as parameter. 2020-04-27 18:52:22 +02:00
Guillaume Damiand 7e8fc7f72a Add header 2020-04-27 18:52:22 +02:00
Guillaume Damiand 88b920893b Remove wrong assert 2020-04-27 18:52:22 +02:00
Guillaume Damiand 05f33f1562 Several improvements 2020-04-27 18:52:22 +02:00
Guillaume Damiand 4933a2fbdf Update draw face graph with path 2020-04-27 18:52:22 +02:00
Guillaume Damiand a9d353fa24 Start small improvements of code. 2020-04-27 18:52:22 +02:00
Guillaume Damiand a5eb1530ff Update surface mesh topology to integrate shortest path computation. 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
Guillaume Damiand 6e5f8ef934 align = 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
Guillaume Damiand 98d67a9e68 Comment. 2020-04-27 18:37:59 +02:00
Guillaume Damiand 03c383030e update 2020-04-27 18:37:58 +02:00