Commit Graph

247 Commits

Author SHA1 Message Date
Maxime Gimeno 060377f231 Add a function to get the diagonal of an item's Bbox. 2016-06-03 11:16:11 +02:00
Maxime Gimeno 56a75095ad Merge branch 'Polyhedron_demo-Use_d_pointers-GF-old' into Polyhedron_demo-Use_d_pointers-GF
Conflicts:
	Polyhedron/demo/Polyhedron/Scene_image_item.cpp
	Polyhedron/demo/Polyhedron/Scene_image_item.h
	Polyhedron/demo/Polyhedron/Scene_polyhedron_selection_item.h
	Polyhedron/demo/Polyhedron/Scene_polylines_item.cpp
2016-06-03 10:38:05 +02:00
Maxime Gimeno b5ef4c2938 Merge branch 'Polyhedron_demo-Use_d_pointers-GF-old' into Polyhedron_demo-Use_d_pointers-GF
Conflicts:
	Polyhedron/demo/Polyhedron/Scene_polyhedron_item.cpp
	Polyhedron/demo/Polyhedron/Scene_polyhedron_item.h
2016-05-31 11:51:59 +02:00
Sébastien Loriot d9a0ef25e3 change init order 2016-05-30 18:04:46 +02:00
Maxime Gimeno 084662ea87 Print the information on screen. 2016-05-27 17:02:08 +02:00
Sébastien Loriot 11b8eb428b Merge pull request #558 from maxGimeno/Polyhedron_demo-display_indices_of_primitives-GF
Display indices of Polyhedron_item primitives in Polyhedron_demo
2016-05-26 17:09:23 +02:00
Sébastien Loriot cea729de5a fix header 2016-05-26 17:05:34 +02:00
Maxime Gimeno 84a32d2685 Merge branch 'Polyhedron_demo-Use_d_pointers-GF-old' into Polyhedron_demo-Use_d_pointers-GF
Conflicts:
	Polyhedron/demo/Polyhedron/Plugins/Surface_mesh_deformation/Scene_edit_polyhedron_item.cpp
	Polyhedron/demo/Polyhedron/Scene_polygon_soup_item.cpp
	Polyhedron/demo/Polyhedron/Scene_polygon_soup_item.h
	Polyhedron/demo/Polyhedron/Scene_polyhedron_item.cpp
	Polyhedron/demo/Polyhedron/Scene_polyhedron_item.h
	Three/include/CGAL/Three/Scene_group_item.h
2016-05-26 10:42:23 +02:00
Maxime Gimeno 9abe59c917 Fix the bug of single textItems on multiple scene_items. 2016-05-25 17:02:26 +02:00
Sebastien Loriot 1127725c11 Merge pull request #1013 from maxGimeno/Polyhedron_demo-OFF_with_color-GF
Polyhedron demo : OFF with colors
2016-05-23 11:28:19 +02:00
Maxime Gimeno 7fde6ef3a2 Fix plugins with disconnected actions. 2016-05-13 16:13:15 +02:00
Maxime Gimeno 775732dcf9 Surface_mesh_item drawing functions 2016-05-12 17:09:43 +02:00
Maxime Gimeno f294d4cade Update example plugins init() functions 2016-05-11 10:55:58 +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 57a5a91ccf Clean-up 2016-05-09 15:15:05 +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 96c9d2eb70 Fix the rebase 2016-05-06 12:15:04 +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 221c91b0d7 Fix typos and add info about the add_item macro 2016-05-06 11:12:09 +02:00
Maxime Gimeno 49388baae5 Correction 2016-05-06 11:12:09 +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 633b8d09d5 Fixed the doc mainpage 2016-05-06 10:51:58 +02:00
Maxime Gimeno b4229241ba Removes the hardcoded actions in Operations 2016-05-06 10:51:58 +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 e7c5ff1dbe Adding the missing doc files 2016-05-06 10:50:49 +02:00
Maxime Gimeno 111f3b666b Fix removeChild 2016-05-06 10:50:49 +02:00
Maxime Gimeno 21f5c82990 WIP Correct the doc 2016-05-06 10:46:21 +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 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 b5659954b7 Renamed the interface 2016-04-27 14:32:51 +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 845a9c7bac Creation of a scene_item_print_interface
- An item that wants to print its primitives must inherit from CGAL::Three::Scene_item_print_interface,
  that contains the two print function. That way, to test if an item is able to print, one just has to check
  if a cast to CGAL::Three::Scene_item_print_interface works.
