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

217 Commits

Author SHA1 Message Date
Maxime Gimeno 2156017402 Remove native gl.h include and native gl code in Surface_mesher/archive 2018-02-28 10:36:26 +01:00
Andreas Fabri 52549b1145 STL_extension: Introduce CGAL::iterator as replacement for the deprecated std::iterator 2018-02-14 18:46:45 +00:00
Laurent Rineau 3c6640bf59 Merge pull request #1436 from lrineau/CGAL-new_cmake-GF 
Renewal of CMake scripts: header-only, ctest, CMake>=3.1

# Conflicts:
#	Installation/config/testfiles/CGAL_CFG_NESTED_CLASS_FRIEND_DECLARATION_BUG.cpp
 2017-12-05 18:20:05 +01:00
Laurent Rineau 3466eb83f0 Polyhedron demo: do not use the OpenGL API directly 2017-11-28 17:54:38 +01:00
Sébastien Loriot ff26773f7b remove include directive for checking GPL compliance in LGPL headers 2017-11-12 10:21:35 +01:00
Sébastien Loriot ee57fc2d6c add SPDX identifier for files under the GPL-3+ license 2017-11-12 10:17:51 +01:00
Sébastien Loriot 0698f79aff add SPDX identifier for files under the LGPL-3+ license 2017-11-12 10:17:50 +01:00
Michael Vetter 154c48e8e3 Include OpenGL ES for arm 
If we compile CGAL with having Qt present on arm, Qt will use OpenGL ES
headers. But CGAL/gl.h includes specifically include <GL/gl.h> which are
the desktop headers. They cannot be mixed.
 2017-09-27 15:59:28 +02:00
Mael Rouxel-Labbé 16392c92d1 Fixed bare_point / weighted_point issue 2017-06-28 10:15:30 +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
Andreas Fabri 76d751be01 Use CGAL_FALLTHROUGH 2016-10-17 13:45:42 +02:00
Andreas Fabri 335a87df79 Fix package GraphicsView: include headers 2016-09-30 15:23:14 +02:00
Laurent Rineau 2bb72c7f26 Compatibility with QT_NO_KEYWORDS 2016-03-09 17:02:59 +01:00
Maxime Gimeno b9856fe1a7 - fix MESA 
Restoring the memory leak in order to keep the demo running on Mesa.
 2016-02-17 15:18:11 +01:00
Sebastien Loriot 69ba6238a3 Merge pull request #764 from maxGimeno/Fix_For_761 
Fix for 761
 2016-02-16 16:21:56 +01:00
Maxime Gimeno 507fdc9f58 Fix the MemoryLeak 2016-02-12 09:26:32 +01:00
Laurent Rineau 8b22743b06 Merge pull request #766 from maxGimeno/LCC_Demo-MSAA_removal-GF 
Removal of the MSAA in LCC

Conflicts:
	GraphicsView/include/CGAL/Qt/CreateOpenGLContext.h
	Linear_cell_complex/demo/Linear_cell_complex/Viewer.cpp
 2016-02-11 15:13:18 +01:00
Maxime Gimeno 9da8afe1f1 Removal of the MSAA in LCC 2016-02-11 14:27:44 +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
Sebastien Loriot ed557b907d Merge pull request #735 from maxGimeno/Surface_mesher_demo-Glu_removal-GF 
Surface_mesher : Glu removal
 2016-02-10 10:40:51 +01:00
