Commit Graph

7347 Commits

Author SHA1 Message Date
Maxime Gimeno ade33b9a3f Update tooltip 2020-10-20 12:56:45 +02:00
Maxime Gimeno 3098b09898 Allow the user to erase the scene_item in the polylines with the DEL key. 2020-10-20 12:48:30 +02:00
Maxime Gimeno 78fe976b31 Fix isotropic remeshing applicable 2020-10-20 11:11:44 +02:00
Maxime Gimeno e678f589a4 Same for isotropic remeshing 2020-10-20 10:59:15 +02:00
Maxime Gimeno 27fed64b92 If a selection item does not have seleted edges, it is skipped during the color each components phase. 2020-10-20 10:53:34 +02:00
Maxime Gimeno c093da3077 If selected_edges is empty, applying mesh_simplification to a selection_item fails with a warning dialog. 2020-10-20 10:43:46 +02:00
Maxime Gimeno 716285945b Convex_hull for sleection items applies only for the selection, not for the whole mesh. 2020-10-20 10:43:21 +02:00
Maxime Gimeno bebd60c12b Merge remote-tracking branch 'cgal/master' into Cmake_improvements-maxGimeno 2020-10-20 09:53:54 +02:00
Maxime Gimeno 945653c46f fix selection_item 2020-10-20 09:24:51 +02:00
Sébastien Loriot 8cdc871ff1 fix warnings 2020-10-19 17:00:18 +02:00
Jane Tournois de7b05c096 Merge remote-tracking branch 'cgal/master' into PMP-remesh_non_triangle_faces-jtournois
# Conflicts:
#	Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/internal/Isotropic_remeshing/remesh_impl.h
2020-10-19 12:10:52 +02:00
Simon Giraudot 80a5deb8e9 Merge remote-tracking branch 'mine/Classification-Simpler_IO_for_ETHZ_Random_forest-GF' into Classification-Simpler_IO_for_ETHZ_Random_forest-GF 2020-10-19 07:59:47 +02:00
Maxime Gimeno af7e1a8829 Remove the scaler form the scene API 2020-10-16 14:32:12 +02:00
Laurent Rineau b4a536047d
Merge pull request #5060 from Vishal19111999/CGAL-Define_CXX20_master-Vishal19111999 2020-10-16 13:56:25 +02:00
Laurent Rineau 86e1fc18ce Merge pull request #4876 from lrineau/GraphicsView-Basic_viewer_improvements-GF
Improvements to Basic_viewer
2020-10-16 13:43:10 +02:00
Laurent Rineau f5ce2bdb09 Merge pull request #5057 from maxGimeno/Demo-Fix_scene_scaling-maxGimeno
Polyhedron demo: Fix the scene scaling
2020-10-16 13:43:05 +02:00
Laurent Rineau c6ae44a0fc Merge pull request #5062 from sloriot/Demo-fix_move_border_vertex
Fix move vertex on the boundary
2020-10-16 13:43:03 +02:00
Laurent Rineau 0f92273687 Merge pull request #5064 from maxGimeno/Demo-Fixes-maxGimeno
Polyhedron_demo : Fix Edit_box->export_to_facegraph()
2020-10-16 13:43:00 +02:00
Laurent Rineau fe24278512 Merge pull request #5069 from maxGimeno/Demo-Merge_hole_filling_plugins-maxgimeno
Polyhedron_demo: Merge hole_filling and hole_filling_polylines plugins
2020-10-16 13:42:58 +02:00
Laurent Rineau 1cf1a8435c Merge pull request #5064 from maxGimeno/Demo-Fixes-maxGimeno
Polyhedron_demo : Fix Edit_box->export_to_facegraph()
2020-10-16 13:41:16 +02:00
Maxime Gimeno 32d137fda7 Add missing include 2020-10-13 15:45:33 +02:00
Maxime Gimeno 152ec0f8e0 Fix memory leeks 2020-10-13 12:26:36 +02:00
Vishal Pratap Singh 0c1c37bf3a
changed [=,this] to [this] 2020-10-12 23:36:23 +05:30
Laurent Rineau 90a9e97379 Use SYSTEM for target_include_directories
That way, the include dirs for libssh will be among those with
`SYSTEM`: at the end. As `CGAL::CGAL` is an imported target, its
include dirs were already `SYSTEM`.
2020-10-12 16:37:37 +02:00
Simon Giraudot c453422a53 Update from review 2020-10-12 14:27:44 +02:00
Mael Rouxel-Labbé 10bd0729a9 Add missing 'bhd' in IAP (polyhedron param plugin) 2020-10-12 11:33:48 +02:00
Maxime Gimeno d6641f8b9c Privatize ssh and websocket 2020-10-12 09:49:04 +02:00
Vishal Pratap Singh f889663188 removed trailing whitespaces 2020-10-10 11:32:24 +05:30
Vishal Pratap Singh f6b81e8c2d replaced [=] with [=,this] for C++ 20 2020-10-09 20:22:57 +05:30
Laurent Rineau 615d84d0db Merge pull request #5056 from maxGimeno/Demo-Fix_compatibility_shaders-maxGImeno
Polyhedron_demo : Fix for compatibility shader
2020-10-09 16:50:09 +02:00
Maxime Gimeno d44c38644e Merge hole_filling and hole_filling_polylines plugins 2020-10-09 14:04:27 +02:00
Maxime Gimeno 28e3ceb749 Clean-up 2020-10-09 10:14:46 +02:00
Maxime Gimeno 14c8887307 Move the macro to the demo config.h and add misisng include 2020-10-09 09:49:52 +02:00
Maxime Gimeno 8d73e78abc use target_compile_definition for websockets too 2020-10-08 15:47:46 +02:00
Maxime Gimeno d9f5f7e226 Fix libssh usage for windows 2020-10-08 15:30:17 +02:00
Simon Giraudot 79abde22e8 Scanline orientation in demo 2020-10-08 15:08:51 +02:00
Maxime Gimeno 031b9e0ad0 Fix ssh usage 2020-10-08 13:19:11 +02:00
Maxime Gimeno 3ca8f13d1c Fix Export_to_facegraph. Wrong item was modified. 2020-10-08 12:48:48 +02:00
Sébastien Loriot 9d920ba66c fix move vertex on the boundary 2020-10-08 11:55:15 +02:00
Maxime Gimeno 5ab054b84d Fix the scene scaling 2020-10-06 12:52:12 +02:00
Maxime Gimeno e4362c88a7 more possible errors 2020-10-06 10:20:05 +02:00
Maxime Gimeno 10739ba980 Fix the compatibility shader for shader_with_light 2020-10-06 10:11:41 +02:00
Maxime Gimeno 43a49605e0 Fix conflicts 2020-10-05 13:20:40 +02:00
Sebastien Loriot 10ba34719e
Merge pull request #4728 from sloriot/PMP-cc_cleanup
Clean in connected components
2020-10-02 15:20:53 +02:00
Sebastien Loriot 20ac7ff2da
Merge pull request #4792 from lrineau/Mesh_3-reduce_size_of_debuginfo-GF
Reduce size of symbols (and debug infos)
2020-10-02 15:17:44 +02:00
Sebastien Loriot aff306bb55
Merge pull request #4811 from maxGimeno/Demo-Fixes_and_features-maxGimeno
Polyhedron demo: fixes and features
2020-10-02 15:17:25 +02:00
Sebastien Loriot 931d707e4d
Merge pull request #4845 from danston/Polyhedron-cpp11_ranges-danston
Polyhedron cpp11 range-based loops
2020-10-02 15:17:05 +02:00
Sebastien Loriot 9ea4a875ef
Merge pull request #4862 from maxGimeno/Demo-Display_properties_plugin-maxGimeno
3D Demo: Display Surface_mesh properties
2020-10-02 15:16:37 +02:00
Laurent Rineau c27dfb97e5 Merge pull request #4973 from maxGimeno/Demo-Fix_remve_isolated_vertices-maxGimeno
Polyhedron Demo: Fix Remove_isolated_vertices
2020-09-25 15:34:28 +02:00
Laurent Rineau 0615f32441 Merge pull request #5014 from maxGimeno/Demo-Fix_fit_text-maxGimeno
Polyhedron Demo: Robustify the engrave_text_plugin
2020-09-25 15:34:25 +02:00
Laurent Rineau ad93ce0175 Merge pull request #5018 from maxGimeno/Demo-Add_simply_connected_polygon_generator-maxGimeno
Polyhedron Demo: Add an option to the polyline generator
2020-09-25 15:34:23 +02:00
Laurent Rineau 47b6db41d3 Merge pull request #5019 from maxGimeno/Demo-offset_mesher_wire-maxGimeno
Polyhedron Demo: Offset mesher detail
2020-09-25 15:34:21 +02:00
Laurent Rineau ad83011d27 Merge branch '5.1.x-branch' 2020-09-24 16:45:08 +02:00
Laurent Rineau 4b65694724 Merge pull request #4944 from maxGimeno/Demo-AABB_plugins-new_stuff-maxGimeno
Polyhedron demo: filter the AABB_tree representation
2020-09-24 16:43:18 +02:00
Laurent Rineau 692fc7d167 Merge pull request #4959 from maxGimeno/Demo-Grid_plugin_changes-maxGimeno
Polyhedron demo: change for grid plugin
2020-09-24 16:43:11 +02:00
Laurent Rineau 62e8fcb4ce Merge pull request #4975 from maxGimeno/Demo-Fix_mesh_plane_detection-maxGimeno
Polyhedron Demo: Fix Mesh_plane_detection_plugin
2020-09-24 16:43:07 +02:00
Laurent Rineau cee9751f6a Merge pull request #4980 from maxGimeno/Demo-Animation_mesh_deform-maxGimeno
Polyhedron Demo: Animation of surface_meshes
2020-09-24 16:43:04 +02:00
Laurent Rineau 0b2528c8b0 Merge branch 'releases/CGAL-5.0-branch' into 5.1.x-branch 2020-09-24 16:41:45 +02:00
Laurent Rineau a246b3d776 Merge pull request #4979 from janetournois/PMP-remesh_after_detect_sharp_features-jtournois
Polyhedron demo - get the sharp edges back after remeshing
2020-09-24 16:34:48 +02:00
Maxime Gimeno eccde8231b Merge remote-tracking branch 'cgal/master' into Demo-Fixes_and_features-maxGimeno 2020-09-24 16:27:54 +02:00
Maxime Gimeno 2c7f4f0824 Factorized 2020-09-24 16:24:56 +02:00
Maxime Gimeno 702655aac5 Works with point set. Need factorization 2020-09-24 16:24:56 +02:00
Maxime Gimeno ebc7ba62db WIP point_set 2020-09-24 16:24:56 +02:00
Maxime Gimeno f4e2edd5a6 WIP Point_set 2020-09-24 16:24:56 +02:00
Maxime Gimeno 086ed69d27 fix warning 2020-09-24 16:24:56 +02:00
Maxime Gimeno 6183da0408 Replace the IO keyword by "Viewer" and add it to the Display_property_plugin 2020-09-24 16:24:54 +02:00
Maxime Gimeno 59d5d2efad Replace the IO keyword by "Viewer" and add it to the Display_property_plugin 2020-09-24 16:24:48 +02:00
Maxime Gimeno a1ade09966 Ajust pixmap width 2020-09-24 16:24:16 +02:00
Maxime Gimeno adc7da1be7 fix typo 2020-09-24 16:24:16 +02:00
Maxime Gimeno fd1160b057 Fixes for heat_method and finalize the properties diplay 2020-09-24 16:24:16 +02:00
Maxime Gimeno 4db9a82fc3 WIP display property 2020-09-24 16:24:16 +02:00
Maxime Gimeno 9c194a7143 Switch offset item to wireframe 2020-09-24 13:01:04 +02:00
Maxime Gimeno 52c5245eb1 Add an option to triangulate a polyline/polygon in basic generator 2020-09-24 12:33:35 +02:00
Maxime Gimeno 7c42055ad0 Robustify the engrave text plugin 2020-09-23 12:32:51 +02:00
Maxime Gimeno 79db1b0cb9 Fix warnings and missing includes 2020-09-23 09:54:34 +02:00
Maxime Gimeno 0a2a0070fd More conversion warnings 2020-09-23 09:43:03 +02:00
Mael Rouxel-Labbé 5d414461b0 Merge remote-tracking branch 'cgal/master' into Iterative_authalic_parameterization 2020-09-22 11:53:27 +02:00
Maxime Gimeno 095b801c92 Fix is_border test in id_printing 2020-09-22 08:26:11 +02:00
Maxime Gimeno 07322242a6 Fix warning 2020-09-21 11:39:23 +02:00
Maxime Gimeno 687c86af2b fix warning 2020-09-21 10:16:42 +02:00
Maxime Gimeno a6199184be Add parenthesis around b.min 2020-09-21 09:55:13 +02:00
Laurent Rineau fac1f85985 Merge pull request #4938 from sloriot/BGL-simpler_inheritance
Add a convenience header file to inherit from face graphs
2020-09-11 15:16:34 +02:00
Laurent Rineau 113048faef Merge pull request #4960 from maxGimeno/Demo-C3t3_can_read_mesh_with_domain_0-maxGimeno
Polyhedron Demo: .mesh reading enhancement
2020-09-11 15:07:47 +02:00
Jane Tournois fd88ec4925 update num_faces in selection item
to avoid selected_facets.clear() in the slot() associated to
Scene_surface_mesh_item::itemChanged()
2020-09-11 11:41:19 +02:00
Maxime Gimeno 301f0be305 Fix warnings 2020-09-11 09:14:46 +02:00
Jane Tournois 1dba2d1d82 add visitor in Triangulate_facets_plugin 2020-09-11 08:34:37 +02:00
Jane Tournois 17d7fb8e68 use triangulate_visitor to keep the set of selected facets valid 2020-09-10 16:07:23 +02:00
Maxime Gimeno 721a6aafd1 Fix comparison warning 2020-09-10 09:45:40 +02:00
Maxime Gimeno e1ff1efaab Update_vertex works for flat data 2020-09-08 09:28:16 +02:00
Maxime Gimeno aeda2ef58c Replace boolean name and prevent maxx_domain=0 2020-09-07 12:35:54 +02:00
Jane Tournois 7cdc3775fd get the sharp edges back after remeshing
they were saved in ecm and edges_to_protect but not back-ported
to eif
2020-09-04 15:10:06 +01:00
Jane Tournois 32f6a1ab3d make triangulate_faces usable on a selection of faces 2020-09-04 15:42:15 +02:00
Maxime Gimeno 7449fc4730 add a help box 2020-09-04 15:35:57 +02:00
Maxime Gimeno 8f4055ce9c Nice icons 2020-09-04 14:55:03 +02:00
Maxime Gimeno 3d664482a5 connect slider 2020-09-04 14:33:37 +02:00
Maxime Gimeno fc8d134d56 better reset and init state 2020-09-04 14:29:06 +02:00
Maxime Gimeno 004e76d764 update of the UI 2020-09-04 13:48:18 +02:00
Jane Tournois 8400d05d8a check that surfaces to remesh are triangle meshes 2020-09-04 13:43:59 +02:00
Jane Tournois 6e3ca144aa in the demo, remesh a non-triangle mesh
when a user wants to remesh a non-triangle mesh, give the user
the option to first triangulate before starting to remesh
2020-09-04 11:36:07 +02:00
Maxime Gimeno 023e72482d secure stuff 2020-09-04 11:24:12 +02:00