2016-04-27 14:32:50 +02:00
Maxime Gimeno 6048e6721d Clean-up and documentation for TextRenderer 2016-04-27 14:32:22 +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
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 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 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 c0d9f4f50e WIP QPainter problems 2016-04-27 14:06:27 +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 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 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
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 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 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 f8aabdcc36 Merge pull request #990 from maxGimeno/Polyhedorn_demo-New_picking-GF
Polyhedron_demo : New picking
2016-04-11 11:58:35 +02:00
Maxime Gimeno 24b16b4710 New picking finished. Far more efficient. 2016-04-07 10:13:20 +02:00
Maxime Gimeno 386995bbdc Final fix for itemChanged calls 2016-04-04 16:53:17 +02:00
Maxime Gimeno dfc2143b28 Fix for emit itemChanged() 2016-04-04 11:18:29 +02:00
Maxime Gimeno 56486dbadd Fix for the ctrl+space shortcut 2016-04-04 10:13:21 +02: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
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
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
Maxime Gimeno 8bbb52fad4 Clean-up 2016-03-03 08:41:25 +01:00
Laurent Rineau e76a4727d4 Fix this override of a virtual function 2016-03-01 16:31:08 +01:00
Maxime Gimeno 1adc45b2fc Makes the facets color editable. 2016-02-16 12:16:53 +01:00
Laurent Rineau def3952e0e Merge pull request #767 from bo0ts/Documentation-no_internal_in_title-pmoeller
Remove internal release number from documentation title
2016-02-11 15:42:40 +01:00
Philipp Möller 0a04a3a48f Use CGAL_DOC_VERSION 2016-02-11 15:37:54 +01:00
Maxime Gimeno 0a37521263 Revert "Fix for the context"
This reverts commit 552aaa159f.

Conflicts:
	Linear_cell_complex/examples/Linear_cell_complex/linear_cell_complex_3_viewer_qt.h
