Un peu de nettoyage et rajout de déclaration local

[delaunay.git] / luamesh-tex.lua

diff --git a/luamesh-tex.lua b/luamesh-tex.lua
index 1581638..56b635c 100644 (file)
--- a/luamesh-tex.lua
+++ b/luamesh-tex.lua
@@ -140,9 +140,9 @@ end
 
 -- buildVoronoi with MP
 function buildVoronoiMPBW(chaine,mode,points,bbox,scale,tri,styleD,styleV)
-   listPoints = buildList(chaine, mode)
-   triangulation = BowyerWatson(listPoints,bbox)
-   listVoronoi = buildVoronoi(listPoints, triangulation)
+   local listPoints = buildList(chaine, mode)
+   local triangulation = BowyerWatson(listPoints,bbox)
+   local listVoronoi = buildVoronoi(listPoints, triangulation)
    output = traceVoronoiMP(listPoints,triangulation,listVoronoi,points,tri,styleD,styleV)
    output = "\\leavevmode\\begin{mplibcode}beginfig(0);u:="..scale.. ";" .. output .."endfig;\\end{mplibcode}"
    tex.sprint(output)
@@ -151,9 +151,9 @@ end
 
 -- buildVoronoi with TikZ
 function buildVoronoiTikZBW(chaine,mode,points,bbox,scale,tri,color,colorBbox,colorVoronoi,styleD,styleV)
-   listPoints = buildList(chaine, mode)
-   triangulation = BowyerWatson(listPoints,bbox)
-   listVoronoi = buildVoronoi(listPoints, triangulation)
+   local listPoints = buildList(chaine, mode)
+   local triangulation = BowyerWatson(listPoints,bbox)
+   local listVoronoi = buildVoronoi(listPoints, triangulation)
    output = traceVoronoiTikZ(listPoints,triangulation,listVoronoi,points,tri,color,colorBbox,colorVoronoi,styleD,styleV)
    output = "\\noindent\\begin{tikzpicture}[x=" .. scale .. ",y=" .. scale .."]" .. output .."\\end{tikzpicture}"   tex.sprint(output)
 end
@@ -161,9 +161,9 @@ end
 
 -- buildVoronoi with MP
 function buildVoronoiMPBWinc(chaine,beginning, ending,mode,points,bbox,scale,tri,styleD,styleV)
-   listPoints = buildList(chaine, mode)
-   triangulation = BowyerWatson(listPoints,bbox)
-   listVoronoi = buildVoronoi(listPoints, triangulation)
+   local listPoints = buildList(chaine, mode)
+   local triangulation = BowyerWatson(listPoints,bbox)
+   local listVoronoi = buildVoronoi(listPoints, triangulation)
    output = traceVoronoiMP(listPoints,triangulation,listVoronoi,points,tri,styleD,styleV)
    output = "\\leavevmode\\begin{mplibcode}u:="..scale..";"..beginning .. output .. ending .. "\\end{mplibcode}"
    tex.sprint(output)
@@ -172,9 +172,9 @@ end
 
 -- buildVoronoi with TikZ
 function buildVoronoiTikZBWinc(chaine,beginning, ending,mode,points,bbox,scale,tri,color,colorBbox,colorVoronoi)
-   listPoints = buildList(chaine, mode,styleD,styleV)
-   triangulation = BowyerWatson(listPoints,bbox)
-   listVoronoi = buildVoronoi(listPoints, triangulation)
+   local listPoints = buildList(chaine, mode,styleD,styleV)
+   local triangulation = BowyerWatson(listPoints,bbox)
+   local listVoronoi = buildVoronoi(listPoints, triangulation)
    output = traceVoronoiTikZ(listPoints,triangulation,listVoronoi,points,tri,color,colorBbox,colorVoronoi,styleD,styleV)
    output = "\\noindent\\begin{tikzpicture}[x=" .. scale .. ",y=" .. scale .."]" ..beginning.. output..ending .."\\end{tikzpicture}"
    tex.sprint(output)
@@ -258,8 +258,8 @@ end
 
 -- buildMesh with MP
 function buildMeshMPBW(chaine,mode,points,bbox,scale)
