Commit Graph

2420 Commits

Author SHA1 Message Date
Jane Tournois 021f042e7c use enums for new vaos[Frame_plane] 2015-11-16 14:20:14 +01:00
Jane Tournois 0a12beb5f9 Merge branch 'Polygon_mesh_processing-local_remeshing-GF-old' into Polygon_mesh_processing-local_remeshing-GF 2015-11-16 13:06:03 +01:00
Jane Tournois 27bc02ebcf Revert "fix compilation of split_long_edges for Polyhedron"
This reverts commit 213a280eef.

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

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

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

For good debugging of Windows linker errors, `-fvisibility=hidden` must
also be added to the CMake variable `CMAKE_CXX_FLAGS`.
2015-11-04 13:34:20 +01:00
Maxime Gimeno 1ee2b905d4 Merge branch 'Polyhedron_demo-merge_Mesh_3_demo-GF-old' into Polyhedron_demo-merge_Mesh_3_demo-GF
Conflicts:
	Polyhedron/demo/Polyhedron/create_sphere.h
2015-11-04 12:50:25 +01:00
Maxime Gimeno 8cdf6cc625 Merge branch 'Polyhedron_demo-optimisation_vbos-gf-old' into Polyhedron_demo-optimisation_vbos-gf 2015-11-04 12:16:33 +01:00