2016-02-11 14:16:04 +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
Maxime Gimeno 552aaa159f Fix for the context 2016-02-09 14:48:26 +01:00
Sébastien Loriot 79743f96d9 remove Three from the official doc 2016-02-08 11:42:43 +01:00
Sébastien Loriot 6a405ff7e3 Merge pull request #717 from maxGimeno/Document_the_programs
Polyhedron_Demo : Documentation update
2016-02-08 11:31:05 +01:00
Sébastien Loriot 06c304c614 fix doc warnings spotted by doxygen 1.8.11
Tested locally
2016-02-04 22:23:48 +01:00
Maxime Gimeno 6e111bb5ee Re-arrengement of the doc 2016-02-04 08:48:25 +01:00
Maxime Gimeno cb9ad09559 Documentation update
- Documents the shader programs and explains in what situation they must be used.
2016-02-03 10:34:52 +01:00
Sébastien Loriot e3dc7183f8 rename function 2016-01-26 11:43:01 +01:00
Maxime Gimeno ce9aed08f5 Renaming invalidate_buffers in invalidate_OpenGLBuffers 2016-01-26 11:20:30 +01:00
Maxime Gimeno 271cc81413 contextual_changed removal + textured_polyhedron fix 2016-01-26 11:20:21 +01:00
Sebastien Loriot 1df32a4bd2 Merge pull request #622 from sloriot/Operations_on_polyhedra-plane_clipping_with_corefinement-sloriot
Polyhedron demo: Plugin to clip polyhedra using a plane
2016-01-15 15:25:21 +01:00
Sébastien Loriot 3a80fe3c51 Merge pull request #634 from maxGimeno/Three_doc_update-GF
Doc update
2016-01-14 14:19:08 +01:00
Sébastien Loriot 00df380dfc fix doc warning 2016-01-14 14:18:48 +01:00
Sébastien Loriot 9635dbeeb6 Merge pull request #586 from maxGimeno/Polyhedron_statistics-GF
Polyhedron: add statistics
2016-01-14 14:12:05 +01:00
Maxime Gimeno 39bb4e6e61 Doc update 2016-01-14 12:54:57 +01:00
Maxime Gimeno 73b94bbb5f The clipping plane has 2 different colors, one for each face 2016-01-12 12:30:53 +01:00
Maxime Gimeno 97ba0f33f4 Fix for the header() function
- I forgot half the work on that one.
2016-01-12 10:30:06 +01:00
Maxime Gimeno fa895f3333 Clean-up, link fix and doc 2016-01-12 10:18:52 +01:00
Maxime Gimeno d64b9f9323 Addition of a plugin for plane_clipping polyhedra 2016-01-11 15:37:25 +01:00
Sebastien Loriot 32a3972c33 Merge pull request #592 from afabri/CGAL-dont_submit_cleanup-GF
Towards getting rid of dont_submit files
2016-01-08 14:14:08 +01:00
Sebastien Loriot f3bc10ef81 Merge pull request #549 from afabri/Polyhedron-clipping_in_shader-GF
Improve C3T3 item and meshing of a segmented image
2016-01-07 13:49:16 +01:00
Sébastien Loriot e64ae35a6e Merge pull request #542 from bo0ts/Documentation-release_build2-pmoeller
Allow to build the documentation in a release
2016-01-07 09:21:46 +01:00
Sebastien Loriot d782bc4da8 Merge pull request #556 from sgiraudot/Polyhedron_demo-Quick_moving_display-GF
Polyhedron demo: quick moving display of point sets
2016-01-06 14:55:32 +01:00
Maxime Gimeno c851c4fe3e Finalization
- The holes are available again
- Every type of item can have their own statistics
- There is no more Scene_polyhedron_item in the MainWindow.
2016-01-06 11:39:58 +01:00
Andreas Fabri 9270e4ed60 mainly backquote 2016-01-05 19:01:42 +01:00
Andreas Fabri a41165b6eb various 2016-01-05 18:04:14 +01:00
Andreas Fabri 56bfaa2746 merge 2016-01-05 17:06:04 +01:00
Maxime Gimeno f147e4aebd Some clean-up. 2016-01-04 16:25:58 +01:00
Maxime Gimeno 92aa19ecbf Statistics available for multiple selected polyhedra.
- The median edge length is not available in this case for now because it would be far too long to compute.
2016-01-04 10:08:16 +01:00
Simon Giraudot 8e9f9dd3d6 Use inFastDrawing instead of quick_camera and provide direct access to fast drawing state 2015-12-29 11:40:19 +01:00
Philipp Möller 71b4e9c515 Use CGAL_FULL_VERSION in all Doxyfile.in 2015-12-17 16:33:28 +01:00
Maxime Gimeno ffca2c49b5 Items move even when they are in a group. 2015-12-17 10:01:52 +01:00
Simon Giraudot 7a63e01295 Quick display of point sets: only display small subset when moving large point sets 2015-12-15 10:00:06 +01:00
Maxime Gimeno d1b3937a88 Edges management
- The shader of the edges of the base item discards the edges when it should
- The facets of the cutplane have edges
- The grid is displayed in all the rendering modes
2015-12-14 10:47:34 +01:00
Andreas Fabri e7e5769e9c WIP: introduced a shader that does the clipping 2015-12-11 10:52:35 +01:00
Philipp Möller 98f3d959ec Use generic demo path 2015-12-10 17:05:53 +01:00
Philipp Möller 0ad467b321 Use generic example directories 2015-12-10 17:05:53 +01:00
Sebastien Loriot b03c9bbb7a Merge pull request #533 from maxGimeno/Io_plugin_fix-GF
IO_plugin_interface fix
2015-12-07 16:41:08 +01:00
Sébastien Loriot 196dd5a6bb add missing header license 2015-12-07 15:27:57 +01:00
Sebastien Loriot 7d2e8842fa Merge pull request #522 from maxGimeno/Polyhedron_demo-Hierarchic_view-GF
Polyhedron demo: hierarchic view of items
2015-12-04 17:02:39 +01:00
Maxime Gimeno 5638ffa765 IO_plugin interface_fix
- moved forward declaration of scene_item in the namespace CGAL::Three
2015-12-04 16:11:48 +01:00
Maxime Gimeno b6b9080491 Doc update 2015-11-30 10:42:09 +01:00
Maxime Gimeno 9f816040db WIP Updating the plugins 2015-11-27 15:31:49 +01:00
Maxime Gimeno d74763579c Merge branch 'Polyhedron_demo-Hierarchic_view-GF-old' into Polyhedron_demo-Hierarchic_view-GF
Conflicts:
	Polyhedron/demo/Polyhedron/CMakeLists.txt
	Polyhedron/demo/Polyhedron/MainWindow.cpp
