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

261 Commits

Author SHA1 Message Date
Guillaume Damiand 0bd9088b5a Remove all include( ) and include( CGAL_CreateSingleSourceCGALProgram ) in CMakeLists.txt; they are no more required. 2018-10-17 14:17:08 +02:00
Maxime Gimeno 4086888964 Update glCode in 3D demos 2018-07-06 12:08:22 +02:00
Laurent Rineau 08043e442c Merge pull request #2835 from gdamiand/CGAL-basic_viewers-gdamiand 
Add basic viewers
 2018-06-14 17:36:37 +02:00
Maxime Gimeno 605bf1da52 Add missing includes in other plugins 2018-06-05 12:08:08 +02:00
Guillaume Damiand 53769e98a7 * Add draw examples in the 5 concerned packages (Polyhedron, Surface_mesh, T2, T3, LCC) 
* Update FindQGLViewel to add a target.
 2018-05-29 11:11:49 +02:00
Andreas Fabri 4712fbeb0d Fixes in Linear cell complex demo 2018-05-18 07:51:41 +01:00
Maxime Gimeno 25685fbedd add missing include 2018-05-17 10:43:03 +02:00
Maxime Gimeno f22c2864a0 Put qglviewer in the namespace CGAL 2018-05-17 10:20:56 +02:00
Andreas Fabri ff0836ec79 cleanup 2018-05-17 10:20:56 +02:00
Maxime Gimeno 6584abd90b Use integrated qglviewer for 3D demos 2018-05-17 10:20:55 +02:00
Sébastien Loriot 01af331c72 use https for all links to www.cgal.org and doc.cgal.org 2018-03-14 15:59:38 +01:00
Laurent Rineau 0b0b1503ef Merge pull request #2594 from gdamiand/CMap-bugfixes-gdamiand 
CMap bugfixes
 2017-12-05 18:20:56 +01: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 6ec4c12031 Do not use OpenGL directly, but only using Qt5 OpenGL classes 2017-11-28 17:58:12 +01:00
Laurent Rineau 25dffa1710 Modern usage of Qt5 CMake scripts, to allow CMAKE_WARN_DEPRECATED 2017-11-17 12:54:13 +01:00
Laurent Rineau bbee705221 Add compilation tests for demos 2017-11-16 18:38:15 +01:00
Laurent Rineau a9365554c9 Merge pull request #2550 from sloriot/CGAL-add_SPDX_tags 
Add SPDX License Identifier
 2017-11-15 16:48:27 +01:00
Guillaume Damiand 0783fa8241 Do not clear model before loading something; this is more generic. 2017-11-13 12:24:24 +01:00
Sébastien Loriot 0698f79aff add SPDX identifier for files under the LGPL-3+ license 2017-11-12 10:17:50 +01:00
Laurent Rineau 62c70d41ca Renew the handle of policies, for CMake-3.10 
Now that we require CMake>=3.1, we can forget a lot of old CMake policies.

`CMP0053` `OLD` behavior is still needed, because of a bug in Qt5 CMake files, but it will
not be set with CMake>=3.10. Let's assume that a recent CMake version means
a recent Qt5 version.
 2017-11-06 14:58:36 +01:00
Maxime Gimeno 831f0239cb Fix CMP0071 warning. 2017-08-03 10:38:19 +02:00
Maxime Gimeno f1a7ddf5b8 FIx LCC demo for QGLViewer v2.7 2017-07-10 16:11:09 +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
Andreas Fabri 3f5a0bd27a Linear_cell_complex_demo: Reorder includes to work around a bug in boost 
Reordering includes of CGAL headers changes the inclusion order
for boost headers.  The test file  flat.cpp should reveal the bug
 2017-01-13 10:57:21 +01:00
