diff options
| author | lecoanet | 2005-04-12 09:01:34 +0000 |
|---|---|---|
| committer | lecoanet | 2005-04-12 09:01:34 +0000 |
| commit | 347b08b7da229ba07451e5fe1e936f72151c31a6 (patch) | |
| tree | e630512a5f9c2dc8991d79e734910dc5e0984839 /generic | |
| parent | b6fc435173b9a8680fd73011e08c92e456579bb6 (diff) | |
| download | tkzinc-347b08b7da229ba07451e5fe1e936f72151c31a6.zip tkzinc-347b08b7da229ba07451e5fe1e936f72151c31a6.tar.gz tkzinc-347b08b7da229ba07451e5fe1e936f72151c31a6.tar.bz2 tkzinc-347b08b7da229ba07451e5fe1e936f72151c31a6.tar.xz | |
Switched to the native GLU tesselator
Diffstat (limited to 'generic')
| -rw-r--r-- | generic/Attrs.c | 2 | ||||
| -rw-r--r-- | generic/Curve.c | 12 | ||||
| -rw-r--r-- | generic/Item.c | 2 |
3 files changed, 7 insertions, 9 deletions
diff --git a/generic/Attrs.c b/generic/Attrs.c index 3a4a0ee..62857b9 100644 --- a/generic/Attrs.c +++ b/generic/Attrs.c @@ -32,8 +32,8 @@ #include "List.h" #include "Geo.h" #include "WidgetInfo.h" -#include "glu.h" +#include <GL/glu.h> #include <memory.h> #include <stdlib.h> diff --git a/generic/Curve.c b/generic/Curve.c index 587fd45..0b61722 100644 --- a/generic/Curve.c +++ b/generic/Curve.c @@ -35,8 +35,8 @@ #include "Image.h" #include "Color.h" #include "tkZinc.h" -#include "glu.h" +#include <GL/glu.h> #include <ctype.h> static const char rcsid[] = "$Id$"; @@ -521,8 +521,7 @@ UpdateTristrip(CurveItem cv, if (!revert) { for (j = 0; j < poly->num_contours; j++){ gluTessBeginContour(ZnTesselator.tess); - /*printf("Début contour %d num_points %d\n", - j, poly->contours[j].num_points);*/ + //printf("Début contour %d num_points %d\n", j, poly->contours[j].num_points); for (k = 0; k < poly->contours[j].num_points; k++) { /*printf("%g@%g ", poly->contours[j].points[k].x, poly->contours[j].points[k].y);*/ v[0] = poly->contours[j].points[k].x; @@ -530,15 +529,14 @@ UpdateTristrip(CurveItem cv, v[2] = 0; gluTessVertex(ZnTesselator.tess, v, &poly->contours[j].points[k]); } - /*printf("\n");*/ + //printf("\n"); gluTessEndContour(ZnTesselator.tess); } } else { for (j = 0; j < poly->num_contours; j++){ gluTessBeginContour(ZnTesselator.tess); - /*printf("revert Début contour %d num_points %d\n", - j, poly->contours[j].num_points);*/ + //printf("revert Début contour %d num_points %d\n", j, poly->contours[j].num_points); for (i = (int) (poly->contours[j].num_points-1); i >= 0; i--) { /*printf("%g@%g ", poly->contours[j].points[i].x, poly->contours[j].points[i].y);*/ v[0] = poly->contours[j].points[i].x; @@ -546,7 +544,7 @@ UpdateTristrip(CurveItem cv, v[2] = 0; gluTessVertex(ZnTesselator.tess, v, &poly->contours[j].points[i]); } - /*printf("\n");*/ + //printf("\n"); gluTessEndContour(ZnTesselator.tess); } } diff --git a/generic/Item.c b/generic/Item.c index 9ae7bc2..e1c4230 100644 --- a/generic/Item.c +++ b/generic/Item.c @@ -28,7 +28,6 @@ #include "Types.h" -#include "glu.h" #include "Field.h" #include "Item.h" #include "Group.h" @@ -43,6 +42,7 @@ #include "OverlapMan.h" #endif +#include <GL/glu.h> #include <limits.h> /* For INT_MAX */ #include <stdarg.h> #include <stdio.h> |