Commit Graph

220 Commits

Author SHA1 Message Date
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
Maxime Gimeno a85cf6ed52 Move the include in the ifdef 2021-01-26 09:45:18 +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 2a212bb2a8 Upgrade non-compatibility sahders in Basic_viewer to glsl 150 and add a context creation before the creation of the QApp in draw_xxx examples 2021-01-07 13:06:40 +01:00
Mael Rouxel-Labbé 723890e388 Misc tiny doc fixes (broken links, grammar, etc.) 2020-12-05 11:49:27 +01:00
Jane Tournois 5c8df6672a remove CGAL_CFG_MATCHING_BUG_ variants
the "matching bug" of msvc has been fixed since at least vs 2015
2020-09-25 14:25:14 +02:00
Maxime Gimeno e9d41d7b7d Fixes for min/max 2020-04-21 11:38:37 +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
Guillaume Damiand 853010afa4 Add missing #include; remove an unused variable. 2019-11-20 09:26:50 +01:00
Sébastien Loriot 1bf02b2d94 remove license statements 2019-11-13 15:32:23 +01:00
Guillaume Damiand f42c9ab89d Update licences 2019-11-13 14:44:45 +01:00
Guillaume Damiand d638c80b5a
Merge branch 'master' into gsoc2019-add_basic_viewer-jasmeet 2019-11-12 22:13:10 +01:00
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
Guillaume Damiand 2b381af544 Remove more warnings 2019-09-16 17:19:49 +02:00
Jasmeet Singh 1565773fda Specialization of draw() function for P2T2, can be called together with another viewer now. 2019-07-12 10:46:48 -07:00
Jasmeet Singh 628b24e57f Update headers, trying to deal with Travis CI errors. 2019-06-24 18:14:13 -07:00
Jasmeet Singh 720a0ad815 Merge branch 'gsoc2019-add_basic_viewer-jasmeet' of github.com:CGAL/cgal-public-dev into gsoc2019-add_basic_viewer-jasmeet 2019-06-24 16:36:47 -07:00
Jasmeet Singh c412d3b0f7 Fix bugs in Voronoi Diagram Viewer. Format code. Fix bug in voronoi diagram documentation.
Faces have the same color after toggling vertices - fixed.
Rays and dual vertices have different colors from edges and voronoi vertices - fixed.
Toggle for Voronoi vertices created, now V would only toggle vornoi vertices, not all vertices - fixed
2019-06-24 15:21:16 -07:00
Guillaume Damiand 8af3ab8f77 Change test of keys in periodic triangulation 2 viewer to solve a problem with azerty keyboards. 2019-06-24 10:24:32 +02:00
Jasmeet Singh f8bc47dbf6 Check visualization for Periodic Delaunay Triangulation as well. Change example to a delaunay triangulation.
Add is_triangulation_in_1_sheet() check and then convert to 9-sheet if the triangulation isn't so already.
2019-06-22 18:49:54 -07:00
Jasmeet Singh a9eae8a297 Add Key description for Key D which displays the domain. 2019-06-22 18:00:01 -07:00
Jasmeet Singh 677cbc7c07 Add Periodic_2_triangulation_2 viewer. Add example - draw_periodic_2_triangulation_2.cpp.
Keypress 1-UNIQUE, 2-UNIQUE_COVER_DOMAIN, 3-STORED, 4-STORED_COVER_DOMAIN, D-draw the domain.
Color values for faces are fixed for now. Boundaries of faces are also viewed with a light gray
color so as to properly display a triangular face.
2019-06-22 17:53:18 -07:00
Andreas Fabri e2d19b0c8d Replace NULL and Nullptr_t with nullptr and nullptr_t 2019-06-04 23:45:44 +02:00
Sébastien Loriot 124012d9f9 replace cpp11::array by std::array 2019-03-29 13:28:33 +01:00
Sébastien Loriot 2ce16d14b5 remove workaround code for cpp11 in triangulation packages 2019-03-29 10:41:50 +01:00
Andreas Fabri c8183ab941 Fix Quadratic_program_solution 2019-01-23 10:25:27 +01:00
Andreas Fabri c54a6a4980 Put CGAL::random_shuffle() in the subnamespace cpp98 2018-04-11 09:32:23 +01:00
Andreas Fabri 063a91a771 Use CGAL::random_shuffle 2018-04-04 14:00:23 +01:00
Mael Rouxel-Labbé cbde108708 Renamed template parameter names
It is safer not to use 'K' as template parameter because the CGAL kernels
will also define 'K' typedefs and this confuses some compilers (MSCV).
2017-12-13 11:23:12 +01:00
Sébastien Loriot 8cdfad0d08 add missing URL and Id tags 2017-11-15 22:58:57 +01:00
Sébastien Loriot ee57fc2d6c add SPDX identifier for files under the GPL-3+ license 2017-11-12 10:17:51 +01:00
Mael Rouxel-Labbé b82814a24b Changed K::Has_[static/filtered]... to use Has_[static/filtered]_...<K> instead 2017-08-29 12:35:46 +02:00
Mael Rouxel-Labbé 6411ed2de9 Fixed typo 2017-08-29 11:22:19 +02:00
Mael Rouxel-Labbé 436bb49681 Uniformized const handle ref in P3T3
No need to take const ref of handles. This also aligns on the signature of
similar functions in other triangulations
2017-08-23 17:16:31 +02:00
Mael Rouxel-Labbé aaeaf35380 Introduced the tag "Periodic_tag" to mark distinguish periodic triangulations 2017-08-23 16:18:05 +02:00
Mael Rouxel-Labbé 252f541f5f Removed useless P2Tvertex_base void specialization 2017-08-23 10:57:57 +02:00
Mael Rouxel-Labbé 0106de5fd0 Misc minor changes 2017-08-23 10:57:48 +02:00
Mael Rouxel-Labbé 11c3a490d1 Added functions / enum necessary for P2DT2 to be usable in 2D Alpha Shapes 2017-08-23 10:52:30 +02:00
Mael Rouxel-Labbé 9b570830f0 Removed useless includes 2017-08-23 10:50:57 +02:00
Mael Rouxel-Labbé c987e0f59e Renamed P2DT2 base class typedef 2017-08-23 10:50:20 +02:00
Mael Rouxel-Labbé 5695143729 Moved some functions from P2T2 to P2DT2
circumcenter, side_of_oriented_circle, etc. have nothing to do with P2T2 and
actually will not work if some user decides to use a model of the traits concept
because construct_circumcenter_2 and side_of_oriented_circle_2 are required
by delaunay traits, not triangulation traits.

