X-Git-Url: https://melusine.eu.org/syracuse/G/git/?a=blobdiff_plain;f=test%2Fdelaunay.tex;h=1c3d0ef49c872352db3a092b371130f2a0502588;hb=581ccb9539f0af81056af73d3354fd895f1d7d55;hp=ac45fa4e0cbc5f5960a0a9690432039551c77cec;hpb=f5b04999414b0f514d2fea252417c05ac2efeeac;p=delaunay.git

diff --git a/test/delaunay.tex b/test/delaunay.tex
index ac45fa4..1c3d0ef 100644
--- a/test/delaunay.tex
+++ b/test/delaunay.tex
@@ -7,11 +7,27 @@
 \pagestyle{empty}
 \begin{document}
 
+
+\section{MetaPost}
+
 \buildMeshBW[print=points,  meshpoint = I, color=red]{(0,0);(3.5,3);(7,0);(7.5,5);(1.61,3.14);(3,1);(6,1.5)}
 
-\buildMeshBW[tikz, bbox = show]{(0,0);(3.5,3);(7,0);(7.5,5);(1.61,3.14);(3,1);(6,1.5)}
+%\buildMeshBW[tikz, bbox = show]{(0,0);(3.5,3);(7,0);(7.5,5);(1.61,3.14);(3,1);(6,1.5)}
+
+\buildMeshBW[mode=ext,bbox = show, color=red,colorBbox = blue]{mesh.txt}
+
+\drawPointsMesh[mode=ext,bbox = show, color=red,print=points]{mesh.txt}
 
-\buildMeshBW[mode=ext]{mesh.txt}
+\drawPointsMesh[mode=ext,bbox = show, color=red]{mesh.txt}
+
+
+\buildMeshBWinc[mode=ext,bbox = show, color=red,colorBbox = blue]{mesh.txt}{%
+  beginfig(0);
+}%
+{%
+  draw MeshPoints[3] -- MeshPoints[9];
+  endfig;
+}
 
 \meshAddPointBW[
 meshpoint = x,
@@ -21,12 +37,13 @@ colorCircle = green!70,
 scale=0.6cm]
 {(0,0);(3.5,3);(7,0);(7.5,5);(1.61,3.14);(6,4)}{(3,1)}
 \meshAddPointBW[
-meshpoint = x,
-colorBack=red!10,
-colorNew = green!20!red,
-scale=0.6cm,
-step=cavity]
-{(0,0);(3.5,3);(7,0);(7.5,5);(1.61,3.14);(6,4)}{(3,1)}
+ color = green,
+ meshpoint = x,
+ colorBack=red!10,
+ colorNew = green!20!red,
+ scale=0.6cm,
+ step=cavity]
+ {(0,0);(3.5,3);(7,0);(7.5,5);(1.61,3.14);(6,4)}{(3,1)}
 \meshAddPointBW[
 meshpoint = x,
 colorBack=red!10,
@@ -34,7 +51,8 @@ colorNew = green!20!red,
 scale=0.6cm,
 step=badtriangles,
 newpoint = y,
-bbox = show
+bbox = show,
+colorBbox = black
 ]
 {(0,0);(3.5,3);(7,0);(7.5,5);(1.61,3.14);(6,4)}{(3,1)}
 
@@ -56,15 +74,101 @@ colorNew = green!20!red,
 scale=0.6cm,
 step=badtriangles,
 newpoint = y,
-bbox = show
+bbox = show,
+colorBbox = blue!20,
 ]
 {(0,0);(3.5,3);(7,0);(7.5,5);(1.61,3.14);(6,4)}{(3,1)}{%
 beginfig(0);
 }%
 {%
-  draw (-1,-1)*u--(8.5,-1)*u--(8.5,6)*u--(-1,6)*u--cycle;
+  draw (-1,-1)*u--(8.5,-1)*u--(8.5,6)*u--(-1,6)*u--cycle withcolor \mpcolor{red};
 endfig;
 }
 
 
+\section{tikz}
+
+\buildMeshBW[tikz,print=points,  meshpoint = I,
+color=red]{(0,0);(3.5,3);(7,0);(7.5,5);(1.61,3.14);(3,1);(6,1.5)}
+
+\buildMeshBW[tikz,mode=ext, color=red]{mesh.txt}
+
+\drawPointsMesh[tikz,mode=ext,bbox = show,
+color=red,print=points]{mesh.txt}
+\drawPointsMesh[tikz,mode=ext,bbox = show, color=red]{mesh.txt}
+
+\buildMeshBWinc[tikz,mode=ext,bbox = show, colorBbox = blue]{mesh.txt}{%
+}%
+{%
+  \draw[color = red] (0,0) -- (3,3);
+}
+
+\meshAddPointBW[
+tikz,
+color = green,
+meshpoint = x,
+colorBack=red!10,
+colorNew = green!20!red,
+scale=0.6cm,
+step=cavity]
+{(0,0);(3.5,3);(7,0);(7.5,5);(1.61,3.14);(6,4)}{(3,1)}
+
+\meshAddPointBWinc[
+tikz,
+meshpoint = x,
+colorBack=red!10,
+colorNew = green!20!red,
+scale=0.6cm,
+step=badtriangles,
+newpoint = y,
+bbox = show,
+colorBbox = blue!20,
+]{(0,0);(3.5,3);(7,0);(7.5,5);(1.61,3.14);(6,4)}{(3,1)}
+{}{\draw[color=green] (0,0) -- (3,3);}
+
+\meshAddPointBW[
+tikz,
+meshpoint = x,
+colorBack=red!10,
+colorNew = green!20!red,
+scale=0.6cm,
+step=badtriangles,
+newpoint = y,
+bbox = show,
+colorBbox = black
+]
+{(0,0);(3.5,3);(7,0);(7.5,5);(1.61,3.14);(6,4)}{(3,1)}
+
+
+% \def\CircumPoint{y}
+% \luampcolor
+% \directlua{
+%   buildVoronoiMP("mesh.txt","ext","points","","1cm","show")
+% }
+\buildVoronoiBW[mode=ext]{mesh.txt}
+\buildVoronoiBW[mode=ext,delaunay=show,colorVoronoi=green!60!blue]{mesh.txt}\par
+\buildVoronoiBW[mode=ext,print=points,delaunay=show,bbox=show,meshpoint=x,circumpoint=y]{mesh.txt}
+
+
+\buildVoronoiBW[tikz,mode=ext]{mesh.txt}
+\buildVoronoiBW[tikz,mode=ext,delaunay=show,colorVoronoi=green!60!blue]{mesh.txt}\par
+\buildVoronoiBW[tikz,mode=ext,print=points,delaunay=show,bbox=show,meshpoint=x,circumpoint=y]{mesh.txt}
+
+\buildVoronoiBWinc[mode=ext]{mesh.txt}{beginfig(0);}{endfig;}
+\buildVoronoiBWinc[tikz,mode=ext,print=points]{mesh.txt}{}{}
+
+
+\buildVoronoiBWinc[tikz,mode=ext,print=points,delaunay=show,meshpoint=x,circumpoint=y]{mesh.txt}{}{\draw[color=blue,thick] (0,0)--(3,3);}
+
+\def\MeshPoints{P}
+\directlua{
+  drawGmshMP("maillage.msh","points","8cm")
+}\par
+\directlua{
+  gmshVoronoiMP("maillage.msh","none","8cm","none")
+}
+
+\drawGmsh[tikz,scale=8cm]{maillage.msh}
+
+\gmshVoronoi[tikz,scale=8cm,print=points,delaunay=show]{maillage.msh}
 \end{document}