Commit Graph

1211 Commits

Author SHA1 Message Date
Sébastien Loriot b9fbda6c0c applicable now depends on the action 2015-02-18 16:22:57 +01:00
Sébastien Loriot 68d15e165a Merge branch 'local/Polyhedron_demo-better_selection_offset'
Improve the facet selection process in the demo plugin
  by using the vertex incidence instead of the edge incidence.
  First step toward simpler the code

  Tested in CGAL-4.6-Ic-126
  Approved by the release manager
2015-02-16 10:23:31 +01:00
Sébastien Loriot 373b93d4a2 fix warnings on windows 2015-02-12 14:18:51 +01:00
Sébastien Loriot 743821f76a use the new erode and dilate section functions 2015-02-11 10:05:05 +01:00
Sébastien Loriot bb3264c563 remove conditions that are outdated 2015-02-05 14:46:36 +01:00
Sébastien Loriot d4746febff Merge branch 'Polyhedron_3-IO4Scene_edge_item-GF'
Tested in CGAL-4.6-Ic-120
  Approved by the interim release manager
2015-02-03 17:20:27 +01:00
Sébastien Loriot 2537374f56 fix io plugin 2015-02-03 17:18:48 +01:00
Sébastien Loriot 698189f2d4 only consider io-plugin for loading that can load 2015-02-03 17:05:04 +01:00
Sébastien Loriot f7dac442d9 add the nb of points to respect cgal file format 2015-02-03 16:35:43 +01:00
Sébastien Loriot e56a845b96 Merge branch 'local/Polyhedron_demo-export_STL_builder'
Brings enhancement to the polyhedron demo:
   * better handling of triangle soups -> always orientable as polyhedron
   * better handling of triangulated stl files in the loader

  Tested in CGAL-4.6-Ic-117
  Approved by the release manager
2015-01-30 16:09:00 +01:00
Sébastien Loriot 24fcc4a2fe update orient_polygon_soup to always produce a polyhedron
with self-intersection at singular vertices/edges
2015-01-29 14:02:56 +01:00
Sébastien Loriot b4bd141980 move OFF reading function to a header file 2015-01-29 14:02:47 +01:00
Sébastien Loriot 7c09fdb490 add missing include 2015-01-29 14:02:35 +01:00
Sébastien Loriot 4cf96051c5 stl plugin can now also load polygon soups 2015-01-27 11:38:59 +01:00
Sébastien Loriot 613915c07f add the possibility to load a polygon soup from vector of points and indices
I needed to move the Polygon_soup class inside the header as the function
  added is a template function and the definition must be available in the
  header
2015-01-27 11:38:45 +01:00
Sébastien Loriot d6a8fcaf4f the orientation plugin is only applicable on polygon soup items 2015-01-27 10:39:41 +01:00
Laurent Rineau bd43545717 Disable the normal estimation plugin with Boost-1.57 and C++11 2015-01-26 11:22:09 +01:00
Sébastien Loriot 58b99a51f2 hide the modifier in internal namespace and advertise the function 2015-01-23 15:55:45 +01:00
Sébastien Loriot 135568bb0d abstract the point and polygon type 2015-01-23 15:30:04 +01:00
Sébastien Loriot 4fbf80df46 move Polygon_soup_to_polyhedron_3 to its own header 2015-01-23 15:03:13 +01:00
Sébastien Loriot 00a57be25a remove the STL reading part outside of the builder 2015-01-23 15:01:16 +01:00
Sébastien Loriot b551c0fa55 move Polyhedron builder from STL files from demo plugin to header 2015-01-23 10:40:15 +01:00
Sébastien Loriot b6f5088676 Merge branch 'Scale_space_reconstruction_3-tvanlank'
Tested in CGAL-4.6-Ic-104
   Approved by the release manager
2015-01-14 16:09:11 +01:00
Andreas Fabri 6e36a853a9 Merge branch 'Surface_mesh-new_package-GF'
Approved by the release manager
Conflicts:
	Documentation/doc/Documentation/dependencies
	Documentation/resources/how_to_cite_cgal.bib.in
	Installation/changes.html
2015-01-12 11:27:35 +01:00
Sébastien Loriot 53c52bc516 Merge branch 'old/Scale_space_reconstruction_3-tvanlank' into Scale_space_reconstruction_3-tvanlank 2015-01-09 14:03:59 +01:00
Andreas Fabri 7ac935326e Display the distance to the previously selected point 2014-12-29 16:49:14 +01:00
Sébastien Loriot c480d71f22 Merge branch 'old/Scale_space_reconstruction_3-tvanlank' into Scale_space_reconstruction_3-tvanlank
Conflicts:
	.gitignore
	Polyhedron/demo/Polyhedron/CMakeLists.txt
2014-12-29 10:15:53 +01:00
Sébastien Loriot 205eca6d61 cut-plane plugin is only available if one polyhedron is in the item list
trivial bugfix for master
2014-12-23 11:31:32 +01:00
Sébastien Loriot e0572120d7 always call glew before gl 2014-12-22 14:34:48 +01:00
Sébastien Loriot 12a9027ed9 Merge remote-tracking branch 'origin/BG-split_graph_into_polylines-GF'
The extract polyhedron boundary now extract maximal polylines from
  the set of boundary edges. End point are vertices of degree != 2
  For convenience the function used to build these maximal polylines
  is put into include/CGAL/boost/graph/split_graph_into_polylines.h