Guillaume Damiand a9ac4013fa Update lcc demo and viewer to allow to reverse normal and to change the light. 2016-11-29 11:43:46 +01:00
Guillaume Damiand 0a95173dc7 Add an entry in the demo to reverse the orientation of objects. 2016-11-29 11:43:46 +01:00
Guillaume Damiand 5ff5358c51 Remove template keyword outside template class 2016-11-29 11:43:44 +01:00
Guillaume Damiand 81a8184879 Update demo following the renaming of .h to import from T3 and Polyhedron3 2016-11-29 11:43:38 +01:00
Guillaume Damiand 4bacc7a25a Remove some useless include; set constructor of Dart and attribute protected; check for friend directives. 2016-11-29 11:43:35 +01:00
Guillaume Damiand a0fb8e0a26 Update LCC operations to work with CMap and GMap 2016-11-29 11:43:35 +01:00
Guillaume Damiand 8d22d7e7dc Update LCC to be compatible both for CMap and GMap. 2016-11-29 11:43:34 +01:00
Guillaume Damiand 233840ffc5 Replace pointer by reference in all functions. 
This allows to use non const reference in Foreach_static functor (why this is not possible with pointers ? there is some black magic under tuple and variadic template...).

Thanks to this possibility, remove static variables used to return value in two functors.
 2016-11-29 11:43:33 +01:00
Guillaume Damiand 2aff4068b5 Allow to not define Dart_info and Attributes type in item class. 2016-11-29 11:43:32 +01:00
Guillaume Damiand 4624a0b97b Factorize dart between CMap and GMap. 
Now we use the same class in both packages.
TODO: modify the doc accordingly.
 2016-11-29 11:43:31 +01:00
Guillaume Damiand b12b490e12 Rename classes. 2016-11-29 11:43:29 +01:00
Laurent Rineau 223c1cf5a4 Merge pull request #1530 from lrineau/Installation-compute_dependencies-GF 
Compute and fix packages dependencies
 2016-10-05 13:11:04 +02:00
Laurent Rineau 3fac1b31f0 Fix typos (and compilation errors!) 2016-10-03 12:12:46 +02:00
Andreas Fabri cebf2f8bab include import_from_.. headers in LCC demo 2016-10-03 08:53:28 +02:00
Sébastien Loriot e78bef8a9c update project name of demos 2016-09-08 00:13:34 +02:00
Guillaume Damiand 10469f9c4e Update with master 2016-05-25 10:58:55 +02:00
Sebastien Loriot 4d56e3ef51 Merge pull request #971 from gdamiand/CMap-global_functions-gdamiand 
Combinatorial map: remove global functions
 2016-05-10 09:26:58 +02:00
Guillaume Damiand afb03a8ae4 Remove the use of deprecated functions. 2016-04-01 22:44:29 +02:00
Guillaume Damiand 547ca15400 Demo of lcc must link with glu library 2016-03-23 15:07:18 +01:00
Guillaume Damiand e24572c942 demo updating for LCC after deprecation of global functions. 2016-03-09 19:00:16 +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 d7e9261d58 hide the filtered projection traits behind the projection traits 
the selection of the base class is done using Kernel::Has_filtered_predicates
 2016-03-02 21:57:54 +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
Maxime Gimeno 552aaa159f Fix for the context 2016-02-09 14:48:26 +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
Guillaume Damiand ec54248572 reverse the orientation of created cube to have a correct normal orientation. 2015-11-04 11:30:47 +01:00
Guillaume Damiand a9f2278c5b Better position for light. 2015-11-04 11:29:59 +01:00
Guillaume Damiand 3f206e9b60 Improve drawing. 2015-11-03 17:36:52 +01:00
Guillaume Damiand a21da00c9d Improve drawing 2015-11-02 15:14:50 +01:00
Guillaume Damiand d02357fb9c Remplace int by size_type for mark 2015-10-28 18:56:46 +01:00
Guillaume Damiand 97f44c5749 Add smoth display mode in LCC demo. 2015-10-02 15:01:19 +02:00
Guillaume Damiand 558fbb7f04 Improve triangulation method 2015-10-02 12:05:58 +02:00
Guillaume Damiand 43d4380537 Update drawing function to allow to draw faces with holes. 2015-10-01 19:21:47 +02:00
Guillaume Damiand 0f7bb719f3 Merge branch 'CMap-marks_with_exceptions-sbrandel-old' into CMap-marks_with_exceptions-sbrandel 2015-10-01 18:31:45 +02:00
Laurent Rineau 09766139ec Fix a warning about moc 
The warning was:

    Linear_cell_complex/demo/Linear_cell_complex/MainWindow.cpp:0: Note: No relevant classes found. No output generated.
 2015-09-17 15:38:28 +02:00
