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

264 Commits

Author SHA1 Message Date
Sébastien Loriot 254d60f642 First pass on removing license notice in header for GPL files 2019-10-19 15:23:19 +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
Maxime Gimeno a52592909f Remove all calls to accelerate_distance_queries(), now redundant. 2019-09-24 11:44:20 +02:00
Maxime Gimeno 15d42d6cd2 Make the accelerate_distance_query() lazy and add a function to disable it. 2019-09-24 11:38:19 +02:00
Sébastien Loriot 2e747dd300 Merge remote-tracking branch 'cgal/releases/CGAL-4.14-branch' into HEAD 2019-07-18 17:01:42 +02:00
Maxime Gimeno 261c596cfc Merge branch 'CGAL_Qt-Fix_deprecation_warnings-GF' into CGAL_Qt-Fix_deprecation_warnings-4.14-GF 2019-07-10 14:04:34 +02:00
Maxime Gimeno 1184530530 More warnings fixed 2019-07-10 14:02:06 +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
Andreas Fabri 10e11e6eb2 Do not call deprecated code. Add a test file for the deprecated code 2018-12-13 09:43:14 +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 8ae27f4c9c Fix Circular_kernel and PCA demo 2018-07-13 13:56:46 +02:00
Maxime Gimeno f22c2864a0 Put qglviewer in the namespace CGAL 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 0c74a68952 WIP Header_only 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
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 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 f5b5aead66 Remove direct use of the OpenGL API 
We always use the Qt wrappers.
 2017-11-28 16:07:37 +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
Sébastien Loriot ee57fc2d6c add SPDX identifier for files under the GPL-3+ license 2017-11-12 10:17:51 +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
Sébastien Loriot 9bb2d4433f Merge remote-tracking branch 'cgal/releases/CGAL-4.10-branch' 2017-08-04 13:37:58 +02:00
Maxime Gimeno 831f0239cb Fix CMP0071 warning. 2017-08-03 10:38:19 +02:00
Maxime Gimeno 8104d153af Fixes 
Conflicts:
	Polyhedron/demo/Polyhedron/Plugins/Operations_on_polyhedra/Clip_polyhedron_plugin.cpp
 2017-07-10 16:16:34 +02:00
Maxime Gimeno 51f7218c2a FIx Lloyd demo for QGLViewer 2.7 2017-07-10 16:11:09 +02:00
Maxime Gimeno 09a4b7699b Fix AABB_tree demo for QGLViewer 2.7 2017-07-10 16:11:08 +02:00
Maxime Gimeno 1a5d74f020 Fixes 2017-07-03 09:39:12 +02:00
Maxime Gimeno 82f39dadbf FIx Lloyd demo for QGLViewer 2.7 2017-07-03 09:35:14 +02:00
Maxime Gimeno caf33be218 Fix AABB_tree demo for QGLViewer 2.7 2017-07-03 09:35:13 +02:00
Laurent Rineau 2a71690ded Merge pull request #1921 from MaelRL/Subdivision-FaceGraph-GF 
Subdivision Facegraph
 2017-05-29 11:16:48 +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é 89bd9ded97 Include file consistency with other packages 2017-05-12 10:34:56 +02:00
Laurent Rineau f2e7050364 Merge pull request #1428 from sloriot/AABB_tree-fix_Closest_point 
Fix implementation of AABB_traits::Closest_point
 2016-10-17 10:03:20 +02:00
Sébastien Loriot 426ed00875 move files to fig_src 2016-10-06 09:53:35 +02:00
Sébastien Loriot e78bef8a9c update project name of demos 2016-09-08 00:13:34 +02:00
Sébastien Loriot 8359f3796e remove a no longer needed header 2016-09-01 16:05:04 +02:00
Sebastien Loriot be27bf69b7 Merge pull request #1198 from maxGimeno/Import_AABB_Tree_demo-GF 
Polyhedron_Demo: Import AABB_Tree demo
 2016-07-07 13:37:55 +02:00
Maxime Gimeno fc68989e60 Use Simple_cartesian<double> to greatly enhance the performance. 2016-07-05 15:58:43 +02:00
Laurent Rineau 1cde972cdb Remove whitespace at end of lines 2016-06-29 11:04:29 +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
Guillaume Damiand a528ff0847 Remove commented line 2016-03-09 14:42:24 +01:00
Guillaume Damiand dff63d83d3 Correct the problem of cmake qt5 macro not available in header only when configuring cgal_qt5. 
To solve this problem, we added in the macro check_cgal_component the find package of qt5 if we are configuring cgal_qt5.
 2016-03-09 10:44:15 +01:00
Clement Jamin c27ff9e85c Rename some cmake variables 2016-03-09 10:42:46 +01:00
Clement Jamin 221c9462db Should be set, not message 2016-03-09 10:37:58 +01:00
Guillaume Damiand 561b1f2a38 Do not need cgal_include_moc_files macro 2016-03-09 10:37:58 +01:00
Guillaume Damiand 16a19eb33e Ok for demo for aabbtree 2016-03-09 10:37:57 +01:00
Guillaume Damiand 78cde742ce Work on demo with qt5; ok for AABBtree (but need to be improved) 2016-03-09 10:35:22 +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 ec0928c044 Fix for AABB_demo 
- The scene was not initialized when viewer->initializeGL() wwas called (still because OS X calls initialzeGL() during the setupUI instead of the first draw)
 2016-01-19 17:13:06 +01:00