Maxime Gimeno 552aaa159f Fix for the context 2016-02-09 14:48:26 +01:00
Maxime Gimeno 453708380b Fix for windows 2016-02-09 11:41:28 +01:00
Maxime Gimeno 49e5043f09 Replacing GL/gl.h by CGAL/gl.h 2016-02-08 08:53:45 +01:00
Maxime Gimeno b99c616c23 Re-implementation of opengl_check_errors 2016-02-05 08:36:54 +01:00
Sébastien Loriot e211843b4f Merge pull request #654 from maxGimeno/FixForMac-GF 
Demo fix for OS X (fix for #437)
 2016-02-03 14:39:48 +01:00
Maxime Gimeno 9f9e127aaa Addition of a QPen in SegmentGraphicsItem 2016-01-25 14:12:19 +01:00
Maxime Gimeno eb867bb810 Addition of a specific function for the MSAA in LCC 2016-01-20 14:35:00 +01:00
Maxime Gimeno 517ff8321a Fix for LCC_demo 
- The setSamples(16) was causing a segfault. I moved it in the createOpenGLContext(). If the other demos performances are affected by this, a new function will have to be created.
 2016-01-19 17:13:06 +01:00
Maxime Gimeno 0547f19d58 WIP A fix for mac 
- repared the demo
- Disabled the splatting.
 2016-01-19 10:28:05 +01:00
Guillaume Damiand cf1c0ea0ca Merge branch 'CGAL_headers_only-gdamiand_cjamin-OLD' into CGAL_headers_only-gdamiand_cjamin 2015-10-01 09:12:55 +02:00
Maxime Gimeno 7d220d3da8 Context 3.3 Core changed into 2.1 2015-08-10 08:59:54 +02:00
Andreas Fabri f864b0a8e8 fix line width in demos using GraphicsView 2015-07-28 15:46:11 +02:00
Maxime Gimeno a571e1db8d Clean-up 2015-07-16 08:26:41 +02:00
Laurent Rineau fa13f4ed0c Merge remote-tracking branch 'philaris/sdglinf-philaris' into CGAL-Qt5_support-GF 2015-07-10 17:28:07 +02:00
Andreas Fabri 27024787be QGraphicsItem is no longer an interface 2015-07-08 13:07:35 +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 c29b3cb700 Inline function used to define an OpenGL context for openGL 3.3. 2015-07-08 12:18:15 +02:00
Sébastien Loriot e199f546d4 remove QT4 specific code 2015-07-07 19:36:04 +02:00
Sébastien Loriot 0d431e39ab remove qt4 specific code 2015-07-07 18:00:43 +02:00
Sandeep Kumar Dey 134ca52fea license header 2015-07-03 13:31:22 +02:00
Panagiotis Cheilaris 4eabd4c09c remove sdglinf painter, widget warnings 2015-06-30 10:32:09 +02:00
Panagiotis Cheilaris b4236a0f1f renames to be like formal CGAL repository 
I have only kept in an include directory at the root
the change in arrangement point location.

This change also requires to use some special local
includes in CMakeLists.txt files. I will do it in a
subsequent commit.
 2015-06-30 10:31:01 +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
Sébastien Loriot ce8806b19b Merge remote-tracking branch 'cgal-dev/CGAL-Qt_no_keywords-GF' into Mesh_2-add_optimizers-GF 
Conflicts:
	GraphicsView/demo/Triangulation_2/Constrained_Delaunay_triangulation_2.cpp
 2015-05-19 09:07:08 +02:00
Andreas Fabri 693db86912 Add typenames; reorder member initialization; add this-> 2015-05-19 09:04:27 +02:00
Sébastien Loriot 7cabb0c508 Merge branch 'rebase/Mesh_2-add_optimizers-GF-old' into rebase/Mesh_2-add_optimizers-GF 
Conflicts:
	GraphicsView/demo/Triangulation_2/Constrained_Delaunay_triangulation_2.cpp
	GraphicsView/demo/Triangulation_2/Constrained_Delaunay_triangulation_2.ui
	Triangulation_2/include/CGAL/Constrained_Delaunay_triangulation_2.h
 2015-05-19 09:01:20 +02:00
Jane Tournois 717e795c1a make the specification of DelaunayMeshFaceBase_2 complete 
+ change access functions names to make them conform to CGAL
+ add preconditions in the code
 2015-05-19 08:54:33 +02:00
Jane Tournois 4cf8655c00 move all the cdt.dual(v) code from Triangulation_2 to Mesh_2 
we do not change the API of Triangulation_2 for now
maybe later, and this version should be easy to keep backward compatible
 2015-05-19 08:54:33 +02:00
Andreas Fabri 8e393c792c Graphicsview demos 2015-05-06 17:11:04 +02:00
Andreas Fabri 85e409f413 Polyline simplification demo 2015-05-06 16:06:33 +02:00