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

2841 Commits

Author SHA1 Message Date
Laurent Rineau c52758d590 Improve the draw of the intersection 
I have tweaked the vertex and fragment shaders, to avoid the curious
color interpolation for triangles of the intersection with the cutting
plane.

The component `color.w` is set to the signed distance to the cutting
plane (no longer any conditional in the vertex shader).

Then in the fragment shader, the drawing color is composed as such:

    if(color.w<0)
    {
      vec4 my_color = vec4(color.xzy, 1.);
      // [...]
    }
    else
      discard;
 2016-03-29 18:38:20 +02:00
Laurent Rineau 1439796bf6 Do not draw the intersection while the plane is manipulated 
... plus a fix in `draw_edges()`: missing call to
`compute_intersections()`, if the item was drawn in wireframe-only.
 2016-03-29 18:37:18 +02:00
Laurent Rineau 3c7a5dd7b1 Fix a critical performance issue 
As decided by `MainWindow`, the `Scene_c3t3_item::toolTip()` method is
called by `MainWindow::updateInfo()` for each `modified()` event of the
manipulated frame. While the frame is manipulated, that generates a lot
of events, and a lot of calls to `toolTip()`.

Before this commit, the call to `Scene_c3t3_item::toolTip()`
was `O(n)`. After this commit it is `O(1)`.

That speeds up a lot the drawing of the item while the frame is
manipulated!
 2016-03-29 18:33:59 +02:00
Sébastien Loriot dfd943c8e2 fix typo 2016-03-29 17:08:51 +02:00
Jane Tournois dc3c2f9a8d add verbosity to isotropic_remeshing 
when it's called on several polyhedra, possibly in parallel
 2016-03-29 14:57:48 +02:00
Laurent Rineau 216b298652 Fix issues in I/O of Mesh_complex_3_in_triangulation_3 
And restore the possibility for the Polyhedron demo to load two types of
C3t3 (with `Patch_id` being `int` or `std::pair<int, int>`).
 2016-03-25 15:45:28 +01:00
Maxime Gimeno 8b361c957a Fix the bbox and clean-up 2016-03-25 12:39:55 +01:00
Sébastien Loriot f7848d686a remove unused type 2016-03-25 10:16:21 +01:00
Maxime Gimeno d6ea729758 Addition of a position memory for the planes 
- When the user switch from an item to another, the planes are still in the same position as when he left.
- Addition of a label to indicate that the planes are connected to the selected image
- Fix for a segfault occuring when a plane was destroyed and the imag was selected afterwards.
 2016-03-25 09:59:09 +01:00
Maxime Gimeno 52babc058f Addition of a dialog during the planes creation. 2016-03-25 09:59:07 +01:00
Maxime Gimeno 7e422d484f Adapt the controls 
- When there are several segmented images with planes, the sliders adapt to the last selected one.
 2016-03-25 09:59:02 +01:00
Maxime Gimeno 94f4b42bc6 Adds all planes + intersection in a group. 2016-03-25 09:58:59 +01:00
Sébastien Loriot 9e82d734c2 remove unused typedef and variable 2016-03-24 17:26:19 +01:00
Maxime Gimeno d106d60471 Segfault Fix 
- When deleting the selection_item AND it's associated item, there is no more segfault.
 2016-03-23 13:52:28 +01:00
Maxime Gimeno cae48d8147 Fix shrinking UI 2016-03-22 10:52:27 +01:00
Maxime Gimeno ba86f7ac69 Addition of a feature to inverse the current selection 2016-03-22 10:31:20 +01:00
Maxime Gimeno e174d9373d Addition of a clear_all_button 2016-03-22 10:01:12 +01:00
Maxime Gimeno c173419d61 Addition of a button to flip the plane and a selection color for the plane. 2016-03-22 09:17:11 +01:00
Maxime Gimeno 32a43ad3e0 Addition of a split feature 2016-03-21 15:59:30 +01:00
Jane Tournois fd98e1c5bd init() can't be fully done in the constructor with no parameter 2016-03-21 10:58:36 +01:00
Simon Giraudot bf8e8325d0 Bugfix: update shape detection plugin with new plane regularization API 2016-03-21 10:50:05 +01:00
Sébastien Loriot 7d1b315fab reduce the size of the color map of a polyhedron scene item ... 
...  to  (max patch id - min patch id+1)

# Conflicts:
#	Polyhedron/demo/Polyhedron/Scene_polyhedron_item.cpp
#	Polyhedron/demo/Polyhedron/Scene_polyhedron_item.h
#	Polyhedron/demo/Polyhedron/include/CGAL/gl_render.h
 2016-03-21 10:06:48 +01:00
