Andreas Fabri
4b7373d301
u_char -> unsigned char ; Do not qualify get() with boost::
2016-05-12 17:09:44 +02:00
Maxime Gimeno
fe612feb9b
Addition of a test colormap
2016-05-12 17:09:43 +02:00
Maxime Gimeno
775732dcf9
Surface_mesh_item drawing functions
2016-05-12 17:09:43 +02:00
Maxime Gimeno
442c6454e6
Addition of a Surface_mesh_item
2016-05-12 17:09:14 +02:00
Sebastien Loriot
20bd3d7f10
Merge pull request #1076 from maxGimeno/Polyhedron_demo-Group_items_fix-GF
...
Polyhedron demo : Multiple bug fixes
2016-05-12 16:53:56 +02:00
Sébastien Loriot
1015d1f191
remove non-needed keywords outside of a template
2016-05-12 09:16:03 +02:00
Sébastien Loriot
925d178865
reunse the face normal
2016-05-11 18:12:40 +02:00
Maxime Gimeno
5c2ce8fecb
Fix after merge
2016-05-11 17:51:09 +02:00
Maxime Gimeno
ff2cc2562e
Merge branch 'Euler_operations-rebase-GF-old' into Euler_operations-rebase-GF
...
Conflicts:
Polyhedron/demo/Polyhedron/Plugins/PMP/Selection_plugin.cpp
Polyhedron/demo/Polyhedron/Scene_polyhedron_selection_item.cpp
Polyhedron/demo/Polyhedron/Scene_polyhedron_selection_item.h
2016-05-11 17:41:07 +02:00
Maxime Gimeno
5ea3909c47
Fix Multiselection
...
- The tag I changed was used since 2009, so I am expecting other problems, as I still don't know where the bug came from...
2016-05-11 17:26:37 +02:00
Sebastien Loriot
c3d1602b7d
Merge pull request #1040 from maxGimeno/Three_doc_for_review_rebase-GF
...
Update and correction of the Three API
2016-05-11 17:07:01 +02:00
Sébastien Loriot
c988360a3b
remove a warning
2016-05-11 17:02:14 +02:00
Maxime Gimeno
c780651945
Fix bug with contextMenu
2016-05-11 16:41:18 +02:00
Maxime Gimeno
fa1f052707
More clean-up
2016-05-11 09:51:03 +02:00
Maxime Gimeno
473c92c00c
Remove the init() function without Messages_interface from the plugins API
2016-05-10 17:10:59 +02:00
Maxime Gimeno
7bfeb5fccb
Simplifies the AABB_Tree requests.
2016-05-10 16:29:12 +02:00
Maxime Gimeno
f39632021a
Clean-up
2016-05-10 15:50:04 +02:00
Maxime Gimeno
d7fd2f6dbc
D-pointer for the c3t3_item
2016-05-10 12:46:16 +02:00
Maxime Gimeno
7eb1ecbfee
Fix deprecated header
2016-05-10 12:28:36 +02:00
Maxime Gimeno
d02415f180
Checks sooner if the facet is valid for the split face operation
2016-05-10 12:28:36 +02:00
Maxime Gimeno
68d7063dda
Clears temp-selection when changing the edition mode.
2016-05-10 12:28:36 +02:00
Maxime Gimeno
f076595e38
Fixes and enhancement
2016-05-10 12:28:36 +02:00
Maxime Gimeno
3bb8b21730
fix scene_edit_polyhedron_item
2016-05-10 12:28:34 +02:00
Maxime Gimeno
46c27fdf85
fix for segfaults after reload from itefix for segfaults after reload from itemm
2016-05-10 12:28:12 +02:00
Maxime Gimeno
31f31db234
Fix for the UI file.
2016-05-10 12:28:11 +02:00
Maxime Gimeno
165b01fc75
fix for add_face_to_border and add_vertex_and_face_to_border
2016-05-10 12:28:11 +02:00
Maxime Gimeno
dddaad9670
fix split-vertex
2016-05-10 12:28:11 +02:00
Maxime Gimeno
33bf89e075
Re-writing an instruction for the Split-face operation
2016-05-10 12:28:11 +02:00
Maxime Gimeno
db10b961a5
Parrallelogram prevision for the add vertex to border
2016-05-10 12:28:11 +02:00
Maxime Gimeno
99345f9d1a
Fix for the triangulation assertion fail about the intersecting constraints
...
- Using the Exact_predicates_tag is longer than the No_intersection_tag, but as it is only used on facets that are neither triangles nor quads, we estimated it is a rare case enough to use it.
2016-05-10 12:27:27 +02:00
Maxime Gimeno
a5d0c335bd
Fix for undefined mainwindow
2016-05-10 12:26:49 +02:00
Maxime Gimeno
b27f5e0926
Fix for undefined mainwindow
2016-05-10 11:51:39 +02:00
Maxime Gimeno
fc153cebdd
Multiple event fix
2016-05-10 11:51:31 +02:00
Maxime Gimeno
b5bb9ff2ba
Factorisation and fix for connected components.
2016-05-10 11:51:25 +02:00
Maxime Gimeno
5443dff5b2
Selection after clic in the dock_widget fixed
2016-05-10 11:51:20 +02:00
Maxime Gimeno
9d2fcd8dbc
Small fixes
...
- Doesn't use FOREACH in the edition mode anymore
- zhen an item is created, the selection type corresponds to the one in the combo box.
2016-05-10 11:51:15 +02:00
Maxime Gimeno
127b1bbeb4
Instructions design changed.
2016-05-10 11:51:09 +02:00
Maxime Gimeno
f4c5df9616
Fix Ctrl+Z
2016-05-10 11:51:04 +02:00
Maxime Gimeno
0485017bac
Removed add_edge
2016-05-10 11:50:58 +02:00
Maxime Gimeno
656fa17e7b
Operations secured
2016-05-10 11:50:53 +02:00
Maxime Gimeno
c4538fbb99
Enables edition_groupBox only in edition mode
2016-05-10 11:50:47 +02:00
Maxime Gimeno
4136f5b2e8
Fixes
2016-05-10 11:50:42 +02:00
Maxime Gimeno
612a20145d
Fix for add vertex and face to border
2016-05-10 11:50:36 +02:00
Maxime Gimeno
8ea6109c4d
Fix split face
2016-05-10 11:50:31 +02:00
Maxime Gimeno
fa64cef3e9
Add center vertex secured
2016-05-10 11:50:26 +02:00
Maxime Gimeno
39f2f2d806
Split face secured
2016-05-10 11:50:20 +02:00
Maxime Gimeno
0282b6c361
Remove_center_vertex secured
2016-05-10 11:50:10 +02:00
Maxime Gimeno
4d0da0715e
Join vertex secured
2016-05-10 11:49:54 +02:00
Maxime Gimeno
c9b9d5b017
Collapse edge secured
2016-05-10 11:49:46 +02:00
Maxime Gimeno
dbb001427d
Add facet to border secured
2016-05-10 11:49:25 +02:00
Maxime Gimeno
baa4eb86b7
Split vertex secured
2016-05-10 11:49:17 +02:00
Maxime Gimeno
d938fb7158
WIP Implementation of Euler operations
2016-05-10 11:49:05 +02:00
Maxime Gimeno
05a5f2ef85
Split_face implemented
2016-05-10 11:48:58 +02:00
Maxime Gimeno
8f3efbbc22
join_face implemented
2016-05-10 11:48:53 +02:00
Maxime Gimeno
01a1d59ac1
Split edge implemented
2016-05-10 11:48:47 +02:00
Maxime Gimeno
d30dc15e46
Implementation of split_vertex
2016-05-10 11:48:39 +02:00
Maxime Gimeno
6e23f9df7a
Keep the handleType in selection mode in memory when the mode changes and put it back when the mode becomes selection again.
2016-05-10 11:48:31 +02:00
Maxime Gimeno
876301c043
Join vertex implemented
2016-05-10 11:48:25 +02:00
Maxime Gimeno
cb7fc9b957
Fix selection tool
...
- Triangulates the facets so they can be fully diplsayed
2016-05-10 11:48:18 +02:00
Maxime Gimeno
fbf8d1f5f7
WIP : Fix for the selection Tool
...
- Alteration of the Primitive type for the AABB_Tree in Scene_item, so that the selection tool is able to manage non-triangulated items.
2016-05-10 11:48:11 +02:00
Maxime Gimeno
f6cbe19331
WIP : implementing join_vertex
2016-05-10 11:48:03 +02:00
Maxime Gimeno
5b65873f1d
Interface finished.
2016-05-10 11:47:55 +02:00
Maxime Gimeno
6b1340fc3b
Regroup operations in a comboBox instead of numerous buttons
2016-05-10 11:47:47 +02:00
Maxime Gimeno
52008ab5b7
WIP
2016-05-10 09:43:17 +02:00
Maxime Gimeno
0bf6b0324c
D-pointer for polylines
2016-05-09 15:41:59 +02:00
Maxime Gimeno
57a5a91ccf
Clean-up
2016-05-09 15:15:05 +02:00
Maxime Gimeno
00b834b7d8
D-pointer for Scene_edit_polyhedron_item
2016-05-09 15:07:50 +02:00
Maxime Gimeno
cdcd5626e7
d-pointe rfor textured_polyhedron_item
2016-05-09 13:06:30 +02:00
Maxime Gimeno
f961669922
d-pointer for Spheres_item
2016-05-09 12:40:38 +02:00
Maxime Gimeno
a60a023cca
D-pointer for Scene_segmented_image_item
2016-05-09 11:49:33 +02:00
Maxime Gimeno
8f3dc6ff2a
D-pointer for polygon_soup_item
2016-05-09 11:18:36 +02:00
Maxime Gimeno
f7e1c2bd66
D-pointer for the Scene_points_with_normal_item
2016-05-09 09:54:15 +02:00
Sébastien Loriot
d892ef1a89
Merge pull request #1030 from janetournois/PMP-remeshing_with_patch_ids-jtournois
...
PMP : new features for isotropic_remeshing
2016-05-09 09:43:08 +02:00
Maxime Gimeno
8637d1eaba
Fix AABB_Tree displaying in Cut_plugin
2016-05-09 09:28:03 +02:00
Maxime Gimeno
7900079127
D-pointer for the nef_polyhedron_item and the Scene_plane_item
2016-05-09 09:19:11 +02:00
Maxime Gimeno
ce279e9cda
Merge branch 'Three_doc_for_review_rebase-GF' into Polyhedron_demo-Use_d_pointers-GF
...
Conflicts:
Polyhedron/demo/Polyhedron/Plugins/Operations_on_polyhedra/Scene_combinatorial_map_item.cpp
Polyhedron/demo/Polyhedron/Plugins/Operations_on_polyhedra/Scene_combinatorial_map_item.h
Polyhedron/demo/Polyhedron/Plugins/PCA/Scene_polyhedron_transform_item.cpp
Polyhedron/demo/Polyhedron/Plugins/PCA/Scene_polyhedron_transform_item.h
Polyhedron/demo/Polyhedron/Plugins/Surface_mesh/Scene_polyhedron_shortest_path_item.cpp
Polyhedron/demo/Polyhedron/Plugins/Surface_mesh/Scene_polyhedron_shortest_path_item.h
Polyhedron/demo/Polyhedron/Scene_implicit_function_item.cpp
Polyhedron/demo/Polyhedron/Scene_implicit_function_item.h
Polyhedron/demo/Polyhedron/Scene_polyhedron_item.cpp
Polyhedron/demo/Polyhedron/Scene_polyhedron_item.h
Three/include/CGAL/Three/Scene_item.h
2016-05-06 16:03:30 +02:00
Maxime Gimeno
ffbb76c680
D-pointer for the implicit_function_item
2016-05-06 15:27:16 +02:00
Maxime Gimeno
7fce02a36e
D-pointer for the shortest_path_item
2016-05-06 14:07:50 +02:00
Maxime Gimeno
6486abd0a6
Merge branch 'Three_doc_for_review_rebase-GF' of github.com:maxGimeno/cgal into Three_doc_for_review_rebase-GF
...
Conflicts:
Polyhedron/demo/Polyhedron/MainWindow.cpp
Polyhedron/demo/Polyhedron/Plugins/Mesh_3/Volume_plane_intersection.cpp
Polyhedron/demo/Polyhedron/Plugins/Mesh_3/Volume_planes_plugin.cpp
Polyhedron/demo/Polyhedron/Plugins/Surface_mesh_deformation/Scene_edit_polyhedron_item.cpp
Polyhedron/demo/Polyhedron/Scene.h
Polyhedron/demo/Polyhedron/Scene_c3t3_item.cpp
Polyhedron/demo/Polyhedron/Scene_c3t3_item.h
Polyhedron/demo/Polyhedron/Scene_group_item.cpp
Polyhedron/demo/Polyhedron/Scene_polylines_item.cpp
Polyhedron/demo/Polyhedron/Scene_polylines_item.h
Three/include/CGAL/Three/Scene_group_item.h
2016-05-06 13:41:36 +02:00
Maxime Gimeno
96c9d2eb70
Fix the rebase
2016-05-06 12:15:04 +02:00
Maxime Gimeno
7983ad4298
Clean-up
2016-05-06 11:12:54 +02:00
Maxime Gimeno
92e86c50a8
WIP clean-up
2016-05-06 11:12:10 +02:00
Maxime Gimeno
caed1cd153
Bug fix
...
- Fixes the exported targets namespace and a bug in the example_plugin.
2016-05-06 11:12:10 +02:00
Maxime Gimeno
3f0f27a5ac
Plugin API made in CamelCase
2016-05-06 11:12:09 +02:00
Maxime Gimeno
4dadba77c4
Clean-up the plugin helper
2016-05-06 10:51:59 +02:00
Maxime Gimeno
b4229241ba
Removes the hardcoded actions in Operations
2016-05-06 10:51:58 +02:00
Maxime Gimeno
f8a602814e
WIP Removing plugin helper
2016-05-06 10:50:50 +02:00
Maxime Gimeno
542ee48ddb
Finished doc update and replaced BBox by CGAL::BBox_3
2016-05-06 10:50:50 +02:00
Maxime Gimeno
21f5c82990
WIP Correct the doc
2016-05-06 10:46:21 +02:00
Sébastien Loriot
e869ebcb33
if the color vector was manually set, do not translate color ids
2016-05-06 10:08:59 +02:00
Sebastien Loriot
1ad076e14b
Merge pull request #1010 from lrineau/Mesh_3-improve_images-GF
...
Mesh 3: improve domains based on images
2016-05-05 14:56:56 +02:00
Sebastien Loriot
7630d2a6fc
Merge pull request #875 from sloriot/Triangulation_2_and_PMP-fix_Triangulation_2_projection_traits_3
...
PMP: make triangulate_faces works with non filtered kernels
2016-05-05 14:55:11 +02:00
Sebastien Loriot
88403c1324
Merge pull request #1055 from afabri/Polyhedron-fix_Selection_IO-GF
...
Store the indices of source and target of a selected edge
2016-05-05 14:50:09 +02:00
Maxime Gimeno
54c8ce5b8b
d-pointer for Transform_polyhedron_item
2016-05-04 16:29:27 +02:00
Maxime Gimeno
a920342253
d-pointer for Scene_combinatorial_map
2016-05-04 15:32:12 +02:00
Sébastien Loriot
3c8871f8a9
Merge pull request #739 from bo0ts/Pmp-poly_soup_poly_mesh-pmoeller
...
Add PMP function is_polygon_soup_a_polygon_mesh
2016-05-04 15:01:25 +02:00
Sébastien Loriot
bdfae8cbe7
Merge pull request #815 from maxGimeno/Polyhedron_demo_Volume_planes-Fix_for_775-GF
...
Volume_planes in Polyhedron_demo : Fix for 775
2016-05-04 14:45:54 +02:00
Sébastien Loriot
830348fd4e
Merge pull request #1060 from janetournois/Polyhedron_demo-fix_plane_edit_polyhedron_plugin-GF
...
Polyhedron demo : fix the display of the fixed plane for the deformation plugin
2016-05-04 14:45:07 +02:00
Sébastien Loriot
41eace839a
Merge pull request #1059 from sgiraudot/Polyhedron_demo-Fix_select_one_point-GF
...
Polyhedron demo: fix select one point
2016-05-04 14:45:01 +02:00
Sébastien Loriot
80da43d3aa
Merge pull request #1058 from sloriot/Polyhedron_demo-fix_hole_filling_removal
...
Call erase only if the hole visulizer exists
2016-05-04 14:44:57 +02:00
Sébastien Loriot
2f81909171
Merge pull request #1057 from maxGimeno/Polyhedron_demo-Fix_for_edit_plugin-GF
...
Polyhedron_demo : edit_polyhedron_plugin improvement
2016-05-04 14:44:50 +02:00
Sébastien Loriot
a4d58ce7e7
Merge pull request #1056 from afabri/Polyhedron-write_obj-GF
...
At least allow to write polyhedral surfaces into .obj files
2016-05-04 14:44:19 +02:00
Sébastien Loriot
d5399df43e
Merge pull request #1051 from maxGimeno/Add_warning_when_save_fails-GF
...
Polyhedron_demo : Warning when save fails
2016-05-04 14:44:08 +02:00
Sébastien Loriot
e94733243f
Merge pull request #1012 from maxGimeno/Display_cells_not_in_complex-GF
...
Polyhedron demo : display all cells in c3t3_item
2016-05-04 14:43:59 +02:00
Sébastien Loriot
c66467c87a
Merge pull request #1043 from maxGimeno/Polyhedron_demo-Fix_busy_waiting-GF
...
Polyhedron demo : Fix for busy waiting
2016-05-04 14:43:39 +02:00
Sébastien Loriot
5ea6cc63b6
Merge pull request #1028 from maxGimeno/Polyhedron_demo-Spheres_item-GF
...
Polyhedron demo : Create new items for the spheres and the intersection of the c3t3_item
2016-05-04 14:41:07 +02:00
Maxime Gimeno
58f1f9b894
Moved the last private members of Scene_polyhedron_item in the struct
2016-05-04 14:00:50 +02:00
Jane Tournois
b43581373e
fix the display of the fixed plane for the deformation plugin
2016-05-03 11:56:21 +02:00
Simon Giraudot
99b5602675
Bugfix: missing brackets
2016-05-03 11:21:16 +02:00
Simon Giraudot
574bd21acf
Bugfix: decrement first before swaping for selection
2016-05-03 11:20:57 +02:00
Maxime Gimeno
a33fb76d84
Warning fix
2016-05-03 08:55:59 +02:00
Maxime Gimeno
a1439ade4b
Modifies the way the plugin is applied.
2016-05-03 08:33:14 +02:00
Sébastien Loriot
4cee2ecb23
call erase only if the hole visulizer exists
2016-05-02 19:08:05 +02:00
Maxime Gimeno
10542b0e3f
Add a warningbox when the user forgets to put an extension when saving a file.
2016-05-02 17:53:53 +02:00
Andreas Fabri
94a09dc4c1
At least allow to write polyhedral surfaces into .obj files
2016-05-02 16:48:56 +02:00
Maxime Gimeno
201524325a
Clean-up
2016-05-02 16:25:06 +02:00
Andreas Fabri
13259e8626
Store the indices of source and target of a selected edge.
2016-05-02 16:13:56 +02:00
Jane Tournois
412e0f8846
cleaning includes
2016-05-02 13:51:50 +02:00
Jane Tournois
bb06af9d77
fix export error in scene_spheres_item
...
it should be part of the scene_basic_objects target if there is
only one export configuration procedure
2016-05-02 13:50:42 +02:00
Sébastien Loriot
3005774b84
remove unused type
2016-04-29 14:13:32 +02:00
Sebastien Loriot
54b244c430
Merge pull request #914 from sgiraudot/Point_set_shape_detection_3-Plane_regularization-GF
...
Point set shape detection: Plane regularization
2016-04-29 13:08:44 +02:00
Sebastien Loriot
b822ed05ae
Merge pull request #1034 from maxGimeno/Fix_meshing-GFwq
...
Polyhedron_demo : Fix for the mesh_3 plugin
2016-04-29 13:04:47 +02:00
Sebastien Loriot
b600f9b30a
Merge pull request #1029 from maxGimeno/Add_name_to_PS_and_Polylines-GF
...
Polyline demo : names for items created on the fly
2016-04-29 13:02:21 +02:00
Sébastien Loriot
874505c341
Merge pull request #1037 from maxGimeno/Improvements_for_Points_inside_poly-GF
...
Polyhedron_demo : Improvements for Points_set_inside_polyhedron
2016-04-29 12:58:14 +02:00
Jane Tournois
54d946d39c
remove debug output
2016-04-28 10:49:29 +02:00
Maxime Gimeno
1bf3af124a
Removes is_monochrome from Scene_item and put it in the Scene_polyhedron_item's d-pointer.
2016-04-28 09:57:32 +02:00
Maxime Gimeno
877462690b
Use a d-pointer on Scene_polyhedron_item
2016-04-27 17:15:30 +02:00
Maxime Gimeno
9fb5702610
debugging the rebase and externalizing the TextRender
...
- Avoids the #include "Viewer.h" in Scene_polyhedron_item.h"
2016-04-27 15:17:27 +02:00
Maxime Gimeno
81cc6992e7
Clean-up
2016-04-27 14:32:51 +02:00
Maxime Gimeno
b5659954b7
Renamed the interface
2016-04-27 14:32:51 +02:00
Maxime Gimeno
2ca49b729c
Clean-up
2016-04-27 14:32:50 +02:00
Maxime Gimeno
8a155b4f5d
The scene performs a check on the item to insure it is able to display its primitive IDs.
2016-04-27 14:32:50 +02:00
Maxime Gimeno
4a7fe6ddda
Fixes memoryleak
2016-04-27 14:32:49 +02:00
Maxime Gimeno
9d183d2e6e
User can set the max
...
- Addition of an action in the View menu to set the max_text_items.
2016-04-27 14:32:49 +02:00
Maxime Gimeno
3561497d71
New stuff
...
- Addition of a maximum number of TextItems that can be displayed at the same time
- The viewer now prints text via the TextRenderer and not via the QGLWidget::renderText() function.
2016-04-27 14:32:49 +02:00
Maxime Gimeno
89156854e2
WIP Restoring the messages displaying
...
- The viewer only draws text (with QGLWidget::renderText() ) if the painter draws at least one character (space doesn't count).
2016-04-27 14:32:49 +02:00
Maxime Gimeno
bfa65c2d78
Fixes
...
- Adds a security for the printing when no item is selected
- Adds a missing call to removeTextItem in the polyhedron_item's destructor
2016-04-27 14:32:48 +02:00
Maxime Gimeno
eb7ee3697d
Typo
2016-04-27 14:32:48 +02:00
Maxime Gimeno
5edb90a7a0
Moved the viewer's QPainter to the Viewer_impl.
2016-04-27 14:32:48 +02:00
Maxime Gimeno
9b18443688
Fix a memory leak
2016-04-27 14:32:22 +02:00
Maxime Gimeno
80afed00c3
Clean-up
2016-04-27 14:32:22 +02:00
Maxime Gimeno
923ddab5fc
More clean-up
2016-04-27 14:32:22 +02:00
Maxime Gimeno
6048e6721d
Clean-up and documentation for TextRenderer
2016-04-27 14:32:22 +02:00
Maxime Gimeno
6519196423
Fix
...
- The viewer was disappearing when the selection changed.
2016-04-27 14:31:21 +02:00
Sébastien Loriot
aebb033c03
CGALize code
2016-04-27 14:31:21 +02:00
Sébastien Loriot
f6f832130e
do not use deprecated Object_and_primitive_id in the AABB-tree
2016-04-27 14:31:21 +02:00
Maxime Gimeno
09501f6282
Clean-up
2016-04-27 14:31:21 +02:00
Maxime Gimeno
8950ccc5e7
Clean-up
2016-04-27 14:31:21 +02:00
Maxime GIMENO
9a7c42db76
Windows Fix + conditionnal textItems creation
...
- It seems that overloading the paintEvent was sufficient to get rid of
the "black screen" bug, and initializing targeted_id to NULL fixed the
segfault occuring when loading an item.
- The textItems containing the ids are only computed when ctrl+I are
pressed. There could be an optimization here, so that it is computed
only once, and not every time the ids are displayed.
2016-04-27 14:31:21 +02:00
Andreas Fabri
d60e1e112c
export classes
2016-04-27 14:28:48 +02:00
Maxime Gimeno
31a493b670
H window update
2016-04-27 14:28:48 +02:00
Maxime Gimeno
4403dfbb6c
Print of the Ids of all primitves and the selected one available
2016-04-27 14:28:48 +02:00
Maxime Gimeno
4572da6e7c
WIP :Use the aabb_tree to choose which ids to display
2016-04-27 14:26:05 +02:00
Maxime Gimeno
540bc5dfcb
Some clean-up
2016-04-27 14:19:02 +02:00
Maxime Gimeno
408402d1b5
Print selected primitive Id is done.
...
- Uses the aabb_tree to find the selected facet
- iterate its vertices and halfedges and compute the distances between the Id spots and the selected point
- only prints the spot with the smallest distance.
2016-04-27 14:18:03 +02:00
Maxime Gimeno
68e585d36b
WIP : Use AABB_Tree to find the selected Id quicker
2016-04-27 14:15:50 +02:00
Maxime Gimeno
d20a35d282
Selected id displayed one by one
...
- Segfault when removing the item from the scene
2016-04-27 14:15:50 +02:00
Maxime Gimeno
cbdbc725aa
Ids update :
...
- Ids are all displayed where they should
- WIP : only print the ones that are not hidden by another item or facet
- TO DO: Change the API so that the destructor of an item can remove the textItems from the renderer.
2016-04-27 14:12:22 +02:00
Maxime Gimeno
f76ba833e3
Working text drawing on top of the scene.
2016-04-27 14:06:27 +02:00
Maxime Gimeno
13785ba783
WIP fixes
...
- Repaired the drawText function for the polyhedron_items.
- Restored the white background.
- Still no text displayed.
2016-04-27 14:06:27 +02:00
Maxime Gimeno
c0d9f4f50e
WIP QPainter problems
2016-04-27 14:06:27 +02:00
Maxime Gimeno
dbb5c07709
Draw text done. WIP Blending
2016-04-27 14:02:27 +02:00
Maxime Gimeno
278b9b2614
Remove cells incident to far points
2016-04-26 14:31:45 +02:00
Maxime Gimeno
8c52d26622
fix busy waiting of the cut_plugin
2016-04-26 13:01:38 +02:00
Maxime Gimeno
4285d49d2d
fix the busy waiting of the implicit functions
2016-04-26 12:47:10 +02:00
Maxime Gimeno
227b8f58dc
Fix the busy-waiting of the scene_edit_polyhedron_item
2016-04-26 12:41:26 +02:00
Maxime Gimeno
a31e225547
Fix busy-waiting for c3t3_item
2016-04-26 12:05:39 +02:00
Jane Tournois
6d580bfc83
fix vtk plugin rebase conflict/error
2016-04-26 11:23:59 +02:00
Maxime Gimeno
8f3f910fd8
Clean-up
2016-04-26 08:45:24 +02:00
Maxime Gimeno
6a87afbf66
WIP clean-up
2016-04-25 17:00:15 +02:00
Maxime Gimeno
9e7f9188aa
Bug fix
...
- Fixes the exported targets namespace and a bug in the example_plugin.
2016-04-25 16:53:49 +02:00
Maxime Gimeno
f73b30aa1d
Plugin API made in CamelCase
2016-04-25 16:53:48 +02:00
Maxime Gimeno
0d8f9130b8
Clean-up the plugin helper
2016-04-25 16:40:03 +02:00
Maxime Gimeno
fcd6e247ca
Removes the hardcoded actions in Operations
2016-04-25 16:40:03 +02:00
Maxime Gimeno
1a9edb6fda
WIP Removing plugin helper
2016-04-25 16:40:02 +02:00
Maxime Gimeno
2681d87eef
Finished doc update and replaced BBox by CGAL::BBox_3
2016-04-25 16:39:56 +02:00
Maxime Gimeno
87b2b07956
WIP Correct the doc
2016-04-25 16:35:06 +02:00
Sebastien Loriot
5331ee42b5
Merge pull request #1009 from maxGimeno/Polyhedron_demo-Fix_menus-GF
...
Polyhedron demo : clean up for plugin loader and fix for menus segfault
2016-04-25 16:30:35 +02:00
Simon Giraudot
662efa2c8e
Use CGAL_PI instead of M_PI
2016-04-25 11:01:40 +02:00
Laurent Rineau
dc1d8e870d
Merge pull request #1026 from maxGimeno/Polyhedron_demo-Fix_setColor-GF
...
Fix for Scene_polyhedron_item::setColor.
2016-04-22 15:19:13 +02:00
Maxime Gimeno
54b1e2c3f3
Pops a warning box when an item cannot be meshed instead of segfaulting.
2016-04-22 11:30:10 +02:00
Sébastien Loriot
576d4ca727
fix background of line-edit
2016-04-22 11:21:50 +02:00
Maxime Gimeno
63c0a1e9cc
Modification of the way of naming
2016-04-22 11:21:41 +02:00
Jane Tournois
4206f4fe68
use face_patch_map also in parallel mode
2016-04-22 11:07:24 +02:00
Jane Tournois
b27447d2c0
fix badly resolved rebase conflict
2016-04-22 11:05:36 +02:00
Jane Tournois
eb5056069c
fix error of the merge conflits during rebase
2016-04-22 10:34:14 +02:00
Jane Tournois
304e53ef1e
collect border of the ROI to keep it valid after remeshing
...
this commit also fixes a merge conflict badly resolved in the rebase process
2016-04-22 10:29:05 +02:00
Simon Giraudot
21a631fa67
Bugfix: size is 0 if polyhedron is empty
2016-04-22 10:15:49 +02:00
Jane Tournois
8e574f355a
color sub-connected components on a polyhedron using selected edges as frontiers
2016-04-21 15:32:15 +02:00
Jane Tournois
a8a8a669b8
export items that are necessary for external plugins that use them
2016-04-21 15:31:05 +02:00
Jane Tournois
883a52cd4f
when no facet is selected, remesh all
...
this avoids selecting all facets to run isotropic remeshing
If no facet is selected, and as soon as one edge or one vertex is selected,
the whole polyhedron is remeshed, taking into account constrained vertices
and constrained edges
2016-04-21 15:31:04 +02:00
Jane Tournois
0a45c59bdd
fix return type!
2016-04-21 15:31:02 +02:00
Jane Tournois
fdb663685a
fix mesh deformation plugin
...
now the ROI vertices are properly re-selected after remeshing
2016-04-21 15:29:52 +02:00
Maxime Gimeno
9be465aad9
Adds the possibility to choose the name of the point_sets and polylines created on the fly, but keeps the same counter.
2016-04-21 15:28:58 +02:00
Jane Tournois
a391f5eb36
use face_patch_map also when remeshing the whole polyhedron
2016-04-21 15:28:32 +02:00
Jane Tournois
51d3b22e69
set polyhedron_item multicolor
2016-04-21 15:26:56 +02:00
Jane Tournois
c1e5d67f7c
use face_patch_map in isotropic remeshing
2016-04-21 15:26:54 +02:00
Jane Tournois
14e906d51b
add default constructor
2016-04-21 15:26:52 +02:00
Jane Tournois
ee89276102
isotropic remeshing : introduce surface_patch ids as an input read write pmap
2016-04-21 15:23:20 +02:00
Jane Tournois
c522c6a2a8
restore ROI after deformation
2016-04-21 15:17:24 +02:00
Maxime Gimeno
c7894cb680
Changed the c3t3_item to use an intersection_item
2016-04-21 15:03:57 +02:00
Maxime Gimeno
de524bfecf
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-04-21 14:46:57 +02:00
Maxime Gimeno
3c388c94a6
Fix for the polyhedorn_item's colors
...
- The color calculation when the item is not monochrome was not done correctly.
2016-04-21 14:45:29 +02:00
Sébastien Loriot
cbd27d6793
allow reading of unstructuredGrid from non-XML files
2016-04-21 14:34:36 +02:00
Sébastien Loriot
7bf1db3f39
plug error handler to the reader
2016-04-21 14:32:21 +02:00
Jane Tournois
205e3afe0a
add error observer to vtk Plugin
...
as suggested here
http://www.vtk.org/Wiki/VTK/Examples/Cxx/Utilities/ObserveError
does not work yet
2016-04-21 14:25:58 +02:00
Jane Tournois
84634a48ea
deal with xml and discriminate with a template parameter
2016-04-21 14:21:29 +02:00
Maxime Gimeno
32f92f1445
Adding a spheres_item to the edit_polyhedron_item and fixing some problems
2016-04-21 10:40:04 +02:00
Maxime Gimeno
f39865ce7c
clean up
2016-04-21 08:34:52 +02:00
Maxime Gimeno
c5cea064cb
Fix for Scene_polyhedron_item::setColor, that corrupted the vector colors_.
2016-04-20 17:31:51 +02:00
Laurent Rineau
62d1cfecbe
Fix compilation errors (in the Polyhedron Demo)
2016-04-20 15:26:49 +02:00
Maxime Gimeno
176770fa00
- Addition of a reference to the scene in the group_item so it can add its own children
...
- Modification of the Scene_polylines_item to use a child spheres_item
- fixes about the groups
2016-04-20 12:18:20 +02:00
Maxime Gimeno
0e66c54b27
Addition of a "lock" property in the groups API.
2016-04-19 15:48:53 +02:00
Maxime Gimeno
e1eaa8307a
fix the spheres from loaded c3t3
2016-04-19 15:02:31 +02:00
Maxime Gimeno
7b338f4e45
Fix the drawing of the children's group when their renderingMode isn't compatible.
2016-04-19 14:45:30 +02:00
Maxime Gimeno
22636f6a76
Fix the segfault when deleting the spheres_item
2016-04-19 12:55:52 +02:00
Maxime Gimeno
3ab7050205
Intermediary step:
...
- Created a Scene_spheres_item
- Made the Scene_c3t3_item a group_item
- Changed the spheres management in the c3t3_item
- Fixed the has_group maintanance in group_items
2016-04-19 12:17:45 +02:00
Jane Tournois
8be725fd07
check orientation has not failed
2016-04-19 11:19:26 +02:00
Maxime Gimeno
b1337bd552
Removes the second "Number of isolated vertices" in the polyhedron's info;
2016-04-18 15:47:17 +02:00
Laurent Rineau
1391e2760e
Fix compilation of Mesh_3 plugin
2016-04-18 14:43:53 +02:00
Laurent Rineau
4af747178a
Merge pull request #917 from maxGimeno/Polyhedron_demo-Add_edges_to_self_intersect-GF
...
Polyhedron_demo : adding edges to the self selection item
2016-04-15 16:21:17 +02:00
Maxime Gimeno
6631a2c15a
Allows the display of the cells that are not in the complex oin the c3t3_item.
2016-04-15 16:13:22 +02:00
Laurent Rineau
27f7954213
Merge pull request #1007 from maxGimeno/Polyhedron_demo-Fix-PS_Selection-GF
...
(Merged from remote-tracking branch 'cgal/releases/CGAL-4.8-branch')
2016-04-15 15:46:02 +02:00
Laurent Rineau
74ae3531ba
Merge pull request #1003 from maxGimeno/Mesh_3_demo-Remove_GLU_from_dependencies-GF
...
Mesh_3 Demo : Removes GLU from the CMakeLists.txt
2016-04-15 15:36:45 +02:00
Maxime Gimeno
167752e631
Makes the last point_set made from BBox the default point_set if none is selected.
2016-04-15 12:29:05 +02:00
Laurent Rineau
8e9f1af10e
Revert modifications
2016-04-14 15:26:47 +02:00
Laurent Rineau
5efb63bddd
Merge pull request #998 from sloriot/Polyhedron_demo-enhance_intersection_plugin
...
Only create a polyline item if the intersection is not empty
2016-04-14 15:18:11 +02:00
Laurent Rineau
26af71e126
Merge pull request #883 from lrineau/Three-Scene_group_can_draw-GF
...
Change the semantic of the Scene_group_item
2016-04-14 15:17:07 +02:00
Laurent Rineau
481088f299
Merge pull request #989 from lrineau/Polyhedron-demo_speed_up_loading_of_c3t3_items-GF
...
Polyhedron demo: speed up loading of c3t3 items
2016-04-14 15:11:46 +02:00
Maxime Gimeno
524a8da107
Remove glu from all the CMakeLists
2016-04-14 09:29:50 +02:00
Maxime Gimeno
d084cccd6b
Removes GLU from the CMakeLists.txt
2016-04-14 08:38:39 +02:00
Maxime Gimeno
b9dd2f314c
Fix the point_set selection polylines.
2016-04-13 16:44:31 +02:00
Laurent Rineau
63dc460f42
Merge commit 'refs/pull/990/head' into Three-Scene_group_can_draw-GF
...
Conflicts:
Polyhedron/demo/Polyhedron/Scene.cpp
Polyhedron/demo/Polyhedron/Scene.h
Three/include/CGAL/Three/Scene_draw_interface.h
2016-04-13 11:52:57 +02:00
Laurent Rineau
9cbae0394d
Merge pull request #934 from maxGimeno/Polyhedron_demo-Clipping_polyhedron_plugin_enhancement-GF
...
Polyhedron_demo: Clip_polyhedron_plugin enhancement
2016-04-13 11:19:38 +02:00
Laurent Rineau
1e4d22549c
Fix the text: remove empty lines
2016-04-13 11:04:48 +02:00
Laurent Rineau
202d2c2cf0
Merge pull request #893 from sgiraudot/Polyhedron_demo-Unify_off_io_plugins-GF
...
Polyhedron demo: unify OFF io plugins
2016-04-13 10:46:29 +02:00
Laurent Rineau
cf961c3a2d
Merge pull request #877 from maxGimeno/Polyhedron-demo-Trivial_fixes-GF
...
Polyhedron_demo: Trivial fixes
2016-04-13 10:36:42 +02:00
Laurent Rineau
555f46e850
Merge pull request #928 from janetournois/Polyhedron_demo-fix_colors-GF
...
Polyhedron item : fix access in color map
2016-04-13 10:33:40 +02:00
Laurent Rineau
897085b418
Merge pull request #936 from maxGimeno/Polyhedron_demo-Selection_tool_enhancement-GF
...
Polyhedron_demo : selection tool enhancement
2016-04-13 10:32:29 +02:00
Sébastien Loriot
853006afb0
only create a polyline item if the intersection is not empty
2016-04-12 09:20:11 +02:00
Simon Giraudot
3dc74359ea
Create point set from vertices of polygon soup
2016-04-11 15:56:30 +02:00
Simon Giraudot
c579dd3e65
Add dependency to polygon soup in CMakeLists
2016-04-11 15:56:10 +02:00
Simon Giraudot
6d38c89203
Add method to access points of polygon soup
2016-04-11 15:55:49 +02:00
Laurent Rineau
f8aabdcc36
Merge pull request #990 from maxGimeno/Polyhedorn_demo-New_picking-GF
...
Polyhedron_demo : New picking
2016-04-11 11:58:35 +02:00
Laurent Rineau
e83bf2dc43
Merge pull request #977 from lrineau/Polyhedron-demo_fix_c3t3_item_again-GF
...
Polyhedron demo: fix c3t3 item, again
2016-04-11 11:45:49 +02:00
Laurent Rineau
9b49b2ff0b
Merge pull request #982 from maxGimeno/P_Demo-Fix_for_Ctrl_Space-GF
...
Polyhedron_demo : Fix for the Ctrl+space shortcut
2016-04-08 15:16:30 +02:00
Maxime Gimeno
0ef8191fb7
Allow picking for edges and points.
2016-04-07 15:32:20 +02:00
Laurent Rineau
dca86376bf
Follow-up to "Do not depend on `Viewer.h`"
...
That commit was not complete:
> Author: Laurent Rineau <laurent.rineau@cgal.org>
> Date: Fri Apr 1 16:11:52 2016 +0200
>
> Do not depend on `Viewer.h`
>
> Only `Viewer_interface.h` is needed.
Once `Viewer.h` is removed from a few `.h` file, then
`Viewer_interface.h` must be included in `.cpp` files that use the
`Viewer_interface` API.
2016-04-07 14:49:43 +02:00
Maxime Gimeno
24b16b4710
New picking finished. Far more efficient.
2016-04-07 10:13:20 +02:00
Laurent Rineau
b9ea69e5c3
Do no always compute the AABB tree
...
- The c3t3 item has an option "Show tetrahedra".
- The AABB tree is built lazily, when needed.
- The AABB tree data member is moved in `Scene_c3t3_item_priv`.
2016-04-06 16:20:25 +02:00
Laurent Rineau
0cd5d8a6c4
Fix the look-at function
2016-04-06 16:06:46 +02:00
Laurent Rineau
535c5bb5b2
Speed-up Triangulation_3::read_cells...
...
... by a factor 5 for big triangulations! The old code was using:
std::map<size_t, Vertex_handle> V;
std::map<size_t, Cell_handle> C;
whereas the indices are contiguous: from 0 to n. `std::vector` is a lot
better for that use case!
2016-04-06 16:03:55 +02:00
Maxime Gimeno
bc6d5aa574
Fix for the waitCursor
2016-04-05 15:10:44 +02:00
Maxime Gimeno
1aa34e060a
Fix for missing combo-box
2016-04-05 11:36:26 +02:00
Jane Tournois
f9fdd779f4
a bit more reorganization of the UI
2016-04-05 10:34:38 +02:00
Maxime Gimeno
386995bbdc
Final fix for itemChanged calls
2016-04-04 16:53:17 +02:00
Laurent Rineau
6164c91227
Merge changes to PMP from branch 'releases/CGAL-4.8-branch'
...
Merges:
> 621e16ed Merge pull request #973 from janetournois/Polyhedron_demo-fix_isotropic_remeshing_plugin-jtournois
> 4d1ac46 Merge pull request #974 from janetournois/PMP-complete_remeshing_test-jtournois
2016-04-04 11:22:09 +02:00
Laurent Rineau
621e16ed41
Merge pull request #973 from janetournois/Polyhedron_demo-fix_isotropic_remeshing_plugin-jtournois
...
PMP : fix isotropic_remeshing plugin
2016-04-04 11:19:52 +02:00
Maxime Gimeno
dfc2143b28
Fix for emit itemChanged()
2016-04-04 11:18:29 +02:00
Jane Tournois
f0261b6a3c
minor reorganization of the UI
2016-04-04 10:35:26 +02:00
Maxime Gimeno
56486dbadd
Fix for the ctrl+space shortcut
2016-04-04 10:13:21 +02:00
Laurent Rineau
77a688530b
Fix memory leak
2016-04-01 16:16:17 +02:00
Laurent Rineau
f267cfb960
Do not depend on `Viewer.h`
...
Only `Viewer_interface.h` is needed.
2016-04-01 16:11:52 +02:00
Laurent Rineau
910f17cd51
Allow to pop the context menu with `Key_Menu`
...
As the item selection is rather slow, for the moment, that is a lot
faster than `Shift+Rightbutton`.
2016-04-01 16:10:58 +02:00
Laurent Rineau
5a9d82ebc7
Improve c3t3 loading and display
...
Followup to PR #962 :
- the display of spheres was no longer correct,
- allow loading of c3t3 without any facets and cells (only vertices
with weights),
- fix the display of spheres, with better shaders,
- `Scene_c3t3_item`: do not draw edges, in FlatPlusEdges, during a
`drawWithNames()`, to optimize speed,
- `Viewer`: do not use anti-aliasing during `drawWithNames()`
2016-04-01 16:07:56 +02:00
Laurent Rineau
4f599d5310
Merge pull request #959 from janetournois/PMP-isotropic_remeshing_made_verbose-jtournois
...
Polyhedron demo : add verbosity to isotropic_remeshing plugin
2016-04-01 11:17:49 +02:00
Laurent Rineau
7700b73176
Merge branch 'releases/CGAL-4.8-branch'
...
Merges:
> d53efdd - Merge pull request #964 from afabri/Mesh_2-BOOST_PARAMETER_MAX_ARITY-GF
2016-04-01 11:00:57 +02:00
Laurent Rineau
d53efddbd8
Merge pull request #964 from afabri/Mesh_2-BOOST_PARAMETER_MAX_ARITY-GF
...
#define BOOST_PARAMETER_MAX_ARITY early enough
2016-04-01 11:00:06 +02:00
Jane Tournois
52b09a1e44
do not forget to reset face indices properly before remeshing
2016-03-31 15:43:07 +02:00
Jane Tournois
964e824750
make "preserve duplicates" not available on a selection_item
2016-03-31 15:17:14 +02:00
Jane Tournois
0804847e64
when remeshing a selection_item, use it instead of poly_item
2016-03-31 15:16:55 +02:00
Laurent Rineau
ae33af9222
Merge branch 'releases/CGAL-4.8-branch'
...
Merges the following fixes:
> 4025913 Merge pull request #949 from janetournois/BGL-fix_conversion_of_boundary_halfedges-jtournois
> 9c62628 Merge pull request #948 from janetournois/PMP-fix_assertion_isotropic_remeshing-jtournois
> f61402d Merge pull request #929 from sloriot/Polyhedron_demo-Isotropic_remeshing_preserve_duplicates
See also:
* https://github.com/CGAL/cgal/pull/949
* https://github.com/CGAL/cgal/pull/948
* https://github.com/CGAL/cgal/pull/929
2016-03-31 10:55:12 +02:00
Laurent Rineau
f61402d1d4
Merge pull request #929 from sloriot/Polyhedron_demo-Isotropic_remeshing_preserve_duplicates
...
Polyhedron demo: isotropic remeshing preserves duplicated edges
2016-03-31 10:53:12 +02:00
Laurent Rineau
0e68aca4ed
Merge branch 'releases/CGAL-4.8-branch'
...
Merges:
- a change of the release date of CGAL-4.8
- a fix of a typo in `Polyhedron/demo/Polyhedron/GlSplat/GlSplat.cpp`
2016-03-30 17:11:36 +02:00
Andreas Fabri
920f1dba60
#define the arity, as some other file sets it too low
2016-03-30 12:22:13 +02:00
Laurent Rineau
aff611cb3e
Merge pull request #952 from lrineau/Mesh_3-better_binary_IO-lrineau
...
Fix issues in I/O of Mesh_complex_3_in_triangulation_3
2016-03-30 10:11:21 +02:00
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
Clement Jamin
cee602c34c
Clear CGAL_THREE_VIEWER_INTERFACE_H_PATH & co from the cache before find_path
...
Otherwise, if CGAL_DIR was changed between two "configurations", the old path
is not updated.
2016-03-11 22:09:06 +01:00
Clement Jamin
3525ac3e53
Fix error message
2016-03-11 19:27:24 +01:00
Clement Jamin
e14f49950c
Fix export
2016-03-11 09:50:12 +01:00
Guillaume Damiand
6dd3bdfce6
Modif of CMakeLists.txt in polyhedron demo to solve link problems in header only (nyf)
2016-03-11 07:53:32 +01:00
Clement Jamin
f2c68b25cd
Update CMakeLists.txt of all demos for header-only mode
2016-03-09 17:23:20 +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