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 966 MiB
Commit Graph

2841 Commits

Author SHA1 Message Date
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
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 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
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
Simon Giraudot 21a631fa67 Bugfix: size is 0 if polyhedron is empty 2016-04-22 10:15:49 +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
Maxime Gimeno c7894cb680 Changed the c3t3_item to use an intersection_item 2016-04-21 15:03:57 +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