Sébastien Loriot f2b3a4dd24 remeshing with duplicated constraints now splits the constrained edges 
this ensures the remeshing will always work
 2016-03-18 18:25:10 +01:00
Jane Tournois e4006a5499 fix access in color map, in case we have a single patch with index > 0 2016-03-18 17:44:48 +01:00
Sébastien Loriot 315a2e9184 connect constraining of duplicated edge to the protection of constraints 2016-03-17 17:57:34 +01:00
Laurent Rineau dee4739ecd Merge pull request #915 from janetournois/Polyhedron_demo-fix_deformation_plugin-jtournois 
Polyhedron demo : fix deformation plugin
 2016-03-17 16:46:10 +01:00
Andreas Fabri 716e1ea9a6 Detect duplicates also for a single connected component or a selection 2016-03-17 14:51:48 +01:00
Sébastien Loriot b64d0ee265 do not remesh in pivoting mode 2016-03-17 13:20:27 +01:00
Sébastien Loriot e5a5cdc3c8 do not update the roi after the remeshing 
this also allows to compute border halfedges only when needed,
that is when estimating the target edge length
 2016-03-17 13:17:11 +01:00
Sébastien Loriot 275e16d2e8 the region remesh was using the one-ring of the roi 2016-03-17 10:36:36 +01:00
Sébastien Loriot 6823336c17 add an option to constrain duplicated edges 2016-03-17 09:54:50 +01:00
Andreas Fabri 2468889c51 Also deal with TBB 2016-03-17 09:41:45 +01:00
Andreas Fabri 53d4328d36 Improve wording in UI 2016-03-17 08:29:28 +01:00
Andreas Fabri a4cb1c2a97 Add protection of identical edges in different polyhedra. WIP: with an #undef and std::cerr 2016-03-16 18:09:55 +01:00
Laurent Rineau 4fd24b6487 Merge pull request #913 from sloriot/Polyhedron_demo-rename_mesh_2_plugin_dir 
Polyhedron demo: rename plugin directory
 2016-03-16 15:01:03 +01:00
Maxime Gimeno 17061cd064 Adds edges to the self_selection item. 2016-03-15 12:46:43 +01:00
Maxime Gimeno 612e9ac411 Fixes 
- Moved the shared code between loadPlugins and on_actionLoad_plugin_triggered in a separate function
- Fixed the segfault when menus and submenus have the same name
 2016-03-15 11:38:57 +01:00
Jane Tournois b6f37a16ed add default constructor to ROI_border_pmap 
and fix the list of roi_border edges collected before deformation
 2016-03-15 11:30:33 +01:00
Simon Giraudot 7276c06c36 Merge branch 'Point_set_shape_detection_3-Plane_regularization-GF-old' into Point_set_shape_detection_3-Plane_regularization-GF 2016-03-15 10:37:02 +01:00
Sébastien Loriot c0b39954bf rename Mesh_2 plugin directory for consistency 2016-03-14 20:12:10 +01:00
Maxime Gimeno 6779574a2c Fix the scene bbox 
- The Scene Bbox does not depend on the visibility of the items anymore.
 2016-03-14 16:58:24 +01:00
Simon Giraudot 5852b1134f Remove OFF_to_xyz plugin 2016-03-09 11:21:45 +01:00
Simon Giraudot e009926859 New plugin to create point set from polyhedron vertices (to replace OFF_to_xyz plugin) 2016-03-09 11:21:10 +01:00
Simon Giraudot 8bbf01f9af OFF_io_plugin now saves point sets too 2016-03-09 10:03:38 +01:00
Simon Giraudot f6bb959bc4 OFF_io_plugin now also reads OFF point sets 2016-03-09 09:58:10 +01:00
Simon Giraudot 73617d0704 Remove OFF_to_xyz plugin from CMakeLists 2016-03-09 09:57:54 +01:00
Laurent Rineau 80d7a738e4 Change the semantic of the Scene_group_item 
New feature: an object of class `Scene_group_item`, or derived, is
responsible for drawing its children items. That is the first
approximation of a scene graph.

For that goal, several steps were needed.

- Remove the overload of `Scene::draw()` and `Scene::drawWithNames()`
  that does not have the viewer as parameter. Remove then from
  `Scene_draw_interface` as well.

- Add `Viewer::inDrawWithNames()` so that items, including the
  `Scene_group_item`, can now if a draw function is called for the
  picking or not.

