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

399 Commits

Author SHA1 Message Date
Mael Rouxel-Labbé 1030445709 Fixed missing backticks in Alpha_Shapes_23's docs 2017-06-28 10:16:23 +02:00
Mael Rouxel-Labbé 1fc2282350 Fixed regular triangulation capitalization across CGAL 2017-06-28 10:16:23 +02:00
Mael Rouxel-Labbé 11786a7b90 Fixed minor mistakes from a rebase 2017-06-28 10:16:23 +02:00
Mael Rouxel-Labbé 7ce35c7538 Added point type to the doc of alpha shapes 2/3 2017-06-28 10:15:30 +02:00
Mael Rouxel-Labbé c0cd440956 Moved some doc for clarity 2017-06-28 10:15:30 +02:00
Mael Rouxel-Labbé 781b26f20f Document the fact that ExactAlphaComparisonTag only works for "nice" traits 2017-06-28 10:15:30 +02:00
Mael Rouxel-Labbé d67163dece Various improvements to the Alpha_shapes_3 user manual 2017-06-28 10:15:30 +02:00
Mael Rouxel-Labbé 6a6422073d Fixed concept refinement relationships in Alpha_shapes_3 doc 2017-06-28 10:15:30 +02:00
Mael Rouxel-Labbé c765fbfda0 Clarified TDS concepts and models in alpha_shapes_3 doc 
also removed mention of Regular_triangulation_euclidean_traits_3
 2017-06-28 10:15:30 +02:00
Mael Rouxel-Labbé 1b3a608b30 Fixed not getting Alpha shapes 2 predicates and constructions from Lazy alpha NT 2017-06-28 10:15:30 +02:00
Mael Rouxel-Labbé cdb447a22f Use Kernel_traits<Traits::Pt> to deduce the kernel rather than Traits::Kernel 2017-06-28 10:15:30 +02:00
Mael Rouxel-Labbé 4e4f1ed4c0 Avoided a default traits construction 2017-06-28 10:14:35 +02:00
Mael Rouxel-Labbé 871cce116e Removed Regular_triangulation_euclidean_traits_3 usage in Lazy_alpha_nt_3 
Regular_triangulation_euclidean_traits are deprecated (and do not do anything).
 2017-06-28 10:14:35 +02:00
Mael Rouxel-Labbé ff40039d79 Fixed some Bare_point / Weighted_point typedefs in Alpha_shapes_3 
The triangulation defines those types, not the traits
 2017-06-28 10:14:35 +02:00
Mael Rouxel-Labbé ea295a0ee4 Made some typedefs readable for people without a 30" screen (no real changes) 2017-06-28 10:14:35 +02:00
Mael Rouxel-Labbé 38c212c521 Fixed test_fixed_alpha_shape_3 Point_3/Weighted_point_3 usage 2017-06-28 10:14:35 +02:00
Mael Rouxel-Labbé 3b36c56137 Fixed TDS in test of Alpha_shapes_3 (Regular_tr must use regular cell_base) 2017-06-28 10:14:35 +02:00
Mael Rouxel-Labbé 3e25674957 Weighted alpha shape traits are not based on RT_euclidean_traits anymore 
Similarly to Regular_triangulation_euclidean_traits, the Kernel concept has now
absorbed all the functors that are needed by the alpha shape traits concept and
the weighted alpha shape traits can thus simply be empty shells.
 2017-06-28 10:14:35 +02:00
Mael Rouxel-Labbé 7a7ac15f42 Fixed weighted Alpha_shapes_3 TDS construction 
When weighted, Alpha_cell_base_3 must use Regular_triangulation_cell_base_3
as base
 2017-06-28 10:14:35 +02:00
Laurent Rineau 0685006e33 Merge pull request #2081 from maxGimeno/Merge_3d_demos-GF 
Polyhedron_demo: Add an Alpha_shape_plugin
 2017-05-29 11:16:21 +02:00
Laurent Rineau 7e651b6b78 Merge branch 'releases/CGAL-4.10-branch' 
Merges two pull-requests:

