X-Git-Url: https://melusine.eu.org/syracuse/G/git/?p=delaunay.git;a=blobdiff_plain;f=luamesh.lua;h=de0c2742dcc55660f69975a363f9379493803853;hp=28e61db1a1e0ac6f465b50baecec4d28f3eeb107;hb=4b4f6ae2ce34662269e37912c19c856ebf0cde17;hpb=f5b04999414b0f514d2fea252417c05ac2efeeac

diff --git a/luamesh.lua b/luamesh.lua
index 28e61db..de0c274 100644
--- a/luamesh.lua
+++ b/luamesh.lua
@@ -6,9 +6,9 @@ function BowyerWatson (listPoints,bbox)
    -- add four points to listPoints to have a bounding box
    listPoints = buildBoundingBox(listPoints)
    -- the first triangle
-   triangulation[1] = {lgth+1, lgth+2, lgth+3}
+   triangulation[1] = {lgth+1, lgth+2, lgth+3,type="bbox"}
    -- the second triangle
-   triangulation[2] = {lgth+1, lgth+3, lgth+4}
+   triangulation[2] = {lgth+1, lgth+3, lgth+4,type="bbox"}
    -- add points one by one
    for i=1,lgth do
       -- find the triangles which the circumcircle contained the point to add
@@ -21,7 +21,11 @@ function BowyerWatson (listPoints,bbox)
       end
       -- build the new triangles and add them to triangulation
       for j=1,#polygon do
-         table.insert(triangulation,{polygon[j][1],polygon[j][2],i})
+         if((polygon[j][1]>lgth) or (polygon[j][2]>lgth) or (i>lgth)) then
+            table.insert(triangulation,{polygon[j][1],polygon[j][2],i,type="bbox"})
+         else
+            table.insert(triangulation,{polygon[j][1],polygon[j][2],i,type="in"})
+         end
       end
    end	-- end adding points of the listPoints
    -- remove bounding box
@@ -64,10 +68,10 @@ function buildBoundingBox(listPoints)
    ymin = ymin - eps
    ymax = ymax + eps
    -- add points of the bounding box in last positions
-   table.insert(listPoints,{x=xmin,y=ymin})
-   table.insert(listPoints,{x=xmin,y=ymax})
-   table.insert(listPoints,{x=xmax,y=ymax})
-   table.insert(listPoints,{x=xmax,y=ymin})
+   table.insert(listPoints,{x=xmin,y=ymin,type="bbox"})
+   table.insert(listPoints,{x=xmin,y=ymax,type="bbox"})
+   table.insert(listPoints,{x=xmax,y=ymax,type="bbox"})
+   table.insert(listPoints,{x=xmax,y=ymin,type="bbox"})
    return listPoints
 end
 
@@ -267,7 +271,7 @@ end
 
 
 -- trace a triangulation with MP
-function traceMeshMP(listPoints, triangulation,points,color)
+function traceMeshMP(listPoints, triangulation,points)
    output = "";
    output = output .. " pair MeshPoints[];"
    for i=1,#listPoints do
@@ -278,11 +282,19 @@ function traceMeshMP(listPoints, triangulation,points,color)
       PointI = listPoints[triangulation[i][1]]
       PointJ = listPoints[triangulation[i][2]]
       PointK = listPoints[triangulation[i][3]]
-      output = output .. "draw (".. PointI.x ..",".. PointI.y ..")*u--("..PointJ.x..",".. PointJ.y ..")*u--("..PointK.x..",".. PointK.y ..")*u--cycle withcolor \\mpcolor{"..color.. "};"
+      if(triangulation[i].type == "bbox") then
+         output = output .. "draw (".. PointI.x ..",".. PointI.y ..")*u--("..PointJ.x..",".. PointJ.y ..")*u--("..PointK.x..",".. PointK.y ..")*u--cycle withcolor \\luameshmpcolorBbox;"
+      else
+         output = output .. "draw (".. PointI.x ..",".. PointI.y ..")*u--("..PointJ.x..",".. PointJ.y ..")*u--("..PointK.x..",".. PointK.y ..")*u--cycle withcolor \\luameshmpcolor;"
+      end
    end
    if(points=="points") then
       for i=1,#listPoints do
-         output = output .. "dotlabel.llft( btex $\\MeshPoint_{" .. i .. "}$ etex, (" .. listPoints[i].x ..",".. listPoints[i].y .. ")*u) withcolor \\mpcolor{"..color.. "};"
+         if(listPoints[i].type == "bbox") then
+            output = output .. "dotlabel.llft (btex $\\MeshPoint_{" .. i .. "}$ etex, (" .. listPoints[i].x ..",".. listPoints[i].y .. ")*u ) withcolor \\luameshmpcolorBbox ;"
+         else
+            output = output .. "dotlabel.llft (btex $\\MeshPoint_{" .. i .. "}$ etex, (" .. listPoints[i].x ..",".. listPoints[i].y .. ")*u ) withcolor \\luameshmpcolor ;"
+         end
       end
    end
    return output