Andreas Fabri a41165b6eb various 2016-01-05 18:04:14 +01:00
Andreas Fabri 078afb18b3 Alpha_shapes_2 2015-12-31 16:19:26 +01:00
Maxime Gimeno 61072a8e75 Clean-up 2015-08-10 09:04:01 +02:00
Maxime Gimeno 71b0fd8d31 Replaced the OpenGL 3 3 Core context by a 2_1 context. 2015-08-10 08:46:09 +02:00
Maxime Gimeno 970e767bbf GL security enhancement 
- Version of the shaders added and depth test enabled at each draw.
 2015-08-06 15:05:00 +02:00
Maxime Gimeno fd38d1192b Plane manipulated secured 
- Should resolve all the remaining problems about the manipulated frame, except for the wheels events.
- Added glEnable(GL_DEPTH_TEST) to the draw() function of the viewer to avoid errors in certain cases
 2015-08-06 14:47:21 +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
Maxime Gimeno 839d09e82a ManipulatedFrame fps fix 
- I used the startTimer(0) to cadence the calls to cutting_plane()
- Now if the plane is spinning, the fast_distance is used.
 2015-08-04 09:03:15 +02:00
Laurent Rineau 87a406ab81 Fix a warning with MSVC 
> aabb_tree_demo\Scene.cpp(1313) : warning C4138: '*/' found outside of comment

Trivial bug-fix.
 2015-07-30 13:04:29 +02:00
Sébastien Loriot 6dc5695989 remove unused variable warning 2015-07-22 15:47:23 +02:00
Jane Tournois 012110cfa5 fix warning for windows 2015-07-21 15:59:03 +02:00
Sébastien Loriot cffdb2ca5d fix unused variable warning 2015-07-17 13:56:04 +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
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 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
Maxime Gimeno 8c391c1cdf Windows context problems fixed 
- Called setAttribute(Qt::AA_UseDesktopOpenGL) in the main function.
 2015-07-07 15:31:18 +02:00
Maxime Gimeno 620abb640d WIP : still on the windows OGL context 2015-07-07 15:23:15 +02:00
Maxime Gimeno ce6e05e8bd WIP : forcing windows to use the right opengl context. 2015-07-07 15:12:41 +02:00
Maxime Gimeno 47e827764a Trying to force the context to use OpenGL3_3_Core. 2015-07-07 13:42:37 +02:00
Maxime Gimeno 22dbcfaa2c Still on that SIGSEGV 2015-07-07 11:50:05 +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 870795d79d Add some info display 2015-07-07 11:22:01 +02:00
Maxime Gimeno 8b02b4f914 Still trying to fix that SIGSEGV with glGenTextures 2015-07-07 11:18:14 +02:00
Maxime Gimeno 9c501a57d4 Merge branch 'CGAL-Qt5_support-GF' of github.com:CGAL/cgal-public-dev into CGAL-Qt5_support-GF 2015-07-07 10:59:42 +02:00
Maxime Gimeno b0d87a9236 Fix for the SIGSEGV at runtime 
- initializeOpenGLFunction and GglGenTextures() have been moved to draw to be sure they have a working context.
 2015-07-07 10:58:30 +02:00
Andreas Fabri 1aa3ca438e Merge branch 'CGAL-Qt5_support-GF' of github.com:CGAL/cgal-public-dev into CGAL-Qt5_support-GF 2015-07-07 10:46:55 +02:00
Andreas Fabri 795a0bfafe static_casts 2015-07-07 10:46:43 +02:00
Maxime Gimeno d442644c8d Fix for the SIGSEGV at the runtime 
- draw only if the vectors of vertices aren't empty.
 2015-07-07 10:43:52 +02:00
Maxime Gimeno 2c8bb3f978 changed() fixed 
-  are_buffers_initialized = true instead of ==true in initialize_buffers().
 2015-07-07 08:36:17 +02:00
Maxime Gimeno 85afa81ebd Changed() fixed. 2015-07-07 08:33:47 +02:00
Maxime Gimeno f5ddbfdf96 Merge branch 'CGAL-Qt5_support-GF' of github.com:CGAL/cgal-public-dev into CGAL-Qt5_support-GF 2015-07-07 08:24:24 +02:00
Maxime Gimeno 12501598bb Changed() fix and texture ID generation. 2015-07-07 08:21:56 +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
Andreas Fabri 1a3e0e001b add dependendency on svg 2015-07-06 16:31:56 +02:00
Maxime Gimeno 74ff5ae85c Clean-up 
- Scene_item_with_display_list removed
- Program initializing functions being moved to scene_item to lighten-up the code of each object (Only polyhedron_item concerned at this stage)
 2015-06-12 14:46:05 +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 965f2ab77b Upgrade of AABB_Tree_demo to OpenGL ES with Qt 5 wrappers. 
- used qt wrapper for the gestion of the shaders.
- used OpenGL ES 3 for the gestion of the texture.
- the texture doesn't have the "FLAT" mode while moving anymore.
 2015-04-08 11:13:16 +02:00
Maxime Gimeno 69a534ae37 WORK IN PROGRESS 
- Added vao gestion, draws everything but the cutting plane.
 2015-04-03 16:43:52 +02:00
Maxime Gimeno 0ce6f75bc4 WORK IN PROGRESS 
- Added qt shader material
- only drawing a red triangle for now
 2015-04-03 14:54:35 +02:00
Maxime Gimeno 85c8e7e270 Upgrade of AABB_Tree Demo to Qt5 
- setBackgroudColor was called too soon(in the constructor of the viewer), now called in InitializeGL
 2015-04-02 11:54:06 +02:00