Modifications suite � l'adjonction du param�tre fan dans TRI_STRIP1

et dans la structure tristrip.
Initialisation de cw dans le contour retourn� par GetContours.
Ajout du param�tre controls � la m�thode Coords.

1 files changed, 8 insertions, 5 deletions

diff --git a/generic/Triangles.c b/generic/Triangles.c
index 796333c..4a38e13 100644
--- a/generic/Triangles.c
+++ b/generic/Triangles.c
@@ -307,13 +307,13 @@ ComputeCoordinates(Item		item,
       dev_points = ZnRealloc(dev_points, num_points * sizeof(ZnPoint));
     }
   }
-  TRI_STRIP1(&tr->dev_points, dev_points, num_points);
+  TRI_STRIP1(&tr->dev_points, dev_points, num_points,
+	     ISSET(tr->flags, FAN_BIT));
 
   /*
    * Compute device coordinates.
    */
   ZnTransformPoints(wi->current_transfo, points, dev_points, num_points);
-  tr->dev_points.fan = ISSET(tr->flags, FAN_BIT);
 
   /*
    * Compute the bounding box. 
@@ -621,8 +621,9 @@ GetClipVertices(Item		item,
     return True;
   }
 
-  TRI_STRIP1(tristrip, tr->dev_points.strips->points, tr->dev_points.strips->num_points);
-  tristrip->fan = tr->dev_points.fan;
+  TRI_STRIP1(tristrip, tr->dev_points.strips->points,
+	     tr->dev_points.strips->num_points,
+	     tr->dev_points.strips[0].fan);
   return False;
 }
 
@@ -671,7 +672,8 @@ GetContours(Item	item,
   else {
     POLY_CONTOUR1(poly, tr->dev_points.strips->points, num_points);
   }
-  
+  poly->contour1.cw = !TestCCW(poly->contour1.points, poly->contour1.num_points);
+  poly->contour1.controls = NULL;
   return False;
 }
 
@@ -690,6 +692,7 @@ Coords(Item	item,
        int	index,
        int	cmd,
        ZnPoint	**pts,
+       char	**controls,
        int	*num_pts)
 {
   TrianglesItem	tr = (TrianglesItem) item;