- Add the draw function in `Scene_group_item`:
```
  virtual void draw(CGAL::Three::Viewer_interface*) const;
  virtual void draw_edges(CGAL::Three::Viewer_interface*) const;
  virtual void draw_points(CGAL::Three::Viewer_interface*) const;
  virtual void draw_splats(CGAL::Three::Viewer_interface*) const;
```
  Those draw functions actually call the draw functions of all the
  visible children, depending on their rendering mode. If
  `viewer->inDrawWithNames()`, draw nothing, and let the children be
  drawn with their own names. Another solution could be that the draw
  functions of `Scene_group_item` use `glPushName/glPopName`. That API
  seems to be usable with a scene graph.

- Add in `Scene_item` two functions:
```
  void moveToGroup(Scene_group_item* group);
  Scene_group_item* parentGroup() const;
```
  That is one first step to allow the `has_group` data member to become
  a private member, instead a public one (ugly!!).

Then the big change is in the scene:

- The scene will not call the draw function of items with a parent
  group, if the group itself is visible. If the group is not visible but
  the children are set to visible, then they are drawn anyway. That
  means that a group can "steal" the drawing of its children when it is
  visible. That behavior is really convenient for the use case I have in
  mind, but it may be strange.

- In the picking, in `drawWithName()`, the draw function of all items
  are called, even if they have a parent group.

Cosmetic:

  - Move the definition of the constructor `Scene_item::Scene_item` in
    the cpp file.
 2016-03-04 14:37:53 +01:00
Sébastien Loriot 96c4dc60de Merge pull request #879 from maxGimeno/Polyhedron_demo-c3t3_color_fix-GF 
Polyhedron demo : c3t3 color fix
 2016-03-04 13:31:00 +01:00
Sebastien Loriot 60c29f4b8f Merge pull request #882 from janetournois/Polyhedron_demo-fix_colors_only-jtournois 
Polyhedron_item : fix "colors_only'
 2016-03-04 13:26:16 +01:00
Sebastien Loriot 8e6c92b738 Merge pull request #859 from sloriot/Polyhedron_demo-add_cdt2_mesher 
Polyhedron demo: add cdt2 mesher
 2016-03-04 13:08:52 +01:00
Sebastien Loriot 717ec22664 Merge pull request #874 from janetournois/PMP-isotropic_remeshing_improvements-jtournois 
PMP::isotropic_remeshing() - improve management of constraints
 2016-03-03 17:00:34 +01:00
Sebastien Loriot 26c17db3e8 Merge pull request #865 from lrineau/Polyhedron-demo_fix_c3t3_item-lrineau 
Fix the c3t3 item
 2016-03-03 16:56:35 +01:00
Sébastien Loriot 81d1603ce7 Merge pull request #844 from maxGimeno/Polyhedron_demo-Mesh_3-Fixes-GF 
Polyhedron demo: Fixes for Mesh_3 plugin
 2016-03-03 14:31:22 +01:00
Sebastien Loriot 8a55728cae Merge pull request #787 from maxGimeno/Polyhedron_demo-Fix_for_773-GF 
Polyhedron_demo : Fix for 773
 2016-03-03 14:19:44 +01:00
Jane Tournois 2536c17655 fix "colors_only' 
when colors_only is false, it does not mean that colors are not computed!

this commit fixes commit 0661c21ac0
 2016-03-03 12:57:24 +01:00
Maxime Gimeno cc5f50605e Fix for the intersection that wasn't cleared when the color changed. 2016-03-03 11:38:20 +01:00
Maxime Gimeno 892dee0a99 Fix for the colors 2016-03-03 10:41:24 +01:00
Maxime Gimeno fe20de7ef3 Statistics fix 
- An item must overload has_stats to return true if it has statistics, or else the action will not be displayed in the menu.
 2016-03-03 09:19:04 +01:00
Sébastien Loriot d7e9261d58 hide the filtered projection traits behind the projection traits 
the selection of the base class is done using Kernel::Has_filtered_predicates
 2016-03-02 21:57:54 +01:00
Sébastien Loriot 03f86b3673 handle seeds and other domain definition options 2016-03-02 20:46:15 +01:00
Sébastien Loriot a045576b45 add a plugin to run mesh_2 on polylines in the xy, yz or xz plane 2016-03-02 20:46:15 +01:00
Sebastien Loriot 6c85bc17d0 Merge pull request #845 from maxGimeno/Polyhedron_demo-Fix_reload_item-GF 
Polyhedron demo :  Fix reload item
 2016-03-02 20:20:44 +01:00
Sebastien Loriot 823a65a4ae Merge pull request #848 from maxGimeno/Polyhedron_demo-Fix_segmentation_plugin-GF 
Polyhedron_demo : Fix for the polyhedron_item's colors
 2016-03-02 20:20:07 +01:00