Tested in 4.6-Ic-76
Approved by the release manager
2014-12-16 11:40:11 +01:00
Andreas Fabri f3340f8028 extract polyline 2014-12-02 17:43:31 +01:00
Andreas Fabri c243c20e57 Add is_empty() as an alias to empty() as this is the CGAL nmaing convention 2014-11-25 12:40:50 +01:00
Laurent Rineau 768ec1d687 Merge branch 'Polyhedron_demo-fix_warning-lrineau'
Fix warnings in the Polyhedron demo. The fixes are in Mesh_3,
Min_sphere_or_spheres_d, and in the Polyhedron demo itself.

Tested in CGAL-4.6-Ic-50.
Approved by the Release Manager.
2014-11-06 11:58:09 +01:00
Laurent Rineau 7d63f9d072 Merge branch 'releases/CGAL-4.5-branch'
Conflicts:
	Installation/changes.html
	Maintenance/release_building/public_release_name
2014-11-06 10:47:45 +01:00
Laurent Rineau 5a8b83393d Fix a warning -Wmaybe-uninitialized
Workaround a bug in g++-4.8.3 (and previous versions):
  https://gcc.gnu.org/bugzilla/show_bug.cgi?id=47679
that is triggered in some cases when boost::optional is used.

Using boost::make_optional to copy-initialize 'bbox' hides the
warning about '*bbox' not being initialized. See that StackOverflow
answer:
  http://stackoverflow.com/a/21755207/1728537

The warning was, for example, with g++-4.8.3:

.../test/Polyhedron_Demo/./CGAL_demo/Scene_interface.h: In member function 'virtual Scene_item::Bbox Scene_polyhedron_selection_item::bbox() const':
.../test/Polyhedron_Demo/./CGAL_demo/Scene_interface.h:32:45: warning: '*((void*)& item_bbox +44)' may be used uninitialized in this function [-Wmaybe-uninitialized]
         xmax(_xmax), ymax(_ymax), zmax(_zmax)
                                             ^
In file included from .../test/Polyhedron_Demo/Scene_polyhedron_selection_item.cpp:1:0:
.../test/Polyhedron_Demo/Scene_polyhedron_selection_item.h:288:35: note: '*((void*)& item_bbox +44)' was declared here
     boost::optional<CGAL::Bbox_3> item_bbox;

That bug is not yet fixed in more recent versions of g++.
2014-11-03 16:52:51 +01:00
Laurent Rineau f526ebd5cd Merge branch Mesh_3-fix_plugin_interface-cjamin' into releases/CGAL-4.5-branch
The changes the interface ID declared by
demo/Mesh_3/include/CGAL_demo/Plugin_interface.h, so that the ID of
plugin interface for the Polyedron demo and the Mesh_3 are
different. That will allow to have plugins for both demos in the same
directory.
2014-10-31 16:40:04 +01:00
Clement Jamin ae0a88708b Fix: a plugin may implement two interfaces 2014-10-29 15:34:01 +01:00
Clement Jamin 72513db3b0 Better console output 2014-10-29 15:14:08 +01:00
Andreas Fabri b554444f25 Add canSave and save to Scene_edges_item 2014-10-20 18:53:15 +02:00
Andreas Fabri 2b661081de restrict canSave 2014-10-20 18:52:19 +02:00
Laurent Rineau 908d608072 Merge branch 'releases/CGAL-4.5-branch'
Conflicts:
	Installation/changes.html
2014-10-20 14:46:36 +02:00
Laurent Rineau 70b5a14c9a Fix the picking
There was two problems:
  - the handling of glPushName()/glPopName was not consistent,
  - the splatting MUST be deactivated during a picking.
2014-10-16 15:48:06 +02:00
Andreas Fabri 525312a64b Replace a 'border' of a closed surface.
Approved by the release manager
2014-10-03 08:52:36 +02:00
Sébastien Loriot d79eeddfb9 Merge branch 'Polyhedron_demo-mesh_3_write_c3t3_boundary-GF'
Adding functions to export the boundary of a 3D mesh embedded in a C3T3
  See Features/Small_Features/Mesh_3_output_to_off

Successfully tested in CGAL-4.6-Ic-26
Approved by the interim release manager
2014-09-29 08:31:07 +02:00
Sébastien Loriot 024bd2724f add output_facets_in_complex_to_off and update test and demo 2014-09-24 12:05:02 +02:00
Sébastien Loriot 684104c032 add 2 overloads of output_boundary_of_c3t3_to_off in the C3T3 class
also update the demo plugin to use one of them
2014-09-24 08:26:18 +02:00
Sébastien Loriot 543761cd31 add context menu in c3t3 to extract the boundary of the 3D mesh 2014-09-24 08:26:18 +02:00
Sébastien Loriot e4e65dceda import file to write the surface of a subdomain into a file
use it in the demo, with writting in a .off for now
2014-09-24 08:26:18 +02:00
Sébastien Loriot 7bf22dc6f8 rename Deform_mesh -> Surface_mesh_deformation 2014-09-23 10:39:57 +02:00
Sébastien Loriot d1c866f603 rename scale_space_[begin/end] -> points_[begin/end] 2014-09-22 14:15:39 +02:00