@@ -303,15 +315,11 @@ end
 
 
 -- buildMesh with MP
-function buildMeshMPBW(chaine,mode,points,bbox,full,scale,color)
+function buildMeshMPBW(chaine,mode,points,bbox,scale)
    listPoints = buildList(chaine, mode)
    triangulation = BowyerWatson(listPoints,bbox)
-   output = traceMeshMP(listPoints, triangulation,points,color)
-   if(full=="full") then
-      output = "\\leavevmode\\begin{mplibcode}beginfig(0);u:="..scale.. ";" .. output .."endfig;\\end{mplibcode}"
-   else
-      output = "u:="..scale.. ";".. output
-   end
+   output = traceMeshMP(listPoints, triangulation,points)
+   output = "\\leavevmode\\begin{mplibcode}beginfig(0);u:="..scale.. ";" .. output .."endfig;\\end{mplibcode}"
    tex.sprint(output)
 end
 
@@ -450,6 +458,7 @@ function TeXaddOnePointTikZ(chaine,point,step,color,colorBack, colorNew, colorCi
 end
 
 function TeXaddOnePointMPBW(listPoints,P,step,bbox)
+   print(bbox)
    output = "";
    output = output .. "pair MeshPoints[];"
    -- build the triangulation
@@ -464,7 +473,11 @@ function TeXaddOnePointMPBW(listPoints,P,step,bbox)
          PointI = listPoints[triangulation[i][1]]
          PointJ = listPoints[triangulation[i][2]]
          PointK = listPoints[triangulation[i][3]]
-         output = output .. "draw (".. PointI.x ..",".. PointI.y ..")*u--("..PointJ.x..",".. PointJ.y ..")*u--("..PointK.x..",".. PointK.y ..")*u--cycle withcolor \\luameshmpcolor;"
+         if(triangulation[i].type == "bbox") then
+            output = output .. "draw (".. PointI.x ..",".. PointI.y ..")*u--("..PointJ.x..",".. PointJ.y ..")*u--("..PointK.x..",".. PointK.y ..")*u--cycle withcolor \\luameshmpcolorBbox;"
+         else
+            output = output .. "draw (".. PointI.x ..",".. PointI.y ..")*u--("..PointJ.x..",".. PointJ.y ..")*u--("..PointK.x..",".. PointK.y ..")*u--cycle withcolor \\luameshmpcolor;"
+         end
       end
       -- draw and fill the bad triangle
       for i=1,#badTriangles do
@@ -484,7 +497,11 @@ function TeXaddOnePointMPBW(listPoints,P,step,bbox)
       end
       -- mark the points
       for i=1,#listPoints do
-         output = output .. "dotlabel.llft (btex $\\MeshPoint_{" .. i .. "}$ etex, (" .. listPoints[i].x ..",".. listPoints[i].y .. ")*u ) withcolor \\luameshmpcolor;"
+         if(listPoints[i].type == "bbox") then
+            output = output .. "dotlabel.llft (btex $\\MeshPoint_{" .. i .. "}$ etex, (" .. listPoints[i].x ..",".. listPoints[i].y .. ")*u ) withcolor \\luameshmpcolorBbox ;"
+         else
+            output = output .. "dotlabel.llft (btex $\\MeshPoint_{" .. i .. "}$ etex, (" .. listPoints[i].x ..",".. listPoints[i].y .. ")*u ) withcolor \\luameshmpcolor ;"
+         end
       end
       -- mark the point to add
       output = output .. "dotlabel.llft (btex $\\NewPoint$ etex,(" .. P.x ..",".. P.y .. ")*u) withcolor \\luameshmpcolorNew;"
@@ -500,7 +517,11 @@ function TeXaddOnePointMPBW(listPoints,P,step,bbox)
          PointI = listPoints[triangulation[i][1]]
          PointJ = listPoints[triangulation[i][2]]
          PointK = listPoints[triangulation[i][3]]
-         output = output .. "draw (".. PointI.x ..",".. PointI.y ..")*u--("..PointJ.x..",".. PointJ.y ..")*u--("..PointK.x..",".. PointK.y ..")*u--cycle withcolor \\luameshmpcolor;"
+         if(triangulation[i].type == "bbox") then
+            output = output .. "draw (".. PointI.x ..",".. PointI.y ..")*u--("..PointJ.x..",".. PointJ.y ..")*u--("..PointK.x..",".. PointK.y ..")*u--cycle withcolor \\luameshmpcolorBbox;"
+         else
+            output = output .. "draw (".. PointI.x ..",".. PointI.y ..")*u--("..PointJ.x..",".. PointJ.y ..")*u--("..PointK.x..",".. PointK.y ..")*u--cycle withcolor \\luameshmpcolor;"
+         end
       end
       -- fill and draw the cavity
       path = ""
@@ -512,7 +533,11 @@ function TeXaddOnePointMPBW(listPoints,P,step,bbox)
       output = output .. "draw " .. path .. "cycle withcolor \\luameshmpcolorNew  withpen pencircle scaled 1pt;"
       -- mark the points of the mesh
       for i=1,#listPoints do
-         output = output .. "dotlabel.llft (btex $\\MeshPoint_{" .. i .. "}$ etex, (" .. listPoints[i].x ..",".. listPoints[i].y .. ")*u ) withcolor \\luameshmpcolor ;"
+         if(listPoints[i].type == "bbox") then
+            output = output .. "dotlabel.llft (btex $\\MeshPoint_{" .. i .. "}$ etex, (" .. listPoints[i].x ..",".. listPoints[i].y .. ")*u ) withcolor \\luameshmpcolorBbox ;"
+         else
+            output = output .. "dotlabel.llft (btex $\\MeshPoint_{" .. i .. "}$ etex, (" .. listPoints[i].x ..",".. listPoints[i].y .. ")*u ) withcolor \\luameshmpcolor ;"
+         end
       end
       -- mark the adding point
       output = output .. "dotlabel.llft (btex $\\NewPoint$ etex,(" .. P.x ..",".. P.y .. ")*u) withcolor \\luameshmpcolorNew ;"
@@ -528,7 +553,11 @@ function TeXaddOnePointMPBW(listPoints,P,step,bbox)
          PointI = listPoints[triangulation[i][1]]
          PointJ = listPoints[triangulation[i][2]]
          PointK = listPoints[triangulation[i][3]]
-         output = output .. "draw (".. PointI.x ..",".. PointI.y ..")*u--("..PointJ.x..",".. PointJ.y ..")*u--("..PointK.x..",".. PointK.y ..")*u--cycle withcolor \\luameshmpcolor ;"
+         if(triangulation[i].type == "bbox") then
+            output = output .. "draw (".. PointI.x ..",".. PointI.y ..")*u--("..PointJ.x..",".. PointJ.y ..")*u--("..PointK.x..",".. PointK.y ..")*u--cycle withcolor \\luameshmpcolorBbox;"
+         else
+            output = output .. "draw (".. PointI.x ..",".. PointI.y ..")*u--("..PointJ.x..",".. PointJ.y ..")*u--("..PointK.x..",".. PointK.y ..")*u--cycle withcolor \\luameshmpcolor;"
+         end
       end
       -- fill  the cavity
       path = ""
@@ -545,7 +574,11 @@ function TeXaddOnePointMPBW(listPoints,P,step,bbox)
       end
       -- mark points
       for i=1,#listPoints do
-         output = output .. "dotlabel.llft (btex $\\MeshPoint_{" .. i .. "}$ etex, (" .. listPoints[i].x ..",".. listPoints[i].y .. ")*u ) withcolor \\luameshmpcolor ;"
+         if(listPoints[i].type == "bbox") then
+            output = output .. "dotlabel.llft (btex $\\MeshPoint_{" .. i .. "}$ etex, (" .. listPoints[i].x ..",".. listPoints[i].y .. ")*u ) withcolor \\luameshmpcolorBbox ;"
+         else
+            output = output .. "dotlabel.llft (btex $\\MeshPoint_{" .. i .. "}$ etex, (" .. listPoints[i].x ..",".. listPoints[i].y .. ")*u ) withcolor \\luameshmpcolor ;"
+         end
       end
       -- mark the added point
       output = output .. "dotlabel.llft (btex $\\NewPoint$ etex,(" .. P.x ..",".. P.y .. ")*u) withcolor \\luameshmpcolorNew ;"
@@ -576,7 +609,7 @@ function TeXOnePointTikZ(chaine,point,step,color,colorBack,colorNew,colorCircle,
    tex.sprint(output)
 end
 
-function TeXOnePointMPBW(chaine,point,step,scale,mode,picture,bbox)
+function TeXOnePointMPBW(chaine,point,step,scale,mode,bbox)
    if(mode=="int") then
       Sx,Sy=string.match(point,"%((.+),(.+)%)")
       P = {x=Sx, y=Sy}
@@ -590,7 +623,7 @@ function TeXOnePointMPBW(chaine,point,step,scale,mode,picture,bbox)
    tex.sprint(output)
 end
 
-function TeXOnePointMPBWinc(chaine,point,beginning,ending,step,scale,mode,picture,bbox)
+function TeXOnePointMPBWinc(chaine,point,beginning,ending,step,scale,mode,bbox)
    if(mode=="int") then
       Sx,Sy=string.match(point,"%((.+),(.+)%)")
       P = {x=Sx, y=Sy}