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

1168 Commits

Author SHA1 Message Date
Maxime Gimeno 2dbbca18b3 Restore point size 2018-07-02 11:09:48 +02:00
Maxime Gimeno 54e0e16167 Restore 4.3 context 2018-07-02 10:04:40 +02:00
Jane 93d9e8e227 Remove problematic gl calls 2018-06-29 18:40:25 +02:00
Maxime Gimeno 301416c151 Pass to OpenGL_ES_2 2018-06-29 12:06:06 +02:00
Laurent Rineau 742dd907ed Merge pull request #3074 from maxGimeno/Demo-Add_transparency-GF 
Polyhedron demo: add Depth-peeling and Rendering Helpers
 2018-06-28 16:04:12 +02:00
Laurent Rineau b86fff3f90 Merge pull request #3128 from sgiraudot/Solver_interface-Warn_against_diagonalize_traits-GF 
Solver Interface: deprecate CGAL::Diagonalize_traits
 2018-06-27 10:21:37 +02:00
Maxime Gimeno 8e3eebea0d Fix Conflicts 2018-06-26 15:17:58 +02:00
Maxime Gimeno 2f4f22d236 Merge remote-tracking branch 'cgal/master' into Demo-Add_transparency-GF 2018-06-21 11:42:26 +02:00
Laurent Rineau 5ec1b841b7 Merge pull request #3170 from MaelRL/CGAL-Fix_some_STL_extension_namespaces-GF 
STL_Extension: move CGAL::iterator and CGAL::unary/binary functions to CGAL::cpp98::
 2018-06-20 17:21:01 +02:00
Simon Giraudot 06c0835a3b Add Eigen dependency in CMakeLists of demos that need it 2018-06-19 11:00:02 +02:00
Laurent Rineau 2b33f0690d Merge pull request #2687 from maxGimeno/OpenGL-debugging_option-GF 
Polyhedron demo: add some OpenGL debugging information
 2018-06-14 17:36:54 +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
Laurent Rineau 3a4121b207 Merge pull request #3148 from maxGimeno/Demo-Fix_orthographic_projection-GF 
Polyhedron demo:Fix_orthographic selection

# Conflicts:
#	GraphicsView/include/CGAL/Qt/qglviewer_impl.h
 2018-06-14 17:36:26 +02:00
Mael Rouxel-Labbé 6283291c8a Moved CGAL::iterator to CGAL::cpp98 2018-06-13 15:58:19 +02:00
Maxime Gimeno 8e7fc0b852 Merge master to solve conflicts. 2018-06-13 09:40:56 +02:00
Laurent Rineau a3a2a1d9de
Use Vec in the CGAL::qglviewer namespace 2018-06-12 16:15:34 +00:00
Laurent Rineau 5c6eee6ac3 Merge branch 'master' into Demo-Fix_orthographic_projection-GF 2018-06-12 18:01:55 +02:00
Laurent Rineau 1df3c3e922 Merge branch 'master' into GraphicsView-no_using_namespace_std-GF 2018-06-12 17:37:15 +02:00
Guillaume Damiand c08546276b Factorize draw functions in Basic_viewer_qt.h, when CGAL_USE_BASIC_VIEWER is not defined. 2018-06-11 13:06:20 +02:00
Maxime Gimeno 87fb0cc39a Remove remaining legacy code that generated GL_STACK_UNDERFLOW errors. 2018-06-07 09:56:08 +02:00
Maxime Gimeno 1c6a96d1cf Add qt gl debugging info. 2018-06-06 16:59:34 +02:00
Maxime Gimeno c4b28fd000 Remove the using namespace from the impl files 2018-06-06 16:15:55 +02:00
Laurent Rineau 1f646405e8 Fix -Wconversion warnings (and a few others) in QGLViewer 2018-06-05 14:48:24 +02:00
Maxime Gimeno 39a645883b add misisng namespace before EXIT_VIEWER 2018-06-05 09:45:40 +02:00
Maxime Gimeno 2e56820d8d Fix after rebase 2018-06-04 12:00:22 +02:00
Maxime Gimeno 21359581c4 Add viewer's modifications to CGAL_Qt5 2018-06-04 12:00:22 +02:00
Maxime Gimeno 12ba1084ad Add classes and functions to factorize and facilitate rendering an item. 
Make Surface_mesh_item use them.
 2018-06-04 12:00:21 +02:00
