diff --git a/.gitattributes b/.gitattributes index baf4044fb41..856ac566de3 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1420,6 +1420,8 @@ Segment_Delaunay_graph_2/doc_tex/Segment_Delaunay_graph_2_ref/sdg-join_split.eps Segment_Delaunay_graph_2/doc_tex/Segment_Delaunay_graph_2_ref/sdg-join_split.fig -text Segment_Delaunay_graph_2/doc_tex/Segment_Delaunay_graph_2_ref/sdg-join_split.gif -text svneol=unset#unset Segment_Delaunay_graph_2/doc_tex/Segment_Delaunay_graph_2_ref/sdg-join_split.pdf -text svneol=unset#unset +Skin_surface_3/doc_tex/Skin_surface_3/convexTwoPoints.eps -text +Skin_surface_3/doc_tex/Skin_surface_3/convexTwoPoints.png -text Skin_surface_3/doc_tex/Skin_surface_3/marching.eps -text Skin_surface_3/doc_tex/Skin_surface_3/marching.png -text Skin_surface_3/doc_tex/Skin_surface_3/molecule.eps -text diff --git a/Skin_surface_3/doc_tex/Skin_surface_3/SkinSurface3.tex b/Skin_surface_3/doc_tex/Skin_surface_3/SkinSurface3.tex index 6dd66768e2e..07b15cb255f 100644 --- a/Skin_surface_3/doc_tex/Skin_surface_3/SkinSurface3.tex +++ b/Skin_surface_3/doc_tex/Skin_surface_3/SkinSurface3.tex @@ -43,8 +43,8 @@ model of the concept \ccc{Surface_3}. \begin{figure} \begin{ccTexOnly} \begin{center} + \includegraphics[width=.25\textwidth]{Skin_surface_3/convexTwoPoints} \includegraphics[width=.25\textwidth]{Skin_surface_3/skinTwoPoints} -% \includegraphics[width=.25\textwidth]{Skin_surface_3/skinTwoPoints} \end{center} \end{ccTexOnly} \begin{ccHtmlOnly} @@ -54,10 +54,11 @@ model of the concept \ccc{Surface_3}. curve of two weighted points"> \end{ccHtmlOnly} - \caption{\label{fig:twoPoints} The skin curve of two weighted points - (the two dashed circles). The smaller circles form a subset of the - shrunk convex hull of the input points. Its boundary forms the skin - curve. } + \caption{\label{fig:twoPoints} Left: Convex combinations of two + weighted points (the two dashed circles). Right: The skin curve of + the weighted points. The smaller circles form a subset of the + shrunk convex hull of the input points. Its boundary forms the + skin curve. } \end{figure} This section first briefly reviews skin surfaces. For a more thorough @@ -88,7 +89,7 @@ spheres we refer to \cite{p-gcc-70}. Starting from a weighted point $\ssWpoint{p}=({p},\textsc{P})$, the shrunk weighted point $\ssWpoint{p}^s$ is obtained by taking a convex combination with the unweighted point centered at $p$, formally -$\ssWpoint{p}^s = s \ssWpoint{p} + (1-s) p$. A simple calculations +$\ssWpoint{p}^s = s \ssWpoint{p} + (1-s) p$. A simple calculation shows that, $\ssWpoint{p}^s = ({p},s\cdot \textsc{p})$. The set $\ssWpoint{P}^s$ is the set obtained by shrinking every weighted point of $\ssWpoint{P}$ by a factor $s$. The shrunk weighted points of @@ -113,13 +114,13 @@ set of balls. %pieces quadrics. \section{The interface} -The interface to the skin surface package consists of three distinct -global functions and a class \ccc{Skin_surface_3} which is a model of -the concept \ccc{Surface_3}. The first function takes a list of -weighted points and a shrink factor and outputs a -\ccc{Skin_surface_3}. The parameter \ccc{Tag} is a tag that controls -whether the input balls are grown in such a way that the skin surface -wraps around the input balls. There are two overloaded functions: +The interface to the skin surface package consists of three global +functions and a class \ccc{Skin_surface_3} which is a model of the +concept \ccc{Surface_3}. The first function takes a list of weighted +points and a shrink factor and outputs a \ccc{Skin_surface_3}. The +parameter \ccc{Tag} is a tag that controls whether the input balls are +grown in such a way that the skin surface wraps around the input +balls. There are two overloaded functions: \ccGlobalFunction{template