-   listPoints = buildList(chaine, mode)
-   triangulation = BowyerWatson(listPoints,bbox)
+   local listPoints = buildList(chaine, mode)
+   local triangulation = BowyerWatson(listPoints,bbox)
    output = traceMeshMP(listPoints, triangulation,points)
    output = "\\leavevmode\\begin{mplibcode}beginfig(0);u:="..scale.. ";" .. output .."endfig;\\end{mplibcode}"
    tex.sprint(output)
@@ -267,8 +267,8 @@ end
 
 -- buildMesh with MP include code
 function buildMeshMPBWinc(chaine,beginning, ending,mode,points,bbox,scale)
-   listPoints = buildList(chaine, mode)
-   triangulation = BowyerWatson(listPoints,bbox)
+   local listPoints = buildList(chaine, mode)
+   local triangulation = BowyerWatson(listPoints,bbox)
    output = traceMeshMP(listPoints, triangulation,points)
    output = "\\leavevmode\\begin{mplibcode}u:="..scale..";"..beginning .. output .. ending .. "\\end{mplibcode}"
    tex.sprint(output)
@@ -276,8 +276,8 @@ end
 
 -- buildMesh with TikZ
 function buildMeshTikZBW(chaine,mode,points,bbox,scale,color,colorBbox)
-   listPoints = buildList(chaine, mode)
-   triangulation = BowyerWatson(listPoints,bbox)
+   local listPoints = buildList(chaine, mode)
+   local triangulation = BowyerWatson(listPoints,bbox)
    output = traceMeshTikZ(listPoints, triangulation,points,color,colorBbox)
    output = "\\noindent\\begin{tikzpicture}[x=" .. scale .. ",y=" .. scale .."]" .. output .."\\end{tikzpicture}"
    tex.sprint(output)
@@ -285,8 +285,8 @@ end
 
 -- buildMesh with TikZ
 function buildMeshTikZBWinc(chaine,beginning, ending,mode,points,bbox,scale,color,colorBbox)
-   listPoints = buildList(chaine, mode)
-   triangulation = BowyerWatson(listPoints,bbox)
+   local listPoints = buildList(chaine, mode)
+   local triangulation = BowyerWatson(listPoints,bbox)
    output = traceMeshTikZ(listPoints, triangulation,points,color,colorBbox)
    output = "\\noindent\\begin{tikzpicture}[x=" .. scale .. ",y=" .. scale .."]" ..beginning.. output..ending .."\\end{tikzpicture}"
    tex.sprint(output)
@@ -352,7 +352,7 @@ end
 
 -- print points to mesh
 function printPointsMP(chaine,mode,points,bbox,scale)
-   listPoints = buildList(chaine, mode)
+   local listPoints = buildList(chaine, mode)
    if(bbox == "bbox" ) then
       listPoints = buildBoundingBox(listPoints)
    end
@@ -364,7 +364,7 @@ end
 
 -- print points to mesh
 function printPointsMPinc(chaine,beginning, ending, mode,points,bbox,scale)
-   listPoints = buildList(chaine, mode)
+   local listPoints = buildList(chaine, mode)
    if(bbox == "bbox" ) then
       listPoints = buildBoundingBox(listPoints)
    end
@@ -375,7 +375,7 @@ end
 
 -- print points to mesh
 function printPointsTikZ(chaine,mode,points,bbox,scale,color,colorBbox)
-   listPoints = buildList(chaine, mode)
+   local listPoints = buildList(chaine, mode)
    if(bbox == "bbox" ) then
       listPoints = buildBoundingBox(listPoints)
    end
@@ -387,7 +387,7 @@ end
 
 -- print points to mesh
 function printPointsTikZinc(chaine,beginning, ending, mode,points,bbox,scale,color,colorBbox)
-   listPoints = buildList(chaine, mode)
+   local listPoints = buildList(chaine, mode)
    if(bbox == "bbox" ) then
       listPoints = buildBoundingBox(listPoints)
    end
@@ -399,8 +399,8 @@ end
 
 -- buildMesh
 function buildRect(largeur,a,b,nbrA, nbrB)
-   listPoints = rectangleList(a,b,nbrA,nbrB)
-   triangulation = BowyerWatson(listPoints,"none")
+   local listPoints = rectangleList(a,b,nbrA,nbrB)
+   local triangulation = BowyerWatson(listPoints,"none")
    traceTikZ(listPoints, triangulation,largeur,"none")
 end
 
@@ -409,8 +409,8 @@ end
 function TeXaddOnePointTikZ(listPoints,P,step,bbox,color,colorBack, colorNew, colorCircle,colorBbox)
    output = ""
    -- build the triangulation