Maxime Gimeno 025968643b Fix_orthographic selection 2018-06-04 11:44:56 +02:00
Andreas Fabri 1969ee9853 Fix the license header, as the dual licensing does not apply to pur fork 2018-05-31 10:05:46 +01:00
Andreas Fabri f5b6ec67ef Remove 'using namespace std;' from the qglviewer files 2018-05-31 09:44:49 +01:00
Maxime Gimeno 979bde1025 Fix Triangulation_3 viewer 2018-05-29 11:27:53 +02:00
Guillaume Damiand 4c5b0d31d4 Remove unused variable 2018-05-29 11:11:50 +02:00
Andreas Fabri 4b14990209 Fix warnings; Remove typename in non-template code 2018-05-29 11:11:50 +02:00
Guillaume Damiand ed0c55df89 Bugfix in function that test if a face is convex. 2018-05-29 11:11:50 +02:00
Guillaume Damiand 21012cb0a3 Comment optimization done for convex facets for now, because there is a bug in the test code. Todo: solve the bug (maybe use a better test ?) 2018-05-29 11:11:50 +02:00
Guillaume Damiand 035dd7cd24 Add missing inline; to avoid a multiply defined function. 2018-05-29 11:11:50 +02:00
Guillaume Damiand 39de8ac459 Add licence includes 2018-05-29 11:11:49 +02:00
Guillaume Damiand d8a62aa2c8 Update licence headers of new files. 2018-05-29 11:11:49 +02:00
Guillaume Damiand dba44f48a1 Harmonize the 5 basic viewers. 2018-05-29 11:11:49 +02:00
Guillaume Damiand 82e30832ed Add a redraw method. 2018-05-29 11:04:57 +02:00
Guillaume Damiand b5a4cd1e4a One more bug fix in Buffer_for_vao.h 2018-05-29 11:04:57 +02:00
Guillaume Damiand 4f93b87634 Update is_facet_convex function; I think this is better now. 2018-05-29 11:04:57 +02:00
Guillaume Damiand f1e9fc7ed8 Move class in CGAL namespace 2018-05-29 11:04:57 +02:00
Guillaume Damiand 49de2dee13 Bug fix in quadrangular smooth normals 2018-05-29 11:04:57 +02:00
Guillaume Damiand e0aa99d798 Add the possibility to add weighted point 2 in basic viewer 2018-05-29 11:02:00 +02:00
Guillaume Damiand 62492150e0 Update Buffer_for_vao and Basic_viewer_qt 2018-05-29 11:02:00 +02:00
Guillaume Damiand b22c9959f6 Update buffer for vao to allow the use of indexed points 2018-05-29 11:02:00 +02:00
Guillaume Damiand 9bde858140 update 2018-05-29 11:02:00 +02:00
Guillaume Damiand a7b9656d52 Start to integrate version with indices 2018-05-29 11:02:00 +02:00
Guillaume Damiand 5b8e6d349b Update Buffer_for_vao: byf 2018-05-29 11:02:00 +02:00
Guillaume Damiand f70c6fed86 Update basic viewer to: (1) use a generic class that can maybe be used also in demos; (2) use same name to add mono/colored objects. 2018-05-29 11:02:00 +02:00
Guillaume Damiand 0e6eded6b7 Update basic viewer. 2018-05-29 11:01:59 +02:00
Guillaume Damiand cc3410a729 Bugfix in basic viewer. 2018-05-29 11:01:59 +02:00
Guillaume Damiand 374da8b55d Update basic viewer. 2018-05-29 11:01:59 +02:00
Guillaume Damiand 9e4f2870b8 Work on generic display function. 2018-05-29 11:01:59 +02:00
Maxime Gimeno d617e33253 Add possibly missing include QMouseEvent containing the Qt::NoButton enum. 2018-05-18 10:02:09 +02:00
Andreas Fabri 3804bf6983 Fix Triangulation_3 demo (CGAL_PI) 2018-05-18 08:01:26 +01:00
Andreas Fabri 13454d01c1 Replace M_PI with CGAL_PI 2018-05-17 10:26:08 +01:00
Maxime Gimeno f7d0fc72cd fix the <:: error 2018-05-17 10:20:57 +02:00
Maxime Gimeno 8bf7fcbfe1 Add missing license include 2018-05-17 10:20:57 +02:00
Maxime Gimeno f94a50646f Add license to new file 2018-05-17 10:20:57 +02:00
Maxime Gimeno 03aa69c039 Clean-up the code: 
Remove deprecated functions
Remove useless file
 2018-05-17 10:20:57 +02:00