Sebastien Loriot 9fa7cc3d00 Merge pull request #763 from janetournois/Polyhedron_demo-improve_vtk_plugin-GF 
Polyhedron demo : vtk_io_plugin can save
 2016-03-02 17:20:29 +01:00
Sebastien Loriot d51b9cbb27 Merge pull request #840 from afabri/Polyhedon-isolated-vertices-GF 
Deal with isolated vertices when turning a polygon soup in a polyedral surface
 2016-03-02 17:19:22 +01:00
Sebastien Loriot 3019854153 Merge pull request #850 from sgiraudot/Polyhedron_demo-Bugfix_polygon_soup_segfault-GF 
Bugfix: check if polygon soup is not empty before attempting BBox computation
 2016-03-02 17:16:31 +01:00
Jane Tournois bf63963830 add constrained vertices to isotropic remeshing 
those vertices cannot be modified
 2016-03-02 17:08:38 +01:00
Jane Tournois 906f6360ea restore ROI after deformation 2016-03-02 13:24:12 +01:00
Laurent Rineau 7814cb20c7 Fix the c3t3 item 
- The `isEmpty()` function was wrong: if the domain contains 2D surfaces
  it cannot be considered as empty, even if the 3D volume is empty.

- The computation of the bbox was wrong too.
 2016-03-02 12:35:09 +01:00
Jane Tournois dc0090e9b8 remove duplicate function split_long_edges 
by exploiting the edge_is_constrained_map as read-write pmap
this is not documented, and only for demo purposes (at least for now)
 2016-03-01 16:28:06 +01:00
Jane Tournois 63884d0033 update the constraints property map after the end of remeshing 2016-03-01 15:30:52 +01:00
Maxime Gimeno 5403ae1f37 Addition of a call to c3t3_changed() in the end of the loading function, so the c3t3 is updated before the computation of the colors. 2016-03-01 09:03:29 +01:00
Simon Giraudot 181b9325b1 Fix max precision for ofstream: digits10 + 2 instead of digits10 + 1 2016-02-29 17:46:25 +01:00
Simon Giraudot cc9890a308 Check if polygon soup is not empty before attempting bbox computation 2016-02-29 11:13:35 +01:00
Maxime Gimeno ac862e37a9 Fix a bug when reloadking an item 
the item was disappearing from the object list
 2016-02-29 11:11:57 +01:00
Maxime Gimeno d1e8741675 fix functions signature 2016-02-29 11:11:13 +01:00
Andreas Fabri 8663b3ccbe deal with isolated vertices when turning a polygon soup in a polyedral surface 2016-02-29 11:04:33 +01:00
Sebastien Loriot 7e48843690 Merge pull request #841 from afabri/patch-4 
Capitalize words
 2016-02-29 10:50:43 +01:00
Maxime Gimeno 67fa51de62 Fix for the polyhedorn_item's colors 
- The color calculation when the item is not monochrome was not done correctly.
 2016-02-29 10:23:59 +01:00
Sebastien Loriot cf3c372b57 Merge pull request #823 from sgiraudot/Polyhedron_demo-Increase_precision_ofstream-GF 
Polyhedron demo : Use maximum precision when writing files
 2016-02-29 10:15:26 +01:00
Sebastien Loriot e4dd2dd002 Merge pull request #816 from maxGimeno/Polyhedorn_demo-Fix_applicable-GF 
Polyhedron_demo : Fix applicable
 2016-02-29 10:14:21 +01:00
Maxime Gimeno 12a819bb79 Fix the waitcursor 
- Removed the waitcursor in the dialog for selecting the precision when loading an segmented image.
 2016-02-29 08:37:09 +01:00
Maxime Gimeno 91b7f7c3a7 Renaming the Mesh_3 plugin directory 2016-02-29 08:36:26 +01:00
Andreas Fabri 01a1deebd5 Capitalize words 2016-02-27 10:56:10 +01:00
Sébastien Loriot 542d6cf9fb fix applicable 2016-02-26 15:55:00 +01:00
Sebastien Loriot 27fe675b08 Merge pull request #812 from sloriot/Mesh_3-fix_default_behavior 
Mesh_3: do not enable manifold by default
 2016-02-26 15:41:59 +01:00
Sébastien Loriot 4e2ea7295a vtk plugin can now load segments 2016-02-26 15:39:55 +01:00
Sébastien Loriot e4f1f2f9b4 allow reading of unstructuredGrid from non-XML files 2016-02-26 13:22:33 +01:00
Sébastien Loriot 0f39879ced allow reading vtu 
simplify the conversion function as well
 2016-02-26 12:47:03 +01:00