2015-11-27 08:25:36 +01:00
Maxime Gimeno 713dabef77 Update of the API and of the doc 2015-11-26 16:06:45 +01:00
Sebastien Loriot 8e507866bc Merge pull request #480 from maxGimeno/Polyhedron_demo-C3t3_IO_plugin-GF
I/O plugin for c3t3 meshes
2015-11-26 14:34:19 +01:00
Maxime Gimeno e35a69f576 WIP Modifying the API 2015-11-26 09:42:44 +01:00
Maxime Gimeno ec9379685e WIP : Updating example to use group_items 2015-11-25 16:14:47 +01:00
Maxime Gimeno 9b4e2fbc0b Moved Scene_group_item.h to Three and updated the doc. 2015-11-25 15:45:03 +01:00
Maxime Gimeno b7c6742620 Affine transformation color fix 2015-11-25 11:29:13 +01:00
Maxime Gimeno 8218a38c58 ManipulatedFrame issues : fix
- The call to bbox() at each top of a manipulated frame made it verry slow to manipulate frames
  on a big item, because the bbox was computed at every call. The result is now kept in a
  member and updated only when invalidate_buffers is called.

- The color of the cutting plane is repaired.
2015-11-25 09:43:56 +01:00
Maxime Gimeno 5d3c9a2525 WIP Documentation update 2015-11-24 09:42:25 +01:00
Maxime Gimeno 7ad45de6ef Merge branch 'Polyhedron_demo-Hierarchic_view-GF-old' into Polyhedron_demo-Hierarchic_view-GF
Conflicts:
	Polyhedron/demo/Polyhedron/CMakeLists.txt
	Polyhedron/demo/Polyhedron/MainWindow.cpp
	Polyhedron/demo/Polyhedron/Scene.cpp
	Polyhedron/demo/Polyhedron/Scene.h
2015-11-23 09:32:20 +01:00
Maxime Gimeno 9fd0dc69d4 Implementation
- Addition of .mesh and .ma as save format.

- The Polyhedron_demo_io_plugin_interface now has a saveNameFilters and a loadNameFilters that both return
  nameFilters() by default, in case an IO_plugin have diffrent input and output formats.
2015-11-19 15:22:53 +01:00
Sébastien Loriot bc3fa0e792 add missing header 2015-11-18 11:32:44 +01:00
Maxime Gimeno 1317d673b6 Merge branch 'Polyhedron_demo-plugins_in_directories-GF-old' into Polyhedron_demo-plugins_in_directories-GF
Conflicts:
	Polyhedron/demo/Polyhedron/CMakeLists.txt
	Polyhedron/demo/Polyhedron/MainWindow.cpp
	Polyhedron/demo/Polyhedron/Mesh_3_plugin/Meshing_dialog.ui
	Polyhedron/demo/Polyhedron/Mesh_3_plugin/Polyhedron_demo_mesh_3_plugin.cpp
	Polyhedron/demo/Polyhedron/Mesh_3_plugin/Polyhedron_demo_mesh_3_plugin_cgal_code.cpp
	Polyhedron/demo/Polyhedron/Meshing_dialog.ui
	Polyhedron/demo/Polyhedron/Polyhedron_demo_mesh_3_plugin_dialog.ui
	Polyhedron/demo/Polyhedron/Polylines_io_plugin/Polyhedron_demo_polylines_io_plugin.cpp
	Polyhedron/demo/Polyhedron/Scene_plane_item.h
	Polyhedron/demo/Polyhedron/Scene_polylines_item.cpp
	Polyhedron/demo/Polyhedron/Scene_polylines_item.h
	Polyhedron/demo/Polyhedron/Xyz_plugin/Polyhedron_demo_xyz_plugin.cpp
	Three/doc/Three/Three.txt
	Three/include/CGAL/Three/Scene_item.h