Maxime Gimeno f22c2864a0 Put qglviewer in the namespace CGAL 2018-05-17 10:20:56 +02:00
Laurent Rineau 8fbab5edde Enfore singleton, using qApp->property 2018-05-17 10:20:56 +02:00
Jane Tournois 7d49e2fb17 make the copy-constructor private, and do not define it, 
to make sure it will not be used.

and add missing include
 2018-05-17 10:20:56 +02:00
Laurent Rineau 02d5c69066 typo: frok/fork 2018-05-17 10:20:56 +02:00
Maxime Gimeno 0d4c153da2 Fix ImageInterface UI management 2018-05-17 10:20:56 +02:00
Maxime Gimeno 1c8b2a02c9 use CGAL_QT_EXPORT 2018-05-17 10:20:56 +02:00
Maxime Gimeno 9c1c0b027a Fix UI management 2018-05-17 10:20:56 +02:00
Maxime Gimeno 130e42569e Fix snapshot for othographic view 2018-05-17 10:20:56 +02:00
Maxime Gimeno 55c3048a69 Remove GPL_EXCEPTION and add GeometryFactory 2018 copyrights 2018-05-17 10:20:56 +02:00
Maxime Gimeno c570c7ea7d Change text in licenzse headers tospecify this is a fork 2018-05-17 10:20:56 +02:00
Maxime Gimeno f1162b9914 Add missing tags in license headers 2018-05-17 10:20:56 +02:00
Maxime Gimeno cadee2cac1 force GPL 3.0 to test. 2018-05-17 10:20:56 +02:00
Maxime Gimeno 89882de039 Update licenses 2018-05-17 10:20:56 +02:00
Maxime Gimeno 2779034aa1 Fix Triangulation_2 2018-05-17 10:20:56 +02:00
Maxime Gimeno f1700285de Restore snapshot feature in P3T3 demo 2018-05-17 10:20:56 +02:00
Maxime Gimeno 495b087c6f Finish snapshot implem 2018-05-17 10:20:56 +02:00
Maxime Gimeno 37c52e6bbc WIP SnapShot and SPDX LICENSE update. 2018-05-17 10:20:56 +02:00
Maxime Gimeno 2077a84ea2 Update license file 2018-05-17 10:20:56 +02:00
Maxime Gimeno fb10d4ac55 Fix errors. 2018-05-17 10:20:56 +02:00
Maxime Gimeno 18e38c2344 Fix license GPL 3+ into GPL 3 2018-05-17 10:20:56 +02:00
Maxime Gimeno e7613f7841 restore erased file 2018-05-17 10:20:56 +02:00
Maxime Gimeno 8df643f390 update licenses 2018-05-17 10:20:56 +02:00
Maxime Gimeno 8c32592f83 Add missing file and fix interface for QGraphicsItem 2018-05-17 10:20:56 +02:00
Maxime Gimeno 4d13eb724f Remove render video feature of loyd demo and fix drawvisualhnts in the qglviewer code. 2018-05-17 10:20:55 +02:00
Maxime Gimeno 0c74a68952 WIP Header_only 2018-05-17 10:20:55 +02:00
Maxime Gimeno cbc0ce1130 remove snapsjot functions and files from qglviewer 2018-05-17 10:20:55 +02:00
Maxime Gimeno 50c471253a Move context creation to qglviewer. Replace initializeGL() by init()in demo viewer 2018-05-17 10:20:55 +02:00
Maxime Gimeno 4c6546a558 Clean-up the viewer 2018-05-17 10:20:55 +02:00
Maxime Gimeno 39a0b8a8d5 Restore pivot point drawing 2018-05-17 10:20:55 +02:00
Maxime Gimeno 3995c80524 fix warning in camera and fix fps display in cgal_qt5 so we don't have to overwrite it in the viewer 
Begin the implementation of the graphcal hints
 2018-05-17 10:20:55 +02:00
