diff --git a/.gitattributes b/.gitattributes index 2d753a75a91..efcd7ae4688 100644 --- a/.gitattributes +++ b/.gitattributes @@ -3321,6 +3321,8 @@ Linear_cell_complex/doc/Linear_cell_complex/fig/exemple-carte-with_point_3d-sew. Linear_cell_complex/doc/Linear_cell_complex/fig/exemple-carte-with_point_3d-sew.png -text svneol=unset#image/png Linear_cell_complex/doc/Linear_cell_complex/fig/exemple-carte-with_point_3d-sew2.pdf -text svneol=unset#application/pdf Linear_cell_complex/doc/Linear_cell_complex/fig/exemple-carte-with_point_3d-sew2.png -text svneol=unset#image/png +Linear_cell_complex/doc/Linear_cell_complex/fig/exemple-lcc3d-sew.png -text +Linear_cell_complex/doc/Linear_cell_complex/fig/first-example-lcc.png -text Linear_cell_complex/doc/Linear_cell_complex/fig/import_graph.pdf -text svneol=unset#application/pdf Linear_cell_complex/doc/Linear_cell_complex/fig/import_graph.png -text svneol=unset#image/png Linear_cell_complex/doc/Linear_cell_complex/fig/insert-edge.pdf -text svneol=unset#application/pdf @@ -3335,6 +3337,7 @@ Linear_cell_complex/doc/Linear_cell_complex/fig/intuitif-example-lcc-zoom2.pdf - Linear_cell_complex/doc/Linear_cell_complex/fig/intuitif-example-lcc-zoom2.png -text svneol=unset#image/png Linear_cell_complex/doc/Linear_cell_complex/fig/intuitif-example-lcc.pdf -text svneol=unset#application/pdf Linear_cell_complex/doc/Linear_cell_complex/fig/intuitif-example-lcc.png -text svneol=unset#image/png +Linear_cell_complex/doc/Linear_cell_complex/fig/lcc-examples-2d-3d.png -text Linear_cell_complex/doc/Linear_cell_complex/fig/logo-lcc-small.png -text svneol=unset#image/png Linear_cell_complex/doc/Linear_cell_complex/fig/logo-lcc.png -text svneol=unset#image/png Linear_cell_complex/doc/Linear_cell_complex/fig/make_cuboid.pdf -text svneol=unset#application/pdf @@ -3353,6 +3356,7 @@ Linear_cell_complex/doc/Linear_cell_complex/fig/make_triangle.pdf -text svneol=u Linear_cell_complex/doc/Linear_cell_complex/fig/make_triangle.png -text svneol=unset#image/png Linear_cell_complex/doc/Linear_cell_complex/fig/object2d.pdf -text svneol=unset#application/pdf Linear_cell_complex/doc/Linear_cell_complex/fig/object2d.png -text svneol=unset#image/png +Linear_cell_complex/doc/Linear_cell_complex/fig/objects2d-3d.png -text Linear_cell_complex/doc/Linear_cell_complex/fig/plane-graph.pdf -text svneol=unset#application/pdf Linear_cell_complex/doc/Linear_cell_complex/fig/plane-graph.png -text svneol=unset#image/png Linear_cell_complex/doc/Linear_cell_complex/fig/triangulation.pdf -text svneol=unset#application/pdf diff --git a/Linear_cell_complex/doc/Linear_cell_complex/Linear_cell_complex.txt b/Linear_cell_complex/doc/Linear_cell_complex/Linear_cell_complex.txt index c80f897c5b1..998d916bb23 100644 --- a/Linear_cell_complex/doc/Linear_cell_complex/Linear_cell_complex.txt +++ b/Linear_cell_complex/doc/Linear_cell_complex/Linear_cell_complex.txt @@ -28,8 +28,7 @@ the linear geometrical embedding, a point (a model of associated to each vertex of the combinatorial map. \anchor figexempleintroductif -\image html object2d.png -\image html intuitif-example-lcc-object.png +\image html objects2d-3d.png
Examples of objects with linear geometry. Left: A 2D object @@ -47,9 +46,7 @@ geometrical part of the object is described by associating a point to each vertex of the map. \anchor figexempleintroductiflcc -\image html intuitif-example-lcc.png -\image html intuitif-example-lcc-zoom.png -\image html intuitif-example-lcc-zoom2.png +\image html first-example-lcc.png
Example of 3D linear cell complex describing the object given in Figure \ref figexempleintroductif (Right). Left: The 3D linear cell complex which contains 54 darts (18 for each 3-cell) where each vertex is associated with a point, here a `CGAL::Point_3`. Blue segments represent \f$ \beta_3\f$ relations. Middle: Zoom around the central edge which details the six darts belonging to the edge and the associations between darts and points. Right: Zoom around the facet between light gray and white 3-cells, which details the eight darts belonging to the facet and the associations between darts and points (given by red segments). @@ -119,8 +116,7 @@ We can see two examples of `CGAL::Linear_cell_complex` in Figure \ref figcombi_map_with_point. \anchor figcombi_map_with_point -\image html plane-graph.png -\image html basic-example3D.png +\image html lcc-examples-2d-3d.png
Examples of `CGAL::Linear_cell_complex`. Gray disks show the attributes associated to vertices. Associations between darts and attributes are drawn by small lines between darts and disks. Left: Example of `CGAL::Linear_cell_complex<2,2>`. Right: Example of `CGAL::Linear_cell_complex<3,3>`.
@@ -223,8 +219,7 @@ Intuitively, the geometry of the second 2-cell is deformed to fit to the first 2-cell. \anchor figlccexemplesew -\image html exemple-carte-with_point_3d-sew.png -\image html exemple-carte-with_point_3d-sew2.png +\image html exemple-lcc3d-sew.png
Example of 3-sew operation for linear cell complex. Left: A 3D linear cell complex containing two 3-cells that are not connected. Vertex attributes are drawn with circles containing point coordinates. Associations between darts and attributes are drawn with small lines between darts and disks. Right: The 3D linear cell complex obtained as result of `sew<3>(1,5)` (or `sew<3>(2,8)`, or `sew<3>(3,7)`, or `sew<3>(4,6)`). The eight 0-attributes around the facet between the two 3-cells before the sew operation, are merged into four 0-attributes after. The geometry of the pyramid is deformed since its base is fitted on the 2-cell of the cube.
diff --git a/Linear_cell_complex/doc/Linear_cell_complex/fig/exemple-lcc3d-sew.png b/Linear_cell_complex/doc/Linear_cell_complex/fig/exemple-lcc3d-sew.png new file mode 100644 index 00000000000..3a068846016 Binary files /dev/null and b/Linear_cell_complex/doc/Linear_cell_complex/fig/exemple-lcc3d-sew.png differ diff --git a/Linear_cell_complex/doc/Linear_cell_complex/fig/first-example-lcc.png b/Linear_cell_complex/doc/Linear_cell_complex/fig/first-example-lcc.png new file mode 100644 index 00000000000..edef8afa4e7 Binary files /dev/null and b/Linear_cell_complex/doc/Linear_cell_complex/fig/first-example-lcc.png differ diff --git a/Linear_cell_complex/doc/Linear_cell_complex/fig/lcc-examples-2d-3d.png b/Linear_cell_complex/doc/Linear_cell_complex/fig/lcc-examples-2d-3d.png new file mode 100644 index 00000000000..306b4538b7e Binary files /dev/null and b/Linear_cell_complex/doc/Linear_cell_complex/fig/lcc-examples-2d-3d.png differ diff --git a/Linear_cell_complex/doc/Linear_cell_complex/fig/objects2d-3d.png b/Linear_cell_complex/doc/Linear_cell_complex/fig/objects2d-3d.png new file mode 100644 index 00000000000..4bb67296553 Binary files /dev/null and b/Linear_cell_complex/doc/Linear_cell_complex/fig/objects2d-3d.png differ