-   triangulation = BowyerWatson(listPoints,bbox)
-   badTriangles = buildBadTriangles(P,triangulation)
+   local triangulation = BowyerWatson(listPoints,bbox)
+   local badTriangles = buildBadTriangles(P,triangulation,listPoints)
    for i=1,#listPoints do
       output = output .. "\\coordinate (MeshPoints".. i .. ") at  (" .. listPoints[i].x .. "," .. listPoints[i].y .. ");"
    end
@@ -541,8 +541,10 @@ function TeXaddOnePointMPBW(listPoints,P,step,bbox)
    output = "";
    output = output .. "pair MeshPoints[];"
    -- build the triangulation
+   local triangulation = {}
+   local badTriangles = {}
    triangulation = BowyerWatson(listPoints,bbox)
-   badTriangles = buildBadTriangles(P,triangulation)
+   badTriangles = buildBadTriangles(P,triangulation,listPoints)
    for i=1,#listPoints do
       output = output .. "MeshPoints[".. i .. "] = (" .. listPoints[i].x .. "," .. listPoints[i].y .. ")*u;"
    end
@@ -673,6 +675,7 @@ end
 
 
 function TeXOnePointTikZBW(chaine,point,step,scale,mode,bbox,color,colorBack,colorNew,colorCircle,colorBbox)
+   local listPoints = {}
    if(mode=="int") then
       Sx,Sy=string.match(point,"%((.+),(.+)%)")
       P = {x=Sx, y=Sy}
