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

3374 Commits

Author SHA1 Message Date
Maxime Gimeno 92aa19ecbf Statistics available for multiple selected polyhedra. 
- The median edge length is not available in this case for now because it would be far too long to compute.
 2016-01-04 10:08:16 +01:00
Maxime Gimeno 81b79ed751 Untriangulated polyhedrons do not specify degenerated facets for now. 2015-12-31 14:47:23 +01:00
Maxime Gimeno 1d0f79e249 Addition of the missing files 2015-12-31 12:19:40 +01:00
Maxime Gimeno beb7b59b61 WIP calculate degenerate facets in triangulation 2015-12-31 12:18:23 +01:00
Maxime Gimeno 687d0174a2 Number of degenerated faces added to toolTip 2015-12-31 11:42:08 +01:00
Maxime Gimeno eba188b5fb Re-re-renaming of the IO_plugins 2015-12-31 10:28:29 +01:00
Maxime Gimeno b5e63326b6 Adding info about edges statistics to the toolTip 2015-12-31 10:05:02 +01:00
Maxime Gimeno 019db00106 Adds the new item to the selected group when created 2015-12-30 15:59:51 +01:00
Maxime Gimeno a580d15129 Adds an easiest way of de-selecting primitives. 2015-12-30 12:05:37 +01:00
Maxime Gimeno 2207ec8409 Vtk fix 2015-12-30 10:12:35 +01:00
Maxime Gimeno f68d1db068 Double selection on clic fix 
- The eventFilter of the k_ring_selector was connected once to the viewer AND once
  to the main window, which resulted in pressevents called twice and with two different positions.
  I removed the connection to the main window.
 2015-12-30 08:54:21 +01:00
Simon Giraudot e8be5fe3ca Merge branch 'Point_set_shape_detection_3-Plane_regularization-GF-old' into Point_set_shape_detection_3-Plane_regularization-GF 2015-12-29 14:26:36 +01:00
Simon Giraudot 8e9f9dd3d6 Use inFastDrawing instead of quick_camera and provide direct access to fast drawing state 2015-12-29 11:40:19 +01:00
Maxime Gimeno 648cdce4ad Unification of the names of the IO plugins 
- They are all called xxxx_io_plugin now.
 2015-12-29 10:32:27 +01:00
Simon Giraudot e156ff1cf1 Remove useless calls to virtual functions of QGLViewer 2015-12-29 10:16:04 +01:00
Jane Tournois d212432a56 avoid hardcoding the Image_word_type 2015-12-22 16:53:26 +01:00
Sebastien Loriot e44adafd60 Merge pull request #553 from lrineau/Polyhedron_demo-fix_Scene_c3t3_item_display_of_spheres-GF 
Polyhedron demo: fix the display of protecting balls in Scene_c3t3_item
 2015-12-21 10:52:07 +01:00
Sébastien Loriot b4315f4232 Merge pull request #560 from maxGimeno/Polyhedron_demo-scroll_sceneview-GF 
Scrolls the sceneView when a picking is performed.
 2015-12-18 16:38:26 +01:00
Sebastien Loriot 4187dd1240 Merge pull request #564 from maxGimeno/Polyhedron_demo-moving_names_in_list-GF 
Moving items in the list
 2015-12-18 16:37:01 +01:00
Maxime Gimeno 3097134e28 Some clean-up 2015-12-18 15:16:34 +01:00
Maxime Gimeno 7bb57e35f0 Displays selected points and distance over the scene. 
- Remaining : use the coming textRenderer to indicate the info about distance and points directly on screen.
 2015-12-17 16:10:10 +01:00
Maxime Gimeno ffca2c49b5 Items move even when they are in a group. 2015-12-17 10:01:52 +01:00
Maxime Gimeno f83fc58479 Items move but only when there is no hierarchy. 2015-12-16 15:43:33 +01:00
Maxime Gimeno 0167571c6e Scrolls the list of items when a picking is performed. 2015-12-16 12:58:53 +01:00
Simon Giraudot 53c3f40bdc Bugfix: shuffle selected and unselected points separately 2015-12-15 10:49:21 +01:00
Simon Giraudot c87de089ce Add option to activate or not the quick camera mode 2015-12-15 10:05:02 +01:00
Simon Giraudot 7a63e01295 Quick display of point sets: only display small subset when moving large point sets 2015-12-15 10:00:06 +01:00
Laurent Rineau 89bae417c4 Fix a bug of the c3t3 item 2015-12-14 15:51:06 +01:00
Maxime Gimeno ae6ad8aa88 The spheres are now affected by the plane 2015-12-14 15:07:25 +01:00
Laurent Rineau 0c917c5880 Merge pull request #554 from sgiraudot/Polyhedron_demo-Bugfix_point_inside_polyhedron_selection-GF 
Bugfix: correct point set selection handling for point_inside_polyhedron
 2015-12-14 14:40:11 +01:00
Maxime Gimeno 6cdfeb4518 Merge branch 'Polyhedron-clipping_in_shader-GF' of github.com:CGAL/cgal-dev into Polyhedron-clipping_in_shader-GF 2015-12-14 14:37:42 +01:00
Maxime Gimeno e98668e8c0 Color fix 2015-12-14 14:37:31 +01:00
Andreas Fabri 5aa49078c5 Merge branch 'Polyhedron-clipping_in_shader-GF' of github.com:CGAL/cgal-dev into Polyhedron-clipping_in_shader-GF 2015-12-14 14:28:13 +01:00
Andreas Fabri 294f9c9843 draw missing cells V2 2015-12-14 14:27:44 +01:00
Maxime Gimeno 2c90680a7d Merge branch 'Polyhedron-clipping_in_shader-GF' of github.com:CGAL/cgal-dev into Polyhedron-clipping_in_shader-GF 2015-12-14 14:16:56 +01:00
Maxime Gimeno b507542a64 Fragment shader fix 
- The test was performed on x instead of w.
 2015-12-14 14:16:10 +01:00
Andreas Fabri 03ac017665 draw missing cells 2015-12-14 14:15:47 +01:00
Simon Giraudot c09fae3736 Bugfix: correct point set selection handling for point_inside_polyhedron_plugin 2015-12-14 14:15:31 +01:00
Sebastien Loriot a7ce0cf3a6 Merge pull request #551 from maxGimeno/Polyhedron_demo-Point_inside_polyhedron_fix-GF 
Selection color fix
 2015-12-14 13:58:20 +01:00
