Commit Graph

7395 Commits

Author SHA1 Message Date
Mael Rouxel-Labbé 5240e402de Fix wrong PMap type 2021-07-23 14:26:40 +02:00
Maxime Gimeno 18c7e6f513 Fix scene recenter with scaling ON 2021-05-31 14:09:07 +02:00
Laurent Rineau e745ff3fab Merge pull request #5718 from maxGimeno/Demo-fix_statistics-maxGimeno
Polyhedron Demo: Fix classname property for selection_item

# Conflicts:
#	Polyhedron/demo/Polyhedron/Scene_polyhedron_selection_item.cpp
2021-05-27 19:10:03 +02:00
Laurent Rineau 82bec8a1d6 Merge pull request #5692 from maxGimeno/CGAL_cpp11_atomic_and_threads-maxGimeno
CGAL:: Use std atomic and threads

# Conflicts:
#	Arrangement_on_surface_2/include/CGAL/Arr_counting_traits_2.h
2021-05-19 17:11:37 +02:00
Maxime Gimeno b21f8a412d Fix string comparison 2021-05-19 14:02:29 +02:00
Maxime Gimeno c1f315f500 Fix classname property for selection_item 2021-05-19 13:16:55 +02:00
Laurent Rineau 7eef8b64e1 Merge pull request #5651 from maxGimeno/Demo-Fixes-maxGimeno
Polyhedron Demo : Fix a warning
2021-05-18 17:32:23 +02:00
Laurent Rineau 4ab1000d30 Merge pull request #5666 from alefy/Fix-demo_Polyhedron_mesh_3_linking_with_VTK-alefy
Fix linking issue with VTK for Mesh_3 Polyhedron demo
2021-05-18 17:32:18 +02:00
Maxime Gimeno c272741714 Fix sleep_for() call in Use_ssh.cpp 2021-05-17 11:41:56 +02:00
Maxime Gimeno 96fe2393a8 Fix chrono in Use_ssh 2021-05-12 10:45:34 +02:00
Maxime Gimeno 33cefe1be7 remove calls to cpp11::sleep_for() 2021-05-07 11:13:03 +02:00
Maxime Gimeno 3e03d50b8a replace usages of CGAL::cpp11::atomic and thread by std:: calls 2021-05-07 11:10:30 +02:00
Maxime Gimeno e9b7595fff Deprecate CGAL headers for threads, atomic and result_of, and move their content to config.h as fallback 2021-05-07 11:09:24 +02:00
Adrien Lefieux 5c66c5d0e1 Solve linking issue on macOS with VTK for Mesh3 Polyhedron demo 2021-05-03 18:19:06 +02:00
Maxime Gimeno 971004cfee Fix a warning 2021-04-28 15:40:18 +02:00
Sébastien Loriot eef92fbef7 Merge remote-tracking branch 'cgal/5.1.x-branch' 2021-04-21 15:47:06 +02:00
Sebastien Loriot 7a68dfd3fa
Merge pull request #5623 from maxGimeno/Demo-Fix_dll_warning-maxGimeno
Polyhedron_demo : Fix a warning
2021-04-21 15:34:14 +02:00
Sébastien Loriot cbd95907cd Merge remote-tracking branch 'cgal/5.1.x-branch' into HEAD 2021-04-17 11:11:28 +02:00
Maxime Gimeno 9384b064eb Make `children` a pointer to silent an annoying warning about QList<int> not being a dll-interface class. 2021-04-16 13:39:30 +02:00
Maxime GIMENO 7629e25d40
Update Polyhedron/demo/Polyhedron/Scene_polylines_item.cpp
Co-authored-by: Sebastien Loriot <sloriot.ml@gmail.com>
2021-04-09 14:26:51 +02:00
Maxime Gimeno 83badb138c Fix description of corner_item 2021-04-09 14:15:04 +02:00
Maxime Gimeno db9b78017e Add nissing viewer->makeCurrent() 2021-04-09 12:56:22 +02:00
Laurent Rineau 33ed7a9995 Merge pull request #5529 from maxGimeno/Demo-Fixes_for_5_1-maxGimeno
Polyhedron_demo: Fix Affine_transform_plugin crash
2021-03-24 15:00:25 +01:00
Maxime Gimeno fdcd84b031 Use copy_face_graph to duplicate the surface_mesh in affine_transformation to avoid problems related to the extra properties (it may cause a crash in the cas eof the face patch_id map, for example) 2021-03-16 14:18:05 +01:00
Laurent Rineau 11e3c689ed Merge pull request #5473 from maxGimeno/Demo-Fixes-maxGimeno
Polyhedron demo: Fixes for 5.1
2021-03-03 16:39:47 +01:00
Laurent Rineau 1435e37232 Merge pull request #5473 from maxGimeno/Demo-Fixes-maxGimeno
Polyhedron demo: Fixes for 5.1
2021-03-03 16:31:08 +01:00
Maxime Gimeno b4de351840 Merge branch 'CGAL-CGAL-Disable_tests_that_use_gmp_if_not_found-5.1-maxGimeno' into CGAL-CGAL-Disable_tests_that_use_gmp_if_not_found-5.2-maxGimeno 2021-03-02 10:16:01 +01:00
Maxime Gimeno 7c94a1f2bf Replace condition for a clearer equivalent one, and use APPEND for env property in Arrangement_2 2021-03-02 09:59:28 +01:00
Maxime Gimeno 7d21d5b62d De-activate some things that depend on CGAL_Core if it is not FOUND 2021-03-01 11:27:43 +01:00
Maxime Gimeno 2eac79c326 Fix names of the diff items 2021-02-25 14:20:42 +01:00
Maxime Gimeno e023f3f958 add .js in the end of a scene's filename if needed. 2021-02-18 15:07:29 +01:00
Maxime Gimeno 7109dd9de9 clean-up 2021-02-18 14:15:02 +01:00
Maxime Gimeno 5bffc28758 Invalidate aabb_tree after moving vertex 2021-02-18 14:12:35 +01:00
Maxime Gimeno 23b1024f1b fix direction-constraint in qglviewer 2021-02-18 14:01:15 +01:00
Maxime Gimeno 64597d7cab fix sphere lighting 2021-02-18 14:01:15 +01:00
Laurent Rineau b134ed8246 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:07:32 +01:00
Laurent Rineau d97b9363f8 Merge pull request #5351 from sgiraudot/Classification-Fix_boost_optional_dependencies-GF
[Classification] Fix Boost optional dependencies
2021-02-05 16:07:27 +01:00
Laurent Rineau 5380ffd257 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:05:55 +01:00
Maxime Gimeno b71b8f2034 Don't add isolated vertices after hole filling polyline 2021-01-27 11:33:49 +01:00
Maxime Gimeno 01d8351383 Restore Isotropic remeshing of a selection of faces 2021-01-26 14:46:40 +01:00
Maxime Gimeno a85cf6ed52 Move the include in the ifdef 2021-01-26 09:45:18 +01:00
Simon Giraudot 92c80c4203 Fix outdated CGAL Eigen importent target 2021-01-26 08:44:03 +01:00
Simon Giraudot 8ce0470661 Make Boost IO Stream and Serialization optional for compiling Classification plugin 2021-01-25 15:49:11 +01:00
Laurent Rineau 52bb68c012 Merge pull request #5356 from sloriot/CGAL-boost_function_output-5.2
Include non-deprecated header (5.2)
2021-01-21 16:18:55 +01:00
Laurent Rineau dce5ed14b7 Merge pull request #5355 from sloriot/CGAL-boost_function_output-5.1
Include non-deprecated header (5.1)
2021-01-21 16:09:39 +01:00
Maxime Gimeno dfc613c342 Add missing makeCurrent() 2021-01-21 10:22:51 +01:00
Sébastien Loriot f4935dc199 Merge branch 'CGAL-Eigen3_support-5.1' 2021-01-15 10:54:02 +01:00
Sébastien Loriot eecb00534e fix macro name to be consistent with find_package 2021-01-15 10:43:34 +01:00
Sébastien Loriot bdd4efe3b3 Merge commit 'efc0c525e8b' into HEAD 2021-01-15 10:06:56 +01:00
Sébastien Loriot efc0c525e8 include non-deprecated header 2021-01-15 10:02:00 +01:00