Commit Graph

86380 Commits

Author SHA1 Message Date
Jasmeet Singh f8bc47dbf6 Check visualization for Periodic Delaunay Triangulation as well. Change example to a delaunay triangulation.
Add is_triangulation_in_1_sheet() check and then convert to 9-sheet if the triangulation isn't so already.
2019-06-22 18:49:54 -07:00
Jasmeet Singh a9eae8a297 Add Key description for Key D which displays the domain. 2019-06-22 18:00:01 -07:00
Jasmeet Singh 677cbc7c07 Add Periodic_2_triangulation_2 viewer. Add example - draw_periodic_2_triangulation_2.cpp.
Keypress 1-UNIQUE, 2-UNIQUE_COVER_DOMAIN, 3-STORED, 4-STORED_COVER_DOMAIN, D-draw the domain.
Color values for faces are fixed for now. Boundaries of faces are also viewed with a light gray
color so as to properly display a triangular face.
2019-06-22 17:53:18 -07:00
Jasmeet Singh e769c14b00 Change NULL to nullptr in buffer initialization. 2019-06-21 13:20:23 -07:00
Jasmeet Singh e096af3133 Merge branch 'master' into gsoc2019-add_basic_viewer-jasmeet 2019-06-21 12:25:30 -07:00
Jasmeet Singh 58dec73f74 Update dependencies for Voronoi Diagram package: Add GraphicsView. 2019-06-21 12:17:22 -07:00
Jasmeet Singh d1295ce338 Change order of constructor arguments so that existing derived classes from Basic_viewer which call this constructor set the arguments correctly. 2019-06-21 11:30:22 -07:00
Jasmeet Singh 1107041933 Remove header draw_voronoi from vd_2_point_location as a separate example is added. Change CMakLists.txt accordingly. 2019-06-21 11:12:01 -07:00
Laurent Rineau 6ad4b3934e Merge branch 'releases/CGAL-4.14-branch' 2019-06-21 10:34:35 +02:00
Laurent Rineau 55c9a175b5 Merge branch 'releases/CGAL-4.13-branch' into releases/CGAL-4.14-branch 2019-06-21 10:34:18 +02:00
bryantcurto 056e846e0d Fixed do_intersect() ambiguity.
Occurs when compiling with clang
2019-06-21 10:33:46 +02:00
Jasmeet Singh a48cb941ba Draw Dual Vertices in the voronoi diagram. Update doc image for drawing voronoi diagram.
Toggle with D to view/unview dual vertices. Vertex view should be ON as dual vertices use
the buffer for colored vertices.
2019-06-20 12:09:38 -07:00
Laurent Rineau a236d22e2d Merge pull request #3730 from sloriot/CGAL-create_tarballs
Add an option to create tarballs while creating a release
2019-06-20 14:21:16 +02:00
Laurent Rineau 17add8332e Merge pull request #3903 from MaelRL/PMP-Generalize_keep_largest_CC-GF
PMP: Generalize `keep_large(st)_CCs`
2019-06-20 14:21:14 +02:00
Laurent Rineau 33e7de45e9 Merge pull request #3919 from maxGimeno/Add_3mf_wrapper-GF
Stream_support: Add a 3mf wrapper
2019-06-20 14:21:11 +02:00
Laurent Rineau 8fd3f2d8fd Merge pull request #3973 from sgiraudot/Kernel_23-Add_hash_functions-GF
[Small Feature] Add hash functions for kernel objects
2019-06-20 14:21:09 +02:00
Laurent Rineau 53ba851c89 Merge pull request #3990 from bryantcurto/patch-1
do_intersect() Ambiguity
2019-06-20 14:21:05 +02:00
Laurent Rineau b96e46f7a6 Merge branch 'releases/CGAL-4.14-branch' 2019-06-20 14:20:41 +02:00
Laurent Rineau 8535a3c03c Merge branch 'releases/CGAL-4.14-branch'
# Conflicts:
#	Apollonius_graph_2/include/CGAL/Apollonius_graph_2/Apollonius_graph_2_impl.h
#	Convex_hull_3/include/CGAL/convex_hull_3.h
#	Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/internal/Corefinement/face_graph_utils.h
#	Polyhedron/demo/Polyhedron/Plugins/Mesh_3/Mesh_3_plugin_cgal_code.cpp
#	Stream_support/include/CGAL/IO/Color.h
2019-06-20 14:20:37 +02:00
Laurent Rineau 69a4241d5e Merge pull request #3987 from lrineau/Polyhedron-demo__mesh_several_surfaces_at_a_time-GF
Polyhedron demo:  mesh several surfaces at a time
2019-06-20 14:20:08 +02:00
Laurent Rineau b0c182ce63 Merge pull request #3987 from lrineau/Polyhedron-demo__mesh_several_surfaces_at_a_time-GF
Polyhedron demo:  mesh several surfaces at a time
2019-06-20 14:09:17 +02:00
Laurent Rineau c64c40491b Merge pull request #4003 from maxGimeno/Demo-Fix_clip_plus_point_selection-GF
3D Demo: Fix Points Selection when Clipping
2019-06-20 14:09:15 +02:00
Laurent Rineau b0f1f90a4d Merge branch 'releases/CGAL-4.13-branch' into releases/CGAL-4.14-branch 2019-06-20 14:08:25 +02:00
Laurent Rineau f697343e53 Fake merge commit 'refs/pull/3938/head' into releases/CGAL-4.14-branch
I have used `git merge -s ours ...`.
2019-06-20 14:08:02 +02:00
Laurent Rineau 49090b61ab Merge pull request #3940 from MaelRL/Intersections_2-Populate_tests-GF
Intersections_2: Fix bugs and populate tests (4.14)
2019-06-20 14:07:34 +02:00
Laurent Rineau 208f788494 Merge pull request #3893 from sloriot/PMP-coref_fix_next_prev
Fix the prev/next pointers after polyline removal
2019-06-20 14:01:25 +02:00
Laurent Rineau f6726085ae Merge pull request #3938 from MaelRL/Intersection_2-Fix_Ray_triangle_degenrate_inter-GF
Intersections_2: Fix some issues and populate tests
2019-06-20 14:01:22 +02:00
Laurent Rineau 09e54b05e3 Merge pull request #3939 from lrineau/Kernel_23-Epick_without_interval-GF
Fixes for Convex_hull_3: use `is_certain` to avoid exceptions throwing
2019-06-20 14:01:20 +02:00
Laurent Rineau 2a430c0213 Merge pull request #4011 from MaelRL/SDG-Derecursify-GF
SDG: Derecursify functions
2019-06-20 14:01:17 +02:00
Jasmeet Singh ce1b306d00 Add m_buffer_for_mono_lines and m_buffer_for_colored_lines to view lines.
Trying to visualize bisectors. Formatting changes.
2019-06-19 19:49:09 -07:00
Jasmeet Singh 001fda493b Add documentation for voronoi diagram viewer. 2019-06-19 16:30:56 -07:00
Jasmeet Singh 43015b0059 Add special KeyPressEvent for rays. Format typedefs. Set cgal_test_suit = qEnvironmentVariableIsSet("CGAL_TEST_SUITE")
Adding these changes after learning from the viewers generated by GDamiand.
2019-06-19 14:24:40 -07:00
Jasmeet Singh 955a982a5f Add an example for Voronoi diagram basic viewer.
For rays: draw a really big segment without modifying bounding box.
Hence, the initial screen of the viewer is correctly adjusted.
For faces: drawing only bounded faces for now. The function getSecondPoint(Halfedge)
can help to draw unbounded faces. Keypress R to view/unview rays.
2019-06-19 13:43:07 -07:00
Jasmeet Singh cd3cfc0bc5 Remove wireframe toggle button as it is unavailable in qOpenGLFunctions 2019-06-18 18:27:00 -07:00
Jasmeet Singh ff5e9a3820 Add compute_face() functionality and get_second_point() to find intersection of ray with bounding box
Show wireframe. Not building successfully as qOpenGLFunctions do not support glPolygonMode(). Comitting to save progress.
2019-06-18 17:51:22 -07:00
Jasmeet Singh 2874ce940c Merge remote-tracking branch 'jasmeet9323/cgal/master' into gsoc2019-add_basic_viewer-jasmeet
Sync my branch with remote to avoid conflicts during PR.
2019-06-18 12:56:28 -07:00
Mael Rouxel-Labbé 51333214c0 Derecursify SDG_2::expand_conflict_region_remove() 2019-06-18 13:18:51 +02:00
Mael Rouxel-Labbé a6c528cd8f Derecursify Apollonius_graph_2::expand_conflict_region() 2019-06-18 13:18:25 +02:00
Mael Rouxel-Labbé 4e15225e98 Derecursify 'expand_conflict_region' 2019-06-18 11:04:09 +02:00
Jasmeet Singh 4f9df720ea Toggle ray display with keypress R. Start adding face viewer 2019-06-17 20:45:04 -07:00
Jasmeet Singh 1cc0d12aa4 Revert formatting of the rest of Basic_viewer_qt.h file 2019-06-17 20:13:30 -07:00
Jasmeet Singh 1d4b6242f4 Show rays upto a bounding box 2019-06-17 20:02:08 -07:00
jasmeet9323 1a04afdae4 Experimenting with bounding box-ray intersection 2019-06-17 14:20:30 -07:00
Mael Rouxel-Labbé b1a37a0f1e Update CHANGES.md 2019-06-17 15:19:00 +02:00
Mael Rouxel-Labbé 19de8eda04 Merge branch 'PMP-Generalize_keep_largest_CC-GF-old' into PMP-Generalize_keep_largest_CC-GF 2019-06-17 15:18:33 +02:00
Laurent Rineau f0682d311d Merge branch 'releases/CGAL-4.14-branch' 2019-06-17 14:17:17 +02:00
Laurent Rineau 2f09bbdfff Merge pull request #3951 from lrineau/Mesh_3-fix_issue_2870-GF
Mesh_3: fix issue #2870 (do not deactivate all topological criteria)
2019-06-17 14:16:12 +02:00
Laurent Rineau 23f946a58a Merge pull request #3954 from maxGimeno/AABB_tree-All_intersected_primitives_for_tree-GF
AABB_tree: add do_intersect() for trees
2019-06-17 14:16:09 +02:00
Laurent Rineau eea3cfe18f Merge pull request #3956 from sgiraudot/Classification-Fix_deprecated_random_shuffle-GF
Classification: use cpp98::random_shuffle to avoid errors in C++17
2019-06-17 14:16:05 +02:00
Laurent Rineau 8837c161ef Merge pull request #3958 from afabri/SDG_2-improve_doc-GF
Segment_Delaunay_graph_2: Improve documentation
2019-06-17 14:16:00 +02:00