Commit Graph

4385 Commits

Author SHA1 Message Date
Maxime Gimeno 0111db6173 Add color writing for OFF format. Fixes Vertex_color display. 2017-06-26 16:57:01 +02:00
Maxime Gimeno e362b83c00 Add OBJ reading and writing, along with OFF writing for SM_item. 2017-06-26 15:28:11 +02:00
Laurent Rineau d87dc4473d Merge pull request #2015 from maxGimeno/PMP_iso_rem-Use_SM-GF
Isotropic_ remeshing_plugin use SM
2017-06-23 16:11:40 +02:00
Laurent Rineau 54320bd745 Merge pull request #2018 from maxGimeno/Plugins_use_SM-Mesh_simplifications-GF
Mesh_simplifications_plugin and Shortest_path use SM
2017-06-23 16:11:31 +02:00
Laurent Rineau 4d3b95700c Merge pull request #1993 from maxGimeno/Io_plugins_with_surface_mesh
Io plugins with surface mesh
2017-06-23 16:11:22 +02:00
Laurent Rineau dd7380979d Merge pull request #2166 from maxGimeno/Fix_selection_item_reload-GF
Polyhedron_demo: Fix selection_item reloading
2017-06-22 16:44:24 +02:00
Laurent Rineau 7b7e79f989 Merge pull request #2176 from maxGimeno/Override_cursor_fixes-GF
Polyhedron_demo: Fixes for the override cursor.
2017-06-22 16:44:16 +02:00
Maxime Gimeno d87da4a2c6 Fix config for shortest_path_item (poly OR sm) 2017-06-20 09:55:05 +02:00
Laurent Rineau 86ecb6e466 Merge pull request #2028 from maxGimeno/Update_Three_doc-GF
Update the Three documentation
2017-06-16 12:07:05 +02:00
Laurent Rineau 7eb24fdbbb Merge pull request #2164 from maxGimeno/Save_as_hint-GF
Polyhedron_demo: Enhance the 'Save as' dialog
2017-06-16 12:06:48 +02:00
Laurent Rineau 8693ab4d1d Merge pull request #2152 from lrineau/Mesh_3-small_fixes-GF
Mesh 3: small fixes
2017-06-16 12:06:41 +02:00
Laurent Rineau efc89a9db9 Merge pull request #2151 from maxGimeno/C3t3_spheres_colors-GF
Polyhedron_demo: Change spheres colors in c3t3
2017-06-16 12:06:33 +02:00
Laurent Rineau 01fc5c3b33 Merge branch 'releases/CGAL-4.10-branch' 2017-06-16 11:45:45 +02:00
Maxime Gimeno eeda178c8f Fix after rebase 2017-06-15 15:04:13 +02:00
Maxime Gimeno fe788b641b Fix Shortest_path_plugin for Polyhedron 2017-06-15 14:47:24 +02:00
Maxime Gimeno 515c15f9f2 Shortest_path_item works with SM. 2017-06-15 14:47:23 +02:00
Maxime Gimeno fdbf7d167b Simplification_mesh_plugin works with Surface_mesh_items. 2017-06-15 14:47:23 +02:00
Maxime Gimeno c3a64c35a9 Fix after rebase 2017-06-15 14:44:10 +02:00
Maxime Gimeno 0e0e825116 Remove excessive typename 2017-06-15 12:48:10 +02:00
Maxime Gimeno 459e54c00c Make the isotropic_remeshing_plugin work with surface_mesh_items. 2017-06-15 12:48:08 +02:00
Maxime Gimeno 71296003ed fix after rebase 2017-06-15 12:26:42 +02:00
Maxime Gimeno 9daedafe9c Fix after rebase. 2017-06-15 12:23:47 +02:00
Maxime Gimeno 72fd352aa1 Fix call to scene->PolyhedronMode() 2017-06-15 12:23:46 +02:00
Maxime Gimeno aa849786e6 VTK_plugin exists for Surface_mesh_items 2017-06-15 12:23:46 +02:00
Maxime Gimeno c1447c02eb STL_plugin works with Surface_mesh 2017-06-15 12:23:46 +02:00
Maxime Gimeno 571d716ce9 GOCAD_io_plugin works with surface_mesh. 2017-06-15 12:23:46 +02:00
Maxime Gimeno 4b135487d7 Some fixes for the override cursor. 2017-06-15 10:20:46 +02:00
Andreas Fabri 30838adea2 Merge branch 'Polyhedron_demo-Use_sm_in_Deformation-GF' of github.com:maxGimeno/cgal into Polyhedron_demo-Use_sm_in_Deformation-GF 2017-06-14 10:39:40 +02:00
Andreas Fabri 665e4bbd0b std::size_t -> unsigned int to adress warnings 2017-06-14 10:39:15 +02:00
Maxime Gimeno bd45c39ef3 Fix warnings 2017-06-14 09:32:13 +02:00
Andreas Fabri ec40b4252d fix export/import 2017-06-12 16:35:18 +02:00
Maxime Gimeno 2bf8a0a17e Fix the segfault when reloading a selection_item 2017-06-09 14:30:28 +02:00
Maxime Gimeno eab4175364 Add an automatically generated name to the 'Save as...' dialog. 2017-06-08 15:43:26 +02:00
Maxime Gimeno 91de52e05d fix warnings 2017-06-07 11:22:01 +02:00
Maxime Gimeno 0badde2223 fix warnings 2017-06-07 11:18:51 +02:00
Laurent Rineau ee2545eb10 Fix MainWindow::viewerShow when the box is degenerate 2017-06-02 17:56:50 +02:00
Maxime Gimeno 519454ef8c Create groups in points rendering mode in shape_detection_plugin 2017-06-02 15:25:26 +02:00
Maxime Gimeno 099037cb7a Make the spheres color editable at runtime 2017-06-02 14:56:09 +02:00
Maxime Gimeno 724b18fb51 Fix color in shader and spheres color depends on the in_dimension of the associated vertex. 2017-06-02 14:20:09 +02:00
Maxime Gimeno 4ec4ef63f2 Fix SMesh error 2017-06-01 16:52:05 +02:00
Maxime Gimeno 104ce12c84 Add source for focus hack 2017-06-01 16:33:47 +02:00
Maxime Gimeno 2de2df3442 Fix the width/height problems with retina 2017-06-01 16:28:43 +02:00
Maxime Gimeno 6af84e02b5 Add comments for hack and restore old drawEdges and drawPoints in group_item 2017-06-01 13:08:36 +02:00
Maxime Gimeno ba9049ec5c Enhance axis system 2017-06-01 13:08:36 +02:00
Maxime Gimeno 775ab3b6d2 Workaround to fix focus problem on mac. 2017-06-01 13:08:33 +02:00
Maxime Gimeno f563d89ee9 Fix group drawing for shadedpoints. 2017-06-01 13:07:29 +02:00
Maxime Gimeno 134a3050c9 Fix vaos feeding to programs in case there are normals in the point set. 2017-06-01 13:07:29 +02:00
Maxime Gimeno cc3a635047 Don't compute points data but use lines instead. 2017-06-01 13:07:29 +02:00
Maxime Gimeno 54d5825855 Replace unexisting headers 2017-06-01 09:41:28 +02:00
Andreas Fabri 518c6cc1f4 Fix the demo 2017-05-31 21:16:00 +02:00