2015-11-09 16:04:37 +01:00
Maxime Gimeno 9142fd76c2 Clean-up. 2015-11-05 16:05:48 +01:00
Maxime Gimeno c263923061 Doc fix
- Indentation and title problems fixed
2015-11-05 16:05:48 +01:00
Laurent Rineau 4e61a640d7 add libpolyhedron_demo 2015-11-03 19:12:27 +01:00
Maxime Gimeno 44eacde69c Merge branch 'Polyhedron_demo-plugins_in_directories-GF-old' into Polyhedron_demo-plugins_in_directories-GF
Conflicts:
	Polyhedron/demo/Polyhedron/Scene_item.cpp
	Three/include/CGAL/Three/Scene_item.h
2015-11-03 11:03:39 +01:00
Maxime Gimeno 54e0147772 Merge branch 'Polyhedron_demo-plugins_in_directories-GF-old' into Polyhedron_demo-plugins_in_directories-GF
Conflicts:
	Polyhedron/demo/Polyhedron/Advancing_front_plugin/Polyhedron_demo_advancing_front_plugin.cpp
	Polyhedron/demo/Polyhedron/Advancing_front_plugin/Polyhedron_demo_advancing_front_plugin.ui
	Polyhedron/demo/Polyhedron/CMakeLists.txt
	Polyhedron/demo/Polyhedron/Mesh_3_plugin/Polyhedron_demo_mesh_3_plugin_cgal_code.cpp
	Polyhedron/demo/Polyhedron/Off_to_xyz_plugin/Polyhedron_demo_off_to_xyz_plugin.cpp
	Polyhedron/demo/Polyhedron/Poisson_plugin/Polyhedron_demo_poisson_plugin.cpp
	Polyhedron/demo/Polyhedron/Poisson_plugin/Polyhedron_demo_poisson_plugin.ui
	Polyhedron/demo/Polyhedron/Poisson_plugin/Polyhedron_demo_poisson_plugin_impl.cpp
	Polyhedron/demo/Polyhedron/Polyhedron_demo_poisson_plugin_impl.cpp
	Polyhedron/demo/Polyhedron/Polyhedron_demo_surface_reconstruction_plugin_impl.cpp
	Polyhedron/demo/Polyhedron/Scale_space_reconstruction_plugin/Polyhedron_demo_scale_space_reconstruction_plugin.cpp
	Polyhedron/demo/Polyhedron/Scale_space_reconstruction_plugin/Polyhedron_demo_scale_space_reconstruction_plugin.ui
2015-10-30 12:55:19 +01:00
Laurent Rineau b73d1662e0 move attrib_buffers and getShaderProgram to Viewer 2015-10-29 18:51:10 +01:00
Maxime Gimeno 07f4ea68b5 Addition of an example
- Added the example about how to create an external plugin
2015-10-21 15:00:21 +02:00
Maxime Gimeno 69135cb753 Addition of some doc about the plugin creation 2015-10-21 12:39:10 +02:00
Laurent Rineau 3a61c26695 Remove Three/examples/ and Three/demo/ 2015-10-20 15:13:09 +02:00
Maxime Gimeno 6ceaa4fb68 Creation of an external plugin
- Triangle plugin is now external.
2015-10-20 10:22:21 +02:00
Maxime Gimeno b708d6a8fd Scene_item moved
- Scene-item.h moved to Three.
2015-10-20 09:00:26 +02:00
Maxime Gimeno 3707151474 Warnings fix 2015-10-15 16:21:44 +02:00
Laurent Rineau 29faf89541 Add license and copyrights notices 2015-10-14 15:35:48 +02:00
Maxime Gimeno 38dca64157 Merge branch 'CGAL_Polyhedron_Doxygen_GF-old' into CGAL_Polyhedron_Doxygen_GF
Conflicts:
	Polyhedron/demo/Polyhedron/Scene_item.h
	Polyhedron/demo/Polyhedron/Scene_polyhedron_item.cpp
	Polyhedron/demo/Polyhedron/Scene_polyhedron_selection_item.h
	Polyhedron/demo/Polyhedron/Scene_polyhedron_shortest_path_item.h
	Polyhedron/demo/Polyhedron/Scene_polyhedron_transform_item.h
	Polyhedron/demo/Polyhedron/Scene_textured_polyhedron_item.h