- 9384ff4 Merge pull request #2133 from maxGimeno/Fix_cmake_warning_CMP0053-GF
- 0005d61 Merge pull request #2132 from sloriot/Kernel-use_CGAL_compare
 2017-05-24 17:45:58 +02: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
Mael Rouxel-Labbé 9cd0f31d71 Temporarily silenced weighted alpha shape traits depreciation warnings 2017-05-16 10:28:09 +02:00
Mael Rouxel-Labbé cd2a562ffa Fixed improper guards against the inclusion of deprecated headers 2017-05-16 10:17:41 +02:00
Maxime Gimeno 8f2cba74d8 Add an Alpha_shape_plugin 
- Add a specific alpha_shape item and an alpha_shape_plugin.
- Add a creation of polygon_soup from alpha_shape_item
 2017-04-26 16:38:48 +02:00
Sébastien Loriot 50510c05ea add include directive for license of all GPL header files 
done using:
ack-grep "^GPL" */package_info/*/license.txt -l | awk -F "/" '{print $1}' > /tmp/gpl_packages
for i in `cat /tmp/gpl_packages | \
          grep -v Operations_on_polyhedra | \
          grep -v Algebraic_kernel_for_circles | \
          grep -v Algebraic_kernel_for_spheres | \
          grep -v Polyhedron_IO`;
do
  echo $i
  python Scripts/developer_scripts/add_license_in_pkg_header.py $i
done
python Scripts/developer_scripts/add_license_in_pkg_header.py Operations_on_polyhedra Polygon_mesh_processing
python Scripts/developer_scripts/add_license_in_pkg_header.py Algebraic_kernel_for_circles Circular_kernel_2
python Scripts/developer_scripts/add_license_in_pkg_header.py Algebraic_kernel_for_spheres Circular_kernel_3
python Scripts/developer_scripts/add_license_in_pkg_header.py Polyhedron_IO Polyhedron
 2017-01-19 15:20:25 +01:00
Laurent Rineau bbf430b0b1 Merge pull request #585 from afabri/Kernel-Weighted_point-GF 
Introduce Kernel::Weighted_point_3 together with functors
 2016-12-20 19:52:02 +01:00
Sébastien Loriot 632d1f368d initialize pointers 2016-11-29 11:57:32 +01:00
Sébastien Loriot 4c5270752b rename template parameter 2016-11-29 11:52:52 +01:00
Sébastien Loriot c8117a76f4 replace static_vector by a small struct 2016-11-24 15:42:47 +01:00
Sébastien Loriot 810fbd323f Use a static_vector instead of a shared_ptr<vector> 2016-11-24 11:50:42 +01:00
Sébastien Loriot 10dd2175ac remove non-needed unsigned 2016-11-24 11:37:08 +01:00
Sébastien Loriot 6a0541ede3 remove extra character 2016-11-24 11:37:08 +01:00
Sébastien Loriot bc85850104 use an optional for exact_nt 2016-11-24 09:51:04 +01:00
Sébastien Loriot a46dfa29d0 avoid throwing an assertion 2016-11-24 09:45:45 +01:00
Sébastien Loriot cf71b05937 add an overload of CGAL::to_double for Lazy_alpha_nt_3 2016-11-24 09:41:41 +01:00
Andreas Fabri e5e0cdd5f9 fix a typedef 2016-11-22 17:48:53 +01:00
Andreas Fabri ecf44b08d7 Take the Point type from the underlying vertex type 2016-11-22 16:09:08 +01:00
Andreas Fabri 9f96b59bb9 Take the type Point from the underlyinng triangulation 2016-11-22 16:08:19 +01:00
Andreas Fabri e5219a1725 Take the type Point from the underlyinng triangulation 2016-11-22 16:07:51 +01:00
Andreas Fabri 47e373c299 typo 2016-11-22 16:06:58 +01:00
Andreas Fabri d624271315 Remove usage of Regular_triangulation_euclidean_traits_3 2016-11-21 16:43:40 +01:00
Andreas Fabri d35c6c913d Use Weighted_point_mapper_3 2016-11-21 15:33:27 +01:00
Laurent Rineau 57f0b33eb6 Fix Alpha_shapes_3 
Alpha_shapes_3 needs to know a lot about its template parameter `Dt`. To
simplify the code, I have chosen to make the typedef `Tr_Base` public in
3D Delaunay and Regular triangulations.
 2016-11-18 17:36:50 +01:00
Andreas Fabri 92406379e7 Add typename (Who removed them???) 2016-11-03 13:10:00 +01:00
Andreas Fabri 54ec8f9d92 the VC++ testsuite should pass now 2016-11-03 13:06:02 +01:00
Laurent Rineau 9a0bb54922 Merge pull request #1438 from sloriot/CGAL-clean_up_projects_name_cmake 
Clean up projects name in cmake scripts
 2016-10-05 13:02:25 +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
Andreas Fabri f5da4d8f29 Add a link to the dD alpha complex offered by GUDHI 2016-09-07 17:37:18 +02:00
Guillaume Damiand 8ac37cc7df Add missing link with glu in demo. 2016-06-02 12:25:39 +02:00
Guillaume Damiand 10469f9c4e Update with master 2016-05-25 10:58:55 +02:00
Maxime Gimeno 524a8da107 Remove glu from all the CMakeLists 2016-04-14 09:29:50 +02:00
Sébastien Loriot 4c29bf1b44 CMAKE_SOURCE_DIR -> CMAKE_CURRENT_SOURCE_DIR 2016-03-24 16:33:46 +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
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
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
Maxime Gimeno 552aaa159f Fix for the context 2016-02-09 14:48:26 +01:00
Sebastien Loriot 32a3972c33 Merge pull request #592 from afabri/CGAL-dont_submit_cleanup-GF 
Towards getting rid of dont_submit files
 2016-01-08 14:14:08 +01:00
Andreas Fabri 66a215a6ac files in dont_submit do not exist 2015-12-31 16:26:03 +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
Sébastien Loriot 6d5a92ebcb try to improve cgalRequires removal 2015-11-23 22:06:06 +01:00
Maxime Gimeno 7b4267c162 Replacement of cgalRequires 
-fix for #291
 2015-11-23 22:06:06 +01:00
Laurent Rineau 7ddefbdcc8 Merge pull request #297 from afabri/CGAL-assert-GF 
assert() should not be used in CGAL headers!
 2015-09-07 10:58:20 +02:00
Andreas Fabri 1e2ff1131e assert -> CGAL_assertion 2015-08-27 16:51:55 +02:00
Maxime Gimeno a3addbfd9b Fix 
- Polyhedron : spaces in a shader made it invalid
- Circular Kernel : green intersection spheres are back : wrong attribute in the draw function
- Alpha Shapes : "in" remained in the shaders.
 2015-08-14 13:56:43 +02:00
Maxime Gimeno 95f87a3ac5 Depth test problem fix 
- Calling glEnable(GL_DEPTH_TEST) in the beginning of every draw should solve this problem.
 2015-08-13 14:08:12 +02:00
Maxime Gimeno 7d220d3da8 Context 3.3 Core changed into 2.1 2015-08-10 08:59:54 +02:00
Laurent Rineau 55c30d0808 Qt::AA_UseDesktopOpenGL is usable from Qt-5.3 only 2015-08-04 10:55:26 +02:00
Laurent Rineau cb0bdd3ad2 Remove warnings about unused moc files 
Should fix #194.
 2015-08-03 16:27:28 +02:00
Laurent Rineau 04db43556f Do not warn when Qt5 is not found. 2015-07-13 15:55:41 +02:00
Laurent Rineau 15c1469a54 CGAL requires CMake>=2.8.11. 2015-07-10 17:01:42 +02:00
Laurent Rineau 3ec0c69f8f We want 2.8.10 for all demos 
Previous versions are not tested by the CGAL daily test suite.
 2015-07-09 17:50:22 +02:00
Andreas Fabri 2289e5a2af static_ccasts 2015-07-09 13:05:22 +02:00
Maxime Gimeno 278e9d9829 Merge branch 'CGAL-Qt5_support-GF' of github.com:CGAL/cgal-public-dev into CGAL-Qt5_support-GF 
Conflicts:
	Circular_kernel_3/demo/Circular_kernel_3/Circular_kernel_3.cpp
	Periodic_3_triangulation_3/demo/Periodic_3_triangulation_3/MainWindow.h
 2015-07-08 12:40:14 +02:00
Maxime Gimeno f76bb19734 Windows fix 
- add an attribute at the application in the main() function
- add a custom context to the viewer
 2015-07-08 12:16:51 +02:00
Sébastien Loriot 1d4358e052 update qt urls 2015-07-08 09:48:45 +02:00
Sébastien Loriot 722abba27b cosmetic changes to remove mentions of QT4 2015-07-07 18:00:43 +02:00
Laurent Rineau 517588ebfc Re-add removed files 
Partially revert "Merge branch 'Polyhedron-new_opengl_REBASED_to_ignore_reindentations-gf' into CGAL-Qt5_support-GF"

This reverts partially commit ed3298ee2f, reversing
changes made to ba4ede5f50.
 2015-07-07 16:19:16 +02:00
Maxime Gimeno e12b46d285 Supposed to make windows able to run this demo 
- Add setAttribute() to use desktop OGL in the main function
 - create a specific context in the Viewer's creator
 2015-07-07 15:56:51 +02:00
Laurent Rineau b80a4b6557 Re-add a removed file 
Partially revert "Merge and new plugin fixes"

This reverts partially commit
8ab112f5bd. Only the removal of
Alpha_shapes_3/test/Alpha_shapes_3/data/fin is reverted.
 2015-07-07 13:50:07 +02:00
Sébastien Loriot 84dfabf3b4 remove REQUIRED keyword for CGAL_Qt5 in demos 
The handling should be with a status message
 2015-07-07 11:23:46 +02:00
Maxime Gimeno 85afa81ebd Changed() fixed. 2015-07-07 08:33:47 +02:00
Laurent Rineau e5bcdc5f3e Update all CMakeLists.txt 
- CMake 2.8.11 or later is now required
- GLEW is no longer used by demo/Polyhedron/
 2015-07-06 18:14:34 +02:00
Maxime Gimeno 8ab112f5bd Merge and new plugin fixes 2015-06-30 13:03:20 +02:00
Maxime Gimeno a0e7a60973 Merge remote-tracking branch 'cgal/master' into CGAL-Qt5_support-GF 
Conflicts:
	Alpha_shapes_3/demo/Alpha_shapes_3/CMakeLists.txt
	Alpha_shapes_3/demo/Alpha_shapes_3/MainWindow.cpp
	Alpha_shapes_3/demo/Alpha_shapes_3/Viewer.h
	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/Segment_Delaunay_graph_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/demo/Triangulation_2/CMakeLists.txt
	Linear_cell_complex/demo/Linear_cell_complex/CMakeLists.txt
	Mesh_3/demo/Mesh_3/CMakeLists.txt
	Mesh_3/demo/Mesh_3/include/CGAL_demo/Scene_item_with_display_list.h
	Mesh_3/demo/Mesh_3/src/CGAL_demo/Scene.cpp
	Periodic_3_triangulation_3/demo/Periodic_3_triangulation_3/CMakeLists.txt
	Periodic_3_triangulation_3/demo/Periodic_3_triangulation_3/Scene.cpp
	Polyhedron/demo/Polyhedron/CMakeLists.txt
	Polyhedron/demo/Polyhedron/Polyhedron_demo_join_and_split_polyhedra_plugin.cpp
	Polyhedron/demo/Polyhedron/Polyhedron_demo_mesh_3_plugin.cpp
	Polyhedron/demo/Polyhedron/Polyhedron_demo_trivial_plugin.cpp
	Polyhedron/demo/Polyhedron/Scene.cpp
	Polyhedron/demo/Polyhedron/Scene_combinatorial_map_item.h
	Polyhedron/demo/Polyhedron/Scene_implicit_function_item.h
	Polyhedron/demo/Polyhedron/Scene_plane_item.h
	Polyhedron/demo/Polyhedron/Scene_polygon_soup_item.cpp
	Polyhedron/demo/Polyhedron/Scene_polyhedron_item.cpp
	Polyhedron/demo/Polyhedron/Scene_polyhedron_item.h
	Polyhedron/demo/Polyhedron/Scene_polyhedron_transform_item.h
	Polyhedron/demo/Polyhedron/Scene_polylines_item.h
	Polyline_simplification_2/demo/Polyline_simplification_2/CMakeLists.txt
	Surface_mesher/demo/Surface_mesher/CMakeLists.txt
	Triangulation_3/demo/Triangulation_3/CMakeLists.txt
	Triangulation_3/demo/Triangulation_3/MainWindow.cpp
 2015-06-30 09:17:26 +02:00
Laurent Rineau de7db3ca68 Merge pull request #111 from aympelle/Periodic_3_Delaunay_triangulation_traits_3-APelle 
- Rename `Periodic_3_triangulation_traits_3` to `Periodic_3_Delaunay_triangulation_traits_3`.
- Rename the concept `Periodic_3TriangulationTraits_3` to `Periodic_3DelaunayTriangulationTraits_3`.
- Create `Periodic_3_triangulation_traits_3`.
- Create the concept `Periodic_3TriangulationTraits_3`.

https://cgal.geometryfactory.com/CGAL/Members/wiki/Features/Small_Features/rename_p3tt3_p3dtt3
 2015-06-17 09:59:33 +02:00
Aymeric PELLE 3aeaa24ef7 Alpha_shapes must use P3DTT3 now. 2015-06-05 18:41:12 +02:00
Andreas Fabri 81ca925a34 Alpha_shapes_3 2015-05-06 09:17:14 +02:00
Maxime Gimeno ed3298ee2f Merge branch 'Polyhedron-new_opengl_REBASED_to_ignore_reindentations-gf' into CGAL-Qt5_support-GF 
Conflicts:
	Polyhedron/demo/Polyhedron/CMakeLists.txt
	Polyhedron/demo/Polyhedron/Polyhedron_demo_mesh_3_plugin.cpp
	Polyhedron/demo/Polyhedron/Polyhedron_demo_mesh_3_plugin_cgal_code.cpp
	Polyhedron/demo/Polyhedron/Polyhedron_demo_selection_plugin.cpp
	Polyhedron/demo/Polyhedron/Polyhedron_demo_trivial_plugin.cpp
	Polyhedron/demo/Polyhedron/Scene.cpp
 2015-04-27 08:50:06 +02:00
Maxime Gimeno ba4ede5f50 Clean-up 
- removed the unused functions and dependencies
- Replaced QGLBuffer by QOpenGLBuffer
 2015-04-24 12:54:05 +02:00
Maxime Gimeno 7ba2835c1f Upgrade to OpenGL 3.3 with Qt wrappers 
- no more glu dependency
- smooth spheres
- less light but gestion of the light on the circles
 2015-04-09 15:31:54 +02:00
Maxime Gimeno ce428fd9ed Memory Optimisation 
- Resized the buffers and vao arrays to fit their actual numbers.
 2015-04-09 10:54:20 +02:00
Maxime Gimeno 07222c791f Upgrade to OpenGL3 with Qt wrappers 
- added a function "alphaChanged" to update only the facets when the alpha number changes.
- added the set of function for the shaders
- added a function initializeGL and made Viewer inheritate from QGlFunctions to be able to use the QOpenGL functions
 2015-04-09 09:57:57 +02:00
Maxime Gimeno 60b47f0978 Succesfully upgraded to Qt5 2015-04-01 12:18:59 +02:00