Sébastien Loriot c574c78e66 plug error handler to the reader 2016-02-26 11:02:42 +01:00
Sebastien Loriot 80654639c2 Merge pull request #824 from afabri/Polyhedron-fix_drawing_of_non_triangle_face-GF 
Fix drawing a polyhedron with non-triangular faces
 2016-02-25 10:47:18 +01:00
Andreas Fabri b592865752 3 -> 2 2016-02-25 08:55:38 +01:00
Simon Giraudot 4728805f31 Use maximum precision when writing files to avoid loss of information 2016-02-25 08:47:12 +01:00
Sebastien Loriot cb650d896d Merge pull request #809 from afabri/Polyhedron-complete_basename-GF 
Use completeBaseName() as name of items (for some file name extensions)
 2016-02-24 18:39:47 +01:00
Maxime Gimeno bd5d1646d7 Fix applicable 
- For create_bbox
- For triangulate_facets
 2016-02-23 16:04:17 +01:00
Jane Tournois b6cd6ea5c1 activate protection of feature polylines in labeled images 
when needed or requested
 2016-02-23 16:00:06 +01:00
Laurent Rineau 154ad4c29f Do not enable manifold by default!! 
(cherry picked from commit 2a0b90cff1cd0abb5cde7182f7c57a21ee19a23b)
 2016-02-22 19:20:48 +01:00
Andreas Fabri 8982373981 Use completeBaseName() as name of items (for some file name extensions) 2016-02-22 15:19:37 +01:00
Sebastien Loriot c1b3b784a7 Merge pull request #777 from janetournois/Polyhedron_demo-polyhedron_item_for_quads-GF 
Polyhedron item : improve computation of normals
 2016-02-22 08:24:11 +01:00
Sebastien Loriot 95a03739c4 Merge pull request #798 from afabri/Polyhedron-Unify_capital_letters-GF 
Capitalize words in the menus
 2016-02-19 09:22:58 +01:00
Sebastien Loriot bc927b5af0 Merge pull request #792 from maxGimeno/Polyhedron_demo-Slicer_plugin-Fix_for_783-GF 
Polyhedron_demo : Fix for 783
 2016-02-19 09:10:54 +01:00
Andreas Fabri 9cc245d470 More capitalized 2016-02-18 17:20:44 +01:00
Sébastien Loriot bdb1848ab9 fix unused type warning 2016-02-18 17:03:42 +01:00
Andreas Fabri 9956c2963b More capitalization 2016-02-18 10:56:07 +01:00
Andreas Fabri 864a429d79 Select the affine transformation item 2016-02-18 10:05:00 +01:00
Andreas Fabri 69a1c5fe18 3D Mesh Generation --> Tetrahedral Mesh Generation 2016-02-18 10:03:55 +01:00
Andreas Fabri 8985711115 Capitalize words in the menus 2016-02-17 17:38:19 +01:00
Andreas Fabri 51920f6b86 Unify chapter names 2016-02-17 16:35:48 +01:00
Maxime Gimeno 4fcc58d954 Fix 
- Changed Scene_item into CGAL::Three::Scene_item to connect the item_about_to_be_destroyed signal correctly.
 2016-02-17 08:32:09 +01:00
Sébastien Loriot 0888f5ebeb update include directive 2016-02-16 17:12:31 +01:00
Sebastien Loriot b1b5bcd4f1 Merge pull request #772 from maxGimeno/Polyhedron_demo-Fix_for_770 
Polyhedron_demo : Fix for #770
 2016-02-16 16:30:48 +01:00
Maxime Gimeno 1adc45b2fc Makes the facets color editable. 2016-02-16 12:16:53 +01:00
Sébastien Loriot cf916bafb6 add missing call to invalidate OpenGL buffer after refinement and fairing 2016-02-15 13:27:50 +01:00
Sébastien Loriot 5d4725db39 rename plugin title and menu name 2016-02-15 11:29:01 +01:00
Jane Tournois a0f0ab84b2 replace unordered_map with flat_map 2016-02-12 16:34:45 +01:00
Jane Tournois 0661c21ac0 avoid computing twice the same CDT for non-triangle non-quad facets 
it is still possible to recompute only colors, and not all vectors
(positions and normals) by using the colors_only parameter introduced
in triangulate_facet
 2016-02-12 16:26:28 +01:00
Jane Tournois 1ff1f566a0 factorize the code when push_back is called for p.x(), p.y(), and p.z() 2016-02-12 15:21:48 +01:00
Maxime Gimeno a443cb4c06 clean-up 2016-02-12 15:07:18 +01:00
Maxime Gimeno 37b7a4a145 Fixed Scene_plane_item::setNormal 2016-02-12 14:54:23 +01:00
Jane Tournois a8d7c8fc5e add error observer to vtk Plugin 
as suggested here
http://www.vtk.org/Wiki/VTK/Examples/Cxx/Utilities/ObserveError