2015-10-14 12:46:48 +02:00
Maxime Gimeno 1c0c2c8858 Merge branch 'CGAL_Polyhedron_Doxygen_GF-old' into CGAL_Polyhedron_Doxygen_GF
Conflicts:
	Documentation/doc/Documentation/Doxyfile.in
	Documentation/doc/Documentation/dependencies
	Polyhedron/demo/Polyhedron/Camera_positions_list.cpp
	Polyhedron/demo/Polyhedron/MainWindow.cpp
	Polyhedron/demo/Polyhedron/MainWindow.h
	Polyhedron/demo/Polyhedron/Polyhedron_demo_camera_positions_plugin.cpp
	Polyhedron/demo/Polyhedron/Polyhedron_demo_normal_estimation_plugin.cpp
	Polyhedron/demo/Polyhedron/Polyhedron_demo_off_plugin.cpp
	Polyhedron/demo/Polyhedron/Polyhedron_demo_plugin_helper.cpp
	Polyhedron/demo/Polyhedron/Polyhedron_demo_point_set_average_spacing_plugin.cpp
	Polyhedron/demo/Polyhedron/Polyhedron_demo_point_set_bilateral_smoothing_plugin.cpp
	Polyhedron/demo/Polyhedron/Polyhedron_demo_point_set_simplification_plugin.cpp
	Polyhedron/demo/Polyhedron/Polyhedron_demo_point_set_smoothing_plugin.cpp
	Polyhedron/demo/Polyhedron/Polyhedron_demo_point_set_upsampling_plugin.cpp
	Polyhedron/demo/Polyhedron/Polyhedron_demo_point_set_wlop_plugin.cpp
	Polyhedron/demo/Polyhedron/Scene.h
	Polyhedron/demo/Polyhedron/Scene_item.h
	Polyhedron/demo/Polyhedron/Scene_polylines_item.h
	Polyhedron/demo/Polyhedron/Viewer.h
2015-10-09 13:59:33 +02:00
Maxime Gimeno 61bf99037f Doc fix 2015-10-08 14:50:58 +02:00
Maxime Gimeno 782ac5b9fa Doc fix 2015-10-08 14:26:03 +02:00
Maxime Gimeno 47e372910c Doc fix 2015-10-08 14:25:26 +02:00
Sébastien Loriot 26c7b0fbe4 add missing bibtex entry 2015-10-07 14:34:18 +02:00
Maxime Gimeno e88a7f6da7 Doc about dock widgets done. 2015-10-07 10:10:13 +02:00
Maxime Gimeno 3bda315695 WIP Adding dock about QDockWidget 2015-10-05 13:03:27 +02:00
Maxime Gimeno 7b7b61e289 WIP Adding doc about plugin using ui files 2015-10-05 09:01:29 +02:00
Maxime Gimeno c7c6772dfd Segfault fix 2015-10-02 15:58:39 +02:00
Maxime Gimeno 250520c80a Example, MainWindow and Scene Item added to the doc. 2015-09-28 08:39:28 +02:00
Maxime Gimeno 6395258afd Class List added 2015-09-24 12:49:15 +02:00
Maxime Gimeno 418284475b Added some info 2015-09-23 15:55:58 +02:00
Maxime Gimeno 2ecf612b09 Example added 2015-09-23 15:15:30 +02:00
Maxime Gimeno d264b882f5 Package Three creation
- Creatio of a new package containing the base class for the plugin API.
2015-09-23 13:40:30 +02:00