Commit Graph

1222 Commits

Author SHA1 Message Date
Guillaume Damiand 3bc56024d3 Merge branch 'master' into gsoc2022-EBVs-Mostafa-ashraf19 2024-01-11 14:08:05 +01:00
Guillaume Damiand 88e9921d1d warning in draw nef3 2023-12-26 10:08:15 +01:00
Guillaume Damiand bd04b2a68d Remove space in doc 2023-12-06 17:01:34 +01:00
Guillaume Damiand 029ab430a3 doc draw nef3 2023-12-05 14:58:28 +01:00
Guillaume Damiand c1dd38e581 draw nef3 2023-12-01 13:21:50 +01:00
Guillaume Damiand f8a487d9ef update dependencies 2023-11-29 18:12:09 +01:00
Laurent Rineau 95b83b1214 Merge pull request #7845 from puneetmatharu/patch-cgal-dont-override-build-testing
Patch usage of BUILD_TESTING to handle the case that CGAL is a subproject
2023-11-29 17:22:54 +01:00
Guillaume Damiand 0655006622 Merge with master: now viewers use Qt6 2023-11-29 14:36:38 +01:00
Guillaume Damiand d2d114cf24 Update code to follow last api 2023-11-20 09:33:28 +01:00
Andreas Fabri 4e5082b6b5 remove _qt 2023-11-14 09:25:00 +00:00
Puneet Matharu 7944441068 Patch usage of BUILD_TESTING to handle the case that CGAL is a subproject. 2023-11-02 18:09:03 +00:00
Guillaume Damiand 761fde02be add_in_graphics_scene -> add_to_graphics_scene; plus remove template parameter NumberType 2023-10-23 01:52:38 +02:00
Guillaume Damiand 6daa2a0c3b Graphics_scene is no more templated 2023-10-23 01:30:57 +02:00
Guillaume Damiand a5ee74cb66 Merge branch 'master' into gsoc2022-EBVs-Mostafa-ashraf19 2023-09-29 08:36:37 +02:00
Guillaume Damiand 9f22d67ed0 Rename Graphic_storage in Graphics_scene (Andreas and Sebastien review) 2023-09-28 12:49:00 +02:00
Guillaume Damiand fd115bd321 Rename Graphic_storare into Graphics_scene (Andreas and Sebastien review) 2023-09-28 11:06:53 +02:00
Guillaume Damiand 5cf89dadd9 Rename Drawing_functor in Graphics_scene_options (following Andreas and Sebastien review) 2023-09-28 09:51:12 +02:00
Laurent Rineau 28632f21fc Merge branch 'master' into CGAL-Qt6-GF
# Conflicts:
#	Installation/CHANGES.md
2023-09-14 17:40:05 +02:00
Laurent Rineau 2f6d51b49b Remove a few occurrences of CGAL_Qt5
... and replace by CGAL_Qt6
2023-09-14 16:33:20 +02:00
Laurent Rineau c50c72fd28 Merge pull request #7648 from albert-github/feature/bug_pkgdesc_incl
Better showing of `#include`
2023-09-07 10:46:32 +02:00
Guillaume Damiand 467e55f10d Merge branch 'master' into gsoc2022-EBVs-Mostafa-ashraf19 2023-08-28 14:38:58 +02:00
Sébastien Loriot 608d0c81c4 use a macro 2023-08-24 14:56:48 +02:00
Sébastien Loriot 68bc244d02 Merge remote-tracking branch 'cgal/master' into HEAD 2023-08-24 14:14:12 +02:00
Andreas Fabri c11711e728 More fixes 2023-08-22 10:29:04 +01:00
Sébastien Loriot eada3ee8ca Merge branch 'master' into 'sloriot/CGAL-using_c++17_stl' 2023-08-14 14:19:25 +02:00
albert-github 0ce82c0bd5 Better showing of `#include`
Getting a better (and consistent) output for the include file to be used with some functions.
Normally `#include` are sown as in a typewrite font, but the `#include` in these cases were shown in a code block way.
2023-08-13 18:22:07 +02:00
Mael c6fd1d0316
Merge branch 'master' into CGAL-Qt6-GF 2023-07-18 10:49:58 +02:00
albert-github 5673ccfc71 Spelling corrections
Spelling correction `a edge` to `an edge`
2023-07-06 18:04:38 +02:00
Guillaume Damiand fe23441eab Merge master 2023-06-26 14:42:33 +02:00
Guillaume Damiand 7da9812bda Rename graphic_buffer into graphic_storage. 2023-06-22 15:18:34 +02:00
Sébastien Loriot 9a0bdb5d96 boost::variant ---> std::variant 2023-06-15 10:57:10 +02:00
Sébastien Loriot 557b64e4a6 boost::any ==> std::any 2023-06-15 10:57:09 +02:00
Sébastien Loriot 604dcdc435 boost::optional => std::optional 2023-06-15 10:57:09 +02:00
Guillaume Damiand 519c7cc1a5 rename add_in_graphic_buffer into add_in_graphic_storage 2023-04-28 15:25:40 +02:00
Laurent Rineau 0576e883f9 Merge branch 'CGAL-fix-Qt5-CMake-GF' into CGAL-Qt6-GF
# Conflicts:
#	AABB_tree/demo/AABB_tree/CMakeLists.txt
#	Alpha_shapes_3/demo/Alpha_shapes_3/CMakeLists.txt
#	Arrangement_on_surface_2/demo/Arrangement_on_surface_2/CMakeLists.txt
#	Circular_kernel_3/demo/Circular_kernel_3/CMakeLists.txt
#	GraphicsView/demo/Alpha_shapes_2/CMakeLists.txt
#	GraphicsView/demo/Apollonius_graph_2/CMakeLists.txt
#	GraphicsView/demo/Bounding_volumes/CMakeLists.txt
#	GraphicsView/demo/Circular_kernel_2/CMakeLists.txt
#	GraphicsView/demo/Generator/CMakeLists.txt
#	GraphicsView/demo/GraphicsView/CMakeLists.txt
#	GraphicsView/demo/L1_Voronoi_diagram_2/CMakeLists.txt
#	GraphicsView/demo/Largest_empty_rect_2/CMakeLists.txt
#	GraphicsView/demo/Periodic_2_triangulation_2/CMakeLists.txt
#	GraphicsView/demo/Polygon/CMakeLists.txt
#	GraphicsView/demo/Segment_Delaunay_graph_2/CMakeLists.txt
#	GraphicsView/demo/Segment_Delaunay_graph_Linf_2/CMakeLists.txt
#	GraphicsView/demo/Snap_rounding_2/CMakeLists.txt
#	GraphicsView/demo/Spatial_searching_2/CMakeLists.txt
#	GraphicsView/demo/Stream_lines_2/CMakeLists.txt
#	GraphicsView/include/CGAL/Qt/DemosMainWindow_impl.h
#	Hyperbolic_triangulation_2/demo/Hyperbolic_triangulation_2/CMakeLists.txt
#	Installation/cmake/modules/CGAL_add_test.cmake
#	Linear_cell_complex/demo/Linear_cell_complex/CMakeLists.txt
#	Optimal_transportation_reconstruction_2/demo/Optimal_transportation_reconstruction_2/CMakeLists.txt
#	Periodic_3_triangulation_3/demo/Periodic_3_triangulation_3/CMakeLists.txt
#	Periodic_3_triangulation_3/demo/Periodic_Lloyd_3/CMakeLists.txt
#	Polyhedron/demo/Polyhedron/polyhedron_demo_macros.cmake
#	Polyline_simplification_2/demo/Polyline_simplification_2/CMakeLists.txt
#	Principal_component_analysis/demo/Principal_component_analysis/CMakeLists.txt
#	Triangulation_3/demo/Triangulation_3/CMakeLists.txt
#	Triangulation_on_sphere_2/demo/Triangulation_on_sphere_2/CMakeLists.txt
2023-04-28 13:49:58 +02:00
Guillaume Damiand 4df2edd9c1 Replace draw_buffer by draw_graphic_storage 2023-04-28 12:26:31 +02:00
Guillaume Damiand 8f29e4d323 Rename class graphic buffer 2023-04-27 15:48:42 +02:00
Laurent Rineau 67441a3772 Convert all CMakeLists.txt to Qt6 2023-04-25 17:27:03 +02:00
Laurent Rineau d0478493a0
Bug fix draw Nef_3 (#7388)
_Please use the following template to help us managing pull requests._

## Summary of Changes

Draw only halffacet if(fc.is_shalfedge()).
TODO: do we need to draw something if (fc.is_shalfloop()) ?

## Release Management

* Affected package(s): Nef_3
* Issue(s) solved (if any): fix #7377
2023-04-25 12:18:08 +02:00
Guillaume Damiand afb4ac68b3 Do not draw shalfloop to avoid segfault(TODO draw something?) 2023-04-14 09:52:28 +02:00
Andreas Fabri 0d320e48a8 Merge branch 'Number_types-fix_VC2017_boost_mp-GF' into CORE-boost_mp_number-GF 2023-03-17 08:28:10 +01:00
Laurent Rineau 2f0203be10 Merge pull request #7255 from lrineau/CGAL-rename_ctest_test_names-GF
CGAL CTest support: rename the test names

# Conflicts:
#	Mesh_3/test/Mesh_3/CMakeLists.txt
2023-03-15 14:23:32 +01:00
Laurent Rineau 78e2d5e4d2 Merge pull request #6478 from afabri/Nef_3-replace_deque_by_vector_and_reserve-GF
Nef_3: Add overloads with ORIGIN in predicates
2023-03-02 13:42:35 +01:00
Sébastien Loriot 9e72361537 All packages depends now on CGAL_Core (like Kernel) 2023-02-20 15:24:16 +01:00
Laurent Rineau 6df18b668c CGAL CTest support: rename the test names
Now that CTest test names can contain whitespace, we can have
better looking names. That is also more practicle because we can now
copy-paste the target name in `compilation of  <target_name>`.
2023-02-06 12:04:57 +01:00
Laurent Rineau 02247f7610 Merge pull request #7187 from GilesBathgate/Nef_3-performance_binop_intersections-GilesBathgate
Nef_3: performance in binop_intersection_tests
2023-02-02 10:58:23 +01:00
Giles Bathgate 4e5c945d6c Introduce SNC_const_point_locator typedef for Binary_operation callback 2023-01-24 22:34:02 +00:00
Giles Bathgate 3c56c3e2b1 Include required header in Infimaximal_box.h 2023-01-19 00:58:05 +00:00
Giles Bathgate 33d9560b20 Place forward declaration in SNC_structure 2023-01-19 00:50:47 +00:00
Giles Bathgate b66ee56919 Additional required headers in Nef_3 2023-01-19 00:21:10 +00:00
Giles Bathgate b5580573d6 Fix cyclic dependencies
Move shared code to SNC_halfedge_key.h, remove unneeded headers, add a one forward declaration for SNC_io_parser
2023-01-18 20:30:19 +00:00
Giles Bathgate 59ef7678aa Add header required by additional typedef 2023-01-13 20:01:22 +00:00
Giles Bathgate c2a1810b64 Calculate edge Nef_boxes only once 2023-01-13 18:43:33 +00:00
Giles Bathgate cb5fd9404c Remove unused hash function 2023-01-13 18:43:33 +00:00
Giles Bathgate 15820b3009 Include required headers 2023-01-13 18:43:33 +00:00
Giles Bathgate 017210acfb Rename parameters 2023-01-13 18:43:33 +00:00
Giles Bathgate 1f8244d9bb Cleanup - remove CGAL_NEF3_BOX_INTERSECTION_CUTOFF 2023-01-13 18:43:33 +00:00
Giles Bathgate f827481216 Make binop_intersection_tests const to remove const_cast 2023-01-13 18:43:32 +00:00
Andreas Fabri ae271b08f7 Revert to deque 2023-01-02 10:46:01 +00:00
Mael 0ff7882997
Merge branch 'master' into feature/bug_documentation_spell_20221113 2022-12-06 22:21:06 +01:00
Laurent Rineau 5c943e558c Merge pull request #6935 from lrineau/CGAL-fix_autotest_with_ctest-GF
Fix autotest_cgal_with_ctest
2022-11-25 10:15:07 +01:00
Laurent Rineau b363b7e4af Merge pull request #6935 from lrineau/CGAL-fix_autotest_with_ctest-GF
Fix autotest_cgal_with_ctest
2022-11-25 10:14:18 +01:00
Sébastien Loriot 7322c7908d try to workaround warnings 2022-11-21 14:09:08 +01:00
Sébastien Loriot 8bbbf8d494 try workaround warnings 2022-11-17 19:11:00 +01:00
albert-github 3674c937f7 spelling corrections
Some spelling corrections (Directories starting with `M`-` N`),
some backward work
some forward work
2022-11-15 15:21:01 +01:00
albert-github 45478184de spelling corrections
Some spelling corrections (Directories starting with `E`-` L`),
some backward work
some forward work
2022-11-15 13:39:40 +01:00
Guillaume Damiand e18a573cc1 add missing include 2022-10-19 15:22:09 +02:00
Guillaume Damiand 58fead22b1 draw nef3 review 2022-10-17 17:53:56 +02:00
Guillaume Damiand 24a8004ee0
Merge branch 'master' into gsoc2022-EBVs-Mostafa-ashraf19 2022-10-14 08:53:12 +02:00
Mostafa-ashraf19 2f592577c1 Scope changed. 2022-10-07 19:16:27 +02:00
Mostafa-ashraf19 c4d612c85e Uses new APIs version in Nef_3. 2022-10-07 03:00:19 +02:00
albert-github 17a84db90e Some obvious missing quotes
Some obvious missing quotes  (last set)
2022-09-25 18:00:08 +02:00
Laurent Rineau d49ee20965
Merge pull request #6665 from sloriot/CGAL-std_type_traits 2022-08-17 13:56:54 +02:00
Sébastien Loriot 098ca52aff Merge remote-tracking branch 'cgal/5.5.x-branch' 2022-08-10 18:39:17 +02:00
Sébastien Loriot 601bd64dc8 Merge remote-tracking branch 'cgal/5.4.x-branch' 2022-08-10 18:38:50 +02:00
Sébastien Loriot 861588abe1 Merge 'sloriot/CGAL-std_type_traits' into master 2022-08-03 20:19:51 +02:00
Andreas Fabri 7b09c8e5ea Nef_3: Fix in nary functions 2022-08-02 17:37:38 +01:00
Sebastien Loriot 4b9032f8c6
Merge pull request #6547 from afabri/Skeletoniation-HDS-GF
Skeletonization: Replace internally Polyhedron by HDS
2022-07-08 20:24:58 +02:00
Sébastien Loriot 3186833268 WIP working with simple soup example 2022-07-07 10:16:18 +02:00
Sébastien Loriot 744a964372 fix compilation errors 2022-07-07 09:36:39 +02:00
Sébastien Loriot 69c4af61a9 fix types, still not valid 2022-07-07 09:21:10 +02:00
Sébastien Loriot 07b04366a0 WIP 2022-07-06 17:09:55 +02:00
Andreas Fabri a994933ccb Nef_3: Fix conversion to a FaceGraph 2022-06-30 11:44:09 +01:00
Sébastien Loriot 707b45cb5b Merge remote-tracking branch 'cgal/5.5.x-branch' 2022-06-29 10:48:00 +02:00
Sébastien Loriot f1f201b542 Merge remote-tracking branch 'cgal/5.4.x-branch' into HEAD 2022-06-29 10:47:14 +02:00
Sébastien Loriot 078122cd2e test constructor and constness 2022-06-20 16:59:35 +02:00
Sébastien Loriot e9e07ea874 fix constness issues without constcast and use initialized Index pmap mechanism 2022-06-20 16:30:10 +02:00
Sébastien Loriot 4400120244 remove non-needed include directives 2022-06-16 09:54:57 +02:00
Sébastien Loriot 3fa436459d BOOST_MPL_ASSERT -> static_assert 2022-06-10 08:46:01 +02:00
Sébastien Loriot ac8b6d4731 boost::is_same --> std::is_same 2022-06-10 08:18:20 +02:00
Sébastien Loriot 4f5f8341cc use std::enable_if_t 2022-06-10 07:37:53 +02:00
Giles Bathgate 0570e6aa3c Merge branch 'master' into Nef_3-performance_shoot-GilesBathgate 2022-06-03 15:30:05 +01:00
Laurent Rineau d5b6911929 Merge pull request #6480 from GilesBathgate/Nef_3-performance_reduce_object_casts-GilesBathgate
Nef_3: Use separate lists K3_tree node to avoid object casts
2022-06-03 16:08:58 +02:00
Sebastien Loriot 269a391fa0
Merge pull request #6558 from lrineau/Installation-remove_wd4503-GF
CMake script updates: version of CMake and /wd4503 is only for MSVC 2015
2022-05-13 15:53:36 +02:00
Laurent Rineau 2288225448 Massive update of CMake policies to version 3.23 2022-05-06 09:34:35 +02:00
Andreas Fabri 9567522297 Include header 2022-04-19 17:02:20 +01:00
Andreas Fabri 36f2260948 Move return() out of the switch to avoid warning 2022-04-14 08:36:36 +01:00
Giles Bathgate 168ae33f73 Remove extraneous semicolon, initialize solution enum. 2022-04-13 17:36:12 +01:00
Andreas Fabri 2a5fcdcfb1 Add reserve() in generic code and change comment to avoid warning 2022-04-13 12:59:21 +01:00
Andreas Fabri 68d896b496 Fix warnings 2022-04-13 11:53:02 +01:00