does not work yet
 2016-02-12 11:47:35 +01:00
Jane Tournois afc33545c8 introduce normals at vertices for Gouraud shading on non-triangulated polyhedra 2016-02-12 10:45:00 +01:00
Jane Tournois 6a3c0557d3 use the face_normals property map in triangulate_facet 2016-02-12 10:30:24 +01:00
Jane Tournois 9c238279f9 for quads, we use only one normal per face, not one normal per triangle 2016-02-11 19:21:02 +01:00
Jane Tournois 40c02113b5 use PMP::compute_normals to avoid computing normals multiple times 2016-02-11 19:08:51 +01:00
Jane Tournois 7b9589387d simplify code 2016-02-11 16:05:31 +01:00
Jane Tournois a43cdd8e8d avoid computing the same face normal for each vertex of a face 2016-02-11 15:40:45 +01:00
Laurent Rineau 0770e68485 Merge pull request #755 from maxGimeno/Polyhedron_demo-Fix_for_753-GF 
Polyhedron_demo : Fix for 753
 2016-02-11 15:11:33 +01:00
Jane Tournois 011b6cd473 save as vtkPolyData, consistently with load() function 2016-02-11 10:56:13 +01:00
Sebastien Loriot ed557b907d Merge pull request #735 from maxGimeno/Surface_mesher_demo-Glu_removal-GF 
Surface_mesher : Glu removal
 2016-02-10 10:40:51 +01:00
Sebastien Loriot ef10f19b41 Merge pull request #737 from maxGimeno/Polyhedron_demo-Volume_plane_fix-GF 
Polyhedron_demo Volume_plane fix
 2016-02-10 10:40:23 +01:00
Sebastien Loriot 1c6748be6c Merge pull request #757 from maxGimeno/Three-Fix_for_756-GF 
Three : Fix for 756
 2016-02-10 10:40:05 +01:00
Jane Tournois b456446e08 deal with xml and discriminate with a template parameter 2016-02-10 10:32:33 +01:00
Jane Tournois 906a88b2a4 VTK_io_plugin : first version of the "save" function 2016-02-09 16:58:46 +01:00
Maxime Gimeno e02ecbf884 Fix for the VAOs 2016-02-09 14:59:14 +01:00
Maxime Gimeno 01ed789c02 Fix for the 2nd bug 
- The feature edges are always drawn, only the color changes with the option.
 2016-02-09 09:31:30 +01:00
Maxime Gimeno 14810b078f Fix for the 1st bug 
- The checkboxes status updates everytime the menu is open, not only when it is created.
 2016-02-09 09:06:53 +01:00
Sébastien Loriot eb2ba8cefe rename Surface_modeling package to Surface_mesh_deformation for consistency 2016-02-08 12:25:49 +01:00
Maxime Gimeno b99c616c23 Re-implementation of opengl_check_errors 2016-02-05 08:36:54 +01:00
Sebastien Loriot f1572ac999 Merge pull request #720 from maxGimeno/Fix_for_539 
Fix for 539
 2016-02-04 16:46:14 +01:00
Sebastien Loriot 26066c543b Merge pull request #722 from maxGimeno/Polyhedron_demo-Fix_for_mesh_deformation-GF 
Polyhedron_demo : Fix for the mesh deformation
 2016-02-04 15:43:42 +01:00
Maxime Gimeno 73bd2025eb Fix 
- Moved the item creation out of the threads so that the context is valid when their VAOs and VBOs are created.
 2016-02-04 15:30:49 +01:00