Doc changed accordingly
2017-08-22 17:38:40 +02:00
Mael Rouxel-Labbé b5fd4dfa01 Removed useless include 2017-08-22 17:34:05 +02:00
Mael Rouxel-Labbé addaf298c7 Removed Periodic_2_triangulation_hierarchy_vertex_base_2
This class is a needless duplicate of Triangulation_hierarchy_vertex_2.

Also, actually use the periodic hierarchy in the examples/tests...
2017-08-22 17:29:56 +02:00
Mael Rouxel-Labbé 391c737108 Fixed 2D periodic traits
This is aligned on P3T3 new traits on actually use filtered and statically
filtered traits (automatically selected).
2017-08-22 13:35:45 +02:00
Mael Rouxel-Labbé 3c42724e22 Merge branch 'Periodic_3_Regular_triangulation_3-APelle-old' into Periodic_3_Regular_triangulation_3-APelle
Based on Kernel_Weighted_point_without...
  @ 41e7520b3e
2017-06-15 15:07:53 +02:00
Mael Rouxel-Labbé 98800d2de8 Fixed regular triangulation capitalization across CGAL 2017-06-15 10:34:15 +02:00
Mael Rouxel-Labbé 18a1643c90 Periodic construct_point_2 must have access to the base construct_point_2 operator() 2017-06-15 10:34:15 +02:00
Mael Rouxel-Labbé 06fb6b2b15 Construct_point_2 should not copy the domain 2017-05-24 12:24:18 +02:00
Mael Rouxel-Labbé c554a16695 Fixed bad copy paste 2017-05-24 12:23:10 +02:00
Mael Rouxel-Labbé 73a4326346 Periodic construct_point_2 must have access to the base construct_point_2 operator() 2017-05-22 11:27:02 +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
Laurent Rineau 1ae739a100 Merge pull request #1600 from afabri/Peiodic_2-static-GF
Periodic_2_triangulation_2: Make variables thread local
2016-10-24 11:46:42 +02:00
Sébastien Loriot 51f0b9b431 move internal struct to external struct 2016-10-21 15:12:17 +02:00
Sébastien Loriot b90d411514 gather static variables in a small struct to have only one thread local variable 2016-10-20 18:25:37 +02:00
Andreas Fabri 3c375d7cb7 Fix package Periodic_2_Triangulation_2 2016-09-30 15:22:27 +02:00
Andreas Fabri 21ad968457 Fix package Triangulation_3: Add #include 2016-09-30 15:22:27 +02:00
Andreas Fabri 3df4481e46 Use CGAL_STATIC_THREAD_LOCAL_VARIABLE 2016-09-21 11:01:50 +02:00
Sébastien Loriot 7f3772a50b replace the usage of raw pointer as property map
It was deprecated in boost 1.55
http://www.boost.org/users/history/version_1_55_0.html
2016-07-13 13:53:00 +02:00
Andreas Fabri 27abe38a56 Call init_double in Periodic_T2 static filters 2016-03-03 08:33:44 +01:00
Andreas Fabri 6c547e5663 Mainly added includes 2013-09-13 22:24:30 +02:00
Laurent Rineau 93104198dd Another fix proposed by Nico 2013-09-09 14:42:41 +02:00
Nico Kruithof 90cc4c852b Fixed a copy-paste error from the 3D code to the 2D code.
bug-fix for master
2013-09-09 14:32:16 +02:00
Sébastien Loriot c130fa3b8c update copyright holder of P2T2 package 2013-07-26 08:32:46 +02:00
Nico Kruithof fe3017a048 minor fix for master
- Fixed #define guard
- Fixed #include
2013-07-18 20:57:45 +02:00
Nico Kruithof 0889773189 * Changed template parameter Predicate_ to Functor_ (for the traits classes of P2T2 and P3T3)
* Added side_of_bounded_circle to the predicates in the 2D traits classes
2013-07-15 13:06:45 +02:00
Nico Kruithof 3eeb035a33 Moved a generic named class to an internal namespace 2013-07-04 23:52:59 +02:00
Nico Kruithof c39c55b4f1 Changed the copyright and the license 2013-06-26 21:55:51 +02:00
Nico Kruithof 81fc05c90f Changed the copyright to remain mine until Monique sorts out legal issues with the INRIA legal department 2013-06-06 09:19:13 +02:00
Nico Kruithof a94549091c Resolving warnings 2013-06-04 11:33:38 +02:00
Nico Kruithof 5832a7c0e1 Fixing warnings 2013-05-17 13:01:50 +02:00
Nico Kruithof 4cac3b0020 Fixing compiler warnings 2013-05-16 12:20:36 +02:00
Nico Kruithof 175f6c7d37 Fixing the fix 2013-05-14 09:55:36 +02:00
Nico Kruithof 89c6b1d4a7 Working on the error in the hierarchy and removing compiler warnings 2013-05-14 09:46:19 +02:00
Nico Kruithof 02fdc5b53e Added debug code to analyse the error on windows with the hierarchy 2013-05-12 19:44:36 +02:00
Nico Kruithof e009ea9582 Trying to resolve a bug in serializing the p2t2 hierarchy 2013-04-22 08:23:55 +02:00
Nico Kruithof 8e47f8446d Working on fixing the testsuite 2013-04-16 10:03:26 +02:00
Nico Kruithof b7878b69bd Fixed errors in the testsuite 2013-04-13 12:49:36 +02:00
Nico Kruithof bd096e4b2a Fixing a double defined function 2013-04-08 20:45:50 +02:00
Nico Kruithof d69d0e303b Formatting, ran astyle:
for i in `find . -name "*.h" -or -name "*.cpp"`; do echo $i; astyle -A7 -bps2 $i; done
2013-03-31 22:10:07 +02:00
Nico Kruithof a980dfc210 Big code cleanup. Cleaned all NGHK's (own notes).
Work is done.
2013-03-31 22:06:39 +02:00
Nico Kruithof 6454707d07 Added my name to all files 2013-03-31 20:53:37 +02:00
Nico Kruithof 04191f177a Fixed iterator types 2013-03-31 14:43:39 +02:00
Nico Kruithof 0e9e38498f Fixed excessive calls to validating whether the too long edges administration is correct.
The entire triangulation was checked for every face.
2013-03-27 07:58:11 +01:00
Nico Kruithof 851e7a3d94 Fixed a bug in the too_long_edges bookkeeping. 2013-03-26 15:08:39 +01:00
Nico Kruithof 26e7e44acb Everything is implemented. The big cleanup starts now 2013-03-26 11:16:22 +01:00
Nico Kruithof 98a85e2636 Code cleanup
Making locally_Delaunay public
2013-03-26 10:57:26 +01:00
Nico Kruithof f26692677f Working on the demo, coloring the vertices of small triangulations 2013-03-24 09:19:52 +01:00
Nico Kruithof 8e2e8b9ac8 Code cleanup 2013-03-24 00:03:12 +01:00
Nico Kruithof 15623c4762 Fixed serialization (binary mode doesn't work for exact number types) 2013-03-23 22:51:51 +01:00
Nico Kruithof f44799cdfb Fixed a test in the test suite 2013-03-21 20:47:52 +01:00
Nico Kruithof 6476837c76 Fixed compiler errors 2013-03-21 20:25:40 +01:00
Nico Kruithof 8949bfea19 Changed documentation 2013-03-21 19:56:24 +01:00
Nico Kruithof 52d39974cc Changing move to move_point in the Hierarchy to be consistent with the P2DT2 2013-03-21 19:55:11 +01:00
Nico Kruithof d6f0982c87 Added more tests for iterators, removed debug code 2013-03-20 08:14:59 +01:00
Nico Kruithof 9c05224ab7 Resolving a warning 2013-03-20 08:14:19 +01:00
Nico Kruithof 918062b370 Resolving warnings 2013-03-20 07:55:30 +01:00