@@ -687,6 +690,7 @@ function TeXOnePointTikZBW(chaine,point,step,scale,mode,bbox,color,colorBack,col
 end
 
 function TeXOnePointTikZBWinc(chaine,point,beginning, ending,step,scale,mode,bbox,color,colorBack,colorNew,colorCircle,colorBbox)
+   local listPoints = {}
    if(mode=="int") then
       Sx,Sy=string.match(point,"%((.+),(.+)%)")
       P = {x=Sx, y=Sy}
@@ -701,6 +705,7 @@ function TeXOnePointTikZBWinc(chaine,point,beginning, ending,step,scale,mode,bbo
 end
 
 function TeXOnePointMPBW(chaine,point,step,scale,mode,bbox)
+   local listPoints = {}
    if(mode=="int") then
       Sx,Sy=string.match(point,"%((.+),(.+)%)")
       P = {x=Sx, y=Sy}
@@ -715,6 +720,7 @@ function TeXOnePointMPBW(chaine,point,step,scale,mode,bbox)
 end
 
 function TeXOnePointMPBWinc(chaine,point,beginning,ending,step,scale,mode,bbox)
+   local listPoints = {}
    if(mode=="int") then
       Sx,Sy=string.match(point,"%((.+),(.+)%)")
       P = {x=Sx, y=Sy}
@@ -730,14 +736,14 @@ end
 
 
 function drawGmshMP(file,points,scale)
-   listPoints,triangulation = readGmsh(file)
+   local listPoints,triangulation = readGmsh(file)
    output = traceMeshMP(listPoints,triangulation,points)
    output = "\\leavevmode\\begin{mplibcode}beginfig(0);u:="..scale.. ";" .. output .."endfig;\\end{mplibcode}"
    tex.sprint(output)
 end
 
 function drawGmshMPinc(file,beginning,ending,points,scale)
-   listPoints,triangulation = readGmsh(file)
+   local listPoints,triangulation = readGmsh(file)
    output = traceMeshMP(listPoints,triangulation,points)
    output = "\\leavevmode\\begin{mplibcode}u:="..scale..";"..beginning .. output .. ending .. "\\end{mplibcode}"
    tex.sprint(output)
@@ -747,7 +753,7 @@ end
 
 --
 function drawGmshTikZ(file,points,scale,color)
-   listPoints,triangulation = readGmsh(file)
+   local listPoints,triangulation = readGmsh(file)
    output = traceMeshTikZ(listPoints, triangulation,points,color,colorBbox)
    output = "\\noindent\\begin{tikzpicture}[x=" .. scale .. ",y=" .. scale .."]" .. output .."\\end{tikzpicture}"
    tex.sprint(output)
@@ -755,7 +761,7 @@ end
 
 --
 function drawGmshTikZinc(file,beginning, ending,points,scale,color)
-   listPoints,triangulation = readGmsh(file)
+   local listPoints,triangulation = readGmsh(file)
    output = traceMeshTikZ(listPoints, triangulation,points,color,colorBbox)
    output = "\\noindent\\begin{tikzpicture}[x=" .. scale .. ",y=" .. scale .."]" ..beginning.. output..ending .."\\end{tikzpicture}"
    tex.sprint(output)
@@ -764,8 +770,8 @@ end
 
 -- buildVoronoi with MP
 function gmshVoronoiMP(file,points,scale,tri,styleD,styleV)
-   listPoints,triangulation = readGmsh(file)
-   listVoronoi = buildVoronoi(listPoints, triangulation)
+   local listPoints,triangulation = readGmsh(file)
+   local listVoronoi = buildVoronoi(listPoints, triangulation)
    output = traceVoronoiMP(listPoints,triangulation,listVoronoi,points,tri,styleD,styleV)
    output = "\\leavevmode\\begin{mplibcode}beginfig(0);u:="..scale.. ";" .. output .."endfig;\\end{mplibcode}"
    tex.sprint(output)
@@ -774,8 +780,8 @@ end
 
 -- buildVoronoi with TikZ
 function gmshVoronoiTikZ(file,points,scale,tri,color,colorVoronoi,styleD,styleV)
-   listPoints,triangulation = readGmsh(file)
-   listVoronoi = buildVoronoi(listPoints, triangulation)
+   local listPoints,triangulation = readGmsh(file)
+   local listVoronoi = buildVoronoi(listPoints, triangulation)
    output = traceVoronoiTikZ(listPoints,triangulation,listVoronoi,points,tri,color,colorBbox,colorVoronoi,styleD,styleV)
    output = "\\noindent\\begin{tikzpicture}[x=" .. scale .. ",y=" .. scale .."]" .. output .."\\end{tikzpicture}"   tex.sprint(output)
 end
@@ -783,8 +789,8 @@ end
 
 -- buildVoronoi with MP
 function gmshVoronoiMPinc(file,beginning, ending,points,scale,tri,styleD,styleV)
-   listPoints,triangulation = readGmsh(file)
-   listVoronoi = buildVoronoi(listPoints, triangulation)
+   local listPoints,triangulation = readGmsh(file)
+   local listVoronoi = buildVoronoi(listPoints, triangulation)
    output = traceVoronoiMP(listPoints,triangulation,listVoronoi,points,tri,styleD,styleV)
    output = "\\leavevmode\\begin{mplibcode}u:="..scale..";"..beginning .. output .. ending .. "\\end{mplibcode}"
    tex.sprint(output)
@@ -793,8 +799,8 @@ end
 
 -- buildVoronoi with TikZ
 function gmshVoronoiTikZinc(file,beginning, ending,points,scale,tri,color,colorVoronoi,styleD,styleV)
-   listPoints,triangulation = readGmsh(file)
-   listVoronoi = buildVoronoi(listPoints, triangulation)
+   local listPoints,triangulation = readGmsh(file)
+   local listVoronoi = buildVoronoi(listPoints, triangulation)
    output = traceVoronoiTikZ(listPoints,triangulation,listVoronoi,points,tri,color,colorBbox,colorVoronoi,styleD,styleV)
    output = "\\noindent\\begin{tikzpicture}[x=" .. scale .. ",y=" .. scale .."]" ..beginning.. output..ending .."\\end{tikzpicture}"
    tex.sprint(output)
@@ -813,7 +819,6 @@ end
 function  tracePolygonMP(polygon,points)
    output = "";
    output = output .. "pair polygon[];"
-   print(#polygon)
    for i=1,#polygon do
       output = output .. "polygon[".. i .. "] = (" .. polygon[i].x .. "," .. polygon[i].y .. ")*u;"
    end
@@ -841,11 +846,8 @@ function drawMeshPolygonMP(chaine,mode,h,step,
                              points,scale)
    local polygon = buildList(chaine, mode)
    polygon = addPointsPolygon(polygon,h)
-   print(#polygon)
    local grid = buildGrid(polygon,h)
-   print(#polygon)
    local listPoints = addGridPoints(polygon,grid,h)
-   print(#polygon)
    if(step=="polygon") then
       -- the polygon
       output = tracePolygonMP(polygon,points)