Laurent Rineau c7367211d8 Better layout: follow the `sizeHint()` 2016-02-04 12:31:08 +01:00
Maxime Gimeno 94e6249969 Comment correction 2016-02-03 15:16:09 +01:00
Sébastien Loriot e211843b4f Merge pull request #654 from maxGimeno/FixForMac-GF 
Demo fix for OS X (fix for #437)
 2016-02-03 14:39:48 +01:00
Maxime Gimeno 2f34704270 Fix for the frame plane 
- Added a function to updtae the plane's data, called when the plane constrained option is set,
  so that the plane is always where it should be.
 2016-02-03 13:00:52 +01:00
Maxime Gimeno 0181633bd5 Fix for 539 
- Adds the requested flags from the CMakeLists only if the compiler is CLang or gcc
 2016-02-03 12:05:39 +01:00
Sébastien Loriot 8cee2ef1dd Merge pull request #686 from afabri/Kernel_fix-warnings-GF 
Fix warnings concerning indentation and unused parameter
 2016-02-03 09:49:54 +01:00
Sebastien Loriot ebf66069c3 Merge pull request #706 from afabri/PMP_include_graph_traits-GF 
Deal with deprecated code
 2016-02-03 09:44:11 +01:00
Sebastien Loriot 5c53581d50 Merge pull request #694 from maxGimeno/Trivial_fixes-GF 
Trivial fixes
 2016-02-03 09:37:31 +01:00
Andreas Fabri 201e23a503 include graph_traits file 2016-02-01 17:16:45 +01:00
Sébastien Loriot aa94453c1e fix submenu name 2016-02-01 16:14:58 +01:00
Maxime Gimeno 9abf38bfce warning fix 
- replaced gluErrorString by its source code in Mesh_3
- replaced gluProject by its modified source code in P3T3
- deleted volume_planes files in Polyhedron/demo/Polyhedron, as the real ones are in Plugins/Mesh_3_plugin
 2016-02-01 09:02:36 +01:00
Sebastien Loriot 2a22135a95 Merge pull request #690 from lrineau/Polyhedron-demo_Create_bbox_mesh_plugin-lrineau 
Add the Create_bbox_mesh_plugin
 2016-01-28 14:20:57 +01:00
Laurent Rineau 2692410dfe add `create_bbox_mesh_plugin` in the list 2016-01-28 14:19:56 +01:00
Maxime Gimeno 5ffc01f1a1 indentation warnings fix 2016-01-28 14:17:11 +01:00
Sébastien Loriot 8da745534f fix indentation issues 2016-01-28 13:54:57 +01:00
Sebastien Loriot d702d31d95 Merge pull request #683 from maxGimeno/Hierarchy_fix-GF 
Fixes for the Polyhedron_demo
 2016-01-28 13:49:16 +01:00
Sebastien Loriot 14508b9d70 Merge pull request #685 from afabri/PSP-binary_read_ply-GF 
When opening a binary ply file  we have to use std::ios_base::binary
 2016-01-28 13:47:41 +01:00
Sebastien Loriot 21eaffd9e5 Merge pull request #691 from maxGimeno/Viewer_fixes-GF 
Viewer fixes gf
 2016-01-28 13:47:21 +01:00
Maxime Gimeno da8ca763b8 Removed the call to gluErrorString 2016-01-28 12:41:45 +01:00
Laurent Rineau b829e6b8ca Remove commented code 2016-01-27 14:41:31 +01:00
Maxime Gimeno d67ea21644 Fixes the QGLViewer warning for a deprecated function in version 2.6 2016-01-27 14:22:49 +01:00
Sébastien Loriot 80c30fb5e8 Revert "Merge pull request #658 from maxGimeno/Axis_enhancement-GF" 
This reverts commit 3024e4f913, reversing
changes made to a02ea7ad9b.
 2016-01-27 14:22:45 +01:00
Sébastien Loriot 75e98f0a08 Merge pull request #656 from maxGimeno/Clean_up_Functions-GF 
Clean up scene item API
 2016-01-27 13:45:15 +01:00
Sebastien Loriot 388d80d8df Merge pull request #670 from janetournois/Polyhedron_demo-minor_improvements-jtournois 
Polyhedron demo - statistics - do not compute angles for null_faces
 2016-01-27 13:39:36 +01:00
Laurent Rineau 1179371045 Add the Create_bbox_mesh_plugin 2016-01-27 10:46:52 +01:00
Andreas Fabri 4d605ff2e9 when opening a binary ply file we have to usestd::ios_base::binary 2016-01-26 15:57:44 +01:00
Maxime Gimeno b1d6a324a1 Fixes 
- Fixes the segfault occuring when destroying a selection_item's poly_item
- Fixes the recurseExpand behavior
- Fixes the Segfault occuring when adding a group to a selected group.
 2016-01-26 12:00:51 +01:00
Sébastien Loriot e3dc7183f8 rename function 2016-01-26 11:43:01 +01:00
Maxime Gimeno ce9aed08f5 Renaming invalidate_buffers in invalidate_OpenGLBuffers 2016-01-26 11:20:30 +01:00
Maxime Gimeno 271cc81413 contextual_changed removal + textured_polyhedron fix 2016-01-26 11:20:21 +01:00
Maxime Gimeno 33120d84ad Clean-up 2016-01-25 12:25:07 +01:00
Laurent Rineau 797c4a7395 Merge branch 'Polyhedron-demo_add_c3t3_item-lrineau' 
The only useful patch was:
> diff --git a/Polyhedron/demo/Polyhedron/MainWindow.cpp b/Polyhedron/demo/Polyhedron/MainWindow.cpp
> index aae5f45..dfef492 100644
> --- a/Polyhedron/demo/Polyhedron/MainWindow.cpp
> +++ b/Polyhedron/demo/Polyhedron/MainWindow.cpp
> @@ -1596,4 +1596,5 @@ void MainWindow::on_action_Look_at_triggered()
>  {
>    Show_point_dialog dialog(this);
> +  dialog.setWindowTitle(tr("Look at..."));
>    int i = dialog.exec();
>    if( i == QDialog::Accepted &&
>
 2016-01-25 10:27:40 +01:00
Jane Tournois d3d8ba6f83 Merge branch 'Polyhedron_demo-minor_improvements-jtournois' of github.com:janetournois/cgal into Polyhedron_demo-minor_improvements-jtournois 2016-01-25 10:11:49 +01:00
Jane Tournois 4f084c8a3c the dialog is not deleted anymore, so no need to restore its geometry 2016-01-25 10:06:11 +01:00
Sébastien Loriot 84ae1352e0 fix warnings 2016-01-25 08:23:55 +01:00
Sebastien Loriot 58e8b026a5 Merge pull request #673 from lrineau/Polyhedron-demo_add_load_obj-GF 
Polyhedron demo: add load_obj
 2016-01-25 08:16:56 +01:00
Sebastien Loriot be7e0388a3 Merge pull request #675 from lrineau/Polyhedron-demo_fix_clip_plugin-lrineau 
Polyhedron demo: fix clip plugin
 2016-01-25 08:14:14 +01:00
Sebastien Loriot 3024e4f913 Merge pull request #658 from maxGimeno/Axis_enhancement-GF 
Enhancement of the axis system of the viewer
 2016-01-22 17:14:22 +01:00
Jane Tournois fc3e2e91e0 remove useless function 2016-01-22 17:10:35 +01:00
Jane Tournois f89a8c87fc avoid successive delete and new of statistics_dialog 2016-01-22 17:08:44 +01:00
Jane Tournois 1fa1a07647 border edges need border to be normalized to be counted 2016-01-22 17:07:59 +01:00
Jane Tournois eece1f6d74 keep statistics dialog geometry (location and size) through the use of demo 2016-01-22 16:43:13 +01:00
Jane Tournois d3c04f9847 keep position and size after "update" 2016-01-22 16:29:31 +01:00
Jane Tournois 000c92cc9c fix namespace issues 2016-01-22 16:04:24 +01:00
Laurent Rineau 4b36a072b9 UI improvements 
- add a real title to the dock widget,
- add shortcuts to the checkbox and the buttons,
- and add a text explaining which side of the plane actually clip out.

Cc: @maxGimeno
 2016-01-22 15:52:09 +01:00
Laurent Rineau 2518e94f55 Create the clipping plugin at the center of the scene 
cc: @maxGimeno
 2016-01-22 15:52:09 +01:00
Jane Tournois 31c971d1a0 avoid multiple computing of statistics for polyhedron item 2016-01-22 15:35:34 +01:00
Jane Tournois 769f98c2a1 remove statistics code from rendering code 2016-01-22 14:56:53 +01:00
Laurent Rineau d7d5fe9f33 Better nameFilters 2016-01-22 14:34:22 +01:00
Andreas Fabri 58c4f45760 add the dispatching to the obj reading in the off-plugin 2016-01-22 14:34:22 +01:00
Andreas Fabri 0137af3845 Add the capability to read 2-manifolds in simplest .obj file format 2016-01-22 14:34:21 +01:00
Jane Tournois 2d1d21b84e remove useless vector 2016-01-22 14:26:12 +01:00
Jane Tournois e9c34c502b avoid duplicating code 2016-01-22 13:36:12 +01:00
Jane Tournois bb98d5a560 activate "wait" cursor while statistics are computed 2016-01-22 13:14:51 +01:00
Jane Tournois e653796029 do not compute angles for null_faces 2016-01-22 10:21:18 +01:00
Jane Tournois 878baa5fdf wrong polyhedron used! 
selection_item is NULL in this statement
 2016-01-21 12:47:31 +01:00
Sebastien Loriot efde6e3dc5 Merge pull request #606 from janetournois/PMP-improve_isotropic_remeshing-jtournois 
PMP - Improve isotropic remeshing
 2016-01-21 09:21:00 +01:00
Sébastien Loriot cf08261299 Merge pull request #652 from sloriot/BGL-document_selection_functions 
BGL: document selection functions
 2016-01-20 17:13:21 +01:00
Sebastien Loriot 901a4c17e4 Merge pull request #650 from sloriot/BGL-document_split_in_polylines 
BGL: document split in polylines
 2016-01-20 16:50:36 +01:00