Guillaume Damiand e2656f9600 Remove glu link in cmake 2015-09-03 12:35:42 +02:00
Guillaume Damiand 9b4b3ee846 More cleanup plus do not recenter the scene at each modification. 2015-09-03 12:32:20 +02:00
Guillaume Damiand 98b36b260e Update light parameters 2015-08-31 08:18:04 +02:00
Guillaume Damiand 24840dbd5c Improve drawing code in LCC demo. 2015-08-29 14:43:52 +02:00
Guillaume Damiand 921416603f Reintegrate LCC demo save/load in the new qt5 version ok. 2015-08-28 14:43:07 +02:00
Guillaume Damiand 600e7b1b30 Start to merge with the new qt5 version of the LCC demo (nyf). 2015-08-28 11:51:48 +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 ee2b0b2011 Transparent facets fix 
- set the alpha value to 1 in the shaders to insure opaque color.
 2015-08-13 11:56:04 +02:00
Maxime Gimeno 52a35d4d8d Random displaying fix 
- The bounding box was set before being initialized.
 2015-08-13 08:55:10 +02:00
Maxime Gimeno 3a5d0a79fc Mesa Fix 
- Replaced the 3.3 context by a 2.1 context
- Set the shaders version to 120
 2015-08-10 10:11:29 +02:00
Maxime Gimeno e413b0c45a GLSL Version changed 
- Shaders specify version 140 (opengl 3.1) instead of 330. This should fix the "GLSL 3.30 is not supported" error.
 2015-08-06 15:19:36 +02:00
Laurent Rineau 508b467203 Merge branch 'CGAL-Qt5_support-GF' 2015-08-05 11:23:40 +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
Maxime Gimeno 1b14d447e5 SEGFAULT Fix 
- the iterator he_circ was looping wrong. I changed he_circ_end(he_circ) in
he_circ_end = lcc.darts_of_orbit<1>(dartIter).end();
 2015-08-03 12:57:45 +02:00
Sébastien Loriot 590106f5fc Changes in the other demos due to Polygon_mesh_processing package (PMP) 2015-07-16 17:27:17 +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 6c46be1d01 static_casts 2015-07-09 13:17:41 +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 e199f546d4 remove QT4 specific code 2015-07-07 19:36:04 +02:00
Sébastien Loriot 722abba27b cosmetic changes to remove mentions of QT4 2015-07-07 18:00:43 +02:00
Andreas Fabri 3c46e5262d less typenames 2015-07-07 16:45:26 +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 32a8cb7d0c Changed system fixed. 
- Problem remaining : OFF aren't displayed when loaded.Scene need an additional scene_changed to display OFFs.
 2015-07-07 09:07:04 +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
Guillaume Damiand 662408b2f8 Improve merge coplanar faces method. 2015-07-01 15:21:35 +02:00
Guillaume Damiand 7f0b73634a Remove typename outside templace class 2015-07-01 07:28:37 +02:00
Guillaume Damiand fbfd47896b Remove the use of glu tesselator to draw non convex faces. 2015-06-30 14:22:53 +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
Guillaume Damiand cf563fa834 Disable non flat rendering; add casts to solve problem of gluTessCallback on win32. 2015-06-25 16:09:51 +02:00
Guillaume Damiand ff15468079 Remove flag in cmake, pushed by error 2015-06-22 16:02:32 +02:00
Guillaume Damiand 6395db7d5e Increase the size of the first column. 2015-06-18 09:55:35 +02:00
Guillaume Damiand a57e127412 Remove warnings 2015-06-17 09:45:59 +02:00
Guillaume Damiand 37b0d2256c * Better drawing when scene was empty. 
* Bug fix in triangulate all faces
 2015-06-16 12:14:47 +02:00