Laurent Rineau f1ce747dc3 Try to improve the non-consistent indentation 2015-12-14 13:03:55 +01:00
Laurent Rineau 3b8d7a0dc8 Enhancement: display only non-degenerated spheres 
diff --git a/Polyhedron/demo/Polyhedron/Scene_c3t3_item.cpp b/Polyhedron/demo/Polyhedron/Scene_c3t3_item.cpp
index fbb848f..abe1721 100644
--- a/Polyhedron/demo/Polyhedron/Scene_c3t3_item.cpp
+++ b/Polyhedron/demo/Polyhedron/Scene_c3t3_item.cpp
@@ -1025,6 +1025,8 @@ void Scene_c3t3_item::compute_elements() const
           end =  d->c3t3.triangulation().finite_vertices_end();
           vit != end; ++vit)
       {
+          if(vit->point().weight()==0) continue;
+
           typedef Tr::Vertex_handle Vertex_handle;
           std::vector<Vertex_handle> incident_vertices;
           d->c3t3.triangulation().incident_vertices(vit, std::back_inserter(incident_vertices));
 2015-12-14 13:03:55 +01:00
Laurent Rineau 78fe4f96ea Bug-fix: display all spheres, and not 1 out of 3 2015-12-14 13:03:55 +01:00
Maxime Gimeno 66815745b7 Selection color fix 2015-12-14 11:25:59 +01:00
Maxime Gimeno d1b3937a88 Edges management 
- The shader of the edges of the base item discards the edges when it should
- The facets of the cutplane have edges
- The grid is displayed in all the rendering modes
 2015-12-14 10:47:34 +01:00
Andreas Fabri d4dd0c1b28 merged branch that deals with 1D features on the sides of a cube 2015-12-13 11:07:12 +01:00
Maxime Gimeno a63bfd93c0 frame_plane fix 2015-12-11 21:23:54 +01:00
Jane Tournois 2e16f63689 add invalidate_buffers in discard changes to see that reset has been performed 2015-12-11 21:23:54 +01:00
Maxime Gimeno f4c7d71413 Fixed_plane_translation fix. 2015-12-11 21:23:54 +01:00
Maxime Gimeno bffd28f19a Color fix 2015-12-11 21:23:54 +01:00
Jane Tournois 9664d3702d isotropic_remeshing needs face_index map to be properly initialized 
this is needed by border_halfedges_impl
 2015-12-11 21:23:53 +01:00
Andreas Fabri 700359f675 write less facets into the AABB tree 2015-12-11 17:02:19 +01:00
Andreas Fabri 6143260202 Use the AABB Tree to find the facets intersected by the cutplane 2015-12-11 16:16:12 +01:00
Maxime Gimeno dc24228f64 Fix for selection_tool 
- Restored the emit newItem
 2015-12-11 13:20:55 +01:00
Maxime Gimeno d769fba4b8 Polylines in point_set_selection fix 2015-12-11 13:11:36 +01:00
Andreas Fabri 50cc9af2ad WIP: Add a VBO for the faces intersected by the cut plane. Still compute them brute force 2015-12-11 12:14:28 +01:00
Andreas Fabri 0f31dbeaf5 WIP: compute_values no longer computes the clipped faces 2015-12-11 11:09:55 +01:00
Andreas Fabri e7e5769e9c WIP: introduced a shader that does the clipping 2015-12-11 10:52:35 +01:00
Sebastien Loriot 60dbff189d Merge pull request #534 from afabri/Polyhedron_3-improve_mesh_3_plugin-GF 
Polyhedron 3 improve mesh 3 plugin gf
 2015-12-10 21:01:00 +01:00
Sebastien Loriot f613749ea7 Merge pull request #538 from maxGimeno/Polyhedron_demo-Mesh_3_plugin_color_fix-GF 
Polyhedron demo mesh 3 plugin fix and enhancement
 2015-12-10 20:59:49 +01:00
Andreas Fabri 46eec2d9f0 do not compute sidedness twice 2015-12-09 13:43:11 +01:00
Andreas Fabri fefa699a3d no need to compute a normal 2015-12-09 12:35:49 +01:00
Andreas Fabri c8bd785061 do not use the facet criteria 2015-12-09 12:35:18 +01:00
Andreas Fabri 056ea83fa1 move criteria 2015-12-09 10:04:20 +01:00
Andreas Fabri 18bbaede12 Integrate code for respecting polylines on an Image_3 2015-12-09 06:30:15 +01:00
Sebastien Loriot f9240945ae Merge pull request #529 from afabri/Mesh_3-params-GF 
Set BOOST_PARAMETER_MAX_ARITY only in the packages concerned
 2015-12-07 17:41:57 +01:00
Andreas Fabri 4829475ccb Merge remote-tracking branch 'cgal-dev/Polyhedron_demo-Mesh_3_plugin_color_fix-GF' into Polyhedron_3-improve_mesh_3_plugin-GF 2015-12-07 15:45:35 +01:00
Andreas Fabri 27dcff722d Merge branch 'Polyhedron_3-improve_mesh_3_plugin-GF' of github.com:CGAL/cgal-dev into Polyhedron_3-improve_mesh_3_plugin-GF 2015-12-07 15:44:38 +01:00
Andreas Fabri ce738d5426 typo 2015-12-07 15:41:54 +01:00
Jane Tournois 0523d04cf4 fix bbox computation in c3t3_item 2015-12-07 12:29:53 +01:00
Maxime Gimeno 3dd3fba020 Smooth cutting-plane moves 2015-12-07 12:06:04 +01:00
Maxime Gimeno c81ff58ee7 Restored the multicolor aspect of the c3t3_items 2015-12-07 11:43:04 +01:00
Andreas Fabri 5ec38ae0a8 cleanup 2015-12-04 18:06:35 +01:00
Andreas Fabri 312df7edc3 Avoid duplication of arrays - a std::vector stores an array 2015-12-04 17:56:07 +01:00
Andreas Fabri 9e1fe1be4d fix visualization of a parallel C3T3 2015-12-04 17:27:11 +01:00
Sebastien Loriot 623faf3af1 Merge pull request #531 from maxGimeno/Polyhedorn_demo-adjusting_znearcoefficient-GF 
Adjusting zNear with wheel and shift
 2015-12-04 17:25:25 +01:00
Sebastien Loriot 7d2e8842fa Merge pull request #522 from maxGimeno/Polyhedron_demo-Hierarchic_view-GF 
Polyhedron demo: hierarchic view of items
 2015-12-04 17:02:39 +01:00
Andreas Fabri 07833f55ac Enable activation of concurrent Mesh_3 2015-12-04 16:50:53 +01:00
Andreas Fabri dc81769c8e shift image by 1/2 a voxel 2015-12-04 16:39:19 +01:00
Andreas Fabri b6d77d5f06 move timer 2015-12-04 16:25:02 +01:00
Andreas Fabri bba935108e Make sure that Mesh_3/global_parameters.h gets included before Polyhedron_3.h 2015-12-03 10:13:03 +01:00
Maxime Gimeno 83581b29d2 clean-up 2015-12-03 08:56:54 +01:00
Sebastien Loriot 022c7b41e0 Merge pull request #528 from maxGimeno/Polyhedron_demo-fix_items_location-GF 
Polyhedron demo fix items location gf
 2015-12-02 16:49:52 +01:00
Maxime Gimeno 67ef328279 Using Shift+wheel adjusts the zNear plane in the Frustum 2015-12-02 13:09:28 +01:00
Sebastien Loriot 8d6a6a56bd Merge pull request #527 from sgiraudot/Polyhedron_demo-Bugfix_orient_opened_polyhedron-GF 
Bugfix: Only check orientation of polyhedron if it is closed
 2015-12-01 16:40:02 +01:00
Sebastien Loriot e1437eefaa Merge pull request #523 from maxGimeno/Polyhedron_demo-Controls_widget_visibility_fix-GF 
Volume_planes_plugin fix
 2015-12-01 16:29:33 +01:00
Maxime Gimeno e8c3dd0fe5 Moved add_item for edit_polyhedron 2015-12-01 13:15:06 +01:00
Jane Tournois 90a5dff1b4 move scene_segmented_image_item in Polyhedron demo root directory 2015-12-01 12:40:39 +01:00
Simon Giraudot 140a2c8eec Only check orientation of polyhedron if it is closed 2015-12-01 11:25:27 +01:00
Maxime Gimeno d5ff04f673 Error fix. 2015-11-30 11:07:45 +01:00
Maxime Gimeno 07e2680df9 Addition of a function closure() for all the plugins using a QDockWidget 2015-11-30 10:38:29 +01:00
Sebastien Loriot 79fb20650b Merge pull request #524 from maxGimeno/Polyhedron_Demo-Load_external_plugin_fix-GF 
External plugin loading fix
 2015-11-28 16:40:05 +01:00
Sebastien Loriot 515bfffee8 Merge pull request #520 from sgiraudot/Polyhedron_demo-Merge_normal_estimation_plugins-GF 
Polyhedron demo: Merge normal estimation plugins
 2015-11-27 16:34:21 +01:00
Maxime Gimeno 9f816040db WIP Updating the plugins 2015-11-27 15:31:49 +01:00
Maxime Gimeno a3ea006562 Fix for this plugin. All the others remaining, plus the doc. 2015-11-27 14:37:38 +01:00
Maxime Gimeno 977214a55d Actual fix 
- The precedent fix did nothing. This one does what the previous one was supposed to do.
 2015-11-27 13:04:34 +01:00
Maxime Gimeno ad89447c93 Fixes the error message when loading an external plugin. 2015-11-27 09:00:57 +01:00
Maxime Gimeno 778993db62 Hide the controls widget when created in the Volume_planes_plugin 2015-11-27 08:55:33 +01:00
Maxime Gimeno d74763579c Merge branch 'Polyhedron_demo-Hierarchic_view-GF-old' into Polyhedron_demo-Hierarchic_view-GF 
Conflicts:
	Polyhedron/demo/Polyhedron/CMakeLists.txt
	Polyhedron/demo/Polyhedron/MainWindow.cpp
 2015-11-27 08:25:36 +01:00
Maxime Gimeno 713dabef77 Update of the API and of the doc 2015-11-26 16:06:45 +01:00
Simon Giraudot 858a9511ab Update cgal_test_with_cmake with new plugin 2015-11-26 15:09:36 +01:00
Simon Giraudot 3fd7d42555 Merge and reorganize normal estimation and VCM normal estimation plugins 2015-11-26 14:47:19 +01:00
Simon Giraudot 7b2120dd88 New normal estimation dialog 2015-11-26 14:35:50 +01:00
Sebastien Loriot 8e507866bc Merge pull request #480 from maxGimeno/Polyhedron_demo-C3t3_IO_plugin-GF 
I/O plugin for c3t3 meshes
 2015-11-26 14:34:19 +01:00
Simon Giraudot 1e4b275694 Reorganize normal estimation plugins 2015-11-26 14:30:18 +01:00
Sebastien Loriot 47694dec49 Merge pull request #500 from janetournois/PMP-length_of_border-GF 
PMP : add measure functions
 2015-11-26 14:17:49 +01:00
Sebastien Loriot bd1dfb70b4 Merge pull request #519 from maxGimeno/Polyhedron_demo-Selection_tool_fix-GF 
Fix for the selection tool
 2015-11-26 14:10:43 +01:00
Sebastien Loriot 192fc73051 Merge pull request #517 from maxGimeno/Polyhedron_demo-ManipulatedFrame_fix-GF 
Polyhedron demo manipulated frame fix gf
 2015-11-26 14:10:02 +01:00
Sebastien Loriot bfa47214f3 Merge pull request #513 from maxGimeno/Polyhedron_demo-Selection_colors_fix-GF 
Selection tool : colors fix
 2015-11-26 14:09:08 +01:00
Sebastien Loriot acfa4bef0f Merge pull request #498 from sgiraudot/Polyhedron_demo-Bugfix_selected_points-GF 
Polyhedron demo: Fix point selection behavior
 2015-11-26 14:05:54 +01:00
Sebastien Loriot 36023eb977 Merge pull request #512 from sgiraudot/Polyhedron_demo-Surface_reco_add_param-GF 
Add parameters to surface reconstruction plugin
 2015-11-26 14:05:03 +01:00
Maxime Gimeno e35a69f576 WIP Modifying the API 2015-11-26 09:42:44 +01:00
Maxime Gimeno 0bc61e49c4 Clean-up 2015-11-25 16:24:33 +01:00
Maxime Gimeno ec9379685e WIP : Updating example to use group_items 2015-11-25 16:14:47 +01:00
Maxime Gimeno 9b4e2fbc0b Moved Scene_group_item.h to Three and updated the doc. 2015-11-25 15:45:03 +01:00
Maxime Gimeno dc7584cc9c Made the group_plugin a whole part of the demo. 2015-11-25 14:36:30 +01:00
Maxime Gimeno f57f6f88ec Clean up signals 
Conflicts:
	Polyhedron/demo/Polyhedron/Scene_polyhedron_selection_item.h
 2015-11-25 14:12:45 +01:00
Maxime Gimeno be6dde05a9 Fix for the selection_plugin 
- At some point the poly_item was updated along with the selection_item, which caused it to be re-computed when it should not.

Conflicts:
	Polyhedron/demo/Polyhedron/Scene_polyhedron_selection_item.h
 2015-11-25 14:05:01 +01:00
Maxime Gimeno b7c6742620 Affine transformation color fix 2015-11-25 11:29:13 +01:00
Maxime Gimeno 8b7eed3398 Clean-up 2015-11-25 10:42:26 +01:00
Maxime Gimeno 8218a38c58 ManipulatedFrame issues : fix 
- The call to bbox() at each top of a manipulated frame made it verry slow to manipulate frames
  on a big item, because the bbox was computed at every call. The result is now kept in a
  member and updated only when invalidate_buffers is called.

- The color of the cutting plane is repaired.
 2015-11-25 09:43:56 +01:00
Laurent Rineau 5a508ce86e restore state of plugins' dockwidgets 
With this commit, restoreState is called after plugins have been
initialized. In case the `init()` functions of plugins create new dock
widgets, that allows to restore the state (position/size) of those
dockwidgets as well.
 2015-11-24 18:51:39 +01:00
Laurent Rineau 260af874d3 remove unused #include 2015-11-24 18:48:52 +01:00
Maxime Gimeno b5ad30e77b Merge branch 'Polyhedron_demo-Hierarchic_view-GF' of github.com:CGAL/cgal-dev into Polyhedron_demo-Hierarchic_view-GF 2015-11-24 10:31:57 +01:00
Maxime Gimeno 5d3c9a2525 WIP Documentation update 2015-11-24 09:42:25 +01:00
Maxime Gimeno eb7b0fa302 Merge branch 'Polyhedron_demo-Selection_colors_fix-GF-old' into Polyhedron_demo-Selection_colors_fix-GF 2015-11-24 08:36:54 +01:00
Simon Giraudot b4fa1fd208 Add parameters to surface reconstruction plugin 2015-11-23 19:18:47 +01:00
Jane Tournois a61fefc839 Merge branch 'PMP-length_of_border-GF-old' into PMP-length_of_border-GF 2015-11-23 17:19:30 +01:00
Maxime Gimeno 9e2f611fee Segfault and warning fix 
- The segfault was caused by the absence of a call to unselect_all() after the creation of the point_set from
  a selection.
 2015-11-23 16:49:34 +01:00
Maxime Gimeno f40aca9950 Selection_tool bug color fix 2015-11-23 16:18:57 +01:00
Andreas Fabri 660944b397 fix dll linkage 2015-11-23 16:13:17 +01:00
Simon Giraudot fcbdd0bb86 Change behavior of point set selection: use number of selected points instead of iterator 2015-11-23 14:31:49 +01:00
Maxime Gimeno 4878859db1 Error fix 
- replaced 'or' by '||'
 2015-11-23 10:14:48 +01:00
Maxime Gimeno 3be30b993f Addition of the missing files 2015-11-23 10:06:12 +01:00
Maxime Gimeno 448bda4221 Moved the plugin in a sub-directory 2015-11-23 09:47:08 +01:00
Sebastien Loriot 059ec8cb81 Merge pull request #495 from janetournois/PMP-fix_isotropic_remeshing_bug-jtournois 
PMP : fix a bug in isotropic remeshing
 2015-11-23 09:44:22 +01:00
Maxime Gimeno 7ad45de6ef Merge branch 'Polyhedron_demo-Hierarchic_view-GF-old' into Polyhedron_demo-Hierarchic_view-GF 
Conflicts:
	Polyhedron/demo/Polyhedron/CMakeLists.txt
	Polyhedron/demo/Polyhedron/MainWindow.cpp
	Polyhedron/demo/Polyhedron/Scene.cpp
	Polyhedron/demo/Polyhedron/Scene.h
 2015-11-23 09:32:20 +01:00
Maxime Gimeno ce3b4985b0 Segfault fix 
- The group selection has been restored.
 2015-11-23 09:10:50 +01:00
Maxime Gimeno e8ad030474 Freeze fix 
- The BBox calculation of a group was taking forever because
  it had to compute it for each of it children, which made everything
  freeze if there was a lot of sub-groups. Now a group has an empty BBox().
 2015-11-20 16:00:01 +01:00
Maxime Gimeno 0af72ecf93 Inopportune collapsing fix 
- The model used by scene view is proxyModel and not scene, so all the indexes I used
  were invalid.
 2015-11-20 14:50:34 +01:00
Sebastien Loriot 172f38e7d4 Merge pull request #487 from maxGimeno/Polyhedron_demo-fix_plugin_loading_msvc-GF 
Polyhedron demo fix plugin loading
 2015-11-20 14:46:52 +01:00
Jane Tournois c4bbdda0bd Merge branch 'Polyhedron_demo-fix_plugin_loading_msvc-GF' into PMP-fix_isotropic_remeshing_bug-jtournois 2015-11-19 17:32:49 +01:00
Jane Tournois f358594e92 complete the dump function and its use in the Polyhedron demo 2015-11-19 17:27:36 +01:00
Jane Tournois 20aae37049 use automoc for MainWindow 
Conflicts:
	Polyhedron/demo/Polyhedron/MainWindow.cpp
 2015-11-19 16:27:40 +01:00
Jane Tournois 9a5a9c23a4 fix link error on windows 
export "MainWindow" symbols

Conflicts:
	Polyhedron/demo/Polyhedron/MainWindow_config.h
 2015-11-19 16:25:41 +01:00
Jane Tournois 1fb2c58da6 remove useless include 2015-11-19 16:25:40 +01:00
Maxime Gimeno 9fd0dc69d4 Implementation 
- Addition of .mesh and .ma as save format.

- The Polyhedron_demo_io_plugin_interface now has a saveNameFilters and a loadNameFilters that both return
  nameFilters() by default, in case an IO_plugin have diffrent input and output formats.
 2015-11-19 15:22:53 +01:00
Maxime Gimeno 98ff3fd8e5 Bug linux fix 
- changed package_dir into package_dir_path
 2015-11-19 14:01:40 +01:00
Jane Tournois c9dd782764 fix load of plugins for windows 
needed because msvc creates the configuration (e.g. Debug) intermediate directory
For example, loader needs to find :
build/Plugins/IO/Debug/off_plugin.dll
build/Debug/demo_framework.dll
 2015-11-19 13:00:20 +01:00
Sébastien Loriot 961f3417b0 add missing buffer invalidation and item changed calls 
trivial bug-fix for master
 2015-11-19 10:21:01 +01:00
Maxime Gimeno b95bdff641 Merge branch 'Polyhedron_demo-C3t3_IO_plugin-GF-old' into Polyhedron_demo-C3t3_IO_plugin-GF 
Conflicts:
	Polyhedron/demo/Polyhedron/CMakeLists.txt
 2015-11-19 08:57:56 +01:00
Maxime Gimeno 8df2be4c63 Addition of the I/O management of the ascii ".mesh" format. 
- This has been done partially in the scene_c3t3_item. The next step is to move this code in the plugin.
 2015-11-18 16:01:54 +01:00
Sébastien Loriot 65cda29122 Merge pull request #430 from maxGimeno/Polyhedron_demo-plugins_in_directories-GF 
Polyhedron demo: plugins in sub-directories
 2015-11-18 11:39:58 +01:00
Andreas Fabri 7bc5014254 Merge branch 'Polyhedron_demo-plugins_in_directories-GF' of github.com:CGAL/cgal-dev into Polyhedron_demo-plugins_in_directories-GF 2015-11-18 10:05:07 +01:00
Andreas Fabri f8ae3cf38b size_t -> int to avoid warning 2015-11-18 10:04:30 +01:00
Andreas Fabri 6f69743fa7 fix CMakeLists.txt 2015-11-18 09:58:56 +01:00
Sebastien Loriot 5f894e5598 Merge pull request #485 from janetournois/Polyhedron_demo-fix_remeshing_plugin-jtournois 
Polyhedron demo : fix the isotropic remeshing plugin
 2015-11-18 09:27:34 +01:00
Maxime Gimeno 88421f7467 Signals/slots fix 
- Most of the problems came from Scene_item that became CGAL::Three::Scene_item
 2015-11-18 08:42:24 +01:00
Jane Tournois a4c8f6627c remove unused parameter (triggers warning) 2015-11-17 17:07:37 +01:00
Jane Tournois 376b58b434 fix Isotropic_remeshing plugin 
border_halfedges internal implementation needs the face index map to be properly filled
with indices
 2015-11-17 16:59:31 +01:00
Jane Tournois 61f5743dbf fix double to float conversion warnings 2015-11-17 16:12:13 +01:00
Jane Tournois 265eb559c0 fix conversion warnings (for msvc) 2015-11-17 16:11:53 +01:00
Maxime Gimeno bbe9732171 Merge branch 'cgal-dev/Polyhedron_demo-plugins_in_directories-GF-old' into cgal-dev/Polyhedron_demo-plugins_in_directories-GF 
Conflicts:
	Polyhedron/demo/Polyhedron/CMakeLists.txt
	Polyhedron/demo/Polyhedron/Plugins/Mesh_3_plugin/Mesh_3_plugin.cpp
 2015-11-17 16:03:20 +01:00
Jane Tournois f80603cc9a remove extra return statement 2015-11-17 15:30:46 +01:00
Jane Tournois 625bc56c8a remove useless comments 2015-11-17 15:30:18 +01:00
Maxime Gimeno 08db015daf un-comment a function that shounldn't be commented. 2015-11-17 15:27:57 +01:00
Jane Tournois c86e52b37a Surface_patch_index is an integer for all mesh domains in the Polyhedron demo 2015-11-17 15:21:34 +01:00
Jane Tournois 5f284c032e add missing file 2015-11-17 14:42:00 +01:00
Jane Tournois 0fd8924196 avoid duplicating typedef 2015-11-17 14:36:19 +01:00
Sebastien Loriot 701519e48f Merge pull request #482 from maxGimeno/Polyhedron_demo-Mesh_3_warning_fix-GF 
Warning Fix
 2015-11-17 13:34:34 +01:00
Sebastien Loriot d605b6b95f Merge pull request #457 from janetournois/Polygon_mesh_processing-local_remeshing-GF 
Polygon mesh processing - add isotropic remeshing
 2015-11-17 13:25:45 +01:00
Sebastien Loriot 7d6d5b2072 Merge pull request #479 from maxGimeno/Polyhedorn_demo-Scene_c3t3_item_update-GF 
C3t3_item update
 2015-11-17 13:14:04 +01:00
Maxime Gimeno 62489af1b1 Addition of a new feature 
- If one or several items are selected when a new group is created, they are
  automatically added to the group.
- If all the selected items are in the same group at this time, the new group
  is created as a sub-group of this container group.
 2015-11-17 11:45:23 +01:00
Maxime Gimeno dfd3acb4ef Warning Fix 
- Initialized temp_item to 0 to silence a warning.
 2015-11-17 10:27:20 +01:00
Maxime Gimeno f68eee378c Fix for #46 
- Addition of an IO plugin for the c3t3 meshes. The function try_load_other_binary_format() has been
  commented because it generates a compilation error that I couldn't fix.
 2015-11-17 09:47:14 +01:00
Maxime Gimeno 693d4dd1ad C3t3_item update 
- The scene_c3t3_item now uses Enums for its VBOS and VAOs.
 2015-11-16 14:32:33 +01:00
Jane Tournois 021f042e7c use enums for new vaos[Frame_plane] 2015-11-16 14:20:14 +01:00
Jane Tournois 0a12beb5f9 Merge branch 'Polygon_mesh_processing-local_remeshing-GF-old' into Polygon_mesh_processing-local_remeshing-GF 2015-11-16 13:06:03 +01:00
Maxime Gimeno 15d3e3c51a Merge branch 'Polyhedron_demo-Hierarchic_view-GF-old' into Polyhedron_demo-Hierarchic_view-GF 
Conflicts:
	Polyhedron/demo/Polyhedron/CGAL_demo/Scene_interface.h
	Polyhedron/demo/Polyhedron/CMakeLists.txt
	Polyhedron/demo/Polyhedron/MainWindow.cpp
	Polyhedron/demo/Polyhedron/MainWindow.h
	Polyhedron/demo/Polyhedron/Polyhedron_demo_plugin_helper.h
	Polyhedron/demo/Polyhedron/Scene.cpp
	Polyhedron/demo/Polyhedron/Scene.h
	Polyhedron/demo/Polyhedron/Scene_item.h
	Polyhedron/demo/Polyhedron/Scene_polyhedron_item.cpp
	Polyhedron/demo/Polyhedron/Scene_polyhedron_transform_item.cpp
 2015-11-16 12:32:56 +01:00
Maxime Gimeno 2722c76b3b Segfault fix 2015-11-16 11:52:43 +01:00
Maxime Gimeno f1c3a3f51d collapsing problems fix + clean-up 2015-11-16 11:20:02 +01:00
Maxime Gimeno 836e9c5d65 Segfault Fix and clean-up 2015-11-16 10:00:17 +01:00
Maxime Gimeno 5a45c419ae Saving the expanded state of the groups when modifying the view. 2015-11-13 10:46:44 +01:00
Jane Tournois 27bc02ebcf Revert "fix compilation of split_long_edges for Polyhedron" 
This reverts commit 213a280eef.

and propose another solution to deal with edges vs halfedges
 2015-11-12 15:55:35 +01:00
Jane Tournois 213a280eef fix compilation of split_long_edges for Polyhedron 
and use halfedges everywhere
 2015-11-12 14:53:47 +01:00
Maxime Gimeno 0015b40e9d Bugs fix 
- Manipulating items in sub_groups should work properly
- moving groups into other groups seems to work now
 2015-11-12 10:30:30 +01:00
Jane Tournois ef40621699 improve doc and rename function 2015-11-12 10:20:19 +01:00
Jane Tournois 07ae6235bf put mesh as last parameter of get_border, for consistency 
and return output iterator
 2015-11-12 09:33:22 +01:00
Maxime Gimeno 5b93155623 Renaming the directories 
- The directories and plugins have been renamed to shorten the paths.
- The CMakeLists now uses a FOREACH to add the subdirectories.
 2015-11-10 16:47:20 +01:00
Maxime Gimeno 66acddaebd End merge 2015-11-10 11:07:48 +01:00
Maxime Gimeno 1317d673b6 Merge branch 'Polyhedron_demo-plugins_in_directories-GF-old' into Polyhedron_demo-plugins_in_directories-GF 
Conflicts:
	Polyhedron/demo/Polyhedron/CMakeLists.txt
	Polyhedron/demo/Polyhedron/MainWindow.cpp
	Polyhedron/demo/Polyhedron/Mesh_3_plugin/Meshing_dialog.ui
	Polyhedron/demo/Polyhedron/Mesh_3_plugin/Polyhedron_demo_mesh_3_plugin.cpp
	Polyhedron/demo/Polyhedron/Mesh_3_plugin/Polyhedron_demo_mesh_3_plugin_cgal_code.cpp
	Polyhedron/demo/Polyhedron/Meshing_dialog.ui
	Polyhedron/demo/Polyhedron/Polyhedron_demo_mesh_3_plugin_dialog.ui
	Polyhedron/demo/Polyhedron/Polylines_io_plugin/Polyhedron_demo_polylines_io_plugin.cpp
	Polyhedron/demo/Polyhedron/Scene_plane_item.h
	Polyhedron/demo/Polyhedron/Scene_polylines_item.cpp
	Polyhedron/demo/Polyhedron/Scene_polylines_item.h
	Polyhedron/demo/Polyhedron/Xyz_plugin/Polyhedron_demo_xyz_plugin.cpp
	Three/doc/Three/Three.txt
	Three/include/CGAL/Three/Scene_item.h
 2015-11-09 16:04:37 +01:00
Jane Tournois 634f862de5 fix the use of use_DT *named* parameter 2015-11-09 13:21:46 +01:00
Simon Giraudot 9db8f461b1 Use functions of plane shape instead of Plane_3 2015-11-09 12:31:18 +01:00
Maxime Gimeno 4b6bd8b2ba Bug fix 
- The on the fly creation won't take '.' as a separator anymore.
 2015-11-09 12:17:10 +01:00
Sebastien Loriot 9ec1f4653d Merge pull request #463 from maxGimeno/Polyhedron_demo-merge_Mesh_3_demo-GF 
Polyhedron demo: merge Mesh_3 demo plugins
 2015-11-09 09:16:20 +01:00
Sebastien Loriot 4b50324410 Merge pull request #462 from maxGimeno/Polyhedron_demo-optimisation_vbos-gf 
Polyhedron demo: optimisation for VBOs/VBAs
 2015-11-09 09:10:22 +01:00
Simon Giraudot f93a21c082 Better naming of RANSAC primitives in plugin 2015-11-09 07:52:02 +01:00
Maxime Gimeno e1e5f9e09b Warnings fix and volume_plane action fix. 2015-11-06 15:50:17 +01:00
Maxime Gimeno da3edcc51a Addition of the enums for all the vaos and vbos. 2015-11-06 13:02:22 +01:00
Maxime Gimeno b632dce1bd Warning fix 2015-11-06 10:50:52 +01:00
Maxime Gimeno b11f27efce Warnings fix 2015-11-06 10:42:56 +01:00
Maxime Gimeno ac0de3ce3f Warning fix 2015-11-06 09:25:23 +01:00
Sébastien Loriot 679f918b70 fix warnings 2015-11-05 21:04:46 +01:00
Sébastien Loriot acb78238c7 avoid warning 2015-11-05 20:54:35 +01:00
Sébastien Loriot 38008be025 remove unused typedefs 2015-11-05 20:54:24 +01:00
Sébastien Loriot c63a5ab688 fix typos 2015-11-05 20:43:11 +01:00
Sébastien Loriot 0072b649e2 Merge branch 'old/Polygon_mesh_processing-local_remeshing-GF' into Polygon_mesh_processing-local_remeshing-GF 2015-11-05 20:11:10 +01:00
Sébastien Loriot 8c30832247 update for Three framework 2015-11-05 20:09:16 +01:00
Jane Tournois f324340628 fix display of selected sharp edges in selection_item 2015-11-05 20:09:16 +01:00
Jane Tournois 30cf9ee153 fix display of edges 2015-11-05 20:09:16 +01:00
Jane Tournois 7eecc531af use Three framework 2015-11-05 20:09:16 +01:00
Jane Tournois 20b7f07132 fix compilation of remeshing 2015-11-05 20:09:15 +01:00
Jane Tournois 900dcb3862 fix compilation 2015-11-05 20:09:15 +01:00
Sébastien Loriot c6e649aa9b Merge branch 'Polygon_mesh_processing-local_remeshing-GF-old' into Polygon_mesh_processing-local_remeshing-GF 
and adapt plugin to CGAL::Three
 2015-11-05 20:07:15 +01:00
Sébastien Loriot 811c64fe85 Merge branch 'Polyhedron_demo-add_statistics_plugin-GF' into Polygon_mesh_processing-local_remeshing-GF 2015-11-05 19:50:18 +01:00
Jane Tournois 132e083c7d fix compilation 2015-11-05 19:49:59 +01:00
Sébastien Loriot 54ca52b538 Merge branch 'BGL-SurfaceMesh2SurfaceMesh-GF' into Polygon_mesh_processing-local_remeshing-GF 2015-11-05 19:25:00 +01:00
Sébastien Loriot 9124ba09be remove debug 2015-11-05 16:06:14 +01:00
Sébastien Loriot 8bebae2bc6 remove modif in ui 2015-11-05 16:06:14 +01:00
Maxime Gimeno 9e266d1fcf Move the features to plugins 
- On On the fly polylines creation is now part of polylines_io_plugin
- On On the fly point sets creation is now part of xyz_plugin
 2015-11-05 16:06:13 +01:00
Maxime Gimeno 9142fd76c2 Clean-up. 2015-11-05 16:05:48 +01:00
Maxime Gimeno c356913cdc QMetaObject name problems fix 2015-11-05 16:05:48 +01:00
Maxime Gimeno 391e5f579b Clean-up 2015-11-05 16:05:48 +01:00
Maxime Gimeno 35cd9f0e0a Corrections 
- Removed a separator in a menu
- The input format is now any non-word characters (works with space, cariage return, commas,etc.)
 2015-11-05 16:05:47 +01:00
Maxime Gimeno 9a26c9ea70 Addition of a point_set on the fly creation 
- Based on the polyline dialog, same feature but for point_sets.
 2015-11-05 16:05:47 +01:00
Sébastien Loriot 2ece404cc9 add missing layout 2015-11-05 16:05:47 +01:00
Maxime Gimeno 7b85e20538 Warning and size fix 
Veuillez saisir le message de validation pour vos modifications. Les lignes
 2015-11-05 16:05:47 +01:00
Sébastien Loriot 209e6deeac improve add polylines 2015-11-05 16:05:47 +01:00
Maxime Gimeno 7c1ac400e3 Details fix 
- Dialog title
- Error pop-up when coordinates not valid
- placeholder text
 2015-11-05 16:05:47 +01:00
Maxime Gimeno e195cd224a Addition of the misisng file 2015-11-05 16:05:47 +01:00
Maxime Gimeno 87fc85d7ca Addition of a feature to add polylines without a file 2015-11-05 16:05:47 +01:00
Sebastien Loriot d98a57c724 Merge pull request #458 from sgiraudot/Polyhedron_demo-Ransac_enhance_display-GF 
Polyhedron demo: Enhance RANSAC display
 2015-11-05 15:36:33 +01:00
Simon Giraudot 58f4a7b74f Correction of variable name and meaning 2015-11-04 15:08:59 +01:00
Laurent Rineau e99abf7a66 for master: parse options with QCommandLineParser 2015-11-04 14:52:51 +01:00
Laurent Rineau 9f75c6c39c cosmetic reindentation 2015-11-04 14:52:43 +01:00
Simon Giraudot c1e92807a3 Use same color for parallel planes 2015-11-04 14:11:59 +01:00
Laurent Rineau 75b463ee7e Fix: link libpolyhedron_demo with demo_framework and point_dialog 
On Windows, without that there was a linking error (undefined symbols).

On Linux we can emulate the Windows linker behavior with CMake
variables:

    CMAKE_MODULE_LINKER_FLAGS:STRING=-z defs
    CMAKE_SHARED_LINKER_FLAGS:STRING=-z defs

For good debugging of Windows linker errors, `-fvisibility=hidden` must
also be added to the CMake variable `CMAKE_CXX_FLAGS`.
 2015-11-04 13:34:20 +01:00
Maxime Gimeno 1ee2b905d4 Merge branch 'Polyhedron_demo-merge_Mesh_3_demo-GF-old' into Polyhedron_demo-merge_Mesh_3_demo-GF 
Conflicts:
	Polyhedron/demo/Polyhedron/create_sphere.h
 2015-11-04 12:50:25 +01:00
Maxime Gimeno 8cdf6cc625 Merge branch 'Polyhedron_demo-optimisation_vbos-gf-old' into Polyhedron_demo-optimisation_vbos-gf 2015-11-04 12:16:33 +01:00
Simon Giraudot 627dd01478 Merge branch 'Polyhedron_demo-Ransac_enhance_display-GF' into Point_set_shape_detection_3-Plane_regularization-GF 2015-11-04 12:11:29 +01:00
Maxime Gimeno 7bd2b14429 Clean-up in Scene_implicit_function_item 2015-11-04 12:06:42 +01:00
Simon Giraudot 4b920d9d7b Merge branch 'Point_set_shape_detection_3-Plane_regularization-GF-old' into Point_set_shape_detection_3-Plane_regularization-GF 2015-11-04 12:05:43 +01:00
Maxime Gimeno 55f44c7318 Optimization of Edit_polyhedron 
- Suppressed 10 of the 19 vbos.
 2015-11-04 11:57:12 +01:00
Maxime Gimeno 2ea3b847f7 Fix in triangulation 
- triangulates only non-triangle facets
- if normals are not valid, discard the associated facet instead of crashing and
  displays a warning.
 2015-11-04 10:57:40 +01:00
Laurent Rineau 4e61a640d7 add libpolyhedron_demo 2015-11-03 19:12:27 +01:00
Laurent Rineau 28962ae54d new class Polyhedron_demo 
Conflicts:
	Polyhedron/demo/Polyhedron/Polyhedron_3.cpp
 2015-11-03 19:12:15 +01:00
Laurent Rineau f72186c1cd add option --no-try-catch 2015-11-03 19:11:37 +01:00
Jane Tournois 3448f7cd57 Merge branch 'PMP-length_of_border-GF-old' into PMP-length_of_border-GF 2015-11-03 15:34:45 +01:00
Maxime Gimeno d31bff7161 Reducing the numbers of VAOs from 6 to 3 and the VBOs from 11 to 6. 2015-11-03 13:54:29 +01:00
Simon Giraudot 505469936c Distinguish names of alpha shapes 2015-11-03 12:07:26 +01:00
Simon Giraudot 95fdf5b7b9 Use polyhedron instead of polygon soups for alpha shapes 2015-11-03 12:01:26 +01:00
Simon Giraudot 32f5f10015 Dialog options (generate or not alphashapes/point subsets) 2015-11-03 11:44:42 +01:00
Simon Giraudot 094418a8a9 RANSAC plugin: display alpha shapes of detected planar primitives 2015-11-03 11:24:15 +01:00
Maxime Gimeno 44eacde69c Merge branch 'Polyhedron_demo-plugins_in_directories-GF-old' into Polyhedron_demo-plugins_in_directories-GF 
Conflicts:
	Polyhedron/demo/Polyhedron/Scene_item.cpp
	Three/include/CGAL/Three/Scene_item.h
 2015-11-03 11:03:39 +01:00
Maxime Gimeno c0229bbadc Addition of the protection balls 
- The scene_c3t3_item now possess an option in the context menu to display
  the protection balls on a polyhedron mesh.
 2015-11-03 10:39:59 +01:00
Maxime Gimeno 97d2c0990f Optimization for segmented images and implicit function fix. 
- The optimization plugin works for all 3 types of objects.
- All c3t3_items appeara in flat+edges by default, so the plane is not invisible.
- The IO_image_plugin filter has no All filter anymore, so it is not an option when opening an OFF
 2015-11-02 11:32:33 +01:00
Simon Giraudot f6b49d3cae Include regularization in RANSAC plugin of Polyhedron demo 2015-11-02 11:17:50 +01:00
Simon Giraudot 15e7cb563c Bugfix: unselect all points when reading PLY files 2015-11-02 10:45:59 +01:00
Sebastien Loriot 97eb06bf48 Merge pull request #446 from lrineau/master 
Three: Improvements to Scene_item/Viewer
 2015-11-02 09:01:07 +01:00
Jane Tournois 792130854b uncheck protection features checkbox when unavailable 2015-10-30 16:44:45 +01:00
Jane Tournois 2eda84fbd1 properly set the default surface patch value 2015-10-30 16:23:05 +01:00
Sebastien Loriot a3a0c40916 Merge pull request #448 from maxGimeno/Polyhedron_demo-Selection_tool_fix-GF 
Left click fix
 2015-10-30 16:09:36 +01:00
Jane Tournois 06441cd00d when features protection is not available, disable checkbox 2015-10-30 16:05:32 +01:00
Jane Tournois 1148873cfb this file expects the mesh_3 config file 2015-10-30 16:04:56 +01:00
Jane Tournois f1cb0f182b change actions names 2015-10-30 15:59:08 +01:00
Maxime Gimeno 3f728e61d4 Left click fix 
- No more need to move the mouse to select a facet
- shift + right click doesn't block the shift_pressed state anymore.
 2015-10-30 15:55:36 +01:00
Jane Tournois 90cc72151e remove useless and costly output_to_medit 2015-10-30 13:16:49 +01:00
Maxime Gimeno 13b990b2b8 Cmake error fix 2015-10-30 13:16:04 +01:00
Jane Tournois 21be30d456 set newly created item to be selected automatically 2015-10-30 13:12:30 +01:00
Jane Tournois aab984cb5e add changed() 2015-10-30 13:01:42 +01:00
Maxime Gimeno 54e0147772 Merge branch 'Polyhedron_demo-plugins_in_directories-GF-old' into Polyhedron_demo-plugins_in_directories-GF 
Conflicts:
	Polyhedron/demo/Polyhedron/Advancing_front_plugin/Polyhedron_demo_advancing_front_plugin.cpp
	Polyhedron/demo/Polyhedron/Advancing_front_plugin/Polyhedron_demo_advancing_front_plugin.ui
	Polyhedron/demo/Polyhedron/CMakeLists.txt
	Polyhedron/demo/Polyhedron/Mesh_3_plugin/Polyhedron_demo_mesh_3_plugin_cgal_code.cpp
	Polyhedron/demo/Polyhedron/Off_to_xyz_plugin/Polyhedron_demo_off_to_xyz_plugin.cpp
	Polyhedron/demo/Polyhedron/Poisson_plugin/Polyhedron_demo_poisson_plugin.cpp
	Polyhedron/demo/Polyhedron/Poisson_plugin/Polyhedron_demo_poisson_plugin.ui
	Polyhedron/demo/Polyhedron/Poisson_plugin/Polyhedron_demo_poisson_plugin_impl.cpp
	Polyhedron/demo/Polyhedron/Polyhedron_demo_poisson_plugin_impl.cpp
	Polyhedron/demo/Polyhedron/Polyhedron_demo_surface_reconstruction_plugin_impl.cpp
	Polyhedron/demo/Polyhedron/Scale_space_reconstruction_plugin/Polyhedron_demo_scale_space_reconstruction_plugin.cpp
	Polyhedron/demo/Polyhedron/Scale_space_reconstruction_plugin/Polyhedron_demo_scale_space_reconstruction_plugin.ui
 2015-10-30 12:55:19 +01:00
Jane Tournois 20c85c74e5 fix conversion between indices 2015-10-30 12:35:48 +01:00
Maxime Gimeno 7cd607686a Some clean-up 2015-10-30 12:02:51 +01:00
Maxime Gimeno c00e87da2d Inclusion of the Io_segmented_image_plugin 2015-10-30 11:59:11 +01:00
Maxime Gimeno fd99da8f87 Compilation errors fix 2015-10-30 10:57:15 +01:00
Laurent Rineau f108a22534 minor improvement to Scene_polylines_item 
Reduce the number of data members
 2015-10-29 18:51:28 +01:00
Laurent Rineau b73d1662e0 move attrib_buffers and getShaderProgram to Viewer 2015-10-29 18:51:10 +01:00
Laurent Rineau 34e469bbdc improve Scene_item 
Use an enum instead of macros.
 2015-10-29 18:50:46 +01:00
Laurent Rineau 33059e1eb1 fix comments 2015-10-29 18:50:23 +01:00
Laurent Rineau cb063ca170 remove <CGAL/gl_render.h> 2015-10-29 18:49:10 +01:00
Jane Tournois 33b687d225 change classification of operations 2015-10-29 16:10:41 +01:00
Sebastien Loriot 4292e3b700 Merge pull request #434 from sgiraudot/Polyhedron_demo-Meta_reconstruction_plugin-GF 
Polyhedron demo - Meta reconstruction plugin
 2015-10-29 16:08:59 +01:00
Jane Tournois ac0fa0b22e rename ui 2015-10-29 15:57:36 +01:00
Jane Tournois b0d59347e6 don't use perturbation nor exudation in the mesh_3_plugin 
keep this for mesh_3_optimization_plugin
 2015-10-29 15:50:50 +01:00
Jane Tournois 52df6b72cf remove useless include 2015-10-29 15:41:56 +01:00
Jane Tournois adf5c63fb2 add meshing of segmented images 2015-10-29 15:40:43 +01:00
Jane Tournois 8ad83f7597 add meshing of implicit functions 2015-10-29 14:15:49 +01:00
Simon Giraudot 3d125b461c Remove useless includes in xyz_plugin 2015-10-29 13:34:01 +01:00
Simon Giraudot c9a661b27b Move inclusion of UI file from H to CPP for statistcis on polyhedron 2015-10-29 13:33:10 +01:00
Maxime Gimeno 796f6eca3f Addition of the new files 2015-10-29 10:10:57 +01:00
Simon Giraudot fa0cfae043 Correction of names of variable and displayed QAction 2015-10-29 09:26:40 +01:00
Maxime Gimeno a0aa8aea05 Addition of elements 
- Scene_c3t3_item cleaned
- Segfault for optimizer corrected (another one appeared, see he comment SEGFAULT)
- Scene_segmented_image_item added
- Volume_planes_plugin added
 2015-10-28 13:46:18 +01:00
Jane Tournois b12c895a64 add config file for Mesh_3 2015-10-27 16:34:15 +01:00
Jane Tournois 6ddcb9a306 introduce Meshing_thread 2015-10-27 16:23:38 +01:00
Jane Tournois 9257075883 introduce Mesh_3 optimizers 2015-10-27 16:15:44 +01:00
Jane Tournois 14ac8f542a add concurrency config file 2015-10-27 14:57:14 +01:00
Jane Tournois 89159249bb extract Scene_c3t3_item from mesh_3_plugin, and create C3t3_type.h 2015-10-27 14:53:41 +01:00
Jane Tournois 827e94e2d3 fix the use of template parameters 2015-10-27 13:02:53 +01:00
Sebastien Loriot 38d1c08853 Merge pull request #429 from janetournois/Polyhedron_demo-sort_operations_by_package-GF 
Polyhedron demo : sort operations by package
 2015-10-27 10:19:30 +01:00
Sebastien Loriot 38558c5af5 Merge pull request #433 from maxGimeno/Polyhedron_demo-Splat_fix_for_mac-GF 
Compilation error fix
 2015-10-26 09:16:25 +01:00
Simon Giraudot cef08091f6 Fix testsuite errors: misplaced typename and concurrency tag 2015-10-26 07:25:29 +01:00
Sebastien Loriot a6b985c0c3 Merge pull request #432 from maxGimeno/Polyhedron_demo-Mesh_edition_fix-GF 
Mesh edition fix
 2015-10-23 15:46:50 +02:00
Sebastien Loriot ea8ece44cf Merge pull request #431 from maxGimeno/Polyhedron_demo-Multiple_bug_fixes-GF 
Polyhedron demo multiple bug fixes gf
 2015-10-23 15:45:12 +02:00
Simon Giraudot 37e1b09da7 Update surface reconstruction meta plugin with Three API 2015-10-23 15:39:13 +02:00
Maxime Gimeno c81a149718 Compilation error fix 
- Addition of a typedef for glFramebufferTexture2D.
 2015-10-23 15:31:14 +02:00
Simon Giraudot 82e7ddf5d5 Merge branch 'Polyhedron_demo-Meta_reconstruction_plugin-GF-old' into Polyhedron_demo-Meta_reconstruction_plugin-GF 2015-10-23 15:20:43 +02:00
Sébastien Loriot 258ef34006 vtk version 6 and greater are supported by surface_mesher and polyhedron demos 
vtk is strict and only the patch version can differ
(that is 6.1 is not compatible with 6.0)
 2015-10-22 16:38:21 +02:00
Sébastien Loriot c54bcbb47c request version of VTK 2015-10-22 12:08:06 +02:00
Maxime Gimeno 453bee4c04 Nef fix 
- Boolean operation convert to nef wasn't working because of a invalidate_buffers problem.
 2015-10-22 11:19:30 +02:00
Maxime Gimeno 58ad496b6e Removed the last traces of GLEW in Polyhedron_demo 2015-10-22 11:19:30 +02:00
Maxime Gimeno c4f24f7045 Multiple fixes 
- Overloaded virtual functions warnings fixed by making compute_elements not virtual.
- Spheres in polylines display fixed (mesh and wireframe)
- ply_to_xyz plugin fixed
 2015-10-22 11:19:30 +02:00
Sébastien Loriot aff4c2839a Adapt the ply plugin to the API of Three 2015-10-22 11:15:36 +02:00
Sebastien Loriot 1dbac9df32 Merge pull request #400 from sgiraudot/Point_set_processing_3-IO_ply-GF 
Read and write PLY point clouds
 2015-10-22 08:56:10 +02:00
Sébastien Loriot 87a20886b0 Merge pull request #424 from janetournois/Polyhedron_demo-add_vtk_plugin-GF 
Polyhedron demo : add vtk_plugin
 2015-10-21 15:36:03 +02:00
Sebastien Loriot d7cdff56f5 Merge pull request #410 from sgiraudot/Polyhedron_demo-Enhance_selected_points-GF 
Polyhedron demo - Enhance selected points
 2015-10-21 15:31:42 +02:00
Sebastien Loriot e54db4580f Merge pull request #405 from janetournois/Polyhedron_demo-add_statistics_plugin-GF 
Polyhedron demo : new "statistics" context menu
 2015-10-21 15:30:20 +02:00
Sebastien Loriot bfe374cf60 Merge pull request #426 from maxGimeno/Polyhedron_demo-Tetrahedral_mesh_fix-GF 
Tetrahedral mesh fix
 2015-10-21 15:28:46 +02:00
Sébastien Loriot 873a7f858f comment unused parameter 2015-10-21 15:25:23 +02:00
Sébastien Loriot 582a0393de remove unused typedef 2015-10-21 15:21:31 +02:00
Maxime Gimeno 07f4ea68b5 Addition of an example 
- Added the example about how to create an external plugin
 2015-10-21 15:00:21 +02:00
Maxime Gimeno 69135cb753 Addition of some doc about the plugin creation 2015-10-21 12:39:10 +02:00
Maxime Gimeno 2eb7e7713c Addition of an option to manually add a plugin 2015-10-21 12:18:55 +02:00
Maxime Gimeno 7e78dc9efd Warning fix 2015-10-21 10:40:56 +02:00
Maxime Gimeno c93ae38b95 Merge branch 'CGAL_Polyhedron_Doxygen_GF' into Polyhedron_demo-plugins_in_directories-GF 2015-10-21 10:36:32 +02:00
Sebastien Loriot 69f56ea6d1 Merge pull request #428 from maxGimeno/Polyhedron_demo-context_Operation_Menu 
Contextual menu changed
 2015-10-20 13:00:59 +02:00
Jane Tournois 9ae8dbbdfa sort actionCreateCutPlane 2015-10-20 12:46:34 +02:00
Jane Tournois d5e32479a1 first sorting of actions into directories corresponding to CGAL packages 2015-10-20 12:38:25 +02:00
Maxime Gimeno c0fe5533b5 Contextual menu changed 
- Operations is now part of the item menu, so the first menu does not exists anymore.
  It is quicker to get to an action.
 2015-10-20 11:30:49 +02:00
Maxime Gimeno 4b2f12467e Color optimization 
- The color of the c3t3 item don't use buffers anymore.
 2015-10-20 10:57:30 +02:00
Maxime Gimeno 6ceaa4fb68 Creation of an external plugin 
- Triangle plugin is now external.
 2015-10-20 10:22:21 +02:00
Jane Tournois a00245a443 add missing typenames 2015-10-20 09:56:20 +02:00
Maxime Gimeno b708d6a8fd Scene_item moved 
- Scene-item.h moved to Three.
 2015-10-20 09:00:26 +02:00
Laurent Rineau 1a20952261 Adapt the new vtk_plugin to the API of Three 2015-10-19 16:10:00 +02:00
Simon Giraudot ed6d09ffea Merge branch 'Point_set_processing_3-IO_ply-GF-old' into Point_set_processing_3-IO_ply-GF 2015-10-19 16:00:29 +02:00
Jane Tournois c617fc6519 move statistics to the contextMenu of Scene_polyhedron_item 2015-10-19 15:40:30 +02:00
Laurent Rineau 74342e11f8 Merge pull request #417 from maxGimeno/Polyhedron_demo-Viewer_fix-GF 
Warning fix
 2015-10-19 15:14:37 +02:00
Laurent Rineau d0105297d1 Merge pull request #423 from maxGimeno/Polyhedron_demo-Selection_tool_edges_fix-GF 
Selection tool edges fix
 2015-10-19 14:57:51 +02:00
Jane Tournois 2d4cea70a9 precise type of files handled 2015-10-19 11:02:06 +02:00
Maxime Gimeno 953a34a877 Tetrahedral mesh 
- Displays the item after its creation without having to move the manipulated frame.

- Enhances the performance when moving the manipulated frame.
 2015-10-19 09:42:52 +02:00
Jane Tournois 7fc8ba2012 fix double to float conversion warnings 2015-10-16 16:44:01 +02:00
Jane Tournois ee331d0741 make list of VTK dependencies short 2015-10-16 16:07:48 +02:00
Laurent Rineau 8588d8dd12 Fix the generation of Viewer_interface_moc.cpp (2nd) 
2nd try: during a testsuite implemented with our Docker container, the
position of Viewer_interface.h is different. Now I use the CMake command
`find_path`, with `PATHs ${CGAL_INCLUDE_DIRS}`.
 2015-10-16 11:43:02 +02:00
Maxime Gimeno 0b7b3c60de Fix 
- Forgot to remove the commentend lines.
 2015-10-16 11:04:48 +02:00
Jane Tournois 959daca125 add vtk_plugin to load .vtk and .vtp files in a Scene_polyhedron_item 2015-10-16 10:44:08 +02:00
Maxime Gimeno 54d51089d3 Selection tool edges fix 
- When hitting the "select all" button with "edges" selected, nothing happened.
  I fixed it by adding a call to invalidate_buffers and viewer->update.
 2015-10-16 08:57:26 +02:00
Maxime Gimeno 3707151474 Warnings fix 2015-10-15 16:21:44 +02:00
Simon Giraudot 9085c7d52b Reorder code of surface reconstruction plugin (simplify and remove duplicate) 2015-10-15 14:51:23 +02:00
Simon Giraudot 680cfdf8ac Rename complete reconstruction plugin and update cmake / cgal_test 2015-10-15 14:51:22 +02:00
Simon Giraudot 7043dde8c0 Remove reconstruction plugins 2015-10-15 14:51:22 +02:00
Simon Giraudot 0cfeb7d90b Include all reconstruction methods in one plugin 2015-10-15 14:51:22 +02:00
Simon Giraudot 8f5a2c91b8 Fix missing concurrency_tag and badly handled normal vectors 2015-10-15 14:51:22 +02:00
Simon Giraudot 040f05ba1e Parameters tuning 2015-10-15 14:51:22 +02:00
Simon Giraudot f9d8f4eee5 Poisson reconstruction in meta plugin 2015-10-15 14:51:22 +02:00
Simon Giraudot f47bcff975 Advancing front in meta plugin 2015-10-15 14:51:22 +02:00
Simon Giraudot 4e53ad517e Scale space reconstruction in meta plugin 2015-10-15 14:50:58 +02:00
Simon Giraudot 1709c3e0d3 Better handling of new item + smoothing 2015-10-15 14:50:11 +02:00
Simon Giraudot bac4183933 Size of grid simplification selection + saving of preprocessed point set 2015-10-15 14:50:11 +02:00
Simon Giraudot 2d59ba82d4 Anisotropy and noise detection + simplification 2015-10-15 14:50:11 +02:00
Simon Giraudot df813ccd7d Automatic noise scale detection 2015-10-15 14:50:10 +02:00
Simon Giraudot fbca854720 More on structure of meta reconstruction plugin 2015-10-15 14:50:10 +02:00
Simon Giraudot 2d398d83f1 Structure of meta reconstruction plugin 2015-10-15 14:50:10 +02:00
Simon Giraudot d1eec93ff1 Add option to Poisson reconstruction plugin to remove far away facets (for open shapes) 2015-10-15 14:50:10 +02:00
Simon Giraudot 99d4fc84bd Merge branch 'Point_set_processing_3-IO_ply-GF-old' into Point_set_processing_3-IO_ply-GF 2015-10-15 14:27:57 +02:00
Laurent Rineau c829753d33 Fix the generation of Viewer_interface_moc.cpp 2015-10-15 11:53:39 +02:00
Maxime Gimeno 1685b13f4a Mesh edition fix 
- When validating an edition of mesh, all the items of the scene became invisible.
  This came from a setVisible(false) in the scene_polyhedron_edit_item's destructor
  that was put there to fix a segfault taht has disappeared since.

- When validating an edition, the modifications were not displayed on the
  polyhedron_item. This was because an invalidate_buffers() that was lacking.
 2015-10-14 15:11:54 +02:00
Maxime Gimeno 38dca64157 Merge branch 'CGAL_Polyhedron_Doxygen_GF-old' into CGAL_Polyhedron_Doxygen_GF 
Conflicts:
	Polyhedron/demo/Polyhedron/Scene_item.h
	Polyhedron/demo/Polyhedron/Scene_polyhedron_item.cpp
	Polyhedron/demo/Polyhedron/Scene_polyhedron_selection_item.h
	Polyhedron/demo/Polyhedron/Scene_polyhedron_shortest_path_item.h
	Polyhedron/demo/Polyhedron/Scene_polyhedron_transform_item.h
	Polyhedron/demo/Polyhedron/Scene_textured_polyhedron_item.h
 2015-10-14 12:46:48 +02:00
Laurent Rineau 18cac48bae Merge pull request #367 from sgiraudot/Point_set_processing-hierarchical_clustering-sgiraudot 
New point set processing algorithm: Hierarchical clustering
 2015-10-14 10:54:37 +02:00
Laurent Rineau 1cc6f47099 Merge pull request #401 from maxGimeno/Polyhedron_demo-Selection_tool_fix-GF 
Mouse binding modification
 2015-10-14 10:32:04 +02:00
Laurent Rineau cdeb629691 Merge pull request #402 from maxGimeno/Polyhedron_demo-OFF_loading_fix-GF 
OFF loading fix

Conflicts:
	Polyhedron/demo/Polyhedron/Scene_polylines_item.h
 2015-10-14 10:28:54 +02:00
Laurent Rineau fc7f11d6ba Merge pull request #411 from maxGimeno/Polyhedron_demo-BBox_Modifications-GF 
Default BBox returning changed for someitems
 2015-10-13 17:38:28 +02:00
Laurent Rineau da76927016 Merge pull request #396 from maxGimeno/Polyhedron_demo-Camera_positions_set-GF 
Polyhedron demo: fix camera presets
 2015-10-13 17:37:55 +02:00
Laurent Rineau b37e5fe417 Merge pull request #409 from maxGimeno/Polyhedron_demo-Axis_fix-GF 
Polyhedron demo: fix the display of axis
 2015-10-13 17:36:42 +02:00
Laurent Rineau 330a0e75a2 Merge pull request #385 from cjamin/CGAL_headers_only-gdamiand_cjamin 
CGAL headers only, step 0
 2015-10-13 16:37:38 +02:00
Maxime Gimeno 7eace89c48 Warning fix 
- made compute_elements const to fix the overloaded virtual function warning.
 2015-10-13 15:35:38 +02:00
Maxime Gimeno 57a1e269ca Warning fix 
- addition of casts to silence warnings in Viewer.
 2015-10-13 15:02:29 +02:00
Maxime Gimeno 221c78f370 typo fix 2015-10-13 14:29:48 +02:00
Simon Giraudot fcd24c4321 Bugfix: self-assignment of variable 2015-10-13 14:23:27 +02:00
Maxime Gimeno e263abec99 Optimisation 
- in the scene's addItem function, when checking the new BBox,
  isFinite and isEmpty are tested first.
 2015-10-12 09:16:59 +02:00
Maxime Gimeno b07069e20e Error fix 
- added functions to the viewer_interface so that SELECT being protected does not cause errors.
 2015-10-12 09:12:28 +02:00
Maxime Gimeno 6d81c34d8a Bbox fix 
- Added a test on isFinite and isEmpty for the scene bbox change and one
  on item->visible() in the computation of the scene bbox.
 2015-10-09 16:29:41 +02:00
Maxime Gimeno be90e95e42 Default BBox returning changed for someitems 
- Using tools like the selection tool creates items that make the scene
  re-center, and this can be annoying. To avoid that, I changed the default BBox
  of those items from BBox(), which is (0,0,0,1,1,1) to scene->bbox() for
  most of the cases. This way the scene bbox does not change and you don't
  lose your position when they are added.
 2015-10-09 15:50:41 +02:00
Maxime Gimeno ab4237cf8e Multiple selection handling implementation 
- the drag and drop now supports multiple selection
 2015-10-09 14:32:10 +02:00
Maxime Gimeno 59aa6cba1e Fix for the fix 
- The precedent fix must have brought a lot of similar warnings that are supposed to be
   fixed here # Veuillez saisir le message de validation pour vos modifications. Les lignes
 2015-10-09 14:08:23 +02:00
Maxime Gimeno 1c0c2c8858 Merge branch 'CGAL_Polyhedron_Doxygen_GF-old' into CGAL_Polyhedron_Doxygen_GF 
Conflicts:
	Documentation/doc/Documentation/Doxyfile.in
	Documentation/doc/Documentation/dependencies
	Polyhedron/demo/Polyhedron/Camera_positions_list.cpp
	Polyhedron/demo/Polyhedron/MainWindow.cpp
	Polyhedron/demo/Polyhedron/MainWindow.h
	Polyhedron/demo/Polyhedron/Polyhedron_demo_camera_positions_plugin.cpp
	Polyhedron/demo/Polyhedron/Polyhedron_demo_normal_estimation_plugin.cpp
	Polyhedron/demo/Polyhedron/Polyhedron_demo_off_plugin.cpp
	Polyhedron/demo/Polyhedron/Polyhedron_demo_plugin_helper.cpp
	Polyhedron/demo/Polyhedron/Polyhedron_demo_point_set_average_spacing_plugin.cpp
	Polyhedron/demo/Polyhedron/Polyhedron_demo_point_set_bilateral_smoothing_plugin.cpp
	Polyhedron/demo/Polyhedron/Polyhedron_demo_point_set_simplification_plugin.cpp
	Polyhedron/demo/Polyhedron/Polyhedron_demo_point_set_smoothing_plugin.cpp
	Polyhedron/demo/Polyhedron/Polyhedron_demo_point_set_upsampling_plugin.cpp
	Polyhedron/demo/Polyhedron/Polyhedron_demo_point_set_wlop_plugin.cpp
	Polyhedron/demo/Polyhedron/Scene.h
	Polyhedron/demo/Polyhedron/Scene_item.h
	Polyhedron/demo/Polyhedron/Scene_polylines_item.h
	Polyhedron/demo/Polyhedron/Viewer.h
 2015-10-09 13:59:33 +02:00
Maxime Gimeno 266be4d597 Warning fix 
- Supposed to fix the warning about hidden overloaded virtual functions.
 2015-10-09 13:48:52 +02:00
Laurent Rineau fc81e2ca00 Add tooltips to the buttons 2015-10-09 11:43:08 +02:00
Simon Giraudot 45c25daf12 Simplify computation of normals (no need for 2 separate loops) 2015-10-09 11:42:32 +02:00
Simon Giraudot 45ddbeaab8 Bugfix: loading point set from OFF polyhedron (+ indentation correction) 2015-10-09 11:42:32 +02:00
Simon Giraudot 08a256f44f Bugfix: default copy constructor did not work anymore 2015-10-09 11:42:32 +02:00
Simon Giraudot cccf5e004a Use vector instead of deque and remove useless attribute m_nb_selected_points 2015-10-09 11:42:31 +02:00
Simon Giraudot f239c0d798 Update plugins with new selection behavior 2015-10-09 11:42:31 +02:00
Simon Giraudot 4bd6909c40 Correct invert_selection and remove useless select(begin,end) 2015-10-09 11:42:31 +02:00
Simon Giraudot 9fcd0120c7 Update simplification and selection plugins with new selection behavior 2015-10-09 11:42:31 +02:00
Simon Giraudot b266666934 Update point set item with new selection behavior 2015-10-09 11:42:30 +02:00
Simon Giraudot 24895c83a0 Replace selection behavior using a single iterator instead of N booleans 2015-10-09 11:42:30 +02:00
Simon Giraudot e9bb16a961 Remove 'selected' boolean 2015-10-09 11:42:30 +02:00
Maxime Gimeno ff0a41ffd2 Addition of a ui file for the example plugin 2015-10-09 11:37:23 +02:00
Maxime Gimeno de95dc1fef Axis fix 
- The axis system was representing the rotation of the camera, which was not
  very clear. It now represents the mvp matrix, without the translation part
  which is less disturbing.
 2015-10-09 11:10:02 +02:00
Jane Tournois eea2481cd6 fix unused variable warning 2015-10-09 10:37:38 +02:00
Sébastien Loriot cc8ecc491a fix a warning of clang 2015-10-08 17:53:56 +02:00
Sébastien Loriot fb0687dfb7 Merge branch 'Polyhedron_demo-fix_windows_warnings-sloriot' 2015-10-08 17:13:19 +02:00
Sebastien Loriot 1910311dd8 Merge pull request #395 from maxGimeno/Polyhedron_demo-hole_filling_fix-GF 
Hole_filling fix
 2015-10-08 17:05:35 +02:00
Jane Tournois 3d1ab593a6 add statistics on polyhedron 
todo : add possibilities to get statistics on other types of data,
and more statistics
 2015-10-08 15:08:49 +02:00
Maxime Gimeno e9b5e0c135 OFF loading fix 
- Some items called compute_normals_and_vertices several times in a row.
 2015-10-08 11:39:49 +02:00
Maxime Gimeno 4ac6066360 Mouse binding modification 
- When a selection item is selected, shift+left click does not call information requests
  for the selected point anymore. It makes the selection tool faster by far.
 2015-10-08 11:12:33 +02:00
Maxime Gimeno 2f4660fd7f Addition of a drag&drop feature 2015-10-08 09:48:36 +02:00
Simon Giraudot 79ca962159 Merge branch 'Point_set_processing_3-IO_ply-GF-old' into Point_set_processing_3-IO_ply-GF 2015-10-08 08:48:39 +02:00
Simon Giraudot 9bee520744 Enable possibility to save point sets in off format (polyhedron demo) 2015-10-08 08:32:40 +02:00
Simon Giraudot bf3fb02373 Enable possibility to save point sets in ply format (polyhedron demo) 2015-10-08 07:15:00 +02:00
Laurent Rineau c1b555b64b Fix Scene_polyhedron_item::show_only_feature_edges 
(cherry picked from commit 19046611a8613dedeeb8d93bc368aa182df778d8)
 2015-10-07 16:21:44 +02:00
Simon Giraudot e161dab5df Improve GUI of point set simplification plugin in Polyhedron demo 2015-10-07 16:00:54 +02:00
Simon Giraudot 70502ca75a Integrate hierarchy simplification in reworked simplification plugin 2015-10-07 16:00:53 +02:00
Simon Giraudot a02dabb4b0 Hierarchical clustering plugin for Polyhedron demo 2015-10-07 16:00:52 +02:00
Sebastien Loriot 069eb65d70 Merge pull request #392 from maxGimeno/Polyhedron_demo-nef_item_fix-GF 
Polyhedron demo: fix nef item
 2015-10-07 15:48:27 +02:00
Simon Giraudot 414f04068e Write PLY in polyhedron scene point set item 2015-10-07 15:34:23 +02:00
Sébastien Loriot dc536257c8 fix warnings on windows 2015-10-07 14:53:32 +02:00
Simon Giraudot 674bcb5d91 Check if point set has normals when reading PLY 2015-10-07 14:13:55 +02:00
Simon Giraudot c2e38b72a6 Merge branch 'Point_set_processing_3-IO_ply-GF-old' into Point_set_processing_3-IO_ply-GF 2015-10-07 13:52:06 +02:00
Simon Giraudot fddcb24197 Polyhedron demo ply_to_xyz reader 2015-10-07 13:50:57 +02:00
Simon Giraudot 93c52c605c New test for ply reader 2015-10-07 13:50:41 +02:00
Maxime Gimeno 83537667f1 Camera preset fix 
- The preset camera positions are now centered on the revolveAroundPoint of
  the camera, which makes it right when the item is not centered in the scene.
 2015-10-07 11:45:34 +02:00
Maxime Gimeno 057a51d4f3 Hole_filling fix 
- The polyline item was not computed. I passed the computing function const to
  call it the same way initialize_buffers is called, from draw.
 2015-10-07 10:52:02 +02:00
Maxime Gimeno e88a7f6da7 Doc about dock widgets done. 2015-10-07 10:10:13 +02:00
Sébastien Loriot ba881bf70e Merge pull request #359 from maxGimeno/Polyhedron_demo-Adding_information_about_item-GF 
Addition of some informations about the items
 2015-10-06 17:54:51 +02:00
Sébastien Loriot 82a8d03d79 fix a std::size_t -> int warning 2015-10-06 17:51:43 +02:00
Sébastien Loriot 72fa3d9d81 Merge pull request #357 from maxGimeno/Polyhedron_demo-Axis_system-GF 
Polyhedron demo : Addition of a small axis system in a corner
 2015-10-06 17:47:50 +02:00
Maxime Gimeno de44689648 Warning fix 
- Supposed to fix the warning about double and float.
 2015-10-06 17:46:21 +02:00
Sébastien Loriot dfbba8ad06 Merge pull request #327 from sgiraudot/Point_set_processing_3-TBB-GF 
Point set processing parallelized with TBB
 2015-10-06 17:39:35 +02:00
Sébastien Loriot 76fa1cfb5c Merge branch 'releases/CGAL-4.7-branch' 2015-10-06 17:31:31 +02:00
Sébastien Loriot c21377297a Merge remote-tracking branch 'maxGimeno/Polyhedron_demo-Splatting_fix_mesa-GF' into releases/CGAL-4.7-branch 2015-10-06 17:30:58 +02:00
Sebastien Loriot aa76ae8ea7 Merge pull request #358 from maxGimeno/Polyhedron_demo-context_Operation_Menu 
Polyhedron demo : Menu operation is accessible with a context menu
 2015-10-06 17:27:06 +02:00
Sebastien Loriot 03344a36f7 Merge pull request #360 from maxGimeno/Polyhedron_demo-Camera_positions_set-GF 
Polyhedron demo: Addition of a preset of  camera positions
 2015-10-06 17:26:34 +02:00
Maxime Gimeno 56b31b7971 Color fix 
- The nef item has random facets with their normal reversed. In CGAL-4.6, it
  was dealt with by forcing "draw two side" to true. So it is what I did.
 2015-10-06 14:38:29 +02:00
Maxime Gimeno dc2955c16f Selection Fix 
- The selection was still calling invalidate_buffers.
 2015-10-06 14:38:28 +02:00
Maxime Gimeno 77a6f4af46 Remove item fix + group selection 
- Removing an item does not kill the hirarchy anymore, thanks to recursivity
  in several functions.
- Selecting a group now adds all its children to the selected_items_list.
 2015-10-05 15:58:38 +02:00
Maxime Gimeno 3bda315695 WIP Adding dock about QDockWidget 2015-10-05 13:03:27 +02:00
Maxime Gimeno 08535f2625 Windows Error Fix : 
- Replaced M_PI and M_PI_2 by CGAL_PI and CGAL_PI/2.
 2015-10-05 09:26:32 +02:00
Maxime Gimeno 7b7b61e289 WIP Adding doc about plugin using ui files 2015-10-05 09:01:29 +02:00
Maxime Gimeno c7c6772dfd Segfault fix 2015-10-02 15:58:39 +02:00
Maxime Gimeno 372865722b Merged in master 2015-10-02 11:43:17 +02:00
Maxime Gimeno e6765a68d3 Merge branch 'Polyhedron_demo-Hierarchic_view-GF-old' into Polyhedron_demo-Hierarchic_view-GF 2015-10-02 11:22:41 +02:00
Maxime Gimeno 5616734f26 Addition of removing features 2015-10-02 10:37:06 +02:00
Maxime Gimeno ab74566f82 If condition fixed 
- If ratio was equal to exactly one, nothing was displayed.
 2015-10-01 14:27:18 +02:00
Maxime Gimeno 26e89282a4 Typo 2015-10-01 14:27:18 +02:00
Maxime Gimeno acc51c83ec Ratio fix 
- When the ratio was < 1, the system was out of the window.
 2015-10-01 14:27:17 +02:00
Maxime Gimeno 82defd7dd6 Making the axis a 'right-hand axis' so it fits the actual scene. 2015-10-01 14:27:17 +02:00
Maxime Gimeno cceb479d4f Toggling the axis system 
- Addition of a toggle system with the A key, instead of the QGLViewer axis system.
 2015-10-01 14:27:17 +02:00
Maxime Gimeno b274a3f8e3 Added a permanent axis system in the top right corner of the screen. 2015-10-01 14:27:17 +02:00
Maxime Gimeno c668c2b987 (WIP)Inserting axis system in a corner. 2015-10-01 14:27:16 +02:00
Sébastien Loriot 9b8b98c4d0 Merge branch 'Polyhedron_demo-Menu_organization-GF' 2015-10-01 11:59:13 +02:00
Sébastien Loriot e0e50010ab use suited overload 
this also fix an issue with clang and virtual overload hidding
 2015-10-01 11:55:59 +02:00
Sebastien Loriot 7500bb03aa Merge pull request #361 from maxGimeno/Polyhedron_demo-color_management-GF 
Optimazing color handling
 2015-10-01 11:08:45 +02:00
Maxime Gimeno 887b6c5322 Groups drawing done 
- The hierarchy display seems to be over.
- Remaining : group modifications management.
 2015-10-01 09:21:40 +02:00
Guillaume Damiand cf1c0ea0ca Merge branch 'CGAL_headers_only-gdamiand_cjamin-OLD' into CGAL_headers_only-gdamiand_cjamin 2015-10-01 09:12:55 +02:00
Maxime Gimeno 977c709f58 Integration of the operation context menu to the classic context menu. 
- The context menu (Shift + Right-click) now shows to sub-menus : the
  one from before AND the operation menu.
 2015-09-30 11:40:41 +02:00
Maxime Gimeno d11d6d78c0 Moving items fix 
- addition of conditions when moving a camera position in the list, so that it
  won't disappear when trying to move it up when it is at the first position
  or trying to move it down when it is at the last position.
 2015-09-30 11:16:45 +02:00
Maxime Gimeno 335514b7af Upgrade 
- The number of isolated points is displayed only when the item is
of type Polyhedron or of type polygon soup, or if this number is more than 0.
 2015-09-30 10:12:48 +02:00
Maxime Gimeno 2dbfc6b8a5 More warning fixes 2015-09-29 16:37:57 +02:00
Maxime Gimeno 7ea5f71c60 Warning suppression 2015-09-29 15:40:18 +02:00
Maxime Gimeno fee42307f7 (WIP) Addition of .h files 2015-09-29 14:06:11 +02:00
Simon Giraudot ac591cf257 Merge branch 'Point_set_processing_3-TBB-GF-old' into Point_set_processing_3-TBB-GF 2015-09-29 13:50:17 +02:00
Sebastien Loriot 0100e321a3 Merge pull request #267 from sgiraudot/Scale_space_reconstruction_3-handle_non_manifold-sgiraudot 
Scale space reconstruction 3 handle non manifold sgiraudot
 2015-09-29 13:27:17 +02:00
Maxime Gimeno 06e885da4c Handling of the remove function 2015-09-28 12:47:34 +02:00
Maxime Gimeno 250520c80a Example, MainWindow and Scene Item added to the doc. 2015-09-28 08:39:28 +02:00
Sebastien Loriot 81d65c9aa1 Merge pull request #349 from sgiraudot/Surface_mesh_parametrisation-OpenNL_Eigen-GF 
Surface mesh parametrisation - Replace OpenNL by Eigen as default
 2015-09-26 15:37:04 +02:00
Sebastien Loriot 778dfb92ca Merge pull request #354 from lrineau/Polyhedron-fix_demo_CMakeLists-lrineau 
Polyhedron demo: cleanup the CMakeLists.txt
 2015-09-26 09:58:36 +02:00
Maxime Gimeno 0b810bc19d Delegate fix 2015-09-25 15:52:38 +02:00
Simon Giraudot 4b825deb29 Bugfix: removed forgotten conflict lines (HEAD, etc.) and deleted finalize_polygon_soup 2015-09-25 14:43:46 +02:00
Maxime Gimeno cc88c67983 Hierarchy operational. 
- Must adapt the model so that data() returns the right value.
 2015-09-25 10:08:20 +02:00
Maxime Gimeno 6395258afd Class List added 2015-09-24 12:49:15 +02:00
Simon Giraudot 9cc6982656 Merge branch 'Scale_space_reconstruction_3-handle_non_manifold-sgiraudot-old' into Scale_space_reconstruction_3-handle_non_manifold-sgiraudot 2015-09-24 12:48:15 +02:00
Simon Giraudot 13e4a76cd8 Merge branch 'Point_set_processing_3-TBB-GF-old' into Point_set_processing_3-TBB-GF 2015-09-24 12:45:58 +02:00
Maxime Gimeno d264b882f5 Package Three creation 
- Creatio of a new package containing the base class for the plugin API.
 2015-09-23 13:40:30 +02:00
Laurent Rineau 252cc0ec81 Merge branch 'releases/CGAL-4.7-branch' 
Conflicts:
	Maintenance/release_building/public_release_name

This merges the pull request #340 from
maxGimeno/Polyhedron_demo-WaitCursor_Fix-GF:

    Polyhedron demo: WaitCursor fix in the OFF plugin.
 2015-09-23 12:23:58 +02:00
Laurent Rineau a4016ed4b4 Merge pull request #340 from maxGimeno/Polyhedron_demo-WaitCursor_Fix-GF 
Polyhedron demo: WaitCursor fix in the OFF plugin.
 2015-09-23 12:20:38 +02:00
Maxime Gimeno d3336372b7 editorEvent Fix 
- I accidently changed the QAbstractItemModel of the argmument of the function
  into a QStandardItemModel.
 2015-09-22 10:11:23 +02:00
Sébastien Loriot b970fc80ef Merge branch 'old/Surface_reconstruction_points_3-Change_package_name-GF' into Surface_reconstruction_points_3-Change_package_name-GF 2015-09-22 09:54:18 +02:00
Maxime Gimeno 4d5962a284 WIP Using a hierarchical view 
- Replaced the Abstract list model by a standardItem model, that is able
  to handle hierarchy.
- editorEvent are not caught.
 2015-09-22 09:38:55 +02:00
Laurent Rineau 5c9a3a9954 Polyhedron demo: cleanup the CMakeLists.txt 
That CMakeLists.txt was still using the old API of FindQt4.cmake. Since
then, we have switched to CMake>=2.8.11 and Qt5. Thus:

  - Remove the uses of variables `QT_USE_QTXML` and similar.

  - Remove the uses of `target_link_libraries(... ${QT_QTGUI_LIBRARY})`,
    that is replaced by the function `qt5_use_modules`.

  - Remove last occurrences of GLEW.

  - The Qt5 ScriptTools module is an optional
    component (`OPTIONAL_COMPONENTS`). And it is used only if the option
    `POLYHEDRON_QTSCRIPT_DEBUGGER` is enabled.
 2015-09-21 15:40:38 +02:00
Maxime Gimeno f4a9f93898 Splat Fix for mesa 
- Moved an extension declaration at the beginning of the shader, before the
  #define are added. The problem is that it enables the extension for splatting
  shaders that don't require it, but I don't think it is really bad.
 2015-09-18 14:52:46 +02:00
Maxime Gimeno c21a66f25d Optimazing color handling 
- Corrected a bug in edit polyhedron with the Spheres that were not displayed.
- Added a boolean member to scene_item determining if the color should be handled by
  a single value, which avoids having to re-compute the color of each vertex when
  the color is changed through the UI, or by the buffers (only for certain plugins).
 2015-09-18 12:20:08 +02:00
Simon Giraudot 587ff6414e Revert useless change in MainWindow of Polyhedron demo 2015-09-18 10:43:40 +02:00
Simon Giraudot 6bff21d2e4 Remove useless inclusion of OpenMP 2015-09-18 10:32:31 +02:00
Simon Giraudot b9bbadf631 Merge branch 'Surface_mesh_parametrisation-OpenNL_Eigen-GF-old' into Surface_mesh_parametrisation-OpenNL_Eigen-GF 2015-09-18 10:06:13 +02:00
Maxime Gimeno 69b13c9a0b Clean-up 2015-09-17 16:33:55 +02:00
Maxime Gimeno 46083ca54e Merge branch 'CGAL_Polyhedron_Doxygen_GF-old' into CGAL_Polyhedron_Doxygen_GF 
Conflicts:
	Polyhedron/demo/Polyhedron/CGAL_demo/Viewer_interface.h
	Polyhedron/demo/Polyhedron/Scene_item.h
	Polyhedron/demo/Polyhedron/Scene_polyhedron_selection_item.h
 2015-09-17 16:27:48 +02:00
Maxime Gimeno 7516a77173 Rename doxygen_config in Doxyfile 2015-09-17 15:48:49 +02:00
Maxime Gimeno 5e054a140a Update of the mainPage 2015-09-17 15:45:27 +02:00
Maxime Gimeno 4416bec460 Update the ToolTip doc and the toolType function in the example plugin. 2015-09-17 15:41:43 +02:00
Maxime Gimeno c9f8fcb081 Addition of buttons for the camera positions 
- The buttons are connected to the positions
- The list is cleared, the pre-set positions are not in it anymore
- The buttons up and Down are replaced by arrow icons to gain space.
 2015-09-17 14:07:58 +02:00
Maxime Gimeno 0c4137dbca (WIP) Addition of buttons for basic positions 2015-09-17 12:40:41 +02:00
Maxime Gimeno 4492f6baf1 Addition of a set of camera positions 2015-09-17 12:34:38 +02:00
Maxime Gimeno e96e859277 (WIP) addition of camera positions 2015-09-17 12:31:56 +02:00
Sebastien Loriot 685fccb489 Merge pull request #337 from maxGimeno/Polyhedron_demo-changed_function_enhancement-GF 
Polyhedron demo: changed() function enhancement
 2015-09-17 10:57:32 +02:00
Sebastien Loriot 25a052da94 Merge pull request #338 from afabri/Polyhedron-conversion_warnings-GF 
fix issue #333
 2015-09-17 10:40:43 +02:00
Maxime Gimeno 8443337d9a Addition of some informations about the items 
- Addition of the extremities of the bounding box and the
  number of isolated vertices.
 2015-09-17 10:38:40 +02:00
Maxime Gimeno d5f041dd36 Addition of a context menu for Operations 
- Makes the operations menu appear on the cursor when Ctrl+Shift+Right click
  are pressed.
 2015-09-17 10:22:01 +02:00
Maxime Gimeno 60b2d9e70f (WIP) Addition of a context menu for operations 2015-09-17 10:13:47 +02:00
Sébastien Loriot 04b9cd986d fix conversion from 'size_t' to 'int' warning 2015-09-17 09:13:20 +02:00
Sébastien Loriot c83d9a5035 fix a unused variable warning 2015-09-15 09:15:07 +02:00
Maxime Gimeno 4b401e3794 WaitCursor fix in off plugin. 
- Makes the WaitCursor disappear when the message "isolated vertices ignored" pops up,
  so  that the user doesn't think something is still loading when it's not.
 2015-09-14 11:52:31 +02:00
Sébastien Loriot f1aa5e15f2 remove an automatic invalidate_buffers and replace them by manually placed ones 2015-09-11 21:29:33 +02:00
Sébastien Loriot 30831d27ac explicitly call invalidate_buffers when needed 2015-09-11 17:14:33 +02:00
Sébastien Loriot 7098c2394b remove changed() 2015-09-11 17:08:49 +02:00
Sébastien Loriot e07c9ccb62 hide input 2015-09-11 17:05:59 +02:00
Maxime Gimeno 96fdf120a3 Removed some invalidate_buffers() 2015-09-11 16:12:35 +02:00
Maxime Gimeno 9a4d526012 ModelView fix 
- When choosing the modelview in the context menu, the viewer did not get updated and
  nothing happended before moving the camera. Using a new signal in the scene, it
  now is.
 2015-09-11 16:12:35 +02:00
Maxime Gimeno b1be4dbe5d No more cals to invalidate_buffers when changing rendering mode 
- Everything is calculated when invalidate_buffers is called, including the
  normals for the Flat and the Gouraud mode, so there is no more need to
  call invalidate_buffer when changing the rendering mode, which makes it
  instant.
 2015-09-11 16:12:34 +02:00
Maxime Gimeno f48d6db53c Renaming the function changed() 
-changed() is now called invalidate_buffers() to avoid confusion with itemChanged();
 2015-09-11 16:12:34 +02:00
Sebastien Loriot b7bc31146e Merge pull request #334 from maxGimeno/CGAL_Polygon_soup_fix 
Fix polygon_soup and optimize loading time
 2015-09-11 16:06:43 +02:00
Andreas Fabri 5ce59e470c fix issue #333 2015-09-11 15:30:16 +02:00
Sébastien Loriot c41e558f66 use a float for initialization to avoid a warning 2015-09-11 09:34:06 +02:00
Sébastien Loriot 90c9e4664d fill non-manifold edges once 2015-09-10 17:36:23 +02:00
Sébastien Loriot 96616a9e97 avoid a duplicated call to changed 2015-09-10 17:34:03 +02:00
Maxime Gimeno c99b79bfc9 Fix polygon_soup and optimize loading time 
- fill_edges was called in a loop on the edges, which made the loading of big items extremely slow.
- fill_edges is now only called in compute_normals, when it was called several times when creating or converting a polygon_soup
- compute_normals_and_vertices is now const and called with initialized_buffers in the draw functions, which allows to reduce
  the number of times it is called, in Scene_polygon_soup_item and in Scene_polyhedron_item.
 2015-09-10 14:35:41 +02:00
Maxime Gimeno 6974972477 Add doc for loadPlugins 2015-09-10 10:30:11 +02:00
Maxime Gimeno abe25faf96 Added documentation for sumenus 2015-09-10 10:23:25 +02:00
Maxime Gimeno ff99290200 Making the submenus creation recursive 2015-09-10 10:08:25 +02:00
Laurent Rineau 66e84fe833 Merge pull request #309 from maxGimeno/CGAL_RAM_Eco_GF 
Polyhedron demo: save memory by clearing the vectors after they are sent to OpenGL

Conflicts:
	Polyhedron/demo/Polyhedron/Scene_polygon_soup_item.cpp
	Polyhedron/demo/Polyhedron/Scene_polygon_soup_item.h
	Polyhedron/demo/Polyhedron/Scene_polylines_item.cpp
 2015-09-10 09:43:52 +02:00
Laurent Rineau a0cc815736 Merge pull request #315 from maxGimeno/CGAL_non_manifold_edges_fix_GF 
Polyhedron demo: fix display of non-manifold edges in polygon soup items
 2015-09-10 09:42:54 +02:00
Laurent Rineau 96515dfe42 Merge pull request #306 from maxGimeno/CGAL-Qt5_support-Splatting-Perf-GF 
Restore the splatting feature of the Polyhedron demo
 2015-09-10 09:40:53 +02:00
Maxime Gimeno b442f34875 Menu re-organization 2015-09-09 15:27:19 +02:00
Maxime Gimeno cd5312a5ad ::gl error fix and CGALColor warning fix 2015-09-08 15:53:38 +02:00
Maxime Gimeno 33a2aafcfa Organizing operations menu 2015-09-08 15:42:34 +02:00
Simon Giraudot 8be703a0c8 Update newest Polyhedron demo plugin with parallelized PSP algorithm versions 2015-09-08 11:23:54 +02:00
Simon Giraudot 935956a10f Merge branch 'Point_set_processing_3-TBB-GF-old' into Point_set_processing_3-TBB-GF 2015-09-08 11:11:07 +02:00
Simon Giraudot 59552881a7 Update calls of parallelized PSP function in other packages 2015-09-08 11:01:09 +02:00
Maxime Gimeno 2e2cfe8edf Merge branch 'CGAL_texture_fix_GF' into CGAL_Polyhedron_Doxygen_GF 2015-09-07 15:47:06 +02:00
Maxime Gimeno 795cf24649 Doxygen Documentation 2015-09-07 15:44:29 +02:00
Sébastien Loriot 37b9b8e7bf force update of the display 
mimic what is done for load(istream)

Trivial bug fix for demo
 2015-09-07 15:12:21 +02:00
Jane Tournois 24976853dd use volume function in polyhedron demo 2015-09-07 15:11:29 +02:00
Maxime Gimeno ea54208be1 Function Error Fix 
- Added viewer-> before all the gl functions calls.
 2015-09-07 11:01:08 +02:00
Maxime Gimeno 04d948c34e Doxygen documentation 2015-09-07 10:46:58 +02:00
Simon Giraudot d9d94f082e Update files with new package name (Poisson_surface_reconstruction_3) 2015-09-04 18:18:52 +02:00
Jane Tournois 6a2a218da2 use new area(tmesh) function 2015-09-04 17:42:21 +02:00
Maxime Gimeno d2038e57b2 Doxygen doc 2015-09-04 16:03:56 +02:00
Maxime Gimeno e07b95e7ee Non manifold edges fix 
- The test to detect the non manifold edges was wrong. It had an unnecessary condition.
- The function that fills the list of non manifold edges was not called anymore. It is
  now called in compute_normals_and_vertices().
- I added the necessary code to display the non manifold edges.
 2015-09-04 14:43:25 +02:00
Maxime Gimeno f12ff0ca55 Doxygen documentation 2015-09-04 12:28:01 +02:00
Laurent Rineau 1eab366954 Merge pull request #312 from sloriot/Polyhedron_demo-stl_io_plugin_safer-sloriot 
Polyhedron demo: first check that the STL file is a polygon mesh before loading it

Conflicts:
	Polygon_mesh_processing/doc/Polygon_mesh_processing/PackageDescription.txt
 2015-09-04 11:36:13 +02:00
Maxime Gimeno c3de07dfc9 OpenGL calls fix 
- Replaced ::gl... by viewer->gl...
- Removed the useless calls to CGALglcolor
- Replaced the CGALglcolor call in the splatting draw by a viewer->glColor4d, which fixed a color bug in splatting.
 2015-09-04 08:39:52 +02:00
Maxime Gimeno ca12416e30 Merge branch 'CGAL-Qt5_support-Splatting-Perf-GF' of github.com:CGAL/cgal-public-dev into CGAL-Qt5_support-Splatting-Perf-GF 2015-09-04 08:24:45 +02:00
Maxime Gimeno 73307a3f1c Warning fix 
- there was a semi-column after an 'if' statement.
 2015-09-04 08:23:09 +02:00
Maxime Gimeno 3948587004 Indentation fix 2015-09-04 08:14:51 +02:00
Maxime Gimeno eeab98ab32 Doxygen doc 
- Adding doxygen comments to document the API
 2015-09-04 08:11:21 +02:00
Laurent Rineau 9bae0c0e63 Merge pull request #270 from sgiraudot/Polyhedron_demo-WLOP_plugin-sgiraudot 
Polyhedron demo point set processing plugins
 2015-09-03 17:22:54 +02:00
Sébastien Loriot 4931c8c889 first check that the stl file is a polygon mesh before loading it 2015-09-03 15:17:14 +02:00
Laurent Rineau cf74c64c46 Merge pull request #307 from CGAL/Polyhedron_demo-fix_reset_color-sloriot 
be more permissive for color reset
 2015-09-03 12:50:16 +02:00
Jane Tournois ce54198aa7 Merge branch 'Polygon_mesh_processing-local_remeshing-GF-old' into Polygon_mesh_processing-local_remeshing-GF 2015-09-02 15:57:23 +02:00
Laurent Rineau e061633d85 Remove a warning (unused variable) 2015-09-02 14:22:05 +02:00
Maxime Gimeno 1533deff99 Textures Fix 
- Use texture2D instead of texture in the shaders to have it in gglsl 1.2 and not 1.3.
 2015-09-02 12:14:37 +02:00
Maxime Gimeno 41853ed427 RAM consumption enhancement 
- Use of the swap trick to clear the memory once the buffers have been filled.
 2015-09-02 11:41:52 +02:00
Maxime Gimeno 0be3374555 RAM consumption enhancement 
- Adding the swap trick to save RAM
 2015-09-02 09:45:15 +02:00
Sebastien Loriot 79685a263f be more permissive for color reset 
This enables the reset to work after a coloration per connected component
 2015-09-01 17:27:04 +02:00
Maxime Gimeno c6407cd19d Compatibility Fix 
- Use the extension of glFrameBufferTexture2D.
 2015-09-01 16:19:56 +02:00
Maxime Gimeno 9e1eda01c0 Merge branch 'CGAL-Qt5_support-Splatting-Perf-GF-old' into CGAL-Qt5_support-Splatting-Perf-GF 2015-09-01 15:44:38 +02:00
Sébastien Loriot 2d3cf9210b remove group_box and use layout instead to avoid display issues 2015-09-01 12:36:07 +02:00
Simon Giraudot ae1f64c9a2 Change ACTIVATE_CONCURRENCY tag in CMakeLists of Polyhedron demo 2015-08-31 10:58:16 +02:00
Simon Giraudot 8f98d9dc0a Fixed indentation issues 2015-08-31 10:09:54 +02:00
Laurent Rineau 1710531e06 Fix the color of edges of Scene_polygon_soup_item 
Fixes #301.
 2015-08-28 17:18:04 +02:00
Laurent Rineau 278a28016a Merge branch 'CGAL-Qt5_support-GF' 
Fixes #265, fixes #254.
 2015-08-27 16:37:37 +02:00
Laurent Rineau c9f16f8984 Define the OpenGL functions typedefs 
- PFNGLDRAWARRAYSINSTANCEDARBPROC
   - PFNGLVERTEXATTRIBDIVISORARBPROC

Definitions found in glext.h from Mesa.
 2015-08-18 18:46:02 +02:00
Laurent Rineau eed890672b Merge branch 'CGAL-Qt5_support-GF' into CGAL_Qt5_Support_for_Mesa-GF 
Conflicts:
	Polyhedron/demo/Polyhedron/Scene_polylines_item.cpp
	Polyhedron/demo/Polyhedron/resources/shader_without_light.v
 2015-08-18 18:45:38 +02:00
Maxime Gimeno a3addbfd9b Fix 
- Polyhedron : spaces in a shader made it invalid
- Circular Kernel : green intersection spheres are back : wrong attribute in the draw function
- Alpha Shapes : "in" remained in the shaders.
 2015-08-14 13:56:43 +02:00
Maxime Gimeno 637a2574f1 WIP : Splatting fix 
- GlSplat is re-introduced but without its dependencies to glew. It still uses the OpenGL direct Mode
  and deprecated functions. When items are not all displayed in splat mode, no splat appears. This
  might be due to an incompatible context, but need to be invastigated.
 2015-08-14 11:55:24 +02:00
Simon Giraudot fbf99e3a35 Fix testsuite error on Picasso: filename too long 2015-08-14 10:49:23 +02:00
Maxime Gimeno 1b0b08529d WIP 2015-08-14 08:53:48 +02:00
Sébastien Loriot f6e86631a7 prevent from closing and reopening the stream 2015-08-13 16:21:18 +02:00
Simon Giraudot e75dd99047 update of cgal_test_with_cmake with new plugins 2015-08-13 15:02:06 +02:00
Sébastien Loriot 7216473436 add a warning in case of isolated vertices in an OFF loaded in a polyhedron 2015-08-13 10:00:11 +02:00
Simon Giraudot bba0354286 Option to handle non-manifold features, related example and updated Polyhedron demo plugin 2015-08-12 18:08:02 +02:00
Simon Giraudot 4276d2795e Using Eigen::SimplicialLDLT. Speeds up even more (15x compared to original OpenNL impl) 2015-08-12 11:26:53 +02:00
Sébastien Loriot 6b8d5ebce5 change the bound for the filtering 2015-08-12 11:04:17 +02:00
Maxime Gimeno 31755bdeee Revert "remove splat drawing related functions" 
This reverts commit 0d03326fb6.

Conflicts:
	Polyhedron/demo/Polyhedron/Scene.cpp
	Polyhedron/demo/Polyhedron/Scene_nef_polyhedron_item.h
	Polyhedron/demo/Polyhedron/Scene_points_with_normal_item.cpp
 2015-08-12 10:11:07 +02:00
Simon Giraudot 7fd7005641 Upsampling plugin for Polyhedron demo 2015-08-11 17:25:57 +02:00
Simon Giraudot 9bed4d0453 Fix UI name mistake 2015-08-11 17:13:59 +02:00
Sébastien Loriot 73450942f8 reset constraint types 2015-08-11 16:33:29 +02:00
Simon Giraudot afc6d4b2bf Integration of bilateral smoothing plugin for Polyhedron demo 2015-08-11 16:09:57 +02:00
Maxime Gimeno 6fd4a474db OpenGL upgrade 
- replaced the glVertex() calls by use of shaders.
 2015-08-11 15:43:16 +02:00
Simon Giraudot 9cc40133ec Fix shader error (removed spaces before #version) 2015-08-11 15:18:40 +02:00
Simon Giraudot a05f4b8ad1 Merge branch 'Polyhedron_demo-WLOP_plugin-sgiraudot-old' into Polyhedron_demo-WLOP_plugin-sgiraudot 2015-08-11 14:48:13 +02:00
Simon Giraudot b4de19ab2c Active concurrency in CMakeList 2015-08-11 14:39:55 +02:00
Maxime Gimeno 9257bf2c03 DrawText fix 
- Must disable the polygon offset after drawing so that it does not disturb the postdraw function.
 2015-08-11 14:19:01 +02:00
Jane Tournois 3f7021f20b add plugin that implements the function in PMP/repair.h 
Remove degenerate faces
Remove isolated vertices //does not work yet because
                           Polyhedron item discards them
 2015-08-11 12:52:08 +02:00
Maxime Gimeno e3c53da311 No holes fix 
- If the visualizer was created with an item without a hole, the QMap was not
   updated when the visualizer was destroyed.
 2015-08-11 12:20:27 +02:00
Maxime Gimeno 3291077b16 hole_filling fix 
- The QMap wasn't updated when the visualizer is deleted.
 2015-08-11 12:11:16 +02:00
Maxime Gimeno b4d7511346 get_hole_visualizer() fix 
- Use a QMap instead of a linear search
 2015-08-11 11:27:09 +02:00
Maxime Gimeno 140f7c26ed Merge branch 'CGAL-Qt5_support-GF' of github.com:CGAL/cgal-public-dev into CGAL-Qt5_support-GF 2015-08-11 08:58:56 +02:00
Maxime Gimeno 52eefe1a55 ShortestPath not seen fix 
- Change of DepthFunc to be in mode less or equal, so that if two lines
  overlap, only the last drawn will be displayed. As the shortest path is
  always drawn after the item, it is the one displayed and not the edge
  on wich it is.
 2015-08-11 08:54:11 +02:00
Sébastien Loriot bd1b89cdf4 Fix a loop preventing the selection of several items 
MainWindow::selectionChanged() was calling Scene::setSelectedItem that
was connected to MainWindow::selectionChanged(). We introduce a new
function that does not trigger the call to selectionChanged

Bug fix of
  |--
  |commit 63dca733dc
  |Author: Sébastien Loriot <sebastien.loriot@cgal.org>
  |Date:   Thu Aug 6 16:49:25 2015 +0200
  |
  |    Scene::setSelectedItem is now connected to MainWindow::selectSceneItem
  |--
 2015-08-11 08:15:46 +02:00
Sébastien Loriot 0f83711bab each time an item is removed, the skeletonization functor will be deleted 
it might look rather extreme but indices of items are internally used
so it's the safest way
 2015-08-11 07:52:26 +02:00
Maxime Gimeno 43e675903a Antialiasing fix 
- The polylines were drawn in draw() instead of draw_edges(), which messed up
  the blending, as it should be done with the color of the facets but in
  draw they are not displayed yet.
 2015-08-10 15:03:51 +02:00
Maxime Gimeno db28896b15 Mesa Fix : 
- context set to 2.1
- shaders versions set to 120
- fetch and set the ARB extensions for instanced Rendering
- displays points instead of spheres if the extensions cannot be found
- anti-aliasing problem with polyline fixed : calling lines durind draw instead of
  draw_edges messes the blending. The blending of the lines must be done with the facets
  colors and thus the lines must be drawn AFTER the facets.
 2015-08-10 14:48:42 +02:00
Sébastien Loriot d7fa45184e recreate the first group of vertices after the deform object is reinit 2015-08-07 17:33:03 +02:00
Sébastien Loriot 57b8f164f4 change the plane definition to match the detection of parallel planes 2015-08-07 15:56:40 +02:00
Jane Tournois 86896278e5 Merge branch 'Polygon_mesh_processing-local_remeshing-GF-old' into Polygon_mesh_processing-local_remeshing-GF 2015-08-07 13:02:35 +02:00
Sébastien Loriot ce786f9edd Merge branch 'CGAL-Qt5_support-GF' 
Fixes various issues in demos
      Improve runtime of Side_of_triangle_mesh
 2015-08-07 12:13:41 +02:00
Jane Tournois b399e8fd3f fix double to float conversion warning 
(and avoid a bunch of divisions)
 2015-08-07 12:02:37 +02:00
Sébastien Loriot ab99da0ce2 use CGAL_PI to avoid issue with MSVC and M_PI 2015-08-07 08:30:06 +02:00
Sébastien Loriot ca19447002 fix warnings detected by clang 2015-08-06 19:39:35 +02:00
Sébastien Loriot db4c217d4b make the item created from a selection the selected item 2015-08-06 19:18:19 +02:00
Sébastien Loriot de61f7c933 fix color display bug of the selection 2015-08-06 19:14:40 +02:00
Sébastien Loriot dd55213c85 make sure the selection item is selected when modifying the selection 2015-08-06 19:12:33 +02:00
Sébastien Loriot 88c2ce6b69 force the display of newly created items 2015-08-06 16:59:52 +02:00
Sébastien Loriot 1a21950c37 make a selection item newly created automatically selected 2015-08-06 16:59:15 +02:00
Sébastien Loriot 001cabc022 when creating a new sdf/segmentation item, keep the polyhedron selected 2015-08-06 16:53:56 +02:00
Sébastien Loriot 63dca733dc Scene::setSelectedItem is now connected to MainWindow::selectSceneItem 2015-08-06 16:49:25 +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 4b9c090363 Polyline points color fix 
- The color of the points of the polylines in points renderingMode was not the good one. It is now.
 2015-08-06 13:02:52 +02:00
Sébastien Loriot 867bfec715 do not draw polylines larger 2015-08-06 12:43:28 +02:00
Laurent Rineau 0bd24e0dd3 Trivial CMake fix for issue #243 
Fix #243: "Bug in the export() commands in demo/Polyhedron/CMakeLists.txt"
 2015-08-06 12:34:07 +02:00
Sébastien Loriot 4cf774bc27 remove unused variable bis 2015-08-06 12:33:25 +02:00
Sébastien Loriot b6b78427d0 fix error introduced in a previous commit 2015-08-06 12:30:31 +02:00
Sébastien Loriot 120f5f801d remove debug output 2015-08-06 12:27:53 +02:00
Sébastien Loriot a950c55065 remove unused parameter 2015-08-06 12:26:59 +02:00
Maxime Gimeno f90f19a666 Polylines Fix 
- fixing the FlatPlusEdges return from the last commit.
 2015-08-06 12:12:10 +02:00
Simon Giraudot 6196c183c7 Merge branch 'Surface_mesh_parametrisation-OpenNL_Eigen-GF-old' into Surface_mesh_parametrisation-OpenNL_Eigen-GF 2015-08-06 12:07:42 +02:00
Maxime Gimeno 4dd4e516d2 Spheres 4th position removed 
- Useless bool to be removed
 2015-08-06 11:54:29 +02:00
Maxime Gimeno 251cc372c2 Merge branch 'CGAL-Qt5_support-GF' of github.com:CGAL/cgal-public-dev into CGAL-Qt5_support-GF 2015-08-06 11:35:17 +02:00
Maxime Gimeno 875d1a479e Shortest_path Fix 
- Source Points bigger and polylines made a little thicker to make them visible
when they are rendered over an edge.
 2015-08-06 11:33:06 +02:00
Sébastien Loriot 296935e1f3 factorize the code to create a sphere 2015-08-06 11:19:26 +02:00
Sébastien Loriot 56976db665 reduce the number of containers used and simplify a bit the code 2015-08-06 10:16:16 +02:00
Sébastien Loriot 1a96343a17 fix control vertex group coloring 2015-08-06 10:16:16 +02:00
Maxime Gimeno ccedb330aa Polylines Spheres fixed 
- The FlatPlusEdges mode has been replaced by the Flat mode and the wireframed spheres has been fixed.
 2015-08-06 10:10:07 +02:00
Sébastien Loriot 11bb60f13f restore the lastest mesh_3 plugin lost after a bad merge conflict resolution 
It was lost by this merge:
  |--
  |commit ed3298ee2f
  |Merge: ba4ede5 f44c824
  |Author: Maxime Gimeno <maxime.gimeno@gmail.com>
  |Date:   Mon Apr 27 08:50:06 2015 +0200
  |
  |    Merge branch 'Polyhedron-new_opengl_REBASED_to_ignore_reindentations-gf' into CGAL-Qt5_support-GF
  |--
 2015-08-06 08:58:39 +02:00
Sébastien Loriot dd3e199fcd hue is -1 for grey colors 2015-08-05 17:42:58 +02:00
Sébastien Loriot 5619bd3654 only two parameters... 2015-08-05 17:14:55 +02:00
Sébastien Loriot e18e385062 normal inversion is not applicable if the point set has no normal 2015-08-05 16:08:28 +02:00
Sébastien Loriot d55283c92f jet smoothing is breaking normals 2015-08-05 16:08:28 +02:00
Sébastien Loriot 7d726d2766 only reset the patch ids if the color vector was initialized 
Fixes:
|--
|  commit 9d76ae0b2e
|  Author: Sébastien Loriot <sebastien.loriot@cgal.org>
|  Date:   Wed Aug 5 11:10:22 2015 +0200
|
|      reset the patch ids of faces when the color is changed
|--
 2015-08-05 16:08:28 +02:00
Maxime Gimeno b98f9be2bf Polylines fix 
- draw_edges had no Viewer_interface as argument. I added one and passed it to the polylines draw_edges,
they are now displayed.
 2015-08-05 16:06:47 +02:00
Sébastien Loriot a773d970aa force item update 2015-08-05 12:01:12 +02:00
Sébastien Loriot 3534515fbf remove debug output 2015-08-05 12:01:12 +02:00
Sébastien Loriot 586fef3f57 add an (A/B) tag in the name of plugin needing this item selection method 2015-08-05 12:01:12 +02:00
Sébastien Loriot 17b2aa9595 improve point inside polyhedron ui 2015-08-05 12:01:12 +02:00
Sébastien Loriot 79244a4bf7 force point display 2015-08-05 12:01:12 +02:00
Sébastien Loriot 9d76ae0b2e reset the patch ids of faces when the color is changed 2015-08-05 12:01:12 +02:00
Sébastien Loriot 564ca2afc8 changed() is already called by SetColor() 2015-08-05 12:01:12 +02:00
Laurent Rineau 6b4be50068 Merge branch 'CGAL-Qt5_support-GF' of github.com:CGAL/cgal-public-dev into CGAL-Qt5_support-GF 2015-08-05 11:24:10 +02:00
Laurent Rineau 508b467203 Merge branch 'CGAL-Qt5_support-GF' 2015-08-05 11:23:40 +02:00
Sébastien Loriot 413ea747b8 improve ui of advanced skeletonization 2015-08-05 10:39:19 +02:00
Sébastien Loriot 0d4f874d55 rename button to help guessing what is the input 2015-08-05 10:20:34 +02:00
Sébastien Loriot e63fb1e0fc fix the orientation of faces in mesh_3 plugin 2015-08-05 10:00:58 +02:00
Sébastien Loriot 5db1450981 avoid segfault when several items are erased at the same time 2015-08-04 18:48:43 +02:00
Maxime Gimeno 69fd6e1266 Picking Fix 
- With the new drawing system, the frustum was not modified by gluPickMatrix anymore. This commit make the shader use this matrix.
 2015-08-04 12:22:15 +02:00
Laurent Rineau 55c30d0808 Qt::AA_UseDesktopOpenGL is usable from Qt-5.3 only 2015-08-04 10:55:26 +02:00
Sébastien Loriot 6de3260215 force the display of the intersecting faces 2015-08-03 16:42:38 +02:00
Sébastien Loriot 90a5e0e56e do trigger the redraw 2015-08-03 16:39:40 +02:00
Sébastien Loriot 59b06b3101 Merge branch 'CGAL-Qt5_support-GF' 
Fix the corefinement plugins and remove warnings
 2015-08-01 16:05:23 +02:00
Sébastien Loriot 7f2b86d360 fix the fix bb39544d for the stitching plugin 
the definition of a border vertex was reversed
 2015-07-31 16:56:33 +02:00
Laurent Rineau 6ce9023f73 Merge pull request #223 from lrineau/Polyhedron_demo-Point_set_selection-GF 
Polyhedron demo, add a demo point set selection plugin
 2015-07-31 14:51:59 +02:00
Maxime Gimeno 086ffc763e Display fixed 
- One normal per vertex and not one per facet
 2015-07-31 14:30:49 +02:00
Laurent Rineau 56cecfaec2 Merge branch 'CGAL-Qt5_support-GF' 2015-07-31 14:30:18 +02:00
Maxime Gimeno 0077565843 Upgrading Scene_combinatorial_map_item to Programmable_Pipeline 2015-07-31 14:14:39 +02:00
Laurent Rineau cf64acbd15 Remove the include of <QOpenGLFunctions_3_3_Core> 
Now, only the Viewer class uses <QOpenGLFunctions_3_3_Core>.
 2015-07-31 14:06:35 +02:00
Sébastien Loriot 07a81b4429 remove no longer used opengl code for drawing nef 2015-07-31 12:06:59 +02:00
Sébastien Loriot 0319548f96 Merge remote-tracking branch 'cgal-dev/Shape_detection-cleanup-GF' 
Improve the Point set shape detection plugin for the polyhedron demo
  Tested in CGAL-4.7-Ic-101
 2015-07-30 17:47:17 +02:00
Sébastien Loriot 6546fa02dc Merge branch CGAL-Qt5-GF 
Improve the Qt5 support in CGAL demos

  Tested in CGAL-4.7-Ic-101
  Approved by the release manager

Conflicts:
	AABB_tree/demo/AABB_tree/Scene.cpp
 2015-07-30 17:39:50 +02:00
Andreas Fabri 152b083f8a no typename in non-template functions 2015-07-30 14:42:14 +02:00
Simon Giraudot 7c87bf9457 Fixed outdated files problem 2015-07-30 14:21:56 +02:00
Simon Giraudot ca0325fb6e Fixed visualization bug 2015-07-30 13:57:12 +02:00
Maxime Gimeno 2664804224 Merge branch 'CGAL-Qt5_support-GF' of github.com:CGAL/cgal-public-dev into CGAL-Qt5_support-GF 2015-07-30 12:26:49 +02:00
Maxime Gimeno 33e35f5d44 SEGFAULT Fix 
- when deleting a Scene_edit_polyhedron_item WHILE manipulating a frame, a segfault
occured because a bad manipulated frame was sent to the viewer. Calling setVisible(false)
 in the destructor of the item calls setManipulatedFrame(NULL) and fixex the problem.
 2015-07-30 12:24:10 +02:00
Simon Giraudot 204d3ec2af * Right clic to cancel selection 
* Stop spinning when selection starts
 2015-07-30 12:01:44 +02:00
Simon Giraudot 3db148e73d Free form selection and visualization working (still some bugs) 2015-07-30 10:42:33 +02:00
Simon Giraudot f68d3f8dee Rectangle selection working 
(Visualization of selection-rectangle not working)
 2015-07-29 15:37:46 +02:00
Laurent Rineau 7f84d345a9 Enable the three last plugins 
Q_PLUGIN_METADATA was missing.

See
http://doc.qt.io/qt-5/plugins-howto.html#the-low-level-api-extending-qt-applications

Fix #209
 2015-07-29 14:25:22 +02:00
Laurent Rineau 1d2657b069 Revert "Segfault fix", and change the API of Scene_item and Viewer_interface 
This reverts commit 28b8c3bf6b.

I have removed the qFunc member from `Scene_item`. Now, the only
`QOpenGLFunctions_3_3_Core` object is the base class of the
`Viewer` (accessible through the interface `Viewer_interface`).

All calls to OpenGL functions are now done using the `viewer` pointer.
 2015-07-29 13:02:58 +02:00
Laurent Rineau 64410e1e8b Remove the spurious #include of moc files 
Fix #194 : Qt5 moc reports a lot of notes "No relevant classes found"
 2015-07-29 12:15:22 +02:00
Simon Giraudot 02a4678159 Point set selection widget and global selection tools (all, clear, revert, new objet, etc.) 2015-07-29 10:35:11 +02:00
Andreas Fabri 52de475f55 encode the cylinder radius in the item name 2015-07-28 23:04:24 +02:00
Andreas Fabri e5bf00b9d8 Add a filter for cylinders with too big radius 2015-07-28 17:27:18 +02:00
Sebastien Loriot b30ac099a9 Merge pull request #195 from afabri/Polyhedron_demo-fix_stitching_plugin-GF 
fix compilation for VC++
 2015-07-28 17:17:00 +02:00
Andreas Fabri 05d201ea61 Add checkboxes for the shapes 2015-07-28 16:56:20 +02:00
Laurent Rineau 0a9eaa3808 Simplify the CMakeLists.txt 
I remove the very old hack I have used, very long ago, before the
branch-build was designed.

I also remove from include_directories():

    ../../../Advancing_front_surface_reconstruction/include
 2015-07-28 15:56:57 +02:00
Laurent Rineau 8be7c27063 Merge remote-tracking branch 'cgal-public-dev/CGAL-Qt5_support-GF' into CGAL-Qt5_support-GF 
...aka refresh the branch from 'master'.

Conflicts:
	AABB_tree/demo/AABB_tree/Scene.cpp
	Polyhedron/demo/Polyhedron/Scene_edit_polyhedron_item.cpp
 2015-07-28 15:30:17 +02:00
Jane Tournois 4741e4c3d5 add warning 2015-07-28 12:29:10 +02:00
Jane Tournois fad75752e7 add "discard changes" button that cancels the last deformation 
this button resets the mesh to its geometry before last call to
overwrite_initial_geometry

also reorganize buttons in the widget
 2015-07-28 12:25:57 +02:00
Jane Tournois b0c34ee58f fix restriction plane center 2015-07-28 11:09:27 +02:00
Sébastien Loriot 14035ecac2 add the possibility to constraint the movement of control vertices in a plane 
if you want to modify the plane constraint you need to use the
  "Activate pivoting" switch
 2015-07-27 18:40:39 +02:00
Jane Tournois 21cf70af60 remove commented draft 2015-07-27 16:05:08 +02:00
Jane Tournois 380f77002e add tooltip 2015-07-27 15:57:22 +02:00
Jane Tournois d9d5a9edc3 make deform_mesh a pointer 
we do this to make possible to update the polyhedron
between a remeshing and a deformation step
 2015-07-27 15:39:21 +02:00
Jane Tournois 97117a323f add options to set target edge length and nb iterations for remeshing 2015-07-27 15:06:50 +02:00
Andreas Fabri bb39544dcd fix compilation for VC++ 2015-07-27 14:35:56 +02:00
Sébastien Loriot f34ac07fa9 draw the bbox of control vertices when deforming 2015-07-27 14:29:45 +02:00
Jane Tournois 7c8f0f93f2 fix display of polyhedron after being remeshed 2015-07-27 12:28:43 +02:00
Jane Tournois 8e94e438ff introduce remeshing that happens after deformation 
(1st shot : update of display is broken for now)
 2015-07-24 16:12:22 +02:00
Maxime Gimeno 9b2f8ebad4 Cutting plane fix 
- Added a timer event to specify when cut() must be called or not, which makes
the plane manipulation far smoother.
 2015-07-24 10:55:12 +02:00
Jane Tournois b5cf442653 make plugins valid for Qt5 2015-07-24 10:05:02 +02:00
Jane Tournois bb3d38c9e7 Merge branch 'Polygon_mesh_processing-local_remeshing-GF-old' into Polygon_mesh_processing-local_remeshing-GF 2015-07-23 17:50:34 +02:00
Sébastien Loriot 0343f70578 fix detection of borders plugin 
if the vertices are not filtered they'll show up as isolated polylines
  Trivial bug fix in a demo for master
 2015-07-21 17:40:23 +02:00
Maxime Gimeno 28b8c3bf6b Segfault fix 
- calling delete on a Q_OBJECT is not recommanded. In the Scene's destructor, delete was called
for every Scene_item, which made the destructor of the ShaderPrograms QMap fail. I replaced
delete by deleteLater(), which seems to have corrected the problem.
 2015-07-20 14:10:35 +02:00
Sebastien Loriot acd57e5779 Merge pull request #185 from sloriot/Polygon_mesh_processing-GF 
Fix warnings in Polygon_mesh_processing
 2015-07-20 13:17:22 +02:00
Maxime Gimeno 5ab90bbf7a Performance fix 
- Stop setting the color of each edge to black, which could be quite long for a big item,
and set the attribute value of the shader to black instead.
 2015-07-20 11:52:43 +02:00
Sébastien Loriot 22aff712b1 do not connect the modif signal of the manipulated frame to deform to boost perf 2015-07-20 11:44:59 +02:00
Sébastien Loriot cfe6f59802 add a method to invalidate the aabb-tree in the polyhedron item 2015-07-20 11:43:24 +02:00
Sébastien Loriot 5d2c892dbe Merge pull request #149 'lrineau/Polygon_mesh_processing-GF' 
Add various functions to manipulate polygon meshes
 2015-07-17 14:50:56 +02:00
Sébastien Loriot 0140746292 remove non-needed typedef 2015-07-17 14:43:07 +02:00
Sébastien Loriot 1e743cf0ae remove extra ; 2015-07-17 14:42:04 +02:00
Sébastien Loriot 2668d83d4e Merge pull request #150 from 'cjamin/Point_set_shape_detection_3-cjamin' 
Add an algorithm to fit geometric primitives on a point set

Conflicts:
	Installation/changes.html
	Polyhedron/demo/Polyhedron/CMakeLists.txt
 2015-07-17 14:32:09 +02:00
Maxime Gimeno db134dfef7 Performance drop fix 
- Added a QTime to reduce the number of calls to deform().
 2015-07-17 14:22:48 +02:00
Laurent Rineau aa72eaa371 Merge pull request #154 from maxGimeno/CGAL-Qt5_support-GF 
Qt5 support, GSoC 2014

https://cgal.geometryfactory.com/CGAL/Members/wiki/Features/Small_Features/Qt5_support

In this commit, I have fixed the permissions of the file:
	Periodic_3_triangulation_3/demo/Periodic_3_triangulation_3/data/points

In this commit, I have also modified:
	Installation/changes.html
 2015-07-17 14:13:37 +02:00
Maxime Gimeno 9fee9aa3e2 Merge branch 'CGAL-Qt5_support-GF' of github.com:CGAL/cgal-public-dev into CGAL-Qt5_support-GF 2015-07-17 11:46:38 +02:00
Maxime Gimeno a6ea2d94b7 Clean-up 2015-07-17 11:46:13 +02:00
Sébastien Loriot b9be9e6725 remove Scene_item_with_display_list that is no longer used 2015-07-17 10:08:00 +02:00
Sébastien Loriot fbeb14e5d9 remove empty file 2015-07-17 09:42:41 +02:00
Sébastien Loriot a8741a26fe avoid using glu when not needed 2015-07-17 09:41:15 +02:00
Sébastien Loriot 07100ade70 Changes in the polyhedron demo due to Polygon_mesh_processing package (PMP) 2015-07-16 17:04:48 +02:00
Sébastien Loriot 6b15ec643c Merge branch 'CGAL-Qt5_support-GF' into cgal-public-dev/Polygon_mesh_processing-GF 
Conflicts:
	Mesh_3/demo/Mesh_3/include/CGAL/gl_render.h
	Polyhedron/demo/Polyhedron/CMakeLists.txt
	Polyhedron/demo/Polyhedron/GlSplat/GlSplat.cpp
	Polyhedron/demo/Polyhedron/Scene_polygon_soup_item.cpp
	Polyhedron/demo/Polyhedron/Scene_polyhedron_selection_item.h
 2015-07-16 16:52:53 +02:00
Sébastien Loriot a30ad4be3c use PMP internal function 2015-07-16 16:40:54 +02:00
Maxime Gimeno fb765fe7d1 Merge branch 'CGAL-Qt5_support-GF' of github.com:CGAL/cgal-public-dev into CGAL-Qt5_support-GF 2015-07-16 13:37:45 +02:00
Maxime Gimeno f36cc05464 The toggling of the Show/Hide action does not trigger a changed() anymore. 2015-07-16 13:36:27 +02:00
Andreas Fabri df34cd1986 colors are ints between 0 and 255 2015-07-16 11:36:20 +02:00
Simon Giraudot 317581f38c WLOP plugin for Polyhedron demo 2015-07-16 11:15:23 +02:00
Sébastien Loriot 0d03326fb6 remove splat drawing related functions 2015-07-16 10:49:13 +02:00
Sébastien Loriot c57483da4c fix hidden overload warning 2015-07-16 10:48:16 +02:00
Sébastien Loriot f25bcd32aa fix warnings 2015-07-16 10:14:42 +02:00
Sébastien Loriot 6df729033d fix warning 2015-07-16 09:11:41 +02:00
Sébastien Loriot 8299c9c00f remove extra typename keywords 2015-07-16 09:09:14 +02:00
Maxime Gimeno a571e1db8d Clean-up 2015-07-16 08:26:41 +02:00
Andreas Fabri 498a2069ab work on a smaller range 2015-07-15 17:51:36 +02:00
Sébastien Loriot 0f4043d383 fix function hidden warning 2015-07-15 16:56:33 +02:00
Laurent Rineau 32a3f4b60b The `make clean` can fail when there is no target at all 2015-07-15 16:36:19 +02:00
Jane Tournois fdf53b2e47 comment verbose mode macro 2015-07-15 16:02:32 +02:00
Jane Tournois ef124155fe macros 2015-07-15 16:02:30 +02:00
Jane Tournois e3121567fa automatically re-select border of selection after refining only border 2015-07-15 16:02:29 +02:00
Jane Tournois 2c3c2e0c58 fix the use of selected facets with no selected edges 2015-07-15 16:02:29 +02:00
Jane Tournois 7da4b81a19 add very verbose mode 2015-07-15 16:02:29 +02:00
Jane Tournois 99e0a245a0 add macro for verbose mode 2015-07-15 16:02:29 +02:00
Jane Tournois edbe0338f6 add checkbox to split only selected edges 2015-07-15 16:02:27 +02:00
Jane Tournois 127327fff3 add vertical spacers between groups 2015-07-15 16:02:26 +02:00
Jane Tournois ca12add0bf add QDialog for isotropic remeshing options 2015-07-15 16:02:26 +02:00
Jane Tournois f7204a0a99 add edge_is_constrained_map as a parameter for remeshing 
this property map "tags" the edges that should be kept in the remeshed mesh.
They can be splitted or collapsed, but their vertices can't move with the
Laplacian, and they can't be flipped.

in the Polyhedron demo, this feature is integrated in order to remesh two
adjacent surface patches and keep the (possibly sharp) polyline that is
delimitating them
 2015-07-15 16:02:26 +02:00
Jane Tournois 139949d739 split detect_sharp_edges in two functions 2015-07-15 16:02:25 +02:00
Jane Tournois b6a221a0e9 use selected edges as boundary for remeshing 2015-07-15 16:02:25 +02:00
Jane Tournois ad624dbea1 clear selection after remeshing 
everything has changed, but some faces have been recycled to the
selection has become completely wrong
 2015-07-15 16:02:25 +02:00
Jane Tournois acf142192d add possibility to hide sharp features 2015-07-15 16:02:25 +02:00
Jane Tournois 374549bf60 fix warning 2015-07-15 16:02:25 +02:00
Sébastien Loriot 0127227827 add missing typename 2015-07-15 16:02:25 +02:00
Jane Tournois 9e3daf9085 selection of one connected component, based on the sharp edges detected/selected 2015-07-15 16:02:24 +02:00
Jane Tournois 0f0beddb20 WIP : selection of a connected component 2015-07-15 16:02:24 +02:00
Jane Tournois 9b4145d6ca add itemChanged to update display 2015-07-15 16:02:24 +02:00
Jane Tournois a59eb5fb0e fix the selection widget layout 2015-07-15 16:02:24 +02:00
Jane Tournois 00b50b3e3e select sharp edges 
button and code added

Conflicts:
	Polyhedron/demo/Polyhedron/Scene_polyhedron_selection_item.h
 2015-07-15 16:02:24 +02:00
Jane Tournois 6fd3b99f77 detect sharp edges 
Conflicts:
	Polyhedron/demo/Polyhedron/CMakeLists.txt
 2015-07-15 16:02:24 +02:00
Jane Tournois d34d47a6d5 Revert "detect sharp edges and surface patches" 
This reverts commit 80b1363f1db4db8391398188bcb33427ffc69aac.
 2015-07-15 16:02:23 +02:00
Jane Tournois 83957ed495 add code to the selection tool to be able to select a surface patch 
for now it works only for facets and the checkbox is not used
 2015-07-15 16:02:23 +02:00
Jane Tournois 73642feab7 add checbox to use feature edges as selection boundaries 2015-07-15 16:02:23 +02:00
Jane Tournois 8a8e3f2888 detect sharp edges and surface patches 2015-07-15 16:02:23 +02:00
Jane Tournois 8d06f1861c add input dialog for nb of iterations of remeshing 2015-07-15 16:02:23 +02:00
Jane Tournois 9cf0f55b9d demo ready for remeshing of selection item 2015-07-15 16:02:22 +02:00
Jane Tournois c067ffcbc6 remesh only a selection made available in Polyhedron demo 
(remeshing code still not able to handle it)
 2015-07-15 16:02:22 +02:00
Jane Tournois 14979947a0 add isotropic remeshing plugin 
note it does not compile yet because the remeshing code is not
fully compatible with Polyhedron_3
 2015-07-15 16:02:22 +02:00
Andreas Fabri 7d7c4feb6f use special traits class for spheres of radius 0 2015-07-15 14:50:38 +02:00
Maxime Gimeno 5bcc14593c Segfault fix 
-Q_PLUGIN_METADATA was misplaced in the space_scale_plugin
 2015-07-15 14:14:39 +02:00
Maxime Gimeno c5940aab10 Use reserve to try to optimize the memory use 2015-07-15 13:53:13 +02:00
Maxime Gimeno 274245f822 Selectionned points color is red again 2015-07-15 12:48:46 +02:00
Maxime Gimeno a2fcbefb10 trying to reduce the memory problem by reducing the calls to compute_points_and_normals; 2015-07-15 12:17:17 +02:00
Maxime Gimeno 2d7d0cf44f Gain in memory 
- Removed the buffers of color to use attribute values instead.
 2015-07-15 11:10:41 +02:00
Maxime Gimeno d693e45f8f Removed the useless objects supposed to be used with splatting. 2015-07-15 10:04:14 +02:00
Laurent Rineau fa28b44ea3 Merge pull request #144 from sgiraudot/Polyhedron_demo-Scale_space_plugin_speedup-sgiraudot 
speedup the scale space plugin in the Polyhedron demo
 2015-07-14 16:48:08 +02:00
Laurent Rineau 04db43556f Do not warn when Qt5 is not found. 2015-07-13 15:55:41 +02:00
Sébastien Loriot 7f4bd2837e accomodate changes after branch update 2015-07-13 09:59:12 +02:00
Sébastien Loriot c616df7196 Merge branch 'old/Polygon_mesh_processing-GF' into Polygon_mesh_processing-GF 
Conflicts:
	Documentation/biblio/cgal_manual.bib
	Installation/changes.html
 2015-07-13 08:16:59 +02:00
Laurent Rineau 15c1469a54 CGAL requires CMake>=2.8.11. 2015-07-10 17:01:42 +02:00
Sébastien Loriot e36ae9666b display skeleton widget only once 2015-07-10 12:21:43 +02:00
Sébastien Loriot 3113b619a7 update the name of the skeleton widget 2015-07-10 12:10:01 +02:00
Sébastien Loriot 62a4255b6a update the scene when new items are added 2015-07-10 12:06:24 +02:00
Sébastien Loriot 3498e2e61e update layout so that the dock widget shows up 
(cherry picked from commit 386b1c3490)
 2015-07-09 19:23:36 +02:00
Sébastien Loriot 386b1c3490 update layout so that the dock widget shows up 2015-07-09 19:22:12 +02:00
Laurent Rineau 9ce70faffb Merge branch 'gsoc13-CurveSkeleton-new_package-xgao' into CGAL-Qt5_support-GF 
Conflicts:
	Polyhedron/demo/Polyhedron/CMakeLists.txt

There was also a "conceptual conflict" in:
	Polyhedron/demo/Polyhedron/Polyhedron_demo_mean_curvature_flow_skeleton_plugin.cpp
-> Adapt the declaration of the plugin to the Qt5 way.
 2015-07-09 18:04:09 +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
Sébastien Loriot e7563d3e05 Merge branch 'gsoc13-CurveSkeleton-new_package-xgao' 
Conflicts:
	Installation/changes.html
 2015-07-09 17:30:24 +02:00
Andreas Fabri ae168ef060 qt4_wrap_ui -> qt5_wrap_ui but only for this one plugin 
This and the previous commit make that the plugin only builds
if this branch gets merged with the QT5 branch
 2015-07-09 16:38:26 +02:00
Andreas Fabri 2306dae379 upgrade plugin interface 2015-07-09 16:30:32 +02:00
Andreas Fabri 0ad1c00e68 Merge branch 'CGAL-Qt5_support-GF' of github.com:CGAL/cgal-public-dev into CGAL-Qt5_support-GF 2015-07-09 12:03:42 +02:00
Andreas Fabri daa8d210b8 int -> size_t 2015-07-09 11:59:48 +02:00
Maxime Gimeno c40f54a7a9 Merge branch 'CGAL-Qt5_support-GF' of github.com:CGAL/cgal-public-dev into CGAL-Qt5_support-GF 2015-07-09 11:40:33 +02:00
Maxime Gimeno 0365d8611a SEGFAULT fix 
- a GL_FLAT/GL_SMOOTH was remaining, I changed them into Flat || FlatPlusEdges and Gouraud.
 2015-07-09 11:37:47 +02:00
Andreas Fabri 728f9a86a8 static_casts 2015-07-09 11:36:38 +02:00
Laurent Rineau bbd6951161 Merge branch 'afabri/Advancing_front_surface_reconstruction-afabri' into CGAL-Qt5_support-GF 
Conflicts:
	Polyhedron/demo/Polyhedron/Scene_points_with_normal_item.cpp

There was also two "conceptual conflicts" that git-merge did not see,
in:
        Polyhedron/demo/Polyhedron/CMakeLists.txt
        Polyhedron/demo/Polyhedron/Polyhedron_demo_advancing_front_plugin.cpp

Polyhedron/demo/Polyhedron/CMakeLists.txt had to use qt5_wrap_ui instead
of qt4_wrap_ui (that lead to a CMake error), and the declaration of the plugin in
Polyhedron/demo/Polyhedron/Polyhedron_demo_advancing_front_plugin.cpp
was not using the Qt5 way (that lead to a compilation error)
 2015-07-08 17:21:36 +02:00
Laurent Rineau 9ab4859647 Remove '#pragma message("scene_EXPORTS is defined")' 2015-07-08 17:08:34 +02:00
Maxime Gimeno cac3fb7414 Merge branch 'CGAL-Qt5_support-GF' of github.com:CGAL/cgal-public-dev into CGAL-Qt5_support-GF 
Conflicts:
	Polyhedron/demo/Polyhedron/Polyhedron_demo_point_set_smoothing_plugin.cpp
 2015-07-08 16:31:13 +02:00
Maxime Gimeno 8e4f08139e Fix : when multiple objects are rendered in a different rendering Model, they don't mess up contextual_changed() anymore. 2015-07-08 16:28:26 +02:00
Laurent Rineau f377b424ec Fix a runtime warning from Qt5 
Andreas reported the following warning on console of the Polyhedron
demo:
> QIODevice::read (QFile,
> "C:\cgal\git\Polyhedron\demo\Polyhedron\VC12QT5\autostart.js"): device
> not open

This should be fixed, now.
 2015-07-08 15:46:54 +02:00
Andreas Fabri 28571dcb21 getInteger -> getInt 2015-07-08 14:05:55 +02:00
Laurent Rineau f931cf643c Fix a compilation 
The removal of the Qt4 code had side-effects. In Qt5, the method is
QInputDialog::getInt instead of QInputDialog::getInteger
 2015-07-08 14:01:09 +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 1d4358e052 update qt urls 2015-07-08 09:48:45 +02:00
Sébastien Loriot e199f546d4 remove QT4 specific code 2015-07-07 19:36:04 +02:00
Sébastien Loriot 58c8bfd328 remove remaining splat files 2015-07-07 18:19:32 +02:00
Sébastien Loriot 722abba27b cosmetic changes to remove mentions of QT4 2015-07-07 18:00:43 +02:00
Andreas Fabri 6682ec1b35 move line 2015-07-07 13:27:52 +02:00
Sébastien Loriot 3785112993 remove unused code 2015-07-07 11:26:08 +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 cde1fea1fa Merge branch 'CGAL-Qt5_support-GF' of github.com:CGAL/cgal-public-dev into CGAL-Qt5_support-GF 2015-07-07 10:45:17 +02:00
Andreas Fabri 74913d5cd8 static_casts 2015-07-07 10:32:45 +02:00
Maxime Gimeno 557cbeeeb7 Texture ID generation 2015-07-07 09:39:52 +02:00
Andreas Fabri 46f7b7437c Merge branch 'CGAL-Qt5_support-GF' of github.com:CGAL/cgal-public-dev into CGAL-Qt5_support-GF 2015-07-06 18:21:41 +02:00
Andreas Fabri d57444f71f less typename 2015-07-06 18:21:28 +02:00
Laurent Rineau 1ed3ef23a4 Merge branch 'CGAL-Qt5_support-GF' of github.com:CGAL/cgal-public-dev into CGAL-Qt5_support-GF 2015-07-06 18:16:27 +02:00
Andreas Fabri 86007c20a9 Add static_casts 2015-07-06 18:15:49 +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 deec6e3278 remove typename 2015-07-06 17:03:39 +02:00
Sébastien Loriot 9098ea7db4 cancel modification in the demo framework to introduce the transparency 2015-07-03 16:05:56 +02:00
Sébastien Loriot 65d11bd4ee do not use transparency and ui from MainWindow 2015-07-03 16:05:56 +02:00
Sébastien Loriot 0ab0633279 Revert "min_edge_length -> max_edge_length" 
This reverts commit 1156381171b183c42fa87cf86b2b6a58d0b4b02e.

Conflicts:
	Mean_curvature_skeleton/include/CGAL/Mean_curvature_flow_skeletonization.h
 2015-07-02 18:47:16 +02:00
Sébastien Loriot 7894e0e071 min_edge_length -> max_edge_length 2015-07-02 18:47:15 +02:00
Laurent Rineau 2335fbc793 Fix the list of plugin in cgal_test_with_cmake 2015-07-02 15:45:01 +02:00
Sébastien Loriot 6d65407387 use size_t for the segment ids 2015-07-02 13:47:41 +02:00
Andreas Fabri 46a24d0335 take code as in the Qt5 branch 2015-07-02 13:11:11 +02:00
Andreas Fabri 9087f863a4 fix previous commit 2015-07-01 17:40:57 +02:00
Andreas Fabri 4c841d73e8 fix previous commit 2015-07-01 17:38:37 +02:00
Andreas Fabri bec3370540 avoid merge conflicts by moving lines 2015-07-01 17:03:13 +02:00
Maxime Gimeno 2f121f103c warnings fix 2015-07-01 16:10:31 +02:00
Laurent Rineau bb1b3deb96 Fix -Wreorder for Scene_item.h 2015-07-01 14:04:07 +02:00
Andreas Fabri 20c1b1a1f6 Merge branch 'Polygon_mesh_processing-GF-old' into Polygon_mesh_processing-GF 
Conflicts:
	BGL/include/CGAL/boost/graph/Euler_operations.h
	BGL/include/CGAL/boost/graph/iterator.h
	Documentation/doc/Documentation/Doxyfile.in
	Documentation/doc/Documentation/dependencies
	Polyhedron/demo/Polyhedron/Polyhedron_demo_point_inside_polyhedron_plugin.cpp
	Polyhedron/demo/Polyhedron/Scene_polygon_soup_item.cpp
	Polyhedron/demo/Polyhedron/Selection_widget.ui
 2015-07-01 13:52:44 +02:00
Clement Jamin 41e7ee2093 Add our plugin to the list 2015-06-30 16:58:21 +02:00
Maxime Gimeno 8ab112f5bd Merge and new plugin fixes 2015-06-30 13:03:20 +02:00
Clement Jamin 3fac8e761a Merge branch 'Point_set_shape_detection_3-cjamin-old' into Point_set_shape_detection_3-cjamin 2015-06-30 10:36:11 +02:00
Jane Tournois ec365e2bb4 use keep_connected_components in Polyhedron demo (selection tool) 2015-06-30 10:31:52 +02:00
Maxime Gimeno a0e7a60973 Merge remote-tracking branch 'cgal/master' into CGAL-Qt5_support-GF 
Conflicts:
	Alpha_shapes_3/demo/Alpha_shapes_3/CMakeLists.txt
	Alpha_shapes_3/demo/Alpha_shapes_3/MainWindow.cpp
	Alpha_shapes_3/demo/Alpha_shapes_3/Viewer.h
	GraphicsView/demo/Alpha_shapes_2/CMakeLists.txt
	GraphicsView/demo/Apollonius_graph_2/CMakeLists.txt
	GraphicsView/demo/Bounding_volumes/CMakeLists.txt
	GraphicsView/demo/Circular_kernel_2/CMakeLists.txt
	GraphicsView/demo/Generator/CMakeLists.txt
	GraphicsView/demo/GraphicsView/CMakeLists.txt
	GraphicsView/demo/L1_Voronoi_diagram_2/CMakeLists.txt
	GraphicsView/demo/Largest_empty_rect_2/CMakeLists.txt
	GraphicsView/demo/Periodic_2_triangulation_2/CMakeLists.txt
	GraphicsView/demo/Segment_Delaunay_graph_2/CMakeLists.txt
	GraphicsView/demo/Snap_rounding_2/CMakeLists.txt
	GraphicsView/demo/Spatial_searching_2/CMakeLists.txt
	GraphicsView/demo/Stream_lines_2/CMakeLists.txt
	GraphicsView/demo/Triangulation_2/CMakeLists.txt
	Linear_cell_complex/demo/Linear_cell_complex/CMakeLists.txt
	Mesh_3/demo/Mesh_3/CMakeLists.txt
	Mesh_3/demo/Mesh_3/include/CGAL_demo/Scene_item_with_display_list.h
	Mesh_3/demo/Mesh_3/src/CGAL_demo/Scene.cpp
	Periodic_3_triangulation_3/demo/Periodic_3_triangulation_3/CMakeLists.txt
	Periodic_3_triangulation_3/demo/Periodic_3_triangulation_3/Scene.cpp
	Polyhedron/demo/Polyhedron/CMakeLists.txt
	Polyhedron/demo/Polyhedron/Polyhedron_demo_join_and_split_polyhedra_plugin.cpp
	Polyhedron/demo/Polyhedron/Polyhedron_demo_mesh_3_plugin.cpp
	Polyhedron/demo/Polyhedron/Polyhedron_demo_trivial_plugin.cpp
	Polyhedron/demo/Polyhedron/Scene.cpp
	Polyhedron/demo/Polyhedron/Scene_combinatorial_map_item.h
	Polyhedron/demo/Polyhedron/Scene_implicit_function_item.h
	Polyhedron/demo/Polyhedron/Scene_plane_item.h
	Polyhedron/demo/Polyhedron/Scene_polygon_soup_item.cpp
	Polyhedron/demo/Polyhedron/Scene_polyhedron_item.cpp
	Polyhedron/demo/Polyhedron/Scene_polyhedron_item.h
	Polyhedron/demo/Polyhedron/Scene_polyhedron_transform_item.h
	Polyhedron/demo/Polyhedron/Scene_polylines_item.h
	Polyline_simplification_2/demo/Polyline_simplification_2/CMakeLists.txt
	Surface_mesher/demo/Surface_mesher/CMakeLists.txt
	Triangulation_3/demo/Triangulation_3/CMakeLists.txt
	Triangulation_3/demo/Triangulation_3/MainWindow.cpp
 2015-06-30 09:17:26 +02:00
Simon Giraudot c37d830783 * map::find/insert merged to a single map::insert 
* Cancelled edition of changes.html
 2015-06-30 07:25:49 +02:00
Sébastien Loriot 5a0edd7fc3 accomodate update of demo 2015-06-29 23:19:55 +02:00
Sébastien Loriot 7792a8fa15 Merge branch 'old/gsoc13-CurveSkeleton-new_package-xgao' into gsoc13-CurveSkeleton-new_package-xgao 
Conflicts:
	Documentation/doc/Documentation/Doxyfile.in
	Polyhedron/demo/Polyhedron/cgal_test_with_cmake
 2015-06-29 23:16:37 +02:00
Clement Jamin 487b540f34 Fix warning 2015-06-29 20:36:04 +02:00
Sébastien Loriot 6f62ce8ab9 add layouts to the dock widget 2015-06-29 18:13:00 +02:00
Sébastien Loriot dd115af7ee add plugin to the testsuite 2015-06-29 18:12:42 +02:00
Sébastien Loriot c6f3dd6e83 fix plugin 2015-06-29 17:47:00 +02:00
Jane Tournois c1aee7307e add keep_connected_components to the selection plugin, 
and keep_connected_components with no named parameters

for the moment it crashes
 2015-06-25 18:42:55 +02:00
Jane Tournois 32f0c9b37b rename Point_inside_polygon_mesh to Side_of_triangle_mesh 
and document it
 2015-06-25 11:51:45 +02:00
Clement Jamin fc7a9f4163 Replaced C++11 mt19937 by CGAL::Random 2015-06-23 17:56:22 +02:00
Simon Giraudot cb5ed8412c Vertices inserted to polygon soup only if needed 2015-06-22 16:32:24 +02:00
Laurent Rineau 44ebc81721 Re-add C2t3_type.h 
This reverts one error made in commit
ec54e1d42c.
 2015-06-22 11:42:23 +02:00
Maxime Gimeno 49b45a753d vaos replacement 
- The vao array has been relaced by a QMap and the buffer array by a vector, so that each item can have the right number of VAOs/VBOs.
 2015-06-22 10:10:45 +02:00
Andreas Fabri 27aa60c2dc more fixes 2015-06-19 10:04:36 +02:00
Andreas Fabri bc648016da slots -? Q_SLOTS 2015-06-19 09:06:19 +02:00
Maxime Gimeno f315b195cd Merge remote-tracking branch 'refs/remotes/cgal-public-dev/CGAL-Qt5_support-GF' into CGAL-Qt5_support-GF 
Conflicts:
	Polyhedron/demo/Polyhedron/Scene_polyhedron_item.cpp
 2015-06-18 15:11:59 +02:00
Maxime Gimeno 6a3bae29cd clean up 2015-06-18 15:08:06 +02:00
Maxime Gimeno 0273dd2544 trivial_plugin refactored. 2015-06-18 14:55:13 +02:00
Maxime Gimeno 0484ba4e6c mesh_3 plugin refactored 2015-06-18 14:45:13 +02:00
Maxime Gimeno 0fbea0f85c cut_plugin refactored 2015-06-18 14:20:33 +02:00
Maxime Gimeno ab568465c5 cene_edges_item in cut_plugin refactored. 2015-06-18 12:54:40 +02:00
Maxime Gimeno 980eb8fcf3 scene_aabb_item in cut plugin refactored. 2015-06-18 12:47:30 +02:00
Maxime Gimeno 5148c8d377 polyhedron_selection_item refactored. 2015-06-18 12:29:31 +02:00
Maxime Gimeno f566e54ddb transformed_item refactored and corrected some problems in other items. 2015-06-18 12:04:15 +02:00
Maxime Gimeno c9272417b1 Points_with_normal_items refactored. 
- No more splatting for now.
 2015-06-18 11:39:48 +02:00
Maxime Gimeno 5172e2d6a5 nef_polyhedron_item refactored 2015-06-18 11:15:43 +02:00
Maxime Gimeno 8754e3a40f edit_polyhedron_item refactored. 
- needed a special program for the red bbox appearing when moving points.
 2015-06-18 10:42:39 +02:00
Sébastien Loriot df47015db9 Merge branch 'old/Advancing_front_surface_reconstruction-afabri' into Advancing_front_surface_reconstruction-afabri 
Conflicts:
	Documentation/doc/Documentation/Doxyfile.in
	Documentation/doc/Documentation/dependencies
	Polyhedron/demo/Polyhedron/cgal_test_with_cmake
 2015-06-18 09:12:12 +02:00
Sébastien Loriot 3fbc191693 Revert parts of "On Polygon_mesh_processing_OpenMesh-GF: fairing pour openmesh" 
This reverts commit eb23730432aaeeef35b85feb013942175ae504f8, reversing
changes made to 1f0191190bcd9dfce903cf5af155ee114d00ac4b.

Only undo the permission changes

Conflicts:
	Polygon_mesh_processing/examples/Polygon_mesh_processing/hole_filling_example_OM.cpp
	Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/internal/Hole_filling/Weights.h
	Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/internal/fair_impl.h
	Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/triangulate_hole.h
 2015-06-17 17:59:42 +02:00
Maxime Gimeno 7c23f13b3e polygon_soup_item refactored + bug corrected 
- wire mode wasn't working correctly because the filling of the edges data wasn't looping.
 2015-06-17 14:37:17 +02:00
Maxime Gimeno 2e9ae070dd Implicit function refactored 
- Use the program library
- force some data like the manipulated frame matrix or the color and normals in the draw functions to be able to use an existing program
with existing shaders.
 2015-06-17 13:00:28 +02:00
Maxime Gimeno ec54e1d42c Refactoring 
- keeps shaders in resources files
- Uses a program vector doubled with a sort of singleton to create or return a program.
- currently implemented classes ; polyhedron_item, textured_polyhedron_item and polylines items
 2015-06-17 11:39:07 +02:00
Maxime Gimeno bf7412066d Shader code clean-up 
- Moved the programs and shaders of textured_polyhedron in Scene_item
 2015-06-15 12:31:30 +02:00
Laurent Rineau cce0d3ec64 Merge pull request #100 from sloriot/gsoc2014-Polyhedron_shortest_path-skiazyk 
https://cgal.geometryfactory.com/CGAL/Members/wiki/Features/Polyhedron_shortest_path

This package provides methods to compute the surface-constrained shortest path on 3d models. It was written as a project during GSoC 2014.
 2015-06-15 10:45:25 +02:00
Laurent Rineau 71207cac07 Merge pull request #116 from sloriot/gsoc2014-VCM_3-jmeyron 
GSoC 2014, VCM feature from Jocelyn Meyron, Sébastien Loriot, and Quentin Mérigot

https://cgal.geometryfactory.com/CGAL/Members/wiki/Features/Small_Features/vcm_computation_and_applications
 2015-06-15 10:37:29 +02:00
Sebastien Loriot 3c9fbbb393 Merge pull request #110 from afabri/Polyhedron_iostream-Binary_STL_Readder-GF 
Read binary STL files
 2015-06-15 10:01:40 +02:00
Clement Jamin 1097079153 Merge branch 'Point_set_shape_detection_3-cjamin-old' into Point_set_shape_detection_3-cjamin 2015-06-12 16:04:59 +02:00
Maxime Gimeno 84bc656508 Clean up 
- Shaders and programs moved to scene_item
- Qt wrappers used.
 2015-06-12 15:21:13 +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
Andreas Fabri 426e31681b switch from tuple to array to describe a face 2015-06-11 15:57:59 +02:00
Sebastien Loriot 940117422f Merge pull request #109 from sloriot/Polyhedron_demo-color_each_cc-sloriot 
add an action to assign a color per cc of a polyhedron
 2015-06-10 13:39:31 +02:00
Sébastien Loriot f5837dee87 Disable the normal estimation plugin with Boost-1.57 and C++11 
Patch similar to
|--------------------------------------------------------------------
|  commit bd43545717
|  Author: Laurent Rineau <laurent.rineau@cgal.org>
|  Date:   Mon Jan 26 11:22:09 2015 +0100
|
|      Disable the normal estimation plugin with Boost-1.57 and C++11
|--------------------------------------------------------------------
 2015-06-09 16:22:19 +02:00
Sébastien Loriot cefc1b9c50 add new plugin in testsuite 2015-06-09 09:34:33 +02:00
Sébastien Loriot cac397d073 remove extra const 2015-06-08 16:36:31 +02:00
Andreas Fabri a5aafc876b make applicable 2015-06-08 15:18:55 +02:00
Andreas Fabri 4e9eefd891 Merge branch 'Advancing_front_surface_reconstruction-afabri-old' into Advancing_front_surface_reconstruction-afabri 2015-06-08 15:17:47 +02:00
Andreas Fabri 011adaef42 the filter works the other way round 2015-06-08 15:05:23 +02:00
Andreas Fabri fb1c691ffa get the demo compiled 2015-06-08 14:29:46 +02:00
Sébastien Loriot ae5e0efa33 fix warning 2015-06-08 09:56:59 +02:00
Sébastien Loriot eb4d746815 fix typos 2015-06-05 16:35:27 +02:00
Andreas Fabri 04e4c1b702 open stream in binary mode 2015-06-05 16:07:54 +02:00
Sébastien Loriot dfc9092c90 add an action to assign a color per cc of a polyhedron 2015-06-05 15:58:52 +02:00
Sébastien Loriot fd696dd81c fix warning 2015-06-05 15:37:40 +02:00
Sébastien Loriot 9bb488cd06 remove unused variable 2015-06-05 15:13:04 +02:00
Sébastien Loriot 56a171219c remove unused variable 2015-06-05 15:10:40 +02:00
Sébastien Loriot 9e8727c593 Before trying to orient a soup, start by removing degenerate polygons 2015-06-05 07:23:34 +02:00
Sébastien Loriot 376760340e add new plugins in the testsuite 2015-06-05 06:44:04 +02:00
Sébastien Loriot 0f48225bbe accomodate changes in applicable 2015-06-04 11:40:31 +02:00
Sébastien Loriot 5ae3cb521b accomodate changes in slots declaration 2015-06-04 11:28:48 +02:00
Sébastien Loriot c2cd87865e Merge branch 'old/gsoc2014-VCM_3-jmeyron' into gsoc2014-VCM_3-jmeyron 
Conflicts:
	Installation/changes.html
	Point_set_processing_3/doc/Point_set_processing_3/PackageDescription.txt
	Point_set_processing_3/doc/Point_set_processing_3/Point_set_processing_3.txt
	Point_set_processing_3/doc/Point_set_processing_3/examples.txt
	Point_set_processing_3/examples/Point_set_processing_3/CMakeLists.txt
	Polyhedron/demo/Polyhedron/CMakeLists.txt
 2015-06-04 11:27:56 +02:00
Sebastien Loriot 92ee604a1c Set off ouput precision to the maximum relevant 2015-06-04 10:55:13 +02:00
Sébastien Loriot d123ce5a47 Merge branch 'old/gsoc2014-Polyhedron_shortest_path-skiazyk' into gsoc2014-Polyhedron_shortest_path-skiazyk 
Conflicts:
	Documentation/biblio/geom.bib
	Documentation/doc/Documentation/Doxyfile.in
	Documentation/doc/Documentation/dependencies
	Documentation/doc/Documentation/packages.txt
	Documentation/scripts/generate_how_to_cite.py
	Polyhedron/demo/Polyhedron/CMakeLists.txt
 2015-06-01 17:47:31 +02:00
Sébastien Loriot 03a85fdf95 remove exe flag 2015-06-01 14:26:16 +02:00
Sébastien Loriot 22ec2d5bfb remove extra comma 2015-05-29 13:34:33 +02:00
Sébastien Loriot c85cc1429b remove extra typename 2015-05-28 10:54:24 +02:00
Sébastien Loriot 64deb875a6 more verbose output 2015-05-28 10:43:32 +02:00
Sébastien Loriot d18d07ba2a slots -> Q_SLOTS 2015-05-27 18:12:51 +02:00
Andreas Fabri ce051c74a2 slots -> Q_SLOTS 2015-05-27 08:55:42 +02:00
Laurent Rineau fae635d2fb Merge pull request #73 from afabri/CGAL-Qt_no_keywords-GF 
All Qt4-based demos now use  `-DQT_NO_KEYWORDS`
 2015-05-26 12:32:40 +02:00
Sébastien Loriot 17678e8c3d fix compilation issue and MinIndex usage 2015-05-22 16:27:15 +02:00
Stephen Kiazyk 686bc75f33 Merge branch 'gsoc2014-Polyhedron_shortest_path-skiazyk' of github.com:CGAL/cgal-public-dev into gsoc2014-Polyhedron_shortest_path-skiazyk 2015-05-22 08:45:39 -05:00
Stephen Kiazyk 4460fe6564 Fixed the nearest edge find in polyhedron demo 
The method was left unfinished (and was incorrect)
 2015-05-22 08:42:33 -05:00
Sébastien Loriot 2e40a1684d make the selection plugin exporting selected edges as a polyline item 2015-05-21 09:42:40 +02:00
Sébastien Loriot bb9521a288 factorize vcm normal estimation plugins 2015-05-19 16:09:35 +02:00
Jane Tournois 6c4785a29c On Polygon_mesh_processing_OpenMesh-GF: fairing pour openmesh 2015-05-13 16:10:21 +02:00
Jane Tournois 905d6d5461 use user-given vertex point map in weights.h 2015-05-12 17:00:36 +02:00
Sébastien Loriot c3f637f567 fix typo 2015-05-11 10:53:00 +02:00
Andreas Fabri 1537613726 BOOST_FOREACH -> Q_FFOREACH 2015-05-08 19:15:25 +02:00
Sébastien Loriot 83cc9513c5 if a polyhedron is triangulated, print its volume (if closed) and its surface area 2015-05-07 09:50:21 +02:00
Andreas Fabri 563dd4f06b Polyhedron demo 2015-05-06 15:45:34 +02:00
Laurent Rineau b31d91347d Fix compilation 2015-05-04 16:50:43 +02:00
Laurent Rineau 7afe15871b Merge branch 'Polyhedron-new_opengl_REBASED_to_ignore_reindentations-gf' into CGAL-Qt5_support-GF 
Conflicts:
	Polyhedron/demo/Polyhedron/Scene_polyhedron_item.cpp
	Polyhedron/demo/Polyhedron/Scene_polyhedron_item.h
 2015-05-04 16:11:36 +02:00
Maxime Gimeno 0e58dfbd71 Antialiasing fix 
- Changed the vec3 color of the fragment shaders by vec4 color with alpha chanel value of 1.

(cherry picked from commit 81477ddd81)
 2015-05-04 16:07:50 +02:00
Maxime Gimeno 81477ddd81 Antialiasing fix 
- Changed the vec3 color of the fragment shaders by vec4 color with alpha chanel value of 1.
 2015-05-04 15:43:22 +02:00
Maxime Gimeno 1cf09a4317 Added GLSL error print 2015-04-30 15:02:06 +02:00
Maxime Gimeno 754e38e239 Optimization of the scene_c3t3_item 
- Replaced if(frame->isInMouseGrabPool()), which always return true, by if(frame->isManipulated()||isSpinning()) which returns true only when the frame is actually moving.
 2015-04-29 15:19:36 +02:00
Sébastien Loriot 42a2bbaef2 make the demo plugin compile again 2015-04-29 15:19:09 +02:00
Maxime Gimeno 323b12f55b Color bug in polyhedron_item fixed 
- one color element was missing for the not selected item when filling the vector.
 2015-04-29 14:54:17 +02:00
Maxime Gimeno 0e1a89a187 Implicit Function freeze of the texture while moving and double UV Mapping fixed 
- call to compute_texture at every draw if the frame is manipulated
- The double mapping will stay a mystery for ever... With 3-tupple vertex buffer the problem disappeared.
 2015-04-29 14:26:23 +02:00
Maxime Gimeno b305bb8dee Shuffle_orientation SIGSEGV fixed 
- moved the call to setColor (which now calls changed()) to after load(poly_item) in the sheffle() function in orient_soup_plugin.
 2015-04-28 16:18:52 +02:00
Maxime Gimeno dac5e6740c New Polyhedron_item not displayed and Meshing crashing fixed 
- Added a call to changed to the constructors of Scene_Polyhedron_item and a call to changed() in the setColor() function

- Changed back some code of the mesh_3 plugin and mesh_3_plugin_cgal_code that didn't match after the merging
 2015-04-28 15:45:55 +02:00
Sébastien Loriot 97c8a07289 remove experimental code to extract feature polylines that is not working good 
update the demo plugin accordingly
 2015-04-27 21:42:22 +02:00
Maxime Gimeno 7f3d6e35c5 Merging and integration of Polyhedron_Demo 
- The Splatting has been deactivated
- The Scene_item class has a new member of type QOpenGLFunctions, allowing to use all shader functions without need for GLEW
 2015-04-27 14:51:48 +02:00
Maxime Gimeno ed3298ee2f Merge branch 'Polyhedron-new_opengl_REBASED_to_ignore_reindentations-gf' into CGAL-Qt5_support-GF 
Conflicts:
	Polyhedron/demo/Polyhedron/CMakeLists.txt
	Polyhedron/demo/Polyhedron/Polyhedron_demo_mesh_3_plugin.cpp
	Polyhedron/demo/Polyhedron/Polyhedron_demo_mesh_3_plugin_cgal_code.cpp
	Polyhedron/demo/Polyhedron/Polyhedron_demo_selection_plugin.cpp
	Polyhedron/demo/Polyhedron/Polyhedron_demo_trivial_plugin.cpp
	Polyhedron/demo/Polyhedron/Scene.cpp
 2015-04-27 08:50:06 +02:00
Maxime Gimeno f44c824205 Warning fixed 
- Replaced the seond "fit" iterator by "fit2" to avoid conflict
 2015-04-27 08:24:19 +02:00
Andreas Fabri 6c1f749046 fix applicable() 2015-04-26 19:13:08 +02:00
Maxime Gimeno 89348a1ab9 cut_plugin fixed 
- replaced the missing modified files by the originals
- added a reference to a vector of floats in traits so that it fills it instead of drawing the bboxes
 2015-04-24 15:59:23 +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 85dc68ac9e Forgot to remove my logs again 2015-04-24 11:46:46 +02:00
Maxime Gimeno cef11f0928 Selection improve 
I added a vao for handling the selection color change, which is now instant.
 2015-04-24 11:46:46 +02:00
Maxime Gimeno 1b11fca614 slow draw of polyhedron_items fixed 2015-04-24 11:46:46 +02:00
Maxime Gimeno fa9ec055a6 little fix 2015-04-24 11:46:45 +02:00
Maxime Gimeno c270b32c24 bbox_item upgraded 2015-04-24 11:46:45 +02:00
Maxime Gimeno c7e8bc22d8 Draw point implementation 
I realized I forgot to add a call to contextual_changed in the wiremode and points mode.
 2015-04-24 11:46:44 +02:00
Maxime Gimeno a87c87a611 Scene c3t3 item upgrade 
I had to implement the clipping myself, appart from that everything went fine.
 2015-04-24 11:46:44 +02:00
Maxime Gimeno 7db52de9b5 Edit 2015-04-24 11:46:44 +02:00
Maxime Gimeno e6c6efb86d Selection_item upgrade 2015-04-24 11:46:43 +02:00
Maxime Gimeno 4e363dc6e6 Scene_plane_item upgraded 
I added some functions in the .cpp file, that was empty before.
 2015-04-24 11:46:43 +02:00
Maxime Gimeno 078ad824ff Polyhedron_transform_item upgrade 
It was quite simple, as there was only lines to draw. I add to add a call to change in replaceItem (scene.cpp) though.
 2015-04-24 11:46:43 +02:00
Maxime Gimeno 05fe53e652 points_with_normal_item upgrade 
A classic approach, except for the splatting, that won't work until the scene class don't call a GLSplat Renderer anymore.
 2015-04-24 11:46:42 +02:00
Maxime Gimeno 3a7f25962b points_with_normals upgrade 
Splat_draw is missing for now, and I had to add some calls to changed from different files manipulating scene items.
 2015-04-24 11:46:42 +02:00
Maxime Gimeno 0c1dca6fa6 Double pointsdrawing fixed 
I just found out about renderingMode() == PointsPlusNormal, that solved the problem.
 2015-04-24 11:46:41 +02:00
Maxime Gimeno 20a5f19fe6 Points+normals fixed 
I don't really understand why it is called points+normals as it never was the normals, but anyway.
The problem is that the points are drawn twice, once with draw and once with draw_edges.
 2015-04-24 11:46:41 +02:00
Maxime Gimeno 85e0de731a Convex Decomposition fixed 
Just added a call to changed() in the function.
 2015-04-24 11:46:41 +02:00
Maxime Gimeno f06493726a Upgraded to OpenGL ES 3.0 
No more gluTessPolygon, which means the light does not reveal strange triangles in the surface, but the way nef_Polyhedron deals with the vertices from an OFF file makes a Triangulation mandatory for every polygon, even if it already is triangulated.
 2015-04-24 11:46:40 +02:00
Maxime Gimeno 463c3e5b0e Finished 
The spheres are implemented, everything seems to work.
 2015-04-24 11:46:40 +02:00
Maxime Gimeno 613e990d1f edit_polyhedron update 
Spheres option remaining. The 3 axis of the system when editing are now 3 lines (blue, red and green) until I find a way to draw an arrow.
 2015-04-24 11:46:39 +02:00
Maxime Gimeno 5137499fff Shader modifications 
I moved the texture drawing in the fragment shader, this way the drawing is done by pixel and not by primitive. Forgot about that before I code inimplicit_fuction where it was obvious.
 2015-04-24 11:46:39 +02:00
Maxime Gimeno 0d5d776f53 Change of name 
I renamed shading_mode_changed to contextual_changed, as I use the function in implicit_function for a different test.
 2015-04-24 11:46:39 +02:00
Maxime Gimeno 61ebf2f25a Upgrade and use of a texture 
Upgraded to OGL ES 3 and draw the slice in a texture instead of drawing it directly.
 2015-04-24 11:46:38 +02:00
Maxime Gimeno a09fda551a Forgot the destructor. 2015-04-24 11:46:38 +02:00
Maxime Gimeno 8c6efa6aae Add changed for polylines. 2015-04-24 11:46:38 +02:00
Maxime Gimeno c08e4b6de5 Some clean-up 
Erased some comments.
 2015-04-24 11:46:37 +02:00
Maxime Gimeno 6d2e24c4fc Wired Spheres as Quads. 
The spheres appears with quads in the wiremode. It was just an implementation of the conversion code from triangles to lines when filling the positions_wire_spheres vector.
 2015-04-24 11:46:37 +02:00
Maxime Gimeno 4a48cfb524 Update of polyline_item. 
Polylines now use shaders, and spheres are made without gluSphere. The displayList has been replaced bay an Instanced drawing of the shperes with the function DrawArraysInstanced.
 2015-04-24 11:46:37 +02:00
Maxime Gimeno 3a945c9e00 textured polyhedron update 
The textured polyhedron now use shaders to display an abject and its textures. The draw function doesn't call the Textured_Polyhedron.h function anymore, only to compute the normals.
 2015-04-24 11:46:36 +02:00
Maxime Gimeno 22c51dfa66 Soup Item upgrade 
Soup Item can now read and draw non-triangle faces polygon soups.
 2015-04-24 11:46:36 +02:00
Maxime Gimeno 1f22ca4ca2 Triangulation test updates 
The test to know if a polygon is triangulated is now done once per changed() call,
and it iterates the faces until it finds one that is not a triangle.
 2015-04-24 11:46:36 +02:00
Maxime Gimeno b5c8876071 Not triangle facets implementation 
The polyhedron item is now able to draw plygons with not-triangle facets, but can no longer have a Gouraud Shading model.
 2015-04-24 11:46:35 +02:00
Maxime Gimeno 671c350f2c Split the rendering in two programs 
Facets and Edges have now each their own program.
I had to change attrib_uniform to get a parameter which precise which program we are using.
 GlUseProgram is now done in attrib_uniform.
 2015-04-24 11:46:35 +02:00
Maxime Gimeno 140a6b408a Implementation of draw_points 
just added the same function as polygon_soup_item and it works perfectly.
 2015-04-24 11:46:35 +02:00
Maxime Gimeno 585e3adb76 Fix bugs, clean code and implement color 
I changed a few details in polygon_soup_item, like the sizeof(float) or the size of the location array.

Fixed the bug that deformed an item in polyhedron_item, caused by glGet(GL_POLYGON_MODE) that takes an array of 2 int and not a single int.

Implemented the color changes in polyhedron_item depending of the selection.
 2015-04-24 11:46:34 +02:00
Maxime Gimeno 4ca98368fb Cleaning of the code 
cleaned-up some VBO binding that was useless and corrected a sizeof error.
 2015-04-24 11:46:34 +02:00
Maxime Gimeno cae8bd242c Just to test 
the magic cout is at line 326.
 2015-04-24 11:46:33 +02:00
Laurent Rineau d20b7d3ce3 Better use of Vertex Array Object 
Once the VAO is fully set up, the drawing functions only have to bind it
and unbind it. No need to bind/unbind and setup the VBOs.
 2015-04-24 11:46:33 +02:00
Maxime Gimeno 9fd3d43aa2 First upgrade of polyhedron item 
Now using a shader to draw. Remaining a strange bug in which gouraud and flat modes are exchanged.
 2015-04-24 11:46:33 +02:00
Laurent Rineau 27a5ff51b5 Cleaner drawing code 
uniform_attrib() takes the viewer as argument. That way, `mvp_mat` and
`mv_mat` can be local variables of the method.

The two drawing method draw() and draw_points() both take the viewer as
argument, and no longer setup the buffers (they only use them).

Add cleanup code at the end of the drawing methods.

(See ../../../Mesh_3/demo/Mesh_3/Scene_segmented_image_item.cpp for a
very clean OpenGL code.)
 2015-04-24 11:46:32 +02:00
Laurent Rineau ecea7c3ef6 Split compile_shaders() 
New function initialize_buffers(), that is called in
changed(). compile_shaders() is only call once, in the constructor (but
it should be a static initialization).

glGenBuffers() and others are also called in the constructor.

Add cleanup code at the end of initialize_buffers().
 2015-04-24 11:46:32 +02:00
Laurent Rineau e16cca10ef Call compile_shaders() in the constructor 
Ideally, the shaders should static variables.
 2015-04-24 11:46:31 +02:00
Laurent Rineau 911731eceb Call compute_normals_and_vertices() in changed() 2015-04-24 11:46:31 +02:00
Maxime Gimeno de58fbbc68 Multiple objects rendering fix 
The buffers was only bound once at the creation of the object, which means that only the last object created had its buffers right.
 2015-04-24 11:46:31 +02:00
Maxime Gimeno 2a667cef90 Points view fix 
The size of the data passed to the buffer was too large, noise was passed.
 2015-04-24 11:46:30 +02:00
Sébastien Loriot 1fc89d64e4 applicable now depends on the action 
(cherry picked from commit b9fbda6c0c)
 2015-04-24 11:46:30 +02:00
Maxime Gimeno f9701452e6 Draw Two Side implementation 
The shader is now able to "draw two sides".
 2015-04-24 11:46:30 +02:00
Maxime Gimeno 3419da3b3b Design correction 
No changed function after all.
 2015-04-24 11:46:29 +02:00
Maxime Gimeno 7110d40e76 Design update 
All the global variables are now member, buffers are deleted and the function changed() is implemented.
 2015-04-24 11:46:29 +02:00
Laurent Rineau 8c94b8810a Add data files 2015-04-24 11:46:28 +02:00
Maxime Gimeno a5a5c74464 Cleaned the code. 2015-04-24 11:46:28 +02:00
Maxime Gimeno 39811801e4 Uniform allocation moved 
It is now made only once after the compile_shader.
 2015-04-24 11:46:28 +02:00
Maxime Gimeno e5707a756f points mode implementation 
Now you can use the points view.
 2015-04-24 11:46:27 +02:00
Maxime Gimeno e833e28605 Design update 
No more isInit, the recovery of normals and vertices is now done in the load function.
 2015-04-24 11:46:27 +02:00
Maxime Gimeno 991b697af6 Color Change fix 
I forgot to uncomment the glUseProgram(0) at the end of render().
 2015-04-24 11:46:26 +02:00
Maxime Gimeno 415d3cc44d color fix 
Instead of taking the color information on the object in the draw function, I get the current color value, and I don't need the draw_edges function anymore.
 2015-04-24 11:46:26 +02:00
Maxime Gimeno 7faa2198fd draw_edges fix 
For now the function draw_edges is the same than draw() but the color is twice darker.
 2015-04-24 11:46:26 +02:00
Maxime Gimeno 7edebec70e Light update 
I now set the light properties in the Scene class constructor and pass them to the shader in the polygon_soup render function
 2015-04-24 11:46:25 +02:00
Maxime Gimeno 534a017917 light implementation 
I modified the vertex shader so that it uses Gouraud shading
 2015-04-24 11:46:25 +02:00
Maxime Gimeno b9206adc1e fix click bugs and wireframe problems 
An intempestive call to glClearBufferfv cleared the screen at each call to draw.
 2015-04-24 11:46:25 +02:00
Maxime Gimeno 2a8c381113 first commit, update of the OpenGL code for Scene_polygon_soup_item 2015-04-24 11:46:24 +02:00
Sébastien Loriot 6657c59718 add missing target 2015-04-23 08:26:45 +02:00
Sébastien Loriot fc4980096b remove trailing whitespaces and remove empty dirs 2015-04-22 10:44:28 +02:00
Sébastien Loriot 1a79f9dfb1 update setters in the skeleton plugin 2015-04-10 16:08:41 +02:00
Sven Oesau de5058ae84 Merge branch 'Point_set_shape_detection_3-cjamin_old' into Point_set_shape_detection_3-cjamin 
Conflicts:
	Documentation/doc/Documentation/dependencies
	Documentation/doc/Documentation/packages.txt
 2015-04-03 16:01:03 +02:00
Jane Tournois 396d1875ab named parameters in self_intersections.h (code and doc) 2015-04-01 13:46:53 +02:00
Laurent Rineau cc3ad751a8 Fix the moc issue of scene_edit_polyhedron_item 
- Fix the ODR for Scene_edit_polyhedron_item.h: add inline
- Re-activate the automoc for scene_edit_polyhedron_item
 2015-03-31 15:25:10 +02:00
Maxime Gimeno 3912980086 Upgrade to Qt5 without GLEW 
I am currently working on a new version of the splatting that would be supported by OpenGL 3 GL and Qt5, which is not currently the case and keeps the demo from compiling.
 2015-03-31 14:08:32 +02:00
Laurent Rineau b0a5b5a033 Change the moc handling for Viewer_interface 2015-03-31 11:54:38 +02:00
Maxime Gimeno 8b3cca50a0 Modifying to Qt5 2015-03-31 10:22:21 +02:00
Maxime Gimeno 52dc3b265d Merge remote-tracking branch 'remotes/cgal-public-dev/gsoc2014-CGAL-Qt5_support-vialon' into to-qt5 
All CMake files modified by the branch 'gsoc2014-CGAL-Qt5_support-vialon' have been reset.

Conflicts:
	GraphicsView/demo/Polygon/CMakeLists.txt
	GraphicsView/src/CGAL_Qt4/CMakeLists.txt
	GraphicsView/src/CGAL_Qt4/GraphicsView.qtmoc.cmake
	Installation/cmake/modules/CGALConfig_binary.cmake.in
	Installation/cmake/modules/CGALConfig_install.cmake.in
	Installation/cmake/modules/CGAL_Macros.cmake
	Linear_cell_complex/demo/Linear_cell_complex/CMakeLists.txt
	Linear_cell_complex/demo/Linear_cell_complex/MainWindow.cpp
	Mesh_3/demo/Mesh_3/CMakeLists.txt
	Polyhedron/demo/Polyhedron/CMakeLists.txt
	Polyhedron/demo/Polyhedron/Polyhedron_demo_edit_polyhedron_plugin.cpp
	Polyhedron/demo/Polyhedron/Polyhedron_demo_join_polyhedra_plugin.cpp
	Polyhedron/demo/Polyhedron/Scene.cpp
	Polyhedron/demo/Polyhedron/implicit_functions/CMakeLists.txt
	Polyhedron/demo/Polyhedron/polyhedron_demo_macros.cmake
	Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/CMakeLists.txt
	Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/MainWindow.cpp
	Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/PS_demo_average_spacing_plugin.cpp
	Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/PS_demo_cleaning_plugin.cpp
	Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/PS_demo_inside_out_plugin.cpp
	Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/PS_demo_local_spacing_plugin.cpp
	Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/PS_demo_normal_estimation_plugin.cpp
	Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/PS_demo_off_plugin.cpp
	Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/PS_demo_poisson_plugin.cpp
	Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/PS_demo_poisson_plugin_cgal_code.cpp
	Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/PS_demo_simplification_plugin.cpp
	Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/PS_demo_smoothing_plugin.cpp
	Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/PS_demo_xyz_plugin.cpp
	Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/Point_set_demo.cpp
	Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/Polyhedron_demo_plugin_helper.cpp
	Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/Scene.cpp
	Triangulation_3/demo/Triangulation_3/CMakeLists.txt
 2015-03-30 16:02:51 +02:00
Maxime Gimeno 040458d248 Update of all the CMakeList and .cmake files for Qt5 
Reasy for merging the cpp files from clone qt5
 2015-03-30 15:34:17 +02:00
Sébastien Loriot 201e76025a use an input range instead of an input iterator in the traits 2015-03-26 23:40:25 +01:00
Sébastien Loriot 9172a349f8 move RANSAC algo header to subdirectory and add convenience header 2015-03-26 20:22:34 +01:00
Sébastien Loriot c6153f1c3c make the demo plugin working again 2015-03-26 20:13:12 +01:00
Jane Tournois 3e42166719 fix compilation of the Polyhedron demo according to my previous commits 2015-03-26 12:57:03 +01:00
Guillaume Damiand 522c3dfada Update modified cmakelists.txt to initial versions 2015-03-26 12:23:15 +01:00
Guillaume Damiand e6e7f621dd Update cmake 2015-03-25 17:17:23 +01:00
Guillaume Damiand fd32a64bd5 cmake 2015-03-23 12:25:45 +01:00
Guillaume Damiand 7079291a3e cmake 2015-03-23 12:18:32 +01:00
Guillaume Damiand 4102d26fe8 cmake 2015-03-23 12:06:57 +01:00
Guillaume Damiand df2ec50f50 Modify cmake of Polyhedron demo 2015-03-23 11:42:40 +01:00
Jane Tournois d913b48d98 introduce bgl named function parameters 
and implement them for hole filling, refine and fair functions
 2015-03-20 09:52:54 +01:00
Sébastien Loriot 78f2283406 move header files 2015-03-18 17:11:45 +01:00
Sébastien Loriot 6d2c6df6ab rename header 2015-03-18 15:11:10 +01:00
Sébastien Loriot 324839c8ae move header files 2015-03-18 11:51:33 +01:00
Sébastien Loriot 0a0f0b1e56 replace FAIRING_CONTINUITY by an unsigned int 2015-03-18 11:26:10 +01:00
Andreas Fabri 4cd8980f38 Add implementation of reverse_face_orientations 2015-03-17 17:37:22 +01:00
Jane Tournois 759d558832 Merge branch 'Polygon_mesh_processing-GF' of github.com:CGAL/cgal-dev into Polygon_mesh_processing-GF 2015-03-17 17:34:26 +01:00
Jane Tournois 4a2007598b add save snapshot to polyhedron demo 2015-03-17 17:34:09 +01:00
Sébastien Loriot 2eb06bc9b5 fix header name on case sensitive FS 2015-03-17 16:20:37 +01:00
Jane Tournois 8007bf6d91 add function reverse_face_orientations & rename is_oriented.h to orientation.h 2015-03-17 14:48:16 +01:00
Guillaume Damiand cca136c131 Wip 2015-03-16 18:06:53 +01:00
Guillaume Damiand 9c78897ba5 Merge branch 'CGAL_headers_only-gdamiand_cjamin-old' into CGAL_headers_only-gdamiand_cjamin 2015-03-16 14:00:43 +01:00
Jane Tournois f4c343f5c0 in fairing, make solver parameter usable 2015-03-13 12:30:02 +01:00
Jane Tournois 6a0924ab86 fix compilation in Polyhedron demo 2015-03-12 14:47:10 +01:00
Jane Tournois 1459f283e5 move FAIRING_CONTINUITY to Polygon_mesh_processing namespace 2015-03-12 14:41:00 +01:00
Jane Tournois 07b0ad5e75 replace boost::tuple by CGAL::cpp11::tuple 2015-03-12 10:42:10 +01:00
Jane Tournois d39f201724 in triangulate_hole_polyline, replace begin and end iterators by PointRanges 2015-03-10 11:38:08 +01:00
Andreas Fabri af7fa2ac51 Add LSCM as parametrization method 2015-03-10 10:44:57 +01:00
Jane Tournois 282264a73a in fair() replace (vertices_begin, vertices_end) by vertex range 2015-03-09 17:22:38 +01:00
Jane Tournois f3bfb53917 in refine(), replace facets_begin and facets_end by a range of facets 2015-03-09 16:52:05 +01:00
Jane Tournois b081f8d92b move stitch_borders to Polygon_mesh_processing folder for readability 2015-03-09 12:30:16 +01:00
Jane Tournois fe3d702461 rename stitch_polygon_mesh to stitch_borders 
because it's the name of the function implemented in the header file
 2015-03-09 12:27:58 +01:00
Jane Tournois cde06c7088 remove weight calculator from the public API of fairing 
it is still available internally
 2015-03-05 15:45:14 +01:00
Laurent Rineau 067b134c65 Fix the output of a c3t3 to a polygon soup 
The stream iostate must be cleared before it can be reused.
 2015-03-04 12:57:10 +01:00
Sébastien Loriot 69cd794cb1 demo bug-fix: set the menu as modified 
trivial bug fix for master
 2015-03-03 18:01:16 +01:00
Sébastien Loriot bfc2951dc2 rename function header 2015-02-27 08:15:10 +01:00
Sébastien Loriot b9fbda6c0c applicable now depends on the action 2015-02-18 16:22:57 +01:00
Andreas Fabri fef3ec4692 use BGL named parameters 2015-02-17 20:14:59 +01:00
Jane Tournois 08e14b7af5 Merge branch 'Polygon_mesh_processing-GF' of ssh://scm.cgal.org/var/git/cgal into Polygon_mesh_processing-GF 
Conflicts:
	Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/is_oriented.h
 2015-02-17 12:31:07 +01:00
Sébastien Loriot 86453fc867 fix compilation issues 2015-02-16 14:26:57 +01:00
Sébastien Loriot 13296e6887 Merge branch 'old/Polygon_mesh_processing-GF' into Polygon_mesh_processing-GF 2015-02-16 11:48:29 +01:00
Sébastien Loriot 68d15e165a Merge branch 'local/Polyhedron_demo-better_selection_offset' 
Improve the facet selection process in the demo plugin
  by using the vertex incidence instead of the edge incidence.
  First step toward simpler the code

  Tested in CGAL-4.6-Ic-126
  Approved by the release manager
 2015-02-16 10:23:31 +01:00
Jane Tournois ff1ce272a6 fix a warning 2015-02-13 14:19:07 +01:00
Jane Tournois 0f469859ff triangulate_faces now has 3 versions, for different parameters 
- PolygonMesh, VertexPointMap, and Kernel
- PolygonMesh and VertexPointMap (Kernel deduced automatically)
- PolygonMesh only (VertexPointMap and Kernel deduced automatically)

only the first one is documented, and appears as if the 2 last
parameters had default values
 2015-02-12 14:59:40 +01:00
Sébastien Loriot 373b93d4a2 fix warnings on windows 2015-02-12 14:18:51 +01:00
Jane Tournois 4316ea250b fix compilation 2015-02-12 13:01:54 +01:00
Sébastien Loriot 743821f76a use the new erode and dilate section functions 2015-02-11 10:05:05 +01:00
Jane Tournois 6f27c5a75b BGL-ization triangulate_faces(PolygonMesh) function 2015-02-10 17:49:22 +01:00
Jane Tournois 873da255c8 fix Scene_polyhedron_item according to last commit 2015-02-10 17:27:46 +01:00
Sébastien Loriot 1ed289cc7e Merge branch 'old/gsoc13-CurveSkeleton-new_package-xgao' into gsoc13-CurveSkeleton-new_package-xgao 
Conflicts:
	Documentation/doc/Documentation/Doxyfile.in
	Documentation/resources/how_to_cite_cgal.bib.in
 2015-02-09 12:43:41 +01:00
Sébastien Loriot eeae2f392a Merge branch 'local/Remove_condition_on_CGAL_version' into Polygon_mesh_processing-GF 2015-02-05 14:47:56 +01:00
Sébastien Loriot bb3264c563 remove conditions that are outdated 2015-02-05 14:46:36 +01:00
Sébastien Loriot d4746febff Merge branch 'Polyhedron_3-IO4Scene_edge_item-GF' 
Tested in CGAL-4.6-Ic-120
  Approved by the interim release manager
 2015-02-03 17:20:27 +01:00
Sébastien Loriot 2537374f56 fix io plugin 2015-02-03 17:18:48 +01:00
Sébastien Loriot 698189f2d4 only consider io-plugin for loading that can load 2015-02-03 17:05:04 +01:00
Sébastien Loriot f7dac442d9 add the nb of points to respect cgal file format 2015-02-03 16:35:43 +01:00
Sébastien Loriot c5737d0fa4 rename header 2015-02-03 10:15:42 +01:00
Sébastien Loriot 022666fe09 Polygon_mesh_slicer_3 -> Polygon_mesh_slicer 2015-02-03 10:12:42 +01:00
Sébastien Loriot 416db703c7 Merge branch 'local/Polygon_mesh_processing-extract_cc' into Polygon_mesh_processing-GF 2015-02-03 09:23:37 +01:00