Maxime Gimeno 6584abd90b Use integrated qglviewer for 3D demos 2018-05-17 10:20:55 +02:00
Maxime Gimeno c0c7bd095d WIP: Include QGLViewer inside CGAL_qt5 2018-05-17 10:20:55 +02:00
Laurent Rineau 0bf465dee6
Fix indentation 2018-05-15 15:32:04 +00:00
Maxime Gimeno 76bd923003 Change expected extension for polygon type. 2018-05-15 10:04:24 +02:00
Maxime Gimeno 0d9f89cfbd Reset fstreams with code that is valid even without c++11 2018-05-15 10:04:23 +02:00
Maxime Gimeno df980abff6 Add WKT IO to 2D demos and add saving to stream_lines_2_demo 
Also adds traits for Point_3 to be able to interract with weighted points through them.
 2018-05-15 10:04:23 +02:00
Maxime Gimeno 6ec085ace0 Fix Triangulation icons and add a way to load wkt polygons in CDT demo 2018-05-15 10:04:23 +02:00
Maxime Gimeno d7905547e9 final poly fixes 2018-05-15 10:00:47 +02:00
Maxime Gimeno 80c7ddd254 change fake poly format to .polygon.cgal 2018-05-15 10:00:47 +02:00
Maxime Gimeno a4b2773879 add filter to spatial serching demo 2018-05-15 10:00:47 +02:00
Maxime Gimeno 0f1af8e92d add a filter to the snap_rounding demo 2018-05-15 10:00:47 +02:00
Maxime Gimeno d8b6cbd7af Add filters to Polygon demo 2018-05-15 10:00:47 +02:00
Maxime Gimeno ab29df058d Add a filter for P2T2 demo 2018-05-15 10:00:47 +02:00
Maxime Gimeno c86701de81 Add a filter for L1_voronoi_diagram_2 demo 2018-05-15 10:00:47 +02:00
Maxime Gimeno 2c424514dd add a filter for bounding_volumes_demo 2018-05-15 10:00:47 +02:00
Maxime Gimeno ad115d9628 Make a working IO for Apolonius_graph Demo 2018-05-15 10:00:47 +02:00
Maxime Gimeno 80eaf9a8dd Add a filter for alpha shapes 2 demo 2018-05-15 10:00:47 +02:00
Maxime Gimeno cf69391221 Make the IO of the Triangulation_2 demos coherent 2018-05-15 10:00:47 +02:00
Andreas Fabri 16e4cc5e4b Fix 2D Constrained Delaunay demo. The hint was outdated after cdt.clear() 2018-05-11 14:42:30 +01: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 0a74393dcf Commit all new dependencies files 2018-03-06 18:44:48 +01:00
Maxime Gimeno 2156017402 Remove native gl.h include and native gl code in Surface_mesher/archive 2018-02-28 10:36:26 +01:00
Laurent Rineau 85ce0157cf Merge pull request #2839 from afabri/STL_extension-replace_std_iterator-GF 
STL_extension: Introduce CGAL::iterator
 2018-02-23 17:34:57 +01:00
Laurent Rineau 78e7060525 Merge pull request #2712 from afabri/CGAL-VC+warnlevel_4-GF 
Deal with VC++ warnings of level /W4
 2018-02-19 14:27:06 +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
