Commit Graph

301 Commits

Author SHA1 Message Date
Guillaume Damiand 999a813b35 Rename XXX_handle into XXX_descriptor for CMap, GMap, LCC 2022-05-05 13:34:19 +02:00
Guillaume Damiand 81c2c1196a Allow to test cc with index 2 and 3 2022-05-03 08:37:40 +02:00
Guillaume Damiand c7a8299712 start a new container for index 2022-05-02 10:08:31 +02:00
Guillaume Damiand 7370aa54ef LCC demo with index ok 2022-04-15 12:43:41 +02:00
Guillaume Damiand 138be31cba Merge branch 'master' into CMap_index-gdamiand 2022-04-07 09:44:20 +02:00
Guillaume Damiand 46f5325c1b Remove deprecated code in CMap and LCC (deprecated since CGAL 4.9) 2022-01-27 10:36:22 +01:00
Maxime Gimeno 2d5f91f763 Merge remote-tracking branch 'cgal/master' into T2-Document_projection_traits_3-maxGimeno 2021-05-27 09:06:59 +02:00
Sébastien Loriot fb6f703b55 IO namespace for files in IO directories 2021-05-04 14:36:06 +02:00
Sebastien Loriot b7323389c7
Merge pull request #5622 from maxGimeno/CMake-Update_versions_in_scripts-maxGimeno
Update maximum cmake versions
2021-04-17 10:58:14 +02:00
Maxime Gimeno c49152359c update max version of cmake and announce the new minimal in CHANGE.md 2021-04-15 15:08:54 +02:00
Maxime Gimeno 735567531b RENAME 2021-03-19 12:00:08 +01:00
Maxime Gimeno cc99fd94ad Demo Pass 2021-02-19 16:02:12 +01:00
Maxime Gimeno 2500331070 Merge remote-tracking branch 'cgal/master' into Demo-Add_dependency_to_qt5_moc_and_dependencies-maxGimeno 2021-02-09 12:33:52 +01:00
Maxime Gimeno 9cd0d450f9 Remove QDomElements and need for QtXml 2021-02-09 11:31:34 +01:00
Laurent Rineau c5ba414c72 Merge pull request #5336 from maxGimeno/GraphicsView-Use_opengl_4_1_context-maxGImeno
Graphics_view: Upgrade glsl version in basic_viewer_shaders
2021-02-05 16:12:42 +01:00
Laurent Rineau 468ce8f700 Merge pull request #5347 from gdamiand/LCC_demo-bugfix-gdamiand
Bug fix in LCC demo
2021-02-05 16:10:34 +01:00
Guillaume Damiand f506515008 Bug fix in lcc basic viewer when lcc is null 2021-01-12 18:24:43 +01:00
Maxime Gimeno 04753381e5 Rename file and add ::Qt 2021-01-12 13:22:34 +01:00
Maxime Gimeno 95192d6d4b factorize context initialization 2021-01-12 13:08:58 +01:00
Maxime Gimeno 17e83d573d Fix demos 2021-01-08 11:40:09 +01:00
Maxime Gimeno 9c15f2c9dc Use FeatureSummary in the demo, and remove CGAL_FOUND 2020-08-04 12:46:17 +02:00
Sébastien Loriot 8b153fb495 Merge branch 'cgal/releases/CGAL-5.0-branch'
whitespace+tab removal, merged with option -Xignore-space-change
2020-03-26 14:22:32 +01:00
Sébastien Loriot 0779373835 extra run of the script to remove tabs and trailing whitespaces
right after the  merge of 4.14 release branch

+ manual fix on one line in:
    * Arrangement_on_surface_2/include/CGAL/IO/Arr_text_formatter.h
    * .travis/generate_travis.sh
2020-03-26 14:16:06 +01:00
Mael cf83a22e2d
Merge branch 'master' into T2-Throw_on_collinear_strongly_intersecting_segments-GF 2019-12-02 16:32:29 +01:00
Sébastien Loriot 52164b1fba First pass on removing license notice in header for LGPL files 2019-10-19 15:40:30 +02:00
Sébastien Loriot 7356421d80 introduce Commercial license SPDX tag 2019-10-19 12:15:19 +02:00
Sébastien Loriot 9bd9c68b83 update LGPL[23]+ and GPL[23]+ SPDX tags
ack -l --no-svg "SPDX-License-Identifier: GPL-3.0\+" | xargs sed -i "s/SPDX-License-Identifier: GPL-3.0+/SPDX-License-Identifier: GPL-3.0-or-later/"
ack -l --no-svg "SPDX-License-Identifier: LGPL-3.0\+" | xargs sed -i "s/SPDX-License-Identifier: LGPL-3.0+/SPDX-License-Identifier: LGPL-3.0-or-later/"
ack -l --no-svg "SPDX-License-Identifier: GPL-2.0\+" | xargs sed -i "s/SPDX-License-Identifier: GPL-2.0+/SPDX-License-Identifier: GPL-2.0-or-later/"
ack -l --no-svg "SPDX-License-Identifier: LGPL-2.0\+" | xargs sed -i "s/SPDX-License-Identifier: LGPL-2.0+/SPDX-License-Identifier: LGPL-2.0-or-later/"
2019-10-18 21:57:54 +02:00
Mael Rouxel-Labbé e4c0bcffa0 Update usage of intersection tags 2019-09-19 18:32:34 +02:00
Laurent Rineau 4fbf00fb8a CMake>=3.13: opt for for new policies up to 3.15 2019-06-19 14:34:59 +02:00
Sébastien Loriot db65bd8ecc Merge remote-tracking branch 'cgal/releases/CGAL-4.14-branch' 2019-04-11 21:38:48 +02:00
albert-github 1dd7473818 Correction of links
Correction of redirected links and links that moved to another place.
2019-04-11 21:37:05 +02:00
Sébastien Loriot f62624c4f9 replace cpp11::tuple by std::tuple 2019-03-29 13:28:33 +01:00
Guillaume Damiand 12ae925f31 Some more unused variables. 2018-12-03 20:11:19 +01:00
Guillaume Damiand c2665415cd Remove warning in lcc viewers. 2018-11-30 08:03:31 +01:00
Guillaume Damiand 111eb4ee21 Demo of LCC is now ok 2018-11-27 16:07:52 +01:00
Guillaume Damiand 162a4b5593 Continue to update the lcc demo and the basic viewer. 2018-11-27 15:45:05 +01:00
Guillaume Damiand a5e1edd698 Continue to update the lcc demo and the basic viewer. 2018-11-27 11:59:29 +01:00
Guillaume Damiand 5d7723af4a Update LCC demo 2018-11-27 09:10:03 +01:00
Guillaume Damiand 9c3faed5c5 Bug fixes; nyf 2018-11-26 22:06:13 +01:00
Guillaume Damiand 8297e2b849 Start to update the LCC demo, in order to re-use LCC basic viewer. 2018-11-26 16:33:39 +01:00
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