butterbur/GraphicalElement/Path; tesselation: Support for inner contours

- Currently only taken into account for fill

Author: jerstlouis

butterbur/src/GraphicalElement.ec

@@ -371,17 +371,28 @@ public:
 public class Path : Shape
 {
    Array<Pointf> nodes { };
+   Array<Array<Pointf>> innerNodes { };
    bool closed, needTesselation;
 
    shpType = path;
 
+   ~Path()
+   {
+      innerNodes.Free();
+   }
+
    // FIXME: eC improvements: Clarify and fix usage of private members in base class...
 public:
    property Container<Pointf> nodes
    {
       set { nodes.copySrc = value; }
       get { return nodes; }
    }
+   property Container<Container<Pointf>> innerNodes
+   {
+      set { innerNodes.copySrc = (Array<Array<Pointf>>)value; }
+      get { return (Container<Container<Pointf>>)innerNodes; }
+   }
 
    property bool closed
    {

butterbur/src/tesselation/shapesTesselation.ec

@@ -56,6 +56,7 @@ struct TesselatedShape
       bool closed = false, noJoin = false, needTesselation = false;
       bool partialSector = false, fullSector = false;
       uint count = 0;
+      Array<Array<Pointf>> inner = null;
 
       switch(shp.shpType)
       {
@@ -75,6 +76,7 @@ struct TesselatedShape
             nodes = array.array;
             count = array.count;
             closed = path.closed && count >= 3;
+            inner = (Array<Array<Pointf>>)path.innerNodes;
             needTesselation = closed && path.needTesselation;
             break;
          }
@@ -496,7 +498,7 @@ struct TesselatedShape
                for(i = 0; i < fillCount; i++)
                   tPoints[i] = points[ixFill[i]];
 
-               tesselatePolygon(tPoints, &output, &prims);
+               tesselatePolygonEx(tPoints, inner, &output, &prims);
 
                added = output.count - tPoints.count;
                if(added > 0)

butterbur/src/tesselation/tesselation.ec

@@ -166,7 +166,12 @@ static void CALLBACK tessPrimCombine(GLdouble coords[3], Pointf *d[4],
 
 void tesselatePolygon(Array<Pointf> area, Array<Pointf> * outputPtr, Array<TessPrim> * primitivesPtr)
 {
-	int i, d;
+   tesselatePolygonEx(area, null, outputPtr, primitivesPtr);
+}
+
+void tesselatePolygonEx(Array<Pointf> area, Array<Array<Pointf>> inner, Array<Pointf> * outputPtr, Array<TessPrim> * primitivesPtr)
+{
+	int i, j, d;
    Pointf * destPoints;
    int totalCount = area.count;
    int start = 0;
@@ -176,6 +181,10 @@ void tesselatePolygon(Array<Pointf> area, Array<Pointf> * outputPtr, Array<TessP
 
    static TessPrimData tesselatorData;
 
+   if(inner)
+      for(j = 0; j < inner.count; j++)
+         totalCount += inner[j].count;
+
    tessMutex.Wait();
 
    output.size = totalCount;
@@ -197,6 +206,21 @@ void tesselatePolygon(Array<Pointf> area, Array<Pointf> * outputPtr, Array<TessP
          destPoints[d] = area[i];
          vertices[d] = { area[i].x, area[i].y };
       }
+
+      if(inner)
+      {
+         for(j = 0; j < inner.count; j++)
+         {
+            Array<Pointf> contour = inner[j];
+            n = contour.count;
+
+            for(i = n-1; i >= 0; i--, d++)
+            {
+               destPoints[d] = contour[i];
+               vertices[d] = { contour[i].x, contour[i].y };
+            }
+         }
+      }
    }
 
    if(!butterburTesselator)
@@ -221,11 +245,29 @@ void tesselatePolygon(Array<Pointf> area, Array<Pointf> * outputPtr, Array<TessP
       {
          gluTessBeginContour(butterburTesselator);
          d = start;
+         start += n;
+
          for(i = 0; i < n; i++, d++)
             gluTessVertex(butterburTesselator, (double *)&vertices[d], &destPoints[d]);
          gluTessEndContour(butterburTesselator);
+
+         if(inner)
+         {
+            for(j = 0; j < inner.count; j++)
+            {
+               Array<Pointf> contour = inner[j];
+               n = contour.count;
+               start += n;
+
+               gluTessBeginContour(butterburTesselator);
+               for(i = 0; i < n; i++, d++)
+                  gluTessVertex(butterburTesselator, (double *)&vertices[d], &destPoints[d]);
+               gluTessEndContour(butterburTesselator);
+            }
+         }
       }
-      start += n;
+      else
+         start += n;
    }
 
    gluTessEndPolygon(butterburTesselator);