Maxime Gimeno 688b5dd06e Move dependencies creation to package_info and add dependencies to git 2018-02-02 12:08:05 +01:00
Maxime Gimeno 8bde832931 Fix METIS headers in BGL 2018-02-02 12:08:05 +01:00
Maxime Gimeno a676d5a60e Try to fix errors in classification checks 2018-02-02 12:08:05 +01:00
Maxime Gimeno acd0a72edf Modify travis script to test dependencies 2018-02-02 12:08:05 +01:00
Maxime Gimeno ae36b452bc Add dependencies of all packages 2018-02-02 12:08:05 +01:00
Andreas Fabri cbf3a16471 libs compile without warning 2018-01-17 15:02:32 +00:00
Mael Rouxel-Labbé 1378280c79 Revert "Simplified typedef" 
This reverts commit fecfaacbaf.

Although this typedef is still useless, it's useful to check the sanity of
the names of template parameters of the periodic traits classes. If some
template paremeters are named like typedefs of the kernel (which is valid code,
but not ideal) some compilers will bug and fail to compile.

See also commit cbde108708
 2017-12-13 11:29:12 +01:00
Laurent Rineau 163a90b6c1 Fix `make install` in header-only 
Now the Qt5 resources (qrc files, icons) are installed along with the
CMake modules.
 2017-12-07 11:34:00 +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 fefc79dc17 Fix a warning about CMP0071 2017-12-04 11:33:55 +01:00
Laurent Rineau 3466eb83f0 Polyhedron demo: do not use the OpenGL API directly 2017-11-28 17:54:38 +01:00
Laurent Rineau 19c5502ca8 Fix compilation of demos in non-header-only 
Now the variables `CGAL_Qt5_MOC_FILES` and `CGAL_Qt5_RESOURCE_FILES` are no
longer used by the definition of `CGAL_Qt5_extras`: other names are used.

`CGAL_Qt5_extras` is not supposed to be used directly by
users/examples/demos' `CMakeLists.txt`.
 2017-11-22 12:45:21 +01:00
Andreas Fabri 021b340509 Fix CGAL_Qt5 
In non-header-only, the resources and MOC files are added directly to
the CGAL_Qt5 library.
 2017-11-22 09:59:52 +00:00
Laurent Rineau 891a83840e Merge branch 'CMake-parse_CTest_XML_output-lrineau' into CGAL-new_cmake-GF 2017-11-17 15:03:57 +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 21dabf1b1b Add compilation tests for demos 2017-11-16 18:45:33 +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
Laurent Rineau 3ff09bc549 Merge pull request #2580 from lrineau/CGAL-Support_CMake_3.10-GF 
Renew the handle of policies, for CMake-3.10
 2017-11-15 16:47:42 +01:00
Laurent Rineau 86fb40832a Merge pull request #2580 from lrineau/CGAL-Support_CMake_3.10-GF 
Renew the handle of policies, for CMake-3.10
 2017-11-13 12:01:39 +01:00
Laurent Rineau c6068691fa Merge pull request #2547 from lrineau/CMake-parse_CTest_XML_output-lrineau 
CGAL testsuite implemented with CTest plus Python (part.1)
 2017-11-13 11:13:54 +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
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
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é fecfaacbaf Simplified typedef 2017-08-29 11:21:59 +02:00
Mael Rouxel-Labbé b36154cb7c Fixed P2DT2's traits class in demo 2017-08-24 15:08:28 +02:00
Mael Rouxel-Labbé dba83ba5bf Fixed a few Alpha Shapes 2 headers 2017-08-23 16:40:55 +02:00
Laurent Rineau 8dfa4f4dc8 Fix link error of demo/Polyhedron, in Debug and CGAL_HEADER_ONLY 2017-07-27 17:28:21 +02:00
Laurent Rineau d878561809 Merge pull request #2102 from afabri/Kernel_Weighted_point_without_conversion-GF 
Remove implicit conversions between points and weighted points
 2017-07-03 12:08:57 +02:00
Mael Rouxel-Labbé 1fc2282350 Fixed regular triangulation capitalization across CGAL 2017-06-28 10:16:23 +02:00
Mael Rouxel-Labbé 16392c92d1 Fixed bare_point / weighted_point issue 2